Skip to content

Commit bbce91b

Browse files
authored
Merge branch 'main' into sync-job-stats
2 parents 2c5180c + 16be4de commit bbce91b

File tree

49 files changed

+2253
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2253
-128
lines changed

compiler/src/model/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ export function hoistRequestAnnotations (
668668
const privileges = [
669669
'all', 'cancel_task', 'create_snapshot', 'grant_api_key', 'manage', 'manage_api_key', 'manage_ccr',
670670
'manage_enrich', 'manage_ilm', 'manage_index_templates', 'manage_inference', 'manage_ingest_pipelines', 'manage_logstash_pipelines',
671-
'manage_ml', 'manage_oidc', 'manage_own_api_key', 'manage_pipeline', 'manage_rollup', 'manage_saml',
671+
'manage_ml', 'manage_oidc', 'manage_own_api_key', 'manage_pipeline', 'manage_rollup', 'manage_saml', 'manage_search_application',
672672
'manage_security', 'manage_service_account', 'manage_slm', 'manage_token', 'manage_transform', 'manage_user_profile',
673673
'manage_watcher', 'monitor', 'monitor_ml', 'monitor_rollup', 'monitor_snapshot', 'monitor_text_structure',
674674
'monitor_transform', 'monitor_watcher', 'read_ccr', 'read_ilm', 'read_pipeline', 'read_security', 'read_slm', 'transport_client'

docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,4 +401,74 @@ actions:
401401
application/json:
402402
examples:
403403
connectorSyncJobUpdateStatsRequestExample1:
404-
$ref: "../../specification/connector/sync_job_update_stats/SyncJobUpdateStatsRequestExample1.yaml"
404+
$ref: "../../specification/connector/sync_job_update_stats/SyncJobUpdateStatsRequestExample1.yaml"
405+
## Examples for licensing
406+
- target: "$.paths['/_license/basic_status']['get']"
407+
description: "Add example for get basic status response"
408+
update:
409+
responses:
410+
200:
411+
content:
412+
application/json:
413+
examples:
414+
getBasicStatusResponseExample1:
415+
$ref: "../../specification/license/get_basic_status/GetBasicLicenseStatusResponseExample1.yaml"
416+
- target: "$.paths['/_license/trial_status']['get']"
417+
description: "Add example for get trial status response"
418+
update:
419+
responses:
420+
200:
421+
content:
422+
application/json:
423+
examples:
424+
getLicenseResponseExample1:
425+
$ref: "../../specification/license/get_trial_status/GetTrialLicenseStatusResponseExample1.yaml"
426+
- target: "$.paths['/_license/start_basic']['post']"
427+
description: "Add example for start basic response"
428+
update:
429+
responses:
430+
200:
431+
content:
432+
application/json:
433+
examples:
434+
startBasicLicenseResponseExample1:
435+
$ref: "../../specification/license/post_start_basic/StartBasicLicenseResponseExample1.yaml"
436+
- target: "$.paths['/_license/start_trial']['post']"
437+
description: "Add example for start trial response"
438+
update:
439+
responses:
440+
200:
441+
content:
442+
application/json:
443+
examples:
444+
startTrialLicenseResponseExample1:
445+
$ref: "../../specification/license/post_start_trial/StartTrialLicenseResponseExample1.yaml"
446+
- target: "$.components['requestBodies']['license.post']"
447+
description: "Add examples for update license request"
448+
update:
449+
content:
450+
application/json:
451+
examples:
452+
updateLicenseRequestExample1:
453+
$ref: "../../specification/license/post/PostLicenseRequestExample1.yaml"
454+
- target: "$.components['responses']['license.post#200']"
455+
description: "Add examples for update license response"
456+
update:
457+
content:
458+
application/json:
459+
examples:
460+
clusterHealthResponseExample1:
461+
$ref: "../../specification/license/post/PostLicenseResponseExample1.yaml"
462+
## Examples for search applications
463+
- target: "$.paths['/_application/search_application/{name}/_render_query']['post']"
464+
description: "Add examples for render search application query operation"
465+
update:
466+
requestBody:
467+
content:
468+
application/json:
469+
examples:
470+
renderSearchApplicationQueryRequestExample1:
471+
$ref: "../../specification/search_application/render_query/SearchApplicationsRenderQueryRequestExample1.yaml"
472+
renderSearchApplicationQueryResponseExample1:
473+
$ref: "../../specification/search_application/render_query/SearchApplicationsRenderQueryResponseExample1.yaml"
474+

docs/overlays/elasticsearch-shared-overlays.yaml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,3 +1351,61 @@ actions:
13511351
examples:
13521352
indicesRolloverResponseExample1:
13531353
$ref: "../../specification/indices/rollover/indicesRolloverResponseExample1.yaml"
1354+
## Examples for behavioral analytics
1355+
- target: "$.components['responses']['search_application.get_behavioral_analytics#200']"
1356+
description: "Add example for get behavioral analytics collections response"
1357+
update:
1358+
content:
1359+
application/json:
1360+
examples:
1361+
getBehavioralAnalyticsCollectionsResponseExample1:
1362+
$ref: "../../specification/search_application/get_behavioral_analytics/BehavioralAnalyticsGetResponseExample1.yaml"
1363+
## Examples for licensing
1364+
- target: "$.paths['/_license']['get']"
1365+
description: "Add example for get license response"
1366+
update:
1367+
responses:
1368+
200:
1369+
content:
1370+
application/json:
1371+
examples:
1372+
getLicenseResponseExample1:
1373+
$ref: "../../specification/license/get/GetLicenseResponseExample1.yaml"
1374+
## Examples for search applications
1375+
- target: "$.paths['/_application/search_application']['get']"
1376+
description: "Add examples for get search applications operation"
1377+
update:
1378+
responses:
1379+
200:
1380+
content:
1381+
application/json:
1382+
examples:
1383+
getSearchApplicationsResponseExample1:
1384+
$ref: "../../specification/search_application/list/SearchApplicationsListResponseExample1.yaml"
1385+
- target: "$.paths['/_application/search_application/{name}']['get']"
1386+
description: "Add examples for get search application details operation"
1387+
update:
1388+
responses:
1389+
200:
1390+
content:
1391+
application/json:
1392+
examples:
1393+
getSearchApplicationResponseExample1:
1394+
$ref: "../../specification/search_application/get/SearchApplicationGetResponseExample1.yaml"
1395+
- target: "$.paths['/_application/search_application/{name}']['put']"
1396+
description: "Add examples for create search application operation"
1397+
update:
1398+
requestBody:
1399+
content:
1400+
application/json:
1401+
examples:
1402+
putSearchApplicationRequestExample1:
1403+
$ref: "../../specification/search_application/put/SearchApplicationPutRequestExample1.yaml"
1404+
- target: "$.components['requestBodies']['search_application.search']"
1405+
description: "Add example for search application search request"
1406+
update:
1407+
content:
1408+
application/json:
1409+
examples:
1410+
searchApplicationSearchRequestExample1:
1411+
$ref: "../../specification/search_application/search/SearchApplicationsSearchRequestExample1.yaml"

0 commit comments

Comments
 (0)