Skip to content

Commit 9a14b60

Browse files
haetamoudihaetamoudi
committed
fix merge conflicts
2 parents 184e334 + caad894 commit 9a14b60

File tree

1,130 files changed

+15478
-6871
lines changed

Some content is hidden

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

1,130 files changed

+15478
-6871
lines changed

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2024-09-23
11+
date: 2024-09-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

‎api_docs/advanced_settings.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2024-09-23
11+
date: 2024-09-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

‎api_docs/ai_assistant_management_selection.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
88
title: "aiAssistantManagementSelection"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiAssistantManagementSelection plugin
11-
date: 2024-09-23
11+
date: 2024-09-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
1313
---
1414
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

‎api_docs/aiops.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
88
title: "aiops"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiops plugin
11-
date: 2024-09-23
11+
date: 2024-09-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
1313
---
1414
import aiopsObj from './aiops.devdocs.json';

‎api_docs/alerting.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
88
title: "alerting"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the alerting plugin
11-
date: 2024-09-23
11+
date: 2024-09-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
1313
---
1414
import alertingObj from './alerting.devdocs.json';

‎api_docs/apm.devdocs.json‎

Lines changed: 175 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,23 +2502,53 @@
25022502
"<[",
25032503
"LiteralC",
25042504
"<",
2505-
"IndexLifecyclePhaseSelectOption",
2505+
{
2506+
"pluginId": "observabilityShared",
2507+
"scope": "common",
2508+
"docId": "kibObservabilitySharedPluginApi",
2509+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2510+
"text": "IndexLifecyclePhaseSelectOption"
2511+
},
25062512
".All>, ",
25072513
"LiteralC",
25082514
"<",
2509-
"IndexLifecyclePhaseSelectOption",
2515+
{
2516+
"pluginId": "observabilityShared",
2517+
"scope": "common",
2518+
"docId": "kibObservabilitySharedPluginApi",
2519+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2520+
"text": "IndexLifecyclePhaseSelectOption"
2521+
},
25102522
".Hot>, ",
25112523
"LiteralC",
25122524
"<",
2513-
"IndexLifecyclePhaseSelectOption",
2525+
{
2526+
"pluginId": "observabilityShared",
2527+
"scope": "common",
2528+
"docId": "kibObservabilitySharedPluginApi",
2529+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2530+
"text": "IndexLifecyclePhaseSelectOption"
2531+
},
25142532
".Warm>, ",
25152533
"LiteralC",
25162534
"<",
2517-
"IndexLifecyclePhaseSelectOption",
2535+
{
2536+
"pluginId": "observabilityShared",
2537+
"scope": "common",
2538+
"docId": "kibObservabilitySharedPluginApi",
2539+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2540+
"text": "IndexLifecyclePhaseSelectOption"
2541+
},
25182542
".Cold>, ",
25192543
"LiteralC",
25202544
"<",
2521-
"IndexLifecyclePhaseSelectOption",
2545+
{
2546+
"pluginId": "observabilityShared",
2547+
"scope": "common",
2548+
"docId": "kibObservabilitySharedPluginApi",
2549+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2550+
"text": "IndexLifecyclePhaseSelectOption"
2551+
},
25222552
".Frozen>]>; }>, ",
25232553
"TypeC",
25242554
"<{ environment: ",
@@ -2584,23 +2614,53 @@
25842614
"<[",
25852615
"LiteralC",
25862616
"<",
2587-
"IndexLifecyclePhaseSelectOption",
2617+
{
2618+
"pluginId": "observabilityShared",
2619+
"scope": "common",
2620+
"docId": "kibObservabilitySharedPluginApi",
2621+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2622+
"text": "IndexLifecyclePhaseSelectOption"
2623+
},
25882624
".All>, ",
25892625
"LiteralC",
25902626
"<",
2591-
"IndexLifecyclePhaseSelectOption",
2627+
{
2628+
"pluginId": "observabilityShared",
2629+
"scope": "common",
2630+
"docId": "kibObservabilitySharedPluginApi",
2631+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2632+
"text": "IndexLifecyclePhaseSelectOption"
2633+
},
25922634
".Hot>, ",
25932635
"LiteralC",
25942636
"<",
2595-
"IndexLifecyclePhaseSelectOption",
2637+
{
2638+
"pluginId": "observabilityShared",
2639+
"scope": "common",
2640+
"docId": "kibObservabilitySharedPluginApi",
2641+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2642+
"text": "IndexLifecyclePhaseSelectOption"
2643+
},
25962644
".Warm>, ",
25972645
"LiteralC",
25982646
"<",
2599-
"IndexLifecyclePhaseSelectOption",
2647+
{
2648+
"pluginId": "observabilityShared",
2649+
"scope": "common",
2650+
"docId": "kibObservabilitySharedPluginApi",
2651+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2652+
"text": "IndexLifecyclePhaseSelectOption"
2653+
},
26002654
".Cold>, ",
26012655
"LiteralC",
26022656
"<",
2603-
"IndexLifecyclePhaseSelectOption",
2657+
{
2658+
"pluginId": "observabilityShared",
2659+
"scope": "common",
2660+
"docId": "kibObservabilitySharedPluginApi",
2661+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2662+
"text": "IndexLifecyclePhaseSelectOption"
2663+
},
26042664
".Frozen>]>; }>, ",
26052665
"TypeC",
26062666
"<{ probability: ",
@@ -2672,23 +2732,53 @@
26722732
"<[",
26732733
"LiteralC",
26742734
"<",
2675-
"IndexLifecyclePhaseSelectOption",
2735+
{
2736+
"pluginId": "observabilityShared",
2737+
"scope": "common",
2738+
"docId": "kibObservabilitySharedPluginApi",
2739+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2740+
"text": "IndexLifecyclePhaseSelectOption"
2741+
},
26762742
".All>, ",
26772743
"LiteralC",
26782744
"<",
2679-
"IndexLifecyclePhaseSelectOption",
2745+
{
2746+
"pluginId": "observabilityShared",
2747+
"scope": "common",
2748+
"docId": "kibObservabilitySharedPluginApi",
2749+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2750+
"text": "IndexLifecyclePhaseSelectOption"
2751+
},
26802752
".Hot>, ",
26812753
"LiteralC",
26822754
"<",
2683-
"IndexLifecyclePhaseSelectOption",
2755+
{
2756+
"pluginId": "observabilityShared",
2757+
"scope": "common",
2758+
"docId": "kibObservabilitySharedPluginApi",
2759+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2760+
"text": "IndexLifecyclePhaseSelectOption"
2761+
},
26842762
".Warm>, ",
26852763
"LiteralC",
26862764
"<",
2687-
"IndexLifecyclePhaseSelectOption",
2765+
{
2766+
"pluginId": "observabilityShared",
2767+
"scope": "common",
2768+
"docId": "kibObservabilitySharedPluginApi",
2769+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2770+
"text": "IndexLifecyclePhaseSelectOption"
2771+
},
26882772
".Cold>, ",
26892773
"LiteralC",
26902774
"<",
2691-
"IndexLifecyclePhaseSelectOption",
2775+
{
2776+
"pluginId": "observabilityShared",
2777+
"scope": "common",
2778+
"docId": "kibObservabilitySharedPluginApi",
2779+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2780+
"text": "IndexLifecyclePhaseSelectOption"
2781+
},
26922782
".Frozen>]>; }>, ",
26932783
"TypeC",
26942784
"<{ probability: ",
@@ -2752,23 +2842,53 @@
27522842
"<[",
27532843
"LiteralC",
27542844
"<",
2755-
"IndexLifecyclePhaseSelectOption",
2845+
{
2846+
"pluginId": "observabilityShared",
2847+
"scope": "common",
2848+
"docId": "kibObservabilitySharedPluginApi",
2849+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2850+
"text": "IndexLifecyclePhaseSelectOption"
2851+
},
27562852
".All>, ",
27572853
"LiteralC",
27582854
"<",
2759-
"IndexLifecyclePhaseSelectOption",
2855+
{
2856+
"pluginId": "observabilityShared",
2857+
"scope": "common",
2858+
"docId": "kibObservabilitySharedPluginApi",
2859+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2860+
"text": "IndexLifecyclePhaseSelectOption"
2861+
},
27602862
".Hot>, ",
27612863
"LiteralC",
27622864
"<",
2763-
"IndexLifecyclePhaseSelectOption",
2865+
{
2866+
"pluginId": "observabilityShared",
2867+
"scope": "common",
2868+
"docId": "kibObservabilitySharedPluginApi",
2869+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2870+
"text": "IndexLifecyclePhaseSelectOption"
2871+
},
27642872
".Warm>, ",
27652873
"LiteralC",
27662874
"<",
2767-
"IndexLifecyclePhaseSelectOption",
2875+
{
2876+
"pluginId": "observabilityShared",
2877+
"scope": "common",
2878+
"docId": "kibObservabilitySharedPluginApi",
2879+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2880+
"text": "IndexLifecyclePhaseSelectOption"
2881+
},
27682882
".Cold>, ",
27692883
"LiteralC",
27702884
"<",
2771-
"IndexLifecyclePhaseSelectOption",
2885+
{
2886+
"pluginId": "observabilityShared",
2887+
"scope": "common",
2888+
"docId": "kibObservabilitySharedPluginApi",
2889+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2890+
"text": "IndexLifecyclePhaseSelectOption"
2891+
},
27722892
".Frozen>]>; }>, ",
27732893
"TypeC",
27742894
"<{ probability: ",
@@ -2828,23 +2948,53 @@
28282948
"<[",
28292949
"LiteralC",
28302950
"<",
2831-
"IndexLifecyclePhaseSelectOption",
2951+
{
2952+
"pluginId": "observabilityShared",
2953+
"scope": "common",
2954+
"docId": "kibObservabilitySharedPluginApi",
2955+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2956+
"text": "IndexLifecyclePhaseSelectOption"
2957+
},
28322958
".All>, ",
28332959
"LiteralC",
28342960
"<",
2835-
"IndexLifecyclePhaseSelectOption",
2961+
{
2962+
"pluginId": "observabilityShared",
2963+
"scope": "common",
2964+
"docId": "kibObservabilitySharedPluginApi",
2965+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2966+
"text": "IndexLifecyclePhaseSelectOption"
2967+
},
28362968
".Hot>, ",
28372969
"LiteralC",
28382970
"<",
2839-
"IndexLifecyclePhaseSelectOption",
2971+
{
2972+
"pluginId": "observabilityShared",
2973+
"scope": "common",
2974+
"docId": "kibObservabilitySharedPluginApi",
2975+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2976+
"text": "IndexLifecyclePhaseSelectOption"
2977+
},
28402978
".Warm>, ",
28412979
"LiteralC",
28422980
"<",
2843-
"IndexLifecyclePhaseSelectOption",
2981+
{
2982+
"pluginId": "observabilityShared",
2983+
"scope": "common",
2984+
"docId": "kibObservabilitySharedPluginApi",
2985+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2986+
"text": "IndexLifecyclePhaseSelectOption"
2987+
},
28442988
".Cold>, ",
28452989
"LiteralC",
28462990
"<",
2847-
"IndexLifecyclePhaseSelectOption",
2991+
{
2992+
"pluginId": "observabilityShared",
2993+
"scope": "common",
2994+
"docId": "kibObservabilitySharedPluginApi",
2995+
"section": "def-common.IndexLifecyclePhaseSelectOption",
2996+
"text": "IndexLifecyclePhaseSelectOption"
2997+
},
28482998
".Frozen>]>; }>, ",
28492999
"TypeC",
28503000
"<{ probability: ",

