Skip to content

Commit 6a13e92

Browse files
dplumleedplumlee
authored
Merge branch 'main' into rule-customizations-field
2 parents cb163a4 + 9dfdff1 commit 6a13e92

File tree

210 files changed

+5361
-4683
lines changed

Some content is hidden

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

210 files changed

+5361
-4683
lines changed

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ enabled:
405405
- x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
406406
- x-pack/platform/test/fleet_multi_cluster/config.ts
407407
- x-pack/platform/test/monitoring_api_integration/config.ts
408+
- x-pack/platform/test/onechat_functional/config.ts
408409
- x-pack/platform/test/plugin_api_integration/config.ts
409410
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
410411
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts

‎.buildkite/scripts/steps/cloud/build_and_deploy.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@ ELASTICSEARCH_SHA=$(curl -s $ELASTICSEARCH_MANIFEST_URL | jq -r '.sha')
2222
ELASTICSEARCH_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud-ess:$VERSION-$ELASTICSEARCH_SHA"
2323

2424
KIBANA_CLOUD_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$VERSION-$GIT_COMMIT"
25-
CLOUD_DEPLOYMENT_NAME="kibana-pr-$BUILDKITE_PULL_REQUEST"
25+
26+
if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
27+
PR_NUMBER="$GITHUB_PR_NUMBER"
28+
else
29+
PR_NUMBER="$BUILDKITE_PULL_REQUEST"
30+
fi
31+
32+
CLOUD_DEPLOYMENT_NAME="kibana-pr-$PR_NUMBER"
2633

2734
set +e
2835
DISTRIBUTION_EXISTS=$(docker manifest inspect $KIBANA_CLOUD_IMAGE &> /dev/null; echo $?)

‎.buildkite/scripts/steps/serverless/deploy.sh‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ set -euo pipefail
55

66
source .buildkite/scripts/common/util.sh
77

8-
KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:pr-$BUILDKITE_PULL_REQUEST-${BUILDKITE_COMMIT:0:12}"
8+
if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
9+
PR_NUMBER="$GITHUB_PR_NUMBER"
10+
else
11+
PR_NUMBER="$BUILDKITE_PULL_REQUEST"
12+
fi
13+
14+
KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:pr-$PR_NUMBER-${BUILDKITE_COMMIT:0:12}"
915

