Skip to content

Commit 6963c2e

Browse files
dej611dej611
committed
Merge remote-tracking branch 'upstream/master' into fix/101573
2 parents dd9c52f + 63bedaa commit 6963c2e

2,496 files changed

Lines changed: 72860 additions & 40734 deletions

File tree

Some content is hidden

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

‎.buildkite/scripts/build_kibana.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
export KBN_NP_PLUGINS_BUILT=true
66

77
echo "--- Build Kibana Distribution"
8-
node scripts/build --debug --no-oss
8+
node scripts/build --debug
99

1010
echo "--- Archive Kibana Distribution"
1111
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"

‎.buildkite/scripts/common/env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ export TEST_KIBANA_HOST=localhost
6767
export TEST_KIBANA_PORT=6101
6868
export TEST_KIBANA_URL="http://elastic:changeme@localhost:6101"
6969
export TEST_ES_URL="http://elastic:changeme@localhost:6102"
70-
export TEST_ES_TRANSPORT_PORT=6103
70+
export TEST_ES_TRANSPORT_PORT=6301-6309
7171
export TEST_CORS_SERVER_PORT=6106
7272
export ALERTING_PROXY_PORT=6105

‎.buildkite/scripts/post_build_kibana.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [[ ! "${DISABLE_CI_STATS_SHIPPING:-}" ]]; then
66
echo "--- Ship Kibana Distribution Metrics to CI Stats"
77
node scripts/ship_ci_stats \
88
--metrics target/optimizer_bundle_metrics.json \
9-
--metrics node_modules/@kbn/ui-shared-deps/shared_built_assets/metrics.json
9+
--metrics build/kibana/node_modules/@kbn/ui-shared-deps/shared_built_assets/metrics.json
1010
fi
1111

1212
echo "--- Upload Build Artifacts"

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ module.exports = {
446446
'!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
447447
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
448448
'!(src|x-pack)/plugins/**/__stories__/index.{js,mjs,ts,tsx}',
449+
'!(src|x-pack)/plugins/**/__fixtures__/index.{js,mjs,ts,tsx}',
449450
],
450451
allowSameFolder: true,
451452
errorMessage: 'Plugins may only import from top-level public and server modules.',

‎.github/workflows/backport.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ jobs:
2828
- name: Install Actions
2929
run: npm install --production --prefix ./actions
3030

31+
- name: Fix Version Label Gaps
32+
uses: ./actions/fix-version-gaps
33+
with:
34+
github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
35+
3136
- name: Run Backport
3237
uses: ./actions/backport
3338
with:

