Merge branch 'main' into preconfig_dashboard_link

elastic · Oct 19, 2023 · 8d3cb20 · 8d3cb20
2 parents d9b7133 + 68af520
commit 8d3cb20
Show file tree

Hide file tree

Showing 1,162 changed files with 14,504 additions and 5,767 deletions.
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -187,6 +187,18 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
+    label: 'Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
   - command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
     label: Trigger unsupported ftr tests
     timeout_in_minutes: 10

diff --git a/.buildkite/pipelines/on_merge_unsupported_ftrs.yml b/.buildkite/pipelines/on_merge_unsupported_ftrs.yml
@@ -63,15 +63,3 @@ steps:
           limit: 3
         - exit_status: '*'
           limit: 1
-
-  - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
-    label: 'Osquery Cypress Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 50
-    parallelism: 6
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
@@ -187,6 +187,18 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
+    label: 'Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
   - command: .buildkite/scripts/steps/functional/security_solution_burn.sh
     label: 'Security Solution Cypress tests, burning changed specs'
     agents:
@@ -198,6 +210,28 @@ steps:
       automatic: false
     soft_fail: true
 
+  - command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
+    label: 'Osquery Cypress Tests, burning changed specs'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    soft_fail: true
+    retry:
+      automatic: false
+
+  - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
+    label: 'Serverless Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
   # status_exception: Native role management is not enabled in this Elasticsearch instance
   # - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
   #   label: 'Serverless Security Defend Workflows Cypress Tests'

diff --git a/.buildkite/pipelines/pull_request/osquery_cypress.yml b/.buildkite/pipelines/pull_request/osquery_cypress.yml
diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -151,14 +151,6 @@ const uploadPipeline = (pipelineContent: string | object) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml'));
     }
 
-    if (
-      ((await doAnyChangesMatch([/^x-pack\/plugins\/osquery/, /^x-pack\/test\/osquery_cypress/])) ||
-        GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
-      !GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
-    ) {
-      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/osquery_cypress.yml'));
-    }
-
     if (
       (await doAnyChangesMatch([
         /\.docnav\.json$/,

diff --git a/.buildkite/scripts/steps/artifacts/docker_image.sh b/.buildkite/scripts/steps/artifacts/docker_image.sh
@@ -13,7 +13,8 @@ else
   KIBANA_IMAGE_TAG="pr-$BUILDKITE_PULL_REQUEST-$GIT_ABBREV_COMMIT"
 fi
 
-KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:$KIBANA_IMAGE_TAG"
+KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless"
+KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
 
 echo "--- Verify manifest does not already exist"
 echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
@@ -51,14 +52,21 @@ echo "--- Push images"
 docker image push "$KIBANA_IMAGE-arm64"
 docker image push "$KIBANA_IMAGE-amd64"
 
-echo "--- Create manifest"
+echo "--- Create and push manifests"
 docker manifest create \
   "$KIBANA_IMAGE" \
   --amend "$KIBANA_IMAGE-arm64" \
   --amend "$KIBANA_IMAGE-amd64"
-
-echo "--- Push manifest"
 docker manifest push "$KIBANA_IMAGE"
+
+if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+  docker manifest create \
+    "$KIBANA_BASE_IMAGE:latest" \
+    --amend "$KIBANA_IMAGE-arm64" \
+    --amend "$KIBANA_IMAGE-amd64"
+  docker manifest push "$KIBANA_BASE_IMAGE:latest"
+fi
+
 docker logout docker.elastic.co
 
 cat << EOF | buildkite-agent annotate --style "info" --context image

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -910,35 +910,35 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/aiops/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/infra/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_ai_assistant/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_onboarding/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_shared/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/synthetics/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/ux/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/aiops/**/*.tsx',
+        'x-pack/plugins/apm/**/*.tsx',
+        'x-pack/plugins/exploratory_view/**/*.tsx',
+        'x-pack/plugins/infra/**/*.tsx',
+        'x-pack/plugins/observability/**/*.tsx',
+        'x-pack/plugins/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_shared/**/*.tsx',
+        'x-pack/plugins/profiling/**/*.tsx',
+        'x-pack/plugins/synthetics/**/*.tsx',
+        'x-pack/plugins/ux/**/*.tsx',
       ],
       rules: {
         '@kbn/telemetry/event_generating_elements_should_be_instrumented': 'error',
       },
     },
     {
       files: [
-        'x-pack/plugins/aiops/**/*.{tsx}',
-        'x-pack/plugins/apm/**/*.{tsx}',
-        'x-pack/plugins/exploratory_view/**/*.{tsx}',
-        'x-pack/plugins/infra/**/*.{tsx}',
-        'x-pack/plugins/observability/**/*.{tsx}',
-        'x-pack/plugins/observability_ai_assistant/**/*.{tsx}',
-        'x-pack/plugins/observability_onboarding/**/*.{tsx}',
-        'x-pack/plugins/observability_shared/**/*.{tsx}',
-        'x-pack/plugins/profiling/**/*.{tsx}',
-        'x-pack/plugins/synthetics/**/*.{tsx}',
-        'x-pack/plugins/ux/**/*.{tsx}',
+        'x-pack/plugins/aiops/**/*.tsx',
+        'x-pack/plugins/apm/**/*.tsx',
+        'x-pack/plugins/exploratory_view/**/*.tsx',
+        'x-pack/plugins/infra/**/*.tsx',
+        'x-pack/plugins/observability/**/*.tsx',
+        'x-pack/plugins/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_shared/**/*.tsx',
+        'x-pack/plugins/profiling/**/*.tsx',
+        'x-pack/plugins/synthetics/**/*.tsx',
+        'x-pack/plugins/ux/**/*.tsx',
       ],
       rules: {
         '@kbn/i18n/strings_should_be_translated_with_i18n': 'warn',

diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
@@ -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: 2023-10-18
+date: 2023-10-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';

diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
@@ -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: 2023-10-18
+date: 2023-10-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';

diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
@@ -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: 2023-10-18
+date: 2023-10-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';