Merge branch 'main' into 171082-refactor-infra-logs-locators

.buildkite/ftr_configs.yml

@@ -496,6 +496,8 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/telemetry/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/basic_essentials_license/detection_engine/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/basic_essentials_license/detection_engine/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/basic_essentials_license/rule_management/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/basic_essentials_license/rule_management/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/default_license/exception_lists_items/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/default_license/exception_lists_items/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/default_license/lists_items/configs/serverless.config.ts

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -218,6 +218,12 @@ export async function pickTestGroupRunOrder() {
   if (Number.isNaN(FTR_CONFIGS_RETRY_COUNT)) {
     throw new Error(`invalid FTR_CONFIGS_RETRY_COUNT: ${process.env.FTR_CONFIGS_RETRY_COUNT}`);
   }
+  const JEST_CONFIGS_RETRY_COUNT = process.env.JEST_CONFIGS_RETRY_COUNT
+    ? parseInt(process.env.JEST_CONFIGS_RETRY_COUNT, 10)
+    : 1;
+  if (Number.isNaN(JEST_CONFIGS_RETRY_COUNT)) {
+    throw new Error(`invalid JEST_CONFIGS_RETRY_COUNT: ${process.env.JEST_CONFIGS_RETRY_COUNT}`);
+  }
 
   const FTR_CONFIGS_DEPS =
     process.env.FTR_CONFIGS_DEPS !== undefined
@@ -417,10 +423,10 @@ export async function pickTestGroupRunOrder() {
             },
             retry: {
               automatic: [
-                {
-                  exit_status: '-1',
-                  limit: 3,
-                },
+                { exit_status: '-1', limit: 3 },
+                ...(JEST_CONFIGS_RETRY_COUNT > 0
+                  ? [{ exit_status: '*', limit: JEST_CONFIGS_RETRY_COUNT }]
+                  : []),
               ],
             },
           }
@@ -437,10 +443,10 @@ export async function pickTestGroupRunOrder() {
             },
             retry: {
               automatic: [
-                {
-                  exit_status: '-1',
-                  limit: 3,
-                },
+                { exit_status: '-1', limit: 3 },
+                ...(JEST_CONFIGS_RETRY_COUNT > 0
+                  ? [{ exit_status: '*', limit: JEST_CONFIGS_RETRY_COUNT }]
+                  : []),
               ],
             },
           }

.buildkite/pipelines/flaky_tests/pipeline.ts

