Merge branch 'main' into alerting/telemetry-tests-2

.buildkite/pipelines/hourly.yml

@@ -19,7 +19,7 @@ steps:
     label: 'Default CI Group'
     parallelism: 27
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 250
     key: default-cigroup
@@ -31,7 +31,7 @@ steps:
   - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Docker CI Group'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     key: default-cigroup-docker
@@ -44,7 +44,7 @@ steps:
     label: 'OSS CI Group'
     parallelism: 11
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     key: oss-cigroup
@@ -56,29 +56,49 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_accessibility.sh
     label: 'OSS Accessibility Tests'
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
     label: 'Default Accessibility Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/functional/oss_firefox.sh
     label: 'OSS Firefox Tests'
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -89,18 +109,28 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_firefox.sh
     label: 'Default Firefox Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/functional/oss_misc.sh
     label: 'OSS Misc Functional Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
@@ -111,13 +141,23 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
     label: 'Saved Object Field Metrics'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/test/jest.sh
     label: 'Jest Tests'
@@ -138,9 +178,23 @@ steps:
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
     agents:
-      queue: n2-2
+      queue: n2-4-spot
     timeout_in_minutes: 120
     key: api-integration
+    retry:
+      automatic:
+        - exit_status: '1'
+          limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'

.buildkite/scripts/steps/functional/uptime.sh

@@ -14,4 +14,4 @@ echo "--- Uptime @elastic/synthetics Tests"
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "Uptime @elastic/synthetics Tests" \
-  node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
+  node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.eslintignore

@@ -1,4 +1,5 @@
 **/*.js.snap
+__tmp__
 /.es
 /.chromium
 /build

.eslintrc.js

@@ -104,6 +104,7 @@ const DEV_PACKAGES = [
   'kbn-storybook',
   'kbn-telemetry-tools',
   'kbn-test',
+  'kbn-type-summarizer',
 ];
 
 /** Directories (at any depth) which include dev-only code. */
@@ -1632,28 +1633,6 @@ module.exports = {
       },
     },
 
-    /**
-     * Prettier disables all conflicting rules, listing as last override so it takes precedence
-     */
-    {
-      files: ['**/*'],
-      rules: {
-        ...require('eslint-config-prettier').rules,
-        ...require('eslint-config-prettier/react').rules,
-        ...require('eslint-config-prettier/@typescript-eslint').rules,
-      },
-    },
-    /**
-     * Enterprise Search Prettier override
-     * Lints unnecessary backticks - @see https://github.com/prettier/eslint-config-prettier/blob/main/README.md#forbid-unnecessary-backticks
-     */
-    {
-      files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
-      rules: {
-        quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
-      },
-    },
-
     /**
      * Platform Security Team overrides
      */
@@ -1768,5 +1747,34 @@ module.exports = {
         '@kbn/eslint/no_export_all': 'error',
       },
     },
+
+    {
+      files: ['packages/kbn-type-summarizer/**/*.ts'],
+      rules: {
+        'no-bitwise': 'off',
+      },
+    },
+
+    /**
+     * Prettier disables all conflicting rules, listing as last override so it takes precedence
+     */
+    {
+      files: ['**/*'],
+      rules: {
+        ...require('eslint-config-prettier').rules,
+        ...require('eslint-config-prettier/react').rules,
+        ...require('eslint-config-prettier/@typescript-eslint').rules,
+      },
+    },
+    /**
+     * Enterprise Search Prettier override
+     * Lints unnecessary backticks - @see https://github.com/prettier/eslint-config-prettier/blob/main/README.md#forbid-unnecessary-backticks
+     */
+    {
+      files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
+      rules: {
+        quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
+      },
+    },
   ],
 };

.github/CODEOWNERS

@@ -416,6 +416,9 @@ x-pack/plugins/security_solution/cypress/upgrade_integration @elastic/security-e
 x-pack/plugins/security_solution/cypress/README.md @elastic/security-engineering-productivity
 x-pack/test/security_solution_cypress @elastic/security-engineering-productivity
 
+## Security Solution sub teams - adaptive-workload-protection
+x-pack/plugins/session_view @elastic/awp-platform
+
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
 

.github/workflows/add-to-imui-project.yml

@@ -0,0 +1,31 @@
+name: Add to Infra Monitoring UI project
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add_to_project:
+    runs-on: ubuntu-latest
+    if: |
+      contains(github.event.issue.labels.*.name, 'Team:Infra Monitoring UI') ||
+      contains(github.event.issue.labels.*.name, 'Feature:Stack Monitoring') ||
+      contains(github.event.issue.labels.*.name, 'Feature:Logs UI') ||
+      contains(github.event.issue.labels.*.name, 'Feature:Metrics UI')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAGc3Zs1EEA"
+          GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}

.github/workflows/backport.yml

@@ -9,33 +9,19 @@ on:
 jobs:
   backport:
     name: Backport PR
+    runs-on: ubuntu-latest
     if: |
       github.event.pull_request.merged == true
       && contains(github.event.pull_request.labels.*.name, 'auto-backport')
       && (
         (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
         || (github.event.action == 'closed')
       )
-    runs-on: ubuntu-latest
     steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: 'elastic/kibana-github-actions'
-          ref: main
-          path: ./actions
-
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      - name: Fix Version Label Gaps
-        uses: ./actions/fix-version-gaps
+      - name: Backport Action
+        uses: sqren/backport-github-action@v7.4.0
         with:
           github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
 
-      - name: Run Backport
-        uses: ./actions/backport
-        with:
-          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
-          commit_user: kibanamachine
-          commit_email: 42973632+kibanamachine@users.noreply.github.com
+      - name: Backport log
+        run: cat ~/.backport/backport.log