‎api_docs/apm.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
88
title: "apm"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the apm plugin
11-
date: 2024-09-23
11+
date: 2024-09-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
1313
---
1414
import apmObj from './apm.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/te
2121

2222
| Public API count | Any count | Items lacking comments | Missing exports |
2323
|-------------------|-----------|------------------------|-----------------|
24-
| 29 | 0 | 29 | 119 |
24+
| 29 | 0 | 29 | 118 |
2525

2626
## Client
2727

‎api_docs/apm_data_access.devdocs.json‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,9 @@
295295
"label": "fieldCaps",
296296
"description": [],
297297
"signature": [
298-
"(operationName: string, params: APMEventFieldCapsRequest) => Promise<",
298+
"(operationName: string, params: ",
299+
"APMEventFieldCapsRequest",
300+
") => Promise<",
299301
"FieldCapsResponse",
300302
">"
301303
],
@@ -344,7 +346,9 @@
344346
"label": "termsEnum",
345347
"description": [],
346348
"signature": [
347-
"(operationName: string, params: APMEventTermsEnumRequest) => Promise<",
349+
"(operationName: string, params: ",
350+
"APMEventTermsEnumRequest",
351+
") => Promise<",
348352
"TermsEnumResponse",
349353
">"
350354
],
@@ -1886,7 +1890,15 @@
18861890
},
18871891
"<unknown, unknown, unknown, any>, ",
18881892
"InspectResponse",
1889-
"> | undefined; }"
1893+
"> | undefined; excludedDataTiers?: ",
1894+
{
1895+
"pluginId": "observabilityShared",
1896+
"scope": "common",
1897+
"docId": "kibObservabilitySharedPluginApi",
1898+
"section": "def-common.DataTier",
1899+
"text": "DataTier"
1900+
},
1901+
"[] | undefined; }"
18901902
],
18911903
"path": "x-pack/plugins/observability_solution/apm_data_access/server/lib/helpers/create_es_client/create_apm_event_client/index.ts",
18921904
"deprecated": false,

0 commit comments

Comments
 (0)