Merge branch 'main' into system_actions_rbac

elastic · Jul 11, 2023 · a9e3bd5 · a9e3bd5
2 parents 2c565b1 + 5396f1b
commit a9e3bd5
Show file tree

Hide file tree

Showing 1,025 changed files with 14,632 additions and 6,876 deletions.
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
@@ -49,6 +49,8 @@ disabled:
   - x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
   - x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
   - x-pack/plugins/apm/ftr_e2e/ftr_config.ts
+  - x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
+  - x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
   - x-pack/plugins/profiling/e2e/ftr_config_open.ts
   - x-pack/plugins/profiling/e2e/ftr_config_runner.ts
   - x-pack/plugins/profiling/e2e/ftr_config.ts

diff --git a/.buildkite/scripts/steps/artifacts/docker_image.sh b/.buildkite/scripts/steps/artifacts/docker_image.sh
@@ -92,17 +92,6 @@ steps:
         SERVICE_COMMIT_HASH: $GIT_ABBREV_COMMIT
         REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/config.yaml
 
-  - trigger: serverless-gitops-update-stack-image-tag
-    async: true
-    label: ":argo: Update image tag for Kibana using the legacy script (used in QA/Staging)"
-    branches: main
-    build:
-      env:
-        IMAGE_TAG: "git-$GIT_ABBREV_COMMIT"
-        SERVICE: kibana-controller
-        NAMESPACE: kibana-ci
-        IMAGE_NAME: kibana-serverless
-        COMMIT_MESSAGE: "gitops: update kibana tag to elastic/kibana@$GIT_ABBREV_COMMIT"
 EOF
 
 else

diff --git a/.buildkite/scripts/steps/functional/apm_cypress.sh b/.buildkite/scripts/steps/functional/apm_cypress.sh
@@ -11,9 +11,16 @@ APM_CYPRESS_RECORD_KEY="$(retry 5 5 vault read -field=CYPRESS_RECORD_KEY secret/
 
 export JOB=kibana-apm-cypress
 IS_FLAKY_TEST_RUNNER=${CLI_COUNT:-0}
+GH_APM_TEAM_LABEL="Team:APM"
 
-#Enabling cypress dashboard recording when PR is labeled with `apm:cypress-record` and we are not using the flaky test runner
-if [[ "$IS_FLAKY_TEST_RUNNER" -ne 1 ]] && is_pr_with_label "apm:cypress-record"; then
+if (! is_pr); then
+  echo "--- Add GH labels to buildkite metadata"
+  ts-node .buildkite/scripts/steps/add_gh_labels_to_bk_metadata.ts BUILDKITE_MESSAGE true
+  GH_ON_MERGE_LABELS="$(buildkite-agent meta-data get gh_labels)"
+fi
+
+# Enabling cypress dashboard recording when PR is labeled with `apm:cypress-record` and we are not using the flaky test runner OR on merge with Team:APM label applied
+if ([[ "$IS_FLAKY_TEST_RUNNER" -ne 1 ]] && is_pr_with_label "apm:cypress-record") || ([[ $GH_ON_MERGE_LABELS == *"$GH_APM_TEAM_LABEL"* ]]); then
   CYPRESS_ARGS="--record --key "$APM_CYPRESS_RECORD_KEY" --parallel --ci-build-id "${BUILDKITE_BUILD_ID}""
 else
   CYPRESS_ARGS=""