@@ -168,6 +168,7 @@ for (const testSuite of testSuites) {
         label: group.name,
         agents: { queue: agentQueue },
         depends_on: 'build',
+        timeout_in_minutes: 150,
         parallelism: testSuite.count,
         concurrency,
         concurrency_group: process.env.UUID,

.buildkite/scripts/lifecycle/pre_command.sh

@@ -145,6 +145,9 @@ export DEPLOY_TAGGER_SLACK_WEBHOOK_URL
 GCS_SA_CDN_QA_KEY="$(vault_get gcs-sa-cdn-qa key)"
 export GCS_SA_CDN_QA_KEY
 
+GCS_SA_CDN_QA_EMAIL="$(vault_get gcs-sa-cdn-qa email)"
+export GCS_SA_CDN_QA_EMAIL
+
 GCS_SA_CDN_QA_BUCKET="$(vault_get gcs-sa-cdn-qa bucket)"
 export GCS_SA_CDN_QA_BUCKET
 

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -95,6 +95,7 @@ CDN_ASSETS_FOLDER=$(mktemp -d)
 tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
 
 gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_QA_BUCKET/$GIT_ABBREV_COMMIT"
+gcloud auth revoke "$GCS_SA_CDN_QA_EMAIL"
 
 echo "--- Upload archives"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"

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

@@ -62,7 +62,7 @@ fi
 
 echo "--- Create Deployment"
 CLOUD_DEPLOYMENT_ID=$(ecctl deployment list --output json | jq -r '.deployments[] | select(.name == "'$CLOUD_DEPLOYMENT_NAME'") | .id')
-if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
+if [ -z "${CLOUD_DEPLOYMENT_ID}" ] || [ "${CLOUD_DEPLOYMENT_ID}" = 'null' ]; then
   jq '
     .resources.kibana[0].plan.kibana.docker_image = "'$KIBANA_CLOUD_IMAGE'" |
     .resources.elasticsearch[0].plan.elasticsearch.docker_image = "'$ELASTICSEARCH_CLOUD_IMAGE'" |

.buildkite/scripts/steps/serverless/build_and_deploy.sh

@@ -59,6 +59,11 @@ deploy() {
       -XPOST -d "$PROJECT_CREATE_CONFIGURATION" &>> $DEPLOY_LOGS
 
     PROJECT_ID=$(jq -r --slurp '.[1].id' $DEPLOY_LOGS)
+    if [ -z "${PROJECT_ID}" ] || [ "$PROJECT_ID" = 'null' ]; then
+      echo "Failed to create project. Deploy logs:"
+      cat $DEPLOY_LOGS
+      exit 1
+    fi
 
     echo "Get credentials..."
     curl -s -XPOST -H "Authorization: ApiKey $PROJECT_API_KEY" \

.eslintignore

@@ -29,7 +29,6 @@ snapshots.js
 /x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
 /x-pack/plugins/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
 /x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/**
-/x-pack/plugins/cloud_integrations/cloud_gain_sight/server/assets/**
 
 # package overrides
 /packages/kbn-eslint-config

.github/CODEOWNERS

@@ -39,7 +39,6 @@ packages/analytics/shippers/elastic_v3/browser @elastic/kibana-core
 packages/analytics/shippers/elastic_v3/common @elastic/kibana-core
 packages/analytics/shippers/elastic_v3/server @elastic/kibana-core
 packages/analytics/shippers/fullstory @elastic/kibana-core
-packages/analytics/shippers/gainsight @elastic/kibana-core
 packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam
 x-pack/plugins/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
 x-pack/plugins/apm @elastic/obs-ux-infra_services-team
@@ -81,7 +80,6 @@ x-pack/plugins/cloud_integrations/cloud_data_migration @elastic/platform-onboard
 x-pack/plugins/cloud_defend @elastic/kibana-cloud-security-posture
 x-pack/plugins/cloud_integrations/cloud_experiments @elastic/kibana-core
 x-pack/plugins/cloud_integrations/cloud_full_story @elastic/kibana-core
-x-pack/plugins/cloud_integrations/cloud_gain_sight @elastic/kibana-core
 x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
 x-pack/plugins/cloud_integrations/cloud_links @elastic/kibana-core
 x-pack/plugins/cloud @elastic/kibana-core
@@ -789,6 +787,7 @@ src/plugins/telemetry @elastic/kibana-core
 test/plugin_functional/plugins/telemetry @elastic/kibana-core
 packages/kbn-telemetry-tools @elastic/kibana-core
 packages/kbn-test @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-test-eui-helpers @elastic/kibana-visualizations
 x-pack/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security
 packages/kbn-test-jest-helpers @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-test-subj-selector @elastic/kibana-operations @elastic/appex-qa
@@ -1379,6 +1378,7 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout  @elastic/
 /x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules @elastic/security-detection-rule-management
 /x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/rule_management @elastic/security-detection-rule-management
 /x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/prebuilt_rules @elastic/security-detection-rule-management
+/x-pack/test/security_solution_api_integration/test_suites/detections_response/basic_essentials_license/rule_management @elastic/security-detection-rule-management
 /x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_delete @elastic/security-detection-rule-management
 x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_update @elastic/security-detection-rule-management
 /x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_patch @elastic/security-detection-rule-management

.github/codeql/codeql-config.yml

@@ -61,6 +61,7 @@ paths-ignore:
   - packages/kbn-telemetry-tools
   - packages/kbn-test
   - packages/kbn-test-jest-helpers
+  - packages/kbn-test-eui-helpers
   - packages/kbn-test-subj-selector
   - packages/kbn-tooling-log
   - packages/kbn-ts-project-linter

NOTICE.txt

@@ -225,11 +225,6 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
----
-Portions of this code are licensed under the following license:
-Gainsight PX Agent Wrapper Agent Version: 0.46.0 Installed: 2022-08-25 08:07
-https://www.gainsight.com/policy/gainsight-px-license-agreement/
-
 ---
 This code includes a copy of the `normalize-path`
 https://github.com/jonschlinkert/normalize-path/blob/52c3a95ebebc2d98c1ad7606cbafa7e658656899/index.js
@@ -347,9 +342,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
----
-Copyright (c) 2013 HubSpot, Inc.
-Released under the MIT license
-
-https://github.com/HubSpot/vex/blob/master/LICENSE
-

api_docs/actions.devdocs.json

@@ -5272,13 +5272,13 @@
       },
       {
         "parentPluginId": "actions",
-        "id": "def-common.GenerativeAIConnectorFeatureId",
+        "id": "def-common.GenerativeAIForObservabilityConnectorFeatureId",
         "type": "string",
         "tags": [],
-        "label": "GenerativeAIConnectorFeatureId",
+        "label": "GenerativeAIForObservabilityConnectorFeatureId",
         "description": [],
         "signature": [
-          "\"generativeAI\""
+          "\"generativeAIForObservability\""
         ],
         "path": "x-pack/plugins/actions/common/connector_feature_config.ts",
         "deprecated": false,
@@ -5287,13 +5287,13 @@
       },
       {
         "parentPluginId": "actions",
-        "id": "def-common.GenerativeAIForObservabilityConnectorFeatureId",
+        "id": "def-common.GenerativeAIForSecurityConnectorFeatureId",
         "type": "string",
         "tags": [],
-        "label": "GenerativeAIForObservabilityConnectorFeatureId",
+        "label": "GenerativeAIForSecurityConnectorFeatureId",
         "description": [],
         "signature": [
-          "\"generativeAIForObservability\""
+          "\"generativeAIForSecurity\""
         ],
         "path": "x-pack/plugins/actions/common/connector_feature_config.ts",
         "deprecated": false,
@@ -5627,18 +5627,18 @@
       },
       {
         "parentPluginId": "actions",
-        "id": "def-common.GenerativeAIFeature",
+        "id": "def-common.GenerativeAIForObservabilityFeature",
         "type": "Object",
         "tags": [],
-        "label": "GenerativeAIFeature",
+        "label": "GenerativeAIForObservabilityFeature",
         "description": [],
         "path": "x-pack/plugins/actions/common/connector_feature_config.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "actions",
-            "id": "def-common.GenerativeAIFeature.id",
+            "id": "def-common.GenerativeAIForObservabilityFeature.id",
             "type": "string",
             "tags": [],
             "label": "id",
@@ -5649,7 +5649,7 @@
           },
           {
             "parentPluginId": "actions",
-            "id": "def-common.GenerativeAIFeature.name",
+            "id": "def-common.GenerativeAIForObservabilityFeature.name",
             "type": "string",
             "tags": [],
             "label": "name",
@@ -5660,7 +5660,7 @@
           },
           {
             "parentPluginId": "actions",
-            "id": "def-common.GenerativeAIFeature.compatibility",
+            "id": "def-common.GenerativeAIForObservabilityFeature.compatibility",
             "type": "string",
             "tags": [],
             "label": "compatibility",
@@ -5674,18 +5674,18 @@
       },
       {
         "parentPluginId": "actions",
-        "id": "def-common.GenerativeAIForObservabilityFeature",
+        "id": "def-common.GenerativeAIForSecurityFeature",
         "type": "Object",
         "tags": [],
-        "label": "GenerativeAIForObservabilityFeature",
+        "label": "GenerativeAIForSecurityFeature",
         "description": [],
         "path": "x-pack/plugins/actions/common/connector_feature_config.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "actions",
-            "id": "def-common.GenerativeAIForObservabilityFeature.id",
+            "id": "def-common.GenerativeAIForSecurityFeature.id",
             "type": "string",
             "tags": [],
             "label": "id",
@@ -5696,7 +5696,7 @@
           },
           {
             "parentPluginId": "actions",
-            "id": "def-common.GenerativeAIForObservabilityFeature.name",
+            "id": "def-common.GenerativeAIForSecurityFeature.name",
             "type": "string",
             "tags": [],
             "label": "name",
@@ -5707,7 +5707,7 @@
           },
           {
             "parentPluginId": "actions",
-            "id": "def-common.GenerativeAIForObservabilityFeature.compatibility",
+            "id": "def-common.GenerativeAIForSecurityFeature.compatibility",
             "type": "string",
             "tags": [],
             "label": "compatibility",

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

api_docs/ai_assistant_management_observability.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementObservability
 title: "aiAssistantManagementObservability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementObservability plugin
-date: 2024-01-05
+date: 2024-01-10
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementObservability']
 ---
 import aiAssistantManagementObservabilityObj from './ai_assistant_management_observability.devdocs.json';

api_docs/ai_assistant_management_selection.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
 title: "aiAssistantManagementSelection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementSelection plugin
-date: 2024-01-05
+date: 2024-01-10
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
 ---
 import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.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: 2024-01-05
+date: 2024-01-10
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';

api_docs/alerting.devdocs.json

@@ -5204,6 +5204,70 @@
       }
     ],
     "objects": [
+      {
+        "parentPluginId": "alerting",
+        "id": "def-server.DEFAULT_AAD_CONFIG",
+        "type": "Object",
+        "tags": [],
+        "label": "DEFAULT_AAD_CONFIG",
+        "description": [],
+        "path": "x-pack/plugins/alerting/server/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.DEFAULT_AAD_CONFIG.context",
+            "type": "string",
+            "tags": [],
+            "label": "context",
+            "description": [],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.DEFAULT_AAD_CONFIG.mappings",
+            "type": "Object",
+            "tags": [],
+            "label": "mappings",
+            "description": [],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "alerting",
+                "id": "def-server.DEFAULT_AAD_CONFIG.mappings.fieldMap",
+                "type": "Object",
+                "tags": [],
+                "label": "fieldMap",
+                "description": [],
+                "path": "x-pack/plugins/alerting/server/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": []
+              }
+            ]
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.DEFAULT_AAD_CONFIG.shouldWrite",
+            "type": "boolean",
+            "tags": [],
+            "label": "shouldWrite",
+            "description": [],
+            "signature": [
+              "true"
+            ],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-server.DEFAULT_ALERTS_ILM_POLICY",