Skip to content

Commit

Permalink
Merge branch 'main' into 192323-inventory-use-observabilityentitycent…
Browse files Browse the repository at this point in the history
…ricexperience-to-enable-inventory-2
  • Loading branch information
iblancof authored Sep 27, 2024
2 parents ef0ab30 + a80335e commit 79b4b54
Show file tree
Hide file tree
Showing 1,222 changed files with 29,759 additions and 8,568 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ enabled:
- x-pack/performance/journeys_e2e/promotion_tracking_dashboard.ts
- x-pack/performance/journeys_e2e/web_logs_dashboard.ts
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts
- x-pack/performance/journeys_e2e/web_logs_dashboard_dataview.ts
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts
Expand Down
32 changes: 17 additions & 15 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ jobs:
name: 'Label and Backport'
runs-on: ubuntu-latest
if: |
github.event.pull_request.merged == true
&& (
(
github.event.action == 'labeled' && (
github.event.label.name == 'backport:prev-minor'
|| github.event.label.name == 'backport:prev-major'
|| github.event.label.name == 'backport:current-major'
|| github.event.label.name == 'backport:all-open'
|| github.event.label.name == 'backport:version'
|| github.event.label.name == 'auto-backport'
)
)
|| (github.event.action == 'unlabeled' && github.event.label.name == 'backport:skip')
|| (github.event.action == 'closed')
)
github.event.pull_request.merged == true &&
(github.event.action == 'closed' ||
(github.event.action == 'labeled' &&
(github.event.label.name == 'backport:prev-minor' ||
github.event.label.name == 'backport:prev-major' ||
github.event.label.name == 'backport:current-major' ||
github.event.label.name == 'backport:all-open' ||
github.event.label.name == 'backport:version' ||
github.event.label.name == 'auto-backport')) ||
(github.event.action == 'unlabeled' &&
github.event.label.name == 'backport:skip' &&
(contains(github.event.pull_request.labels.*.name, 'backport:prev-minor') ||
contains(github.event.pull_request.labels.*.name, 'backport:prev-major') ||
contains(github.event.pull_request.labels.*.name, 'backport:current-major') ||
contains(github.event.pull_request.labels.*.name, 'backport:all-open') ||
contains(github.event.pull_request.labels.*.name, 'backport:version') ||
contains(github.event.pull_request.labels.*.name, 'auto-backport'))))
steps:
- name: Checkout Actions
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2024-09-26
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2024-09-26
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_selection.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
title: "aiAssistantManagementSelection"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementSelection plugin
date: 2024-09-26
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
---
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2024-09-26
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
222 changes: 112 additions & 110 deletions api_docs/alerting.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3639,20 +3639,6 @@
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.maintenanceWindowIds",
"type": "Array",
"tags": [],
"label": "maintenanceWindowIds",
"description": [],
"signature": [
"string[] | undefined"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.getTimeRange",
Expand Down Expand Up @@ -3712,59 +3698,16 @@
"children": [
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.savedObjectsClient",
"type": "Object",
"id": "def-server.RuleExecutorServices.alertsClient",
"type": "CompoundType",
"tags": [],
"label": "savedObjectsClient",
"description": [],
"signature": [
{
"pluginId": "@kbn/core-saved-objects-api-server",
"scope": "server",
"docId": "kibKbnCoreSavedObjectsApiServerPluginApi",
"section": "def-server.SavedObjectsClientContract",
"text": "SavedObjectsClientContract"
}
"label": "alertsClient",
"description": [
"\nOnly available when framework alerts are enabled and rule\ntype has registered alert context with the framework with shouldWrite set to true"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.uiSettingsClient",
"type": "Object",
"tags": [],
"label": "uiSettingsClient",
"description": [],
"signature": [
{
"pluginId": "@kbn/core-ui-settings-server",
"scope": "server",
"docId": "kibKbnCoreUiSettingsServerPluginApi",
"section": "def-server.IUiSettingsClient",
"text": "IUiSettingsClient"
}
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.scopedClusterClient",
"type": "Object",
"tags": [],
"label": "scopedClusterClient",
"description": [],
"signature": [
{
"pluginId": "@kbn/core-elasticsearch-server",
"scope": "server",
"docId": "kibKbnCoreElasticsearchServerPluginApi",
"section": "def-server.IScopedClusterClient",
"text": "IScopedClusterClient"
}
"PublicAlertsClient",
"<AlertData, State, Context, ActionGroupIds> | null"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand Down Expand Up @@ -3818,30 +3761,37 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.alertsClient",
"type": "CompoundType",
"id": "def-server.RuleExecutorServices.getDataViews",
"type": "Function",
"tags": [],
"label": "alertsClient",
"description": [
"\nOnly available when framework alerts are enabled and rule\ntype has registered alert context with the framework with shouldWrite set to true"
],
"label": "getDataViews",
"description": [],
"signature": [
"PublicAlertsClient",
"<AlertData, State, Context, ActionGroupIds> | null"
"() => Promise<",
{
"pluginId": "dataViews",
"scope": "common",
"docId": "kibDataViewsPluginApi",
"section": "def-common.DataViewsContract",
"text": "DataViewsContract"
},
">"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
"trackAdoption": false,
"children": [],
"returnComment": []
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.shouldWriteAlerts",
"id": "def-server.RuleExecutorServices.getMaintenanceWindowIds",
"type": "Function",
"tags": [],
"label": "shouldWriteAlerts",
"label": "getMaintenanceWindowIds",
"description": [],
"signature": [
"() => boolean"
"() => Promise<string[]>"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand All @@ -3851,13 +3801,21 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.shouldStopExecution",
"id": "def-server.RuleExecutorServices.getSearchSourceClient",
"type": "Function",
"tags": [],
"label": "shouldStopExecution",
"label": "getSearchSourceClient",
"description": [],
"signature": [
"() => boolean"
"() => Promise<",
{
"pluginId": "data",
"scope": "common",
"docId": "kibDataSearchPluginApi",
"section": "def-common.ISearchStartSearchSource",
"text": "ISearchStartSearchSource"
},
">"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand All @@ -3880,6 +3838,61 @@
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.ruleResultService",
"type": "Object",
"tags": [],
"label": "ruleResultService",
"description": [],
"signature": [
"PublicLastRunSetters",
" | undefined"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.savedObjectsClient",
"type": "Object",
"tags": [],
"label": "savedObjectsClient",
"description": [],
"signature": [
{
"pluginId": "@kbn/core-saved-objects-api-server",
"scope": "server",
"docId": "kibKbnCoreSavedObjectsApiServerPluginApi",
"section": "def-server.SavedObjectsClientContract",
"text": "SavedObjectsClientContract"
}
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.scopedClusterClient",
"type": "Object",
"tags": [],
"label": "scopedClusterClient",
"description": [],
"signature": [
{
"pluginId": "@kbn/core-elasticsearch-server",
"scope": "server",
"docId": "kibKbnCoreElasticsearchServerPluginApi",
"section": "def-server.IScopedClusterClient",
"text": "IScopedClusterClient"
}
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.share",
Expand All @@ -3902,36 +3915,29 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.ruleResultService",
"type": "Object",
"id": "def-server.RuleExecutorServices.shouldStopExecution",
"type": "Function",
"tags": [],
"label": "ruleResultService",
"label": "shouldStopExecution",
"description": [],
"signature": [
"PublicLastRunSetters",
" | undefined"
"() => boolean"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
"trackAdoption": false,
"children": [],
"returnComment": []
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.getDataViews",
"id": "def-server.RuleExecutorServices.shouldWriteAlerts",
"type": "Function",
"tags": [],
"label": "getDataViews",
"label": "shouldWriteAlerts",
"description": [],
"signature": [
"() => Promise<",
{
"pluginId": "dataViews",
"scope": "common",
"docId": "kibDataViewsPluginApi",
"section": "def-common.DataViewsContract",
"text": "DataViewsContract"
},
">"
"() => boolean"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand All @@ -3941,27 +3947,23 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorServices.getSearchSourceClient",
"type": "Function",
"id": "def-server.RuleExecutorServices.uiSettingsClient",
"type": "Object",
"tags": [],
"label": "getSearchSourceClient",
"label": "uiSettingsClient",
"description": [],
"signature": [
"() => Promise<",
{
"pluginId": "data",
"scope": "common",
"docId": "kibDataSearchPluginApi",
"section": "def-common.ISearchStartSearchSource",
"text": "ISearchStartSearchSource"
},
">"
"pluginId": "@kbn/core-ui-settings-server",
"scope": "server",
"docId": "kibKbnCoreUiSettingsServerPluginApi",
"section": "def-server.IUiSettingsClient",
"text": "IUiSettingsClient"
}
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false,
"children": [],
"returnComment": []
"trackAdoption": false
}
],
"initialIsOpen": false
Expand Down
Loading

0 comments on commit 79b4b54

Please sign in to comment.