Merge branch 'main' into security/remove-session-index-template

.bazelversion

@@ -1 +1 @@
-5.2.0
+5.1.1

.buildkite/pipelines/performance/daily.yml

@@ -19,11 +19,11 @@ steps:
     depends_on: build
     key: tests
 
-  # - label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
-  #   command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh
-  #   agents:
-  #     queue: n2-2
-  #   depends_on: tests
+  - label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
+    command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh
+    agents:
+      queue: n2-2
+    depends_on: tests
 
   - label: ':chart_with_upwards_trend: Report performance metrics to ci-stats'
     command: .buildkite/scripts/steps/functional/report_performance_metrics.sh

.buildkite/scripts/steps/functional/performance_playwright.sh

@@ -15,6 +15,21 @@ node scripts/es snapshot&
 
 esPid=$!
 
+# unset env vars defined in other parts of CI for automatic APM collection of
+# Kibana. We manage APM config in our FTR config and performance service, and
+# APM treats config in the ENV with a very high precedence.
+unset ELASTIC_APM_ENVIRONMENT
+unset ELASTIC_APM_TRANSACTION_SAMPLE_RATE
+unset ELASTIC_APM_SERVER_URL
+unset ELASTIC_APM_SECRET_TOKEN
+unset ELASTIC_APM_ACTIVE
+unset ELASTIC_APM_CONTEXT_PROPAGATION_ONLY
+unset ELASTIC_APM_ACTIVE
+unset ELASTIC_APM_SERVER_URL
+unset ELASTIC_APM_SECRET_TOKEN
+unset ELASTIC_APM_GLOBAL_LABELS
+
+
 export TEST_ES_URL=http://elastic:changeme@localhost:9200
 export TEST_ES_DISABLE_STARTUP=true
 
@@ -30,19 +45,19 @@ for i in "${journeys[@]}"; do
 
     checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: WARMUP)" \
       node scripts/functional_tests \
-      --config "x-pack/test/performance/journeys/${i}/config.ts" \
-      --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
-      --debug \
-      --bail
+        --config "x-pack/test/performance/journeys/${i}/config.ts" \
+        --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
+        --debug \
+        --bail
 
     export TEST_PERFORMANCE_PHASE=TEST
 
     checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: TEST)" \
       node scripts/functional_tests \
-      --config "x-pack/test/performance/journeys/${i}/config.ts" \
-      --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
-      --debug \
-      --bail
+        --config "x-pack/test/performance/journeys/${i}/config.ts" \
+        --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
+        --debug \
+        --bail
 done
 
 kill "$esPid"

.buildkite/scripts/steps/functional/report_performance_metrics.sh

@@ -7,7 +7,7 @@ source .buildkite/scripts/common/util.sh
 # TODO: Add new user and change lines accordingly
 USER_FROM_VAULT="$(retry 5 5 vault read -field=username secret/kibana-issues/dev/ci_stats_performance_metrics)"
 PASS_FROM_VAULT="$(retry 5 5 vault read -field=password secret/kibana-issues/dev/ci_stats_performance_metrics)"
-APM_SERVER_URL="https://kibana-ops-e2e-perf.es.us-central1.gcp.cloud.es.io:9243/internal/apm"
+APM_SERVER_URL="https://kibana-ops-e2e-perf.kb.us-central1.gcp.cloud.es.io:9243/internal/apm"
 BUILD_ID=${BUILDKITE_BUILD_ID}
 
 .buildkite/scripts/bootstrap.sh

.buildkite/scripts/steps/functional/scalability_dataset_extraction.sh

@@ -13,14 +13,14 @@ GCS_BUCKET="gs://kibana-performance/scalability-tests"
 .buildkite/scripts/bootstrap.sh
 
 echo "--- Extract APM metrics"
-journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard" "many_fields_discover")
+scalabilityJourneys=("login" "promotion_tracking_dashboard")
 
-for i in "${journeys[@]}"; do
+for i in "${scalabilityJourneys[@]}"; do
     JOURNEY_NAME="${i}"
     echo "Looking for JOURNEY=${JOURNEY_NAME} and BUILD_ID=${BUILD_ID} in APM traces"
 
     node scripts/extract_performance_testing_dataset \
-        --journeyName "${JOURNEY_NAME}" \
+        --config "x-pack/test/performance/journeys/${i}/config.ts" \ \
         --buildId "${BUILD_ID}" \
         --es-url "${ES_SERVER_URL}" \
         --es-username "${USER_FROM_VAULT}" \
@@ -39,4 +39,4 @@ echo "${BUILDKITE_COMMIT}" > "${BUILD_ID}/KIBANA_COMMIT_HASH"
 gsutil -m cp -r "${BUILD_ID}" "${GCS_BUCKET}"
 echo "--- Update reference to the latest CI build"
 echo "${BUILD_ID}" > LATEST
-gsutil cp LATEST "${GCS_BUCKET}"
+gsutil cp LATEST "${GCS_BUCKET}"

.eslintrc.js

@@ -1442,6 +1442,8 @@ module.exports = {
         'import/newline-after-import': 'error',
         'react-hooks/exhaustive-deps': 'off',
         'react/jsx-boolean-value': ['error', 'never'],
+        'sort-keys': 1, // warning
+        '@typescript-eslint/member-ordering': [1, { default: { order: 'alphabetically' } }], // warning
         '@typescript-eslint/no-unused-vars': [
           'error',
           { vars: 'all', args: 'after-used', ignoreRestSiblings: true, varsIgnorePattern: '^_' },

.github/CODEOWNERS

@@ -203,7 +203,6 @@
 /x-pack/test/functional/services/transform/ @elastic/ml-ui
 /x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
 /x-pack/packages/ml/ @elastic/ml-ui
-/packages/kbn-aiops-utils @elastic/ml-ui
 /examples/response_stream/ @elastic/ml-ui
 
 # Maps

.i18nrc.json

@@ -7,7 +7,11 @@
     "bfetch": "src/plugins/bfetch",
     "charts": "src/plugins/charts",
     "console": "src/plugins/console",
-    "core": ["src/core", "packages/core/i18n/core-i18n-browser-internal"],
+    "core": [
+      "src/core",
+      "packages/core/i18n/core-i18n-browser-internal",
+      "packages/core/fatal-errors/core-fatal-errors-browser-internal"
+    ],
     "customIntegrations": "src/plugins/custom_integrations",
     "dashboard": "src/plugins/dashboard",
     "controls": "src/plugins/controls",

api_docs/actions.mdx

@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 summary: API docs for the actions plugin
-date: 2022-06-23
+date: 2022-06-27
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
 ---

api_docs/advanced_settings.mdx

@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 summary: API docs for the advancedSettings plugin
-date: 2022-06-23
+date: 2022-06-27
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
 ---

api_docs/aiops.mdx

@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 summary: API docs for the aiops plugin
-date: 2022-06-23
+date: 2022-06-27
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
 ---

api_docs/alerting.mdx

@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 summary: API docs for the alerting plugin
-date: 2022-06-23
+date: 2022-06-27
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
 ---