1016
deploy() {
1117
PROJECT_TYPE=$1
@@ -38,7 +44,7 @@ deploy() {
3844
esac
3945
fi
4046

41-
PROJECT_NAME="kibana-pr-$BUILDKITE_PULL_REQUEST-$PROJECT_TYPE$PRODUCT_TIER_NAME"
47+
PROJECT_NAME="kibana-pr-$PR_NUMBER-$PROJECT_TYPE$PRODUCT_TIER_NAME"
4248
VAULT_KEY_NAME="$PROJECT_NAME"
4349
is_pr_with_label "ci:project-persist-deployment" && PROJECT_NAME="keep_$PROJECT_NAME"
4450
PROJECT_CREATE_CONFIGURATION='{
@@ -162,16 +168,16 @@ $KIBANA_IMAGE
162168
163169
### Kibana pull request
164170
165-
$BUILDKITE_PULL_REQUEST
171+
$PR_NUMBER
166172
167173
### Further details
168174
169-
Caused by the GitHub label 'ci:project-deploy-observability' in https://github.com/elastic/kibana/pull/$BUILDKITE_PULL_REQUEST
175+
Caused by the GitHub label 'ci:project-deploy-observability' in https://github.com/elastic/kibana/pull/$PR_NUMBER
170176
EOF
171177

172178
GH_TOKEN="$GITHUB_TOKEN" \
173179
gh issue create \
174-
--title "[Deploy Serverless Kibana] for user $GITHUB_PR_TRIGGER_USER with PR kibana@pr-$BUILDKITE_PULL_REQUEST" \
180+
--title "[Deploy Serverless Kibana] for user $GITHUB_PR_TRIGGER_USER with PR kibana@pr-$PR_NUMBER" \
175181
--body-file "${GITHUB_ISSUE}" \
176182
--label 'deploy-custom-kibana-serverless' \
177183
--repo 'elastic/observability-test-environments'

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ src/platform/packages/shared/kbn-esql-validation-autocomplete @elastic/kibana-es
499499
src/platform/packages/shared/kbn-event-annotation-common @elastic/kibana-visualizations
500500
src/platform/packages/shared/kbn-event-annotation-components @elastic/kibana-visualizations
501501
src/platform/packages/shared/kbn-expect @elastic/kibana-operations @elastic/appex-qa
502+
src/platform/packages/shared/kbn-field-formats-common @elastic/kibana-visualizations @elastic/kibana-data-discovery
502503
src/platform/packages/shared/kbn-field-types @elastic/kibana-data-discovery
503504
src/platform/packages/shared/kbn-field-utils @elastic/kibana-data-discovery
504505
src/platform/packages/shared/kbn-flot-charts @elastic/kibana-presentation @elastic/stack-monitoring
@@ -2287,7 +2288,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
22872288
/x-pack/solutions/chat/test/serverless/api_integration/configs/config.ts @elastic/search-kibana @elastic/appex-qa
22882289
/x-pack/solutions/chat/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa
22892290
/x-pack/platform/test/onechat_api_integration @elastic/search-kibana @elastic/workchat-eng
2290-
2291+
/x-pack/platform/test/onechat_functional @elastic/search-kibana @elastic/workchat-eng
22912292

22922293
# Management Experience - Deployment Management
22932294
/src/platform/test/functional/fixtures/kbn_archiver/management.json @elastic/kibana-management @elastic/kibana-data-discovery # Assigned per 2 uses: test/functional/apps/management/_import_objects.ts && test/functional/apps/management/data_views/_scripted_fields_filter.ts

‎.i18nrc.json‎

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88
"apmOss": "src/plugins/apm_oss",
99
"autocomplete": "x-pack/solutions/security/packages/kbn-securitysolution-autocomplete/src",
1010
"avcBanner": "src/platform/packages/shared/kbn-avc-banner/src",
11-
"cases": ["src/platform/packages/shared/kbn-cases-components"],
11+
"cases": [
12+
"src/platform/packages/shared/kbn-cases-components"
13+
],
1214
"cellActions": "src/platform/packages/shared/kbn-cell-actions",
1315
"charts": "src/platform/plugins/shared/charts",
1416
"console": "src/platform/plugins/shared/console",
1517
"contentManagement": "src/platform/packages/shared/content-management",
16-
"core": ["src/core"],
18+
"core": [
19+
"src/core"
20+
],
1721
"customIntegrations": "src/platform/plugins/shared/custom_integrations",
1822
"dashboard": "src/platform/plugins/shared/dashboard",
1923
"cloud": "src/platform/packages/shared/cloud",
@@ -22,7 +26,10 @@
2226
"data": "src/platform/plugins/shared/data",
2327
"observabilityAlertDetails": "x-pack/solutions/observability/packages/alert-details",
2428
"dataViews": "src/platform/plugins/shared/data_views",
25-
"defaultNavigation": ["packages/default-nav", "src/platform/packages/private/default-nav"],
29+
"defaultNavigation": [
30+
"packages/default-nav",
31+
"src/platform/packages/private/default-nav"
32+
],
2633
"devTools": "src/platform/plugins/shared/dev_tools",
2734
"discover": [
2835
"src/platform/plugins/shared/discover",
@@ -50,7 +57,10 @@
5057
"eventAnnotationCommon": "src/platform/packages/shared/kbn-event-annotation-common",
5158
"eventAnnotationComponents": "src/platform/packages/shared/kbn-event-annotation-components",
5259
"fieldUtils": "src/platform/packages/shared/kbn-field-utils",
53-
"fieldFormats": "src/platform/plugins/shared/field_formats",
60+
"fieldFormats": [
61+
"src/platform/plugins/shared/field_formats",
62+
"src/platform/packages/shared/kbn-field-formats-common"
63+
],
5464
"files": "src/platform/plugins/shared/files",
5565
"filesManagement": "src/platform/plugins/private/files_management",
5666
"flot": "src/platform/packages/shared/kbn-flot-charts/lib",
@@ -86,13 +96,19 @@
8696
],
8797
"metricsExperience": "src/platform/packages/shared/kbn-unified-metrics-grid/src",
8898
"monaco": "src/platform/packages/shared/kbn-monaco/src",
89-
"navigation": ["src/platform/plugins/shared/navigation", "packages/solution-nav"],
99+
"navigation": [
100+
"src/platform/plugins/shared/navigation",
101+
"packages/solution-nav"
102+
],
90103
"links": "src/platform/plugins/private/links",
91104
"newsfeed": "src/platform/plugins/shared/newsfeed",
92105
"presentationUtil": "src/platform/plugins/shared/presentation_util",
93106
"presentationUtils": "src/platform/packages/shared/presentation/presentation_util",
94107
"randomSampling": "x-pack/platform/packages/private/kbn-random-sampling",
95-
"reactPackages": ["src/platform/packages/shared/react", "src/platform/packages/private/react"],
108+
"reactPackages": [
109+
"src/platform/packages/shared/react",
110+
"src/platform/packages/private/react"
111+
],
96112
"esqlEditor": "src/platform/packages/private/kbn-esql-editor",
97113
"esqlUtils": "src/platform/packages/shared/kbn-esql-utils",
98114
"reporting": "src/platform/packages/private/kbn-reporting",
@@ -101,8 +117,15 @@
101117
"savedObjectsManagement": "src/platform/plugins/shared/saved_objects_management",
102118
"searchConnectors": "src/platform/packages/shared/kbn-search-connectors",
103119
"server": "src/legacy/server",
104-
"share": ["src/platform/plugins/shared/share", "packages/kbn-reporting-share"],
105-
"sharedUXPackages": ["packages/shared-ux", "src/platform/packages/shared/shared-ux", "src/platform/packages/private/shared-ux/"],
120+
"share": [
121+
"src/platform/plugins/shared/share",
122+
"packages/kbn-reporting-share"
123+
],
124+
"sharedUXPackages": [
125+
"packages/shared-ux",
126+
"src/platform/packages/shared/shared-ux",
127+
"src/platform/packages/private/shared-ux/"
128+
],
106129
"searchApiKeysComponents": "x-pack/solutions/search/packages/kbn-search-api-keys-components",
107130
"searchApiPanels": "src/platform/packages/shared/kbn-search-api-panels/",
108131
"searchErrors": "src/platform/packages/shared/kbn-search-errors",
@@ -118,18 +141,30 @@
118141
"x-pack/solutions/security/packages/side-nav",
119142
"x-pack/solutions/security/packages/upselling"
120143
],
121-
"sharedPlatformPackages": ["x-pack/platform/packages/shared/kbn-cloud-security-posture"],
144+
"sharedPlatformPackages": [
145+
"x-pack/platform/packages/shared/kbn-cloud-security-posture"
146+
],
122147
"serverlessPackages": "packages/serverless",
123-
"sse": ["src/platform/packages/shared/kbn-sse-utils"],
148+
"sse": [
149+
"src/platform/packages/shared/kbn-sse-utils"
150+
],
124151
"coloring": "src/platform/packages/shared/kbn-coloring/src",
125152
"languageDocumentation": "src/platform/packages/private/kbn-language-documentation/src",
126153
"esql": "src/platform/plugins/shared/esql",
127154
"esqlDataGrid": "src/platform/plugins/shared/esql_datagrid",
128155
"statusPage": "src/legacy/core_plugins/status_page",
129-
"telemetry": ["src/platform/plugins/shared/telemetry", "src/platform/plugins/shared/telemetry_management_section"],
130-
"timelion": ["src/platform/plugins/private/vis_types/timelion"],
156+
"telemetry": [
157+
"src/platform/plugins/shared/telemetry",
158+
"src/platform/plugins/shared/telemetry_management_section"
159+
],
160+
"timelion": [
161+
"src/platform/plugins/private/vis_types/timelion"
162+
],
131163
"tryInConsole": "src/platform/packages/shared/kbn-try-in-console/",
132-
"uiActions": ["src/platform/plugins/shared/ui_actions", "src/platform/packages/shared/kbn-ui-actions-browser"],
164+
"uiActions": [
165+
"src/platform/plugins/shared/ui_actions",
166+
"src/platform/packages/shared/kbn-ui-actions-browser"
167+
],
133168
"uiActionsEnhanced": "src/platform/plugins/shared/ui_actions_enhanced",
134169
"uiActionsExamples": "examples/ui_action_examples",
135170
"usageCollection": "src/platform/plugins/shared/usage_collection",
@@ -150,7 +185,10 @@
150185
"visualizations": "src/platform/plugins/shared/visualizations",
151186
"visualizationUiComponents": "src/platform/packages/shared/kbn-visualization-ui-components",
152187
"visualizationUtils": "src/platform/packages/shared/kbn-visualization-utils",
153-
"unifiedDocViewer": ["src/platform/plugins/shared/unified_doc_viewer", "src/platform/packages/shared/kbn-unified-doc-viewer"],
188+
"unifiedDocViewer": [
189+
"src/platform/plugins/shared/unified_doc_viewer",
190+
"src/platform/packages/shared/kbn-unified-doc-viewer"
191+
],
154192
"unifiedSearch": "src/platform/plugins/shared/unified_search",
155193
"unifiedFieldList": "src/platform/packages/shared/kbn-unified-field-list",
156194
"unifiedHistogram": "src/platform/packages/shared/kbn-unified-histogram",
@@ -163,4 +201,4 @@
163201
"responseOpsRuleForm": "src/platform/packages/shared/response-ops/rule_form"
164202
},
165203
"translations": []
166-
}
204+
}