‎.github/workflows/fix-version-gaps.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
on:
2+
pull_request:
3+
branches:
4+
- master
5+
types:
6+
- closed
7+
8+
jobs:
9+
gaps:
10+
name: Fix Version Label Gaps
11+
# This fix also runs as part of the backport action (because backport depends on the labels)
12+
# So we only need to trigger it for merged PRs that also won't be auto-backported
13+
if: |
14+
github.event.pull_request.merged == true
15+
&& !contains(github.event.pull_request.labels.*.name, 'auto-backport')
16+
&& !(
17+
(github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
18+
|| (github.event.action == 'closed')
19+
)
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout Actions
23+
uses: actions/checkout@v2
24+
with:
25+
repository: 'elastic/kibana-github-actions'
26+
ref: main
27+
path: ./actions
28+
29+
- name: Install Actions
30+
run: npm install --production --prefix ./actions
31+
32+
- name: Run Fix Gaps
33+
uses: ./actions/fix-version-gaps
34+
with:
35+
github_token: ${{secrets.KIBANAMACHINE_TOKEN}}

‎.i18nrc.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"paths": {
3+
"autocomplete": "packages/kbn-securitysolution-autocomplete/src",
34
"console": "src/plugins/console",
45
"core": "src/core",
56
"discover": "src/plugins/discover",
@@ -17,7 +18,11 @@
1718
"devTools": "src/plugins/dev_tools",
1819
"expressions": "src/plugins/expressions",
1920
"expressionError": "src/plugins/expression_error",
21+
"expressionImage": "src/plugins/expression_image",
22+
"expressionMetric": "src/plugins/expression_metric",
23+
"expressionRepeatImage": "src/plugins/expression_repeat_image",
2024
"expressionRevealImage": "src/plugins/expression_reveal_image",
25+
"expressionShape": "src/plugins/expression_shape",
2126
"inputControl": "src/plugins/input_control_vis",
2227
"inspector": "src/plugins/inspector",
2328
"inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -28,6 +33,7 @@
2833
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
2934
"maps_legacy": "src/plugins/maps_legacy",
3035
"monaco": "packages/kbn-monaco/src",
36+
"esQuery": "packages/kbn-es-query/src",
3137
"presentationUtil": "src/plugins/presentation_util",
3238
"indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
3339
"indexPatternManagement": "src/plugins/index_pattern_management",

‎api_docs/alerting.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -669,19 +669,19 @@
669669
"children": [
670670
{
671671
"parentPluginId": "alerting",
672-
"id": "def-server.AlertingApiRequestHandlerContext.getAlertsClient",
672+
"id": "def-server.AlertingApiRequestHandlerContext.getRulesClient",
673673
"type": "Function",
674674
"tags": [],
675-
"label": "getAlertsClient",
675+
"label": "getRulesClient",
676676
"description": [],
677677
"signature": [
678678
"() => ",
679679
{
680680
"pluginId": "alerting",
681681
"scope": "server",
682682
"docId": "kibAlertingPluginApi",
683-
"section": "def-server.AlertsClient",
684-
"text": "AlertsClient"
683+
"section": "def-server.RulesClient",
684+
"text": "RulesClient"
685685
}
686686
],
687687
"source": {
@@ -701,7 +701,7 @@
701701
"description": [],
702702
"signature": [
703703
"() => Set<",
704-
"RegistryAlertType",
704+
"RegistryRuleType",
705705
">"
706706
],
707707
"source": {
@@ -1170,7 +1170,7 @@
11701170
"<Params>"
11711171
],
11721172
"source": {
1173-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1173+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
11741174
"lineNumber": 140
11751175
},
11761176
"deprecated": false,
@@ -1183,7 +1183,7 @@
11831183
"label": "page",
11841184
"description": [],
11851185
"source": {
1186-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1186+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
11871187
"lineNumber": 141
11881188
},
11891189
"deprecated": false
@@ -1196,7 +1196,7 @@
11961196
"label": "perPage",
11971197
"description": [],
11981198
"source": {
1199-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1199+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
12001200
"lineNumber": 142
12011201
},
12021202
"deprecated": false
@@ -1209,7 +1209,7 @@
12091209
"label": "total",
12101210
"description": [],
12111211
"source": {
1212-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1212+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
12131213
"lineNumber": 143
12141214
},
12151215
"deprecated": false
@@ -1233,7 +1233,7 @@
12331233
"<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
12341234
],
12351235
"source": {
1236-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1236+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
12371237
"lineNumber": 144
12381238
},
12391239
"deprecated": false
@@ -1330,7 +1330,7 @@
13301330
"description": [],
13311331
"signature": [
13321332
"() => Set<",
1333-
"RegistryAlertType",
1333+
"RegistryRuleType",
13341334
">"
13351335
],
13361336
"source": {
@@ -1343,10 +1343,10 @@
13431343
},
13441344
{
13451345
"parentPluginId": "alerting",
1346-
"id": "def-server.PluginStartContract.getAlertsClientWithRequest",
1346+
"id": "def-server.PluginStartContract.getRulesClientWithRequest",
13471347
"type": "Function",
13481348
"tags": [],
1349-
"label": "getAlertsClientWithRequest",
1349+
"label": "getRulesClientWithRequest",
13501350
"description": [],
13511351
"signature": [
13521352
"(request: ",
@@ -1362,8 +1362,8 @@
13621362
"pluginId": "alerting",
13631363
"scope": "server",
13641364
"docId": "kibAlertingPluginApi",
1365-
"section": "def-server.AlertsClient",
1366-
"text": "AlertsClient"
1365+
"section": "def-server.RulesClient",
1366+
"text": "RulesClient"
13671367
},
13681368
", \"get\" | \"delete\" | \"create\" | \"find\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\">"
13691369
],
@@ -1375,7 +1375,7 @@
13751375
"children": [
13761376
{
13771377
"parentPluginId": "alerting",
1378-
"id": "def-server.PluginStartContract.getAlertsClientWithRequest.$1",
1378+
"id": "def-server.PluginStartContract.getRulesClientWithRequest.$1",
13791379
"type": "Object",
13801380
"tags": [],
13811381
"label": "request",
@@ -1571,10 +1571,10 @@
15711571
},
15721572
{
15731573
"parentPluginId": "alerting",
1574-
"id": "def-server.AlertsClient",
1574+
"id": "def-server.RulesClient",
15751575
"type": "Type",
15761576
"tags": [],
1577-
"label": "AlertsClient",
1577+
"label": "RulesClient",
15781578
"description": [],
15791579
"signature": [
15801580
"{ get: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<Pick<",

‎api_docs/deprecations.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
2626
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L8) | - |
2727
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L21) | - |
2828
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L23) | - |
29-
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L23) | - |
30-
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L98) | - |
29+
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L23) | - |
30+
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L98) | - |
3131

3232

3333

‎api_docs/security.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,14 +1739,14 @@
17391739
{
17401740
"plugin": "alerting",
17411741
"link": {
1742-
"path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
1742+
"path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
17431743
"lineNumber": 23
17441744
}
17451745
},
17461746
{
17471747
"plugin": "alerting",
17481748
"link": {
1749-
"path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
1749+
"path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
17501750
"lineNumber": 98
17511751
}
17521752
}

0 commit comments

Comments
 (0)