diff --git a/.buildkite/scripts/steps/functional/serverless_ftr.sh b/.buildkite/scripts/steps/functional/serverless_ftr.sh
@@ -15,6 +15,7 @@ elif [[ "$SERVERLESS_ENVIRONMENT" == "observability" ]]; then
   SERVERLESS_CONFIGS=(
     "x-pack/test_serverless/api_integration/test_suites/observability/config.ts"
     "x-pack/test_serverless/functional/test_suites/observability/config.ts"
+    "x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts"
   )
 elif [[ "$SERVERLESS_ENVIRONMENT" == "security" ]]; then
   SERVERLESS_CONFIGS=(

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1138,6 +1138,8 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
 /x-pack/plugins/security_solution/public/detections/mitre @elastic/security-detection-rule-management
 /x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules @elastic/security-detection-rule-management
 /x-pack/plugins/security_solution/public/rules @elastic/security-detection-rule-management
+/x-pack/plugins/security_solution/public/entity_analytics @elastic/security-detection-engine
+
 
 /x-pack/plugins/security_solution/server/lib/detection_engine/fleet_integrations @elastic/security-detection-rule-management
 /x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules @elastic/security-detection-rule-management
@@ -1164,6 +1166,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
 /x-pack/plugins/security_solution/cypress/e2e/data_sources @elastic/security-detection-engine
 /x-pack/plugins/security_solution/cypress/e2e/exceptions @elastic/security-detection-engine
 /x-pack/plugins/security_solution/cypress/e2e/value_lists @elastic/security-detection-engine
+/x-pack/plugins/security_solution/cypress/e2e/entity_analytics @elastic/security-detection-engine
 
 /x-pack/plugins/security_solution/common/detection_engine/rule_exceptions @elastic/security-detection-engine
 

diff --git a/api_docs/actions.devdocs.json b/api_docs/actions.devdocs.json
@@ -2664,10 +2664,10 @@
           },
           {
             "parentPluginId": "actions",
-            "id": "def-server.ActionType.isSystemAction",
+            "id": "def-server.ActionType.isSystemActionType",
             "type": "CompoundType",
             "tags": [],
-            "label": "isSystemAction",
+            "label": "isSystemActionType",
             "description": [],
             "signature": [
               "boolean | undefined"
@@ -2962,6 +2962,52 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "actions",
+        "id": "def-server.InMemoryConnector",
+        "type": "Interface",
+        "tags": [],
+        "label": "InMemoryConnector",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "actions",
+            "scope": "server",
+            "docId": "kibActionsPluginApi",
+            "section": "def-server.InMemoryConnector",
+            "text": "InMemoryConnector"
+          },
+          "<Config, Secrets> extends ",
+          {
+            "pluginId": "actions",
+            "scope": "server",
+            "docId": "kibActionsPluginApi",
+            "section": "def-server.ActionResult",
+            "text": "ActionResult"
+          },
+          "<Config>"
+        ],
+        "path": "x-pack/plugins/actions/server/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "actions",
+            "id": "def-server.InMemoryConnector.secrets",
+            "type": "Uncategorized",
+            "tags": [],
+            "label": "secrets",
+            "description": [],
+            "signature": [
+              "Secrets"
+            ],
+            "path": "x-pack/plugins/actions/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "actions",
         "id": "def-server.IUnsecuredActionsClient",
@@ -3026,52 +3072,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "actions",
-        "id": "def-server.PreConfiguredAction",
-        "type": "Interface",
-        "tags": [],
-        "label": "PreConfiguredAction",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "actions",
-            "scope": "server",
-            "docId": "kibActionsPluginApi",
-            "section": "def-server.PreConfiguredAction",
-            "text": "PreConfiguredAction"
-          },
-          "<Config, Secrets> extends ",
-          {
-            "pluginId": "actions",
-            "scope": "server",
-            "docId": "kibActionsPluginApi",
-            "section": "def-server.ActionResult",
-            "text": "ActionResult"
-          },
-          "<Config>"
-        ],
-        "path": "x-pack/plugins/actions/server/types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "actions",
-            "id": "def-server.PreConfiguredAction.secrets",
-            "type": "Uncategorized",
-            "tags": [],
-            "label": "secrets",
-            "description": [],
-            "signature": [
-              "Secrets"
-            ],
-            "path": "x-pack/plugins/actions/server/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "actions",
         "id": "def-server.ServiceParams",
@@ -3315,7 +3315,7 @@
             "section": "def-common.ActionType",
             "text": "ActionType"
           },
-          "[]>; isActionTypeEnabled: (actionTypeId: string, options?: { notifyUsage: boolean; }) => boolean; isPreconfigured: (connectorId: string) => boolean; getGlobalExecutionLogWithAuth: ({ dateStart, dateEnd, filter, page, perPage, sort, namespaces, }: ",
+          "[]>; isActionTypeEnabled: (actionTypeId: string, options?: { notifyUsage: boolean; }) => boolean; isPreconfigured: (connectorId: string) => boolean; isSystemAction: (connectorId: string) => boolean; getGlobalExecutionLogWithAuth: ({ dateStart, dateEnd, filter, page, perPage, sort, namespaces, }: ",
           {
             "pluginId": "actions",
             "scope": "common",
@@ -3848,18 +3848,18 @@
         },
         {
           "parentPluginId": "actions",
-          "id": "def-server.PluginStartContract.preconfiguredActions",
+          "id": "def-server.PluginStartContract.inMemoryConnectors",
           "type": "Array",
           "tags": [],
-          "label": "preconfiguredActions",
+          "label": "inMemoryConnectors",
           "description": [],
           "signature": [
             {
               "pluginId": "actions",
               "scope": "server",
               "docId": "kibActionsPluginApi",
-              "section": "def-server.PreConfiguredAction",
-              "text": "PreConfiguredAction"
+              "section": "def-server.InMemoryConnector",
+              "text": "InMemoryConnector"
             },
             "<",
             "ActionTypeConfig",
@@ -4515,6 +4515,17 @@
             "path": "x-pack/plugins/actions/common/types.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "actions",
+            "id": "def-common.ActionType.isSystemActionType",
+            "type": "boolean",
+            "tags": [],
+            "label": "isSystemActionType",
+            "description": [],
+            "path": "x-pack/plugins/actions/common/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false

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-07-07
+date: 2023-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 270 | 10 | 265 | 27 |
+| 271 | 10 | 266 | 27 |
 
 ## Client
 

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