‎oas_docs/output/kibana.serverless.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14516,6 +14516,19 @@ paths:
1451614516
- status
1451714517
status:
1451814518
$ref: '#/components/schemas/Security_Entity_Analytics_API_PrivilegeMonitoringEngineStatus'
14519+
users:
14520+
description: User statistics for privilege monitoring
14521+
type: object
14522+
properties:
14523+
current_count:
14524+
description: Current number of privileged users being monitored
14525+
type: integer
14526+
max_allowed:
14527+
description: Maximum number of privileged users allowed to be monitored
14528+
type: integer
14529+
required:
14530+
- current_count
14531+
- max_allowed
1451914532
required:
1452014533
- status
1452114534
description: Successful response

‎oas_docs/output/kibana.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17863,6 +17863,19 @@ paths:
1786317863
- status
1786417864
status:
1786517865
$ref: '#/components/schemas/Security_Entity_Analytics_API_PrivilegeMonitoringEngineStatus'
17866+
users:
17867+
description: User statistics for privilege monitoring
17868+
type: object
17869+
properties:
17870+
current_count:
17871+
description: Current number of privileged users being monitored
17872+
type: integer
17873+
max_allowed:
17874+
description: Maximum number of privileged users allowed to be monitored
17875+
type: integer
17876+
required:
17877+
- current_count
17878+
- max_allowed
1786617879
required:
1786717880
- status
1786817881
description: Successful response

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@
580580
"@kbn/features-plugin": "link:x-pack/platform/plugins/shared/features",
581581
"@kbn/features-provider-plugin": "link:x-pack/platform/test/security_api_integration/plugins/features_provider",
582582
"@kbn/fec-alerts-test-plugin": "link:x-pack/platform/test/functional_execution_context/plugins/alerts",
583+
"@kbn/field-formats-common": "link:src/platform/packages/shared/kbn-field-formats-common",
583584
"@kbn/field-formats-example-plugin": "link:examples/field_formats_example",
584585
"@kbn/field-formats-plugin": "link:src/platform/plugins/shared/field_formats",
585586
"@kbn/field-types": "link:src/platform/packages/shared/kbn-field-types",

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ pageLoadAssetSize:
162162
snapshotRestore: 28452
163163
spaces: 32135
164164
stackAlerts: 31499
165-
stackConnectors: 68502
165+
stackConnectors: 68838
166166
streams: 9000
167167
streamsApp: 17000
168168
synthetics: 31571

‎src/platform/packages/shared/kbn-coloring/src/shared_components/color_mapping/special_tokens.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
import { i18n } from '@kbn/i18n';
11+
import { EMPTY_LABEL } from '@kbn/field-formats-common';
1112

1213
// TODO: move in some data/table related package
1314
export const SPECIAL_TOKENS_STRING_CONVERSION = new Map([
@@ -17,12 +18,7 @@ export const SPECIAL_TOKENS_STRING_CONVERSION = new Map([
1718
defaultMessage: 'Other',
1819
}),
1920
],
20-
[
21-
'',
22-
i18n.translate('coloring.colorMapping.terms.emptyLabel', {
23-
defaultMessage: '(empty)',
24-
}),
25-
],
21+
['', EMPTY_LABEL],
2622
]);
2723

2824
/**

0 commit comments

Comments
 (0)