merge with latest

.buildkite/ftr_configs.yml

@@ -128,7 +128,12 @@ enabled:
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
-  - x-pack/test/alerting_api_integration/spaces_only/config.ts
+  - x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts
+  - x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts
+  - x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts
+  - x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts
+  - x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts
+  - x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
   - x-pack/test/api_integration_basic/config.ts
   - x-pack/test/api_integration/config_security_basic.ts
   - x-pack/test/api_integration/config_security_trial.ts

.buildkite/scripts/steps/es_snapshots/build.sh

@@ -34,13 +34,13 @@ export JENKINS_URL=""
 export BUILD_URL=""
 export JOB_NAME=""
 export NODE_NAME=""
-export DOCKER_BUILDKIT=""
 
 # Reads the ES_BUILD_JAVA env var out of .ci/java-versions.properties and exports it
 export "$(grep '^ES_BUILD_JAVA' .ci/java-versions.properties | xargs)"
 
 export PATH="$HOME/.java/$ES_BUILD_JAVA/bin:$PATH"
 export JAVA_HOME="$HOME/.java/$ES_BUILD_JAVA"
+export DOCKER_BUILDKIT=1
 
 # The Elasticsearch Dockerfile needs to be built with root privileges, but Docker on our servers is running using a non-root user
 # So, let's use docker-in-docker to temporarily create a privileged docker daemon to run `docker build` on

.buildkite/scripts/steps/test/kbn_handlebars.sh

@@ -4,5 +4,5 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
-echo '--- Checking for @kbn/handlebars test changes'
-packages/kbn-handlebars/scripts/check_for_test_changes.sh
+echo '--- Checking for @kbn/handlebars upstream updates'
+packages/kbn-handlebars/scripts/check_for_upstream_updates.sh

.eslintrc.js

@@ -518,7 +518,7 @@ module.exports = {
       },
     },
     {
-      files: ['packages/kbn-handlebars/src/upstream/**/*.{js,mjs,ts,tsx}'],
+      files: ['packages/kbn-handlebars/src/spec/**/*.{js,mjs,ts,tsx}'],
       rules: {
         '@kbn/eslint/require-license-header': [
           'error',

.github/CODEOWNERS

@@ -1040,9 +1040,9 @@ packages/shared-ux/button/exit_full_screen/types @elastic/appex-sharedux
 packages/shared-ux/card/no_data/impl @elastic/appex-sharedux
 packages/shared-ux/card/no_data/mocks @elastic/appex-sharedux
 packages/shared-ux/card/no_data/types @elastic/appex-sharedux
-packages/shared-ux/code_editor/impl @elastic/shared-ux
-packages/shared-ux/code_editor/mocks @elastic/shared-ux
-packages/shared-ux/code_editor/types @elastic/shared-ux
+packages/shared-ux/code_editor/impl @elastic/appex-sharedux
+packages/shared-ux/code_editor/mocks @elastic/appex-sharedux
+packages/shared-ux/code_editor/types @elastic/appex-sharedux
 packages/shared-ux/file/context @elastic/appex-sharedux
 packages/shared-ux/file/file_picker/impl @elastic/appex-sharedux
 packages/shared-ux/file/file_upload/impl @elastic/appex-sharedux

.github/workflows/codeql.yml

@@ -17,14 +17,13 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'javascript' ]
-        # branch: [ 'main', '7.17' ]
+        branch: [ 'main', '7.17' ]
 
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
-      # TODO: Enable once a `.github/codeql/codeql-config.yml` file has been committed to 7.17
-      # with:
-      #   ref: ${{ matrix.branch }}
+      with:
+        ref: ${{ matrix.branch }}
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

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-02-01
+date: 2023-02-06
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';

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-02-01
+date: 2023-02-06
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';

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-02-01
+date: 2023-02-06
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';

api_docs/alerting.devdocs.json

@@ -2073,6 +2073,26 @@
             "path": "x-pack/plugins/alerting/server/types.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.RuleExecutorOptions.flappingSettings",
+            "type": "Object",
+            "tags": [],
+            "label": "flappingSettings",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "alerting",
+                "scope": "common",
+                "docId": "kibAlertingPluginApi",
+                "section": "def-common.RulesSettingsFlappingProperties",
+                "text": "RulesSettingsFlappingProperties"
+              }
+            ],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -8079,6 +8099,9 @@
             "tags": [],
             "label": "enabled",
             "description": [],
+            "signature": [
+              "true"
+            ],
             "path": "x-pack/plugins/alerting/common/rules_settings.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -8108,6 +8131,48 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "alerting",
+        "id": "def-common.DISABLE_FLAPPING_SETTINGS",
+        "type": "Object",
+        "tags": [],
+        "label": "DISABLE_FLAPPING_SETTINGS",
+        "description": [],
+        "path": "x-pack/plugins/alerting/common/rules_settings.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.DISABLE_FLAPPING_SETTINGS.Unnamed",
+            "type": "Any",
+            "tags": [],
+            "label": "Unnamed",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "x-pack/plugins/alerting/common/rules_settings.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.DISABLE_FLAPPING_SETTINGS.enabled",
+            "type": "boolean",
+            "tags": [],
+            "label": "enabled",
+            "description": [],
+            "signature": [
+              "false"
+            ],
+            "path": "x-pack/plugins/alerting/common/rules_settings.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-common.DisabledActionTypeIdsForActionGroup",

api_docs/alerting.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2023-02-01
+date: 2023-02-06
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';
@@ -21,7 +21,7 @@ Contact [Response Ops](https://github.com/orgs/elastic/teams/response-ops) for q
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 467 | 0 | 457 | 39 |
+| 471 | 1 | 461 | 39 |
 
 ## Client