Merge branch 'main' into task/olm_downgrade_exp_event_filters-2032

elastic · Jan 11, 2022 · 8632991 · 8632991
2 parents 14bace7 + 7974e31
commit 8632991
Show file tree

Hide file tree

Showing 497 changed files with 25,489 additions and 26,929 deletions.
diff --git a/.buildkite/pipelines/package_testing.yml b/.buildkite/pipelines/package_testing.yml
@@ -0,0 +1,27 @@
+steps:
+  - command: .buildkite/scripts/steps/package_testing/build.sh
+    label: Build Packages
+    agents:
+      queue: c2-16
+    timeout_in_minutes: 60
+    if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
+
+  - wait
+
+  - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for deb
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 60
+
+  - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for rpm
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 60
+
+  - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for docker
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 60
diff --git a/.buildkite/pipelines/pull_request/osquery_cypress.yml b/.buildkite/pipelines/pull_request/osquery_cypress.yml
@@ -9,3 +9,5 @@ steps:
       automatic:
         - exit_status: '*'
           limit: 1
+    artifact_paths:
+      - "target/kibana-osquery/**/*"
diff --git a/.buildkite/scripts/steps/functional/osquery_cypress.sh b/.buildkite/scripts/steps/functional/osquery_cypress.sh
@@ -4,8 +4,9 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
+export BUILD_TS_REFS_DISABLE=false
 .buildkite/scripts/bootstrap.sh
-.buildkite/scripts/download_build_artifacts.sh
+node scripts/build_kibana_platform_plugins.js
 
 export JOB=kibana-osquery-cypress
 
@@ -16,5 +17,5 @@ cd "$XPACK_DIR"
 checks-reporter-with-killswitch "Osquery Cypress Tests" \
  node scripts/functional_tests \
    --debug --bail \
-   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
    --config test/osquery_cypress/cli_config.ts
+
diff --git a/.buildkite/scripts/steps/package_testing/build.sh b/.buildkite/scripts/steps/package_testing/build.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+.buildkite/scripts/bootstrap.sh
+
+echo "--- Build Kibana Distribution"
+node scripts/build --all-platforms --debug
+
+cd target
+buildkite-agent artifact upload "./kibana-[0-9]*-docker-image.tar.gz;./*.deb;./*.rpm"
+cd ..
diff --git a/.buildkite/scripts/steps/package_testing/test.sh b/.buildkite/scripts/steps/package_testing/test.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+.buildkite/scripts/bootstrap.sh
+
+echo "--- Package Testing for $TEST_PACKAGE"
+
+mkdir -p target
+cd target
+if [[ "$TEST_PACKAGE" == "deb" ]]; then
+  buildkite-agent artifact download 'kibana-*.deb' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  KIBANA_IP_ADDRESS="192.168.50.5"
+elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
+  buildkite-agent artifact download 'kibana-*.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  KIBANA_IP_ADDRESS="192.168.50.6"
+elif [[ "$TEST_PACKAGE" == "docker" ]]; then
+  buildkite-agent artifact download 'kibana-*-docker-image.tar.gz' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  KIBANA_IP_ADDRESS="192.168.50.7"
+fi
+cd ..
+
+export VAGRANT_CWD=test/package
+vagrant up "$TEST_PACKAGE" --no-provision
+
+node scripts/es snapshot \
+  -E network.bind_host=127.0.0.1,192.168.50.1 \
+  -E discovery.type=single-node \
+  --license=trial &
+while ! timeout 1 bash -c "echo > /dev/tcp/localhost/9200"; do sleep 30; done
+
+vagrant provision "$TEST_PACKAGE"
+
+export TEST_BROWSER_HEADLESS=1
+export TEST_KIBANA_URL="http://elastic:changeme@$KIBANA_IP_ADDRESS:5601"
+export TEST_ES_URL=http://elastic:changeme@192.168.50.1:9200
+
+cd x-pack
+node scripts/functional_test_runner.js --include-tag=smoke
diff --git a/.buildkite/scripts/steps/storybooks/build_and_upload.js b/.buildkite/scripts/steps/storybooks/build_and_upload.js
@@ -14,12 +14,11 @@ const path = require('path');
 const STORYBOOKS = [
   'apm',
   'canvas',
-  'codeeditor',
   'ci_composite',
+  'codeeditor',
   'custom_integrations',
-  'url_template_editor',
-  'dashboard',
   'dashboard_enhanced',
+  'dashboard',
   'data_enhanced',
   'embeddable',
   'expression_error',
@@ -31,11 +30,13 @@ const STORYBOOKS = [
   'expression_tagcloud',
   'fleet',
   'infra',
-  'security_solution',
-  'ui_actions_enhanced',
+  'lists',
   'observability',
   'presentation',
-  'lists',
+  'security_solution',
+  'shared_ux',
+  'ui_actions_enhanced',
+  'url_template_editor',
 ];
 
 const GITHUB_CONTEXT = 'Build and Publish Storybooks';

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -11,7 +11,7 @@
 /packages/kbn-docs-utils/ @elastic/kibana-tech-leads @elastic/kibana-operations
 
 # Virtual teams
-/x-pack/plugins/rule_registry/ @elastic/rac
+/x-pack/plugins/rule_registry/ @elastic/rac @elastic/response-ops
 
 # Data Discovery
 /src/plugins/discover/ @elastic/kibana-data-discovery
@@ -324,47 +324,25 @@
 /examples/preboot_example/ @elastic/kibana-security @elastic/kibana-core
 #CC# /x-pack/plugins/security/ @elastic/kibana-security
 
-# Kibana Alerting Services
-/x-pack/plugins/alerting/ @elastic/kibana-alerting-services
-/x-pack/plugins/actions/ @elastic/kibana-alerting-services
-/x-pack/plugins/event_log/ @elastic/kibana-alerting-services
-/x-pack/plugins/task_manager/ @elastic/kibana-alerting-services
-/x-pack/test/alerting_api_integration/ @elastic/kibana-alerting-services
-/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/kibana-alerting-services
-/x-pack/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
-/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
-/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
-/docs/user/alerting/ @elastic/kibana-alerting-services
-/docs/management/connectors/ @elastic/kibana-alerting-services
-#CC# /x-pack/plugins/stack_alerts @elastic/kibana-alerting-services
+# Response Ops team
+/x-pack/plugins/alerting/ @elastic/response-ops
+/x-pack/plugins/actions/ @elastic/response-ops
+/x-pack/plugins/event_log/ @elastic/response-ops
+/x-pack/plugins/task_manager/ @elastic/response-ops
+/x-pack/test/alerting_api_integration/ @elastic/response-ops
+/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
+/x-pack/plugins/triggers_actions_ui/ @elastic/response-ops
+/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/response-ops
+/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/response-ops
+/docs/user/alerting/ @elastic/response-ops
+/docs/management/connectors/ @elastic/response-ops
+#CC# /x-pack/plugins/stack_alerts @elastic/response-ops
+/x-pack/plugins/cases @elastic/response-ops
+/x-pack/test/cases_api_integration @elastic/response-ops
 
 # Enterprise Search
-# Shared
-/x-pack/plugins/enterprise_search/* @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/common/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/public/* @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/public/applications/* @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/public/applications/enterprise_search/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/public/applications/shared/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/public/applications/__mocks__/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/* @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/lib/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/__mocks__/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/collectors/lib/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/routes/enterprise_search/ @elastic/enterprise-search-frontend
-/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search @elastic/enterprise-search-frontend
 /x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
-# App Search
-/x-pack/plugins/enterprise_search/public/applications/app_search/ @elastic/app-search-frontend
-/x-pack/plugins/enterprise_search/server/routes/app_search/ @elastic/app-search-frontend
-/x-pack/plugins/enterprise_search/server/collectors/app_search/ @elastic/app-search-frontend
-/x-pack/plugins/enterprise_search/server/saved_objects/app_search/ @elastic/app-search-frontend
-# Workplace Search
-/x-pack/plugins/enterprise_search/public/applications/workplace_search/ @elastic/workplace-search-frontend
-/x-pack/plugins/enterprise_search/server/routes/workplace_search/ @elastic/workplace-search-frontend
-/x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
-/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
 
 # Management Experience - Deployment Management
 /src/plugins/dev_tools/ @elastic/platform-deployment-management
@@ -403,9 +381,7 @@
 #CC# /x-pack/plugins/security_solution/ @elastic/security-solution
 
 # Security Solution sub teams
-/x-pack/plugins/cases @elastic/security-threat-hunting
 /x-pack/plugins/timelines @elastic/security-threat-hunting
-/x-pack/test/cases_api_integration @elastic/security-threat-hunting
 /x-pack/plugins/lists @elastic/security-detections-response
 
 ## Security Solution sub teams - security-onboarding-and-lifecycle-mgt

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -39,5 +39,3 @@ jobs:
           github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
           commit_user: kibanamachine
           commit_email: 42973632+kibanamachine@users.noreply.github.com
-          auto_merge: 'true'
-          auto_merge_method: 'squash'
diff --git a/README.md b/README.md
@@ -49,13 +49,13 @@ _Note: The version numbers below are only examples, meant to illustrate the rela
 
 | Situation                 | Example Kibana version     | Example ES version | Outcome |
 | ------------------------- | -------------------------- |------------------- | ------- |
-| Versions are the same.    | 5.1.2                      | 5.1.2              | 💚 OK      |
-| ES patch number is newer. | 5.1.__2__                  | 5.1.__5__          | ⚠️ Logged warning      |
-| ES minor number is newer. | 5.__1__.2                  | 5.__5__.0          | ⚠️ Logged warning      |
-| ES major number is newer. | __5__.1.2                  | __6__.0.0          | 🚫 Fatal error      |
-| ES patch number is older. | 5.1.__2__                  | 5.1.__0__          | ⚠️ Logged warning      |
-| ES minor number is older. | 5.__1__.2                  | 5.__0__.0          | 🚫 Fatal error      |
-| ES major number is older. | __5__.1.2                  | __4__.0.0          | 🚫 Fatal error      |
+| Versions are the same.    | 7.15.1                     | 7.15.1             | 💚 OK      |
+| ES patch number is newer. | 7.15.__0__                 | 7.15.__1__         | ⚠️ Logged warning      |
+| ES minor number is newer. | 7.__14__.2                 | 7.__15__.0         | ⚠️ Logged warning      |
+| ES major number is newer. | __7__.15.1                 | __8__.0.0          | 🚫 Fatal error      |
+| ES patch number is older. | 7.15.__1__                 | 7.15.__0__         | ⚠️ Logged warning      |
+| ES minor number is older. | 7.__15__.1                 | 7.__14__.2         | 🚫 Fatal error      |
+| ES major number is older. | __8__.0.0                  | __7__.15.1         | 🚫 Fatal error      |
 
 ## Questions? Problems? Suggestions?
 

diff --git a/api_docs/actions.json b/api_docs/actions.json
@@ -1305,13 +1305,7 @@
               "text": "KibanaRequest"
             },
             "<unknown, unknown, unknown, any>) => Promise<",
-            {
-              "pluginId": "@kbn/utility-types",
-              "scope": "server",
-              "docId": "kibKbnUtilityTypesPluginApi",
-              "section": "def-server.PublicMethodsOf",
-              "text": "PublicMethodsOf"
-            },
+            "PublicMethodsOf",
             "<",
             {
               "pluginId": "actions",
@@ -1366,13 +1360,7 @@
               "text": "KibanaRequest"
             },
             "<unknown, unknown, unknown, any>) => ",
-            {
-              "pluginId": "@kbn/utility-types",
-              "scope": "server",
-              "docId": "kibKbnUtilityTypesPluginApi",
-              "section": "def-server.PublicMethodsOf",
-              "text": "PublicMethodsOf"
-            },
+            "PublicMethodsOf",
             "<",
             {
               "pluginId": "actions",

diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
@@ -18,7 +18,7 @@ Contact [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors)
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 23 | 0 | 20 | 1 |
+| 23 | 0 | 19 | 1 |
 
 ## Client
 

diff --git a/api_docs/alerting.json b/api_docs/alerting.json
@@ -25,13 +25,7 @@
             "text": "SanitizedAlert"
           },
           "<never>) => string | ",
-          {
-            "pluginId": "@kbn/utility-types",
-            "scope": "server",
-            "docId": "kibKbnUtilityTypesPluginApi",
-            "section": "def-server.JsonObject",
-            "text": "JsonObject"
-          }
+          "JsonObject"
         ],
         "path": "x-pack/plugins/alerting/public/alert_navigation_registry/types.ts",
         "deprecated": false,
@@ -510,13 +504,7 @@
               ") => Promise<{ filter?: ",
               "KueryNode",
               " | ",
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "server",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-server.JsonObject",
-                "text": "JsonObject"
-              },
+              "JsonObject",
               " | undefined; ensureRuleTypeIsAuthorized: (ruleTypeId: string, consumer: string, auth: string) => void; }>"
             ],
             "path": "x-pack/plugins/alerting/server/authorization/alerting_authorization.ts",
@@ -596,13 +584,7 @@
               ") => Promise<{ filter?: ",
               "KueryNode",
               " | ",
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "server",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-server.JsonObject",
-                "text": "JsonObject"
-              },
+              "JsonObject",
               " | undefined; ensureRuleTypeIsAuthorized: (ruleTypeId: string, consumer: string, auth: string) => void; }>"
             ],
             "path": "x-pack/plugins/alerting/server/authorization/alerting_authorization.ts",
@@ -1492,7 +1474,9 @@
             "label": "search",
             "description": [],
             "signature": [
-              "<TDocument = unknown, TContext = unknown>(query: ",
+              "<TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(query: ",
               "SearchRequest",
               " | ",
               "SearchRequest",
@@ -1502,7 +1486,7 @@
               "TransportResult",
               "<",
               "SearchResponse",
-              "<TDocument>, TContext>>"
+              "<TDocument, TAggregations>, unknown>>"
             ],
             "path": "x-pack/plugins/alerting/server/lib/create_abortable_es_client_factory.ts",
             "deprecated": false,
@@ -1711,13 +1695,7 @@
                 "text": "KibanaRequest"
               },
               "<unknown, unknown, unknown, any>) => ",
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "server",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-server.PublicMethodsOf",
-                "text": "PublicMethodsOf"
-              },
+              "PublicMethodsOf",
               "<",
               {
                 "pluginId": "alerting",
@@ -1772,13 +1750,7 @@
                 "text": "KibanaRequest"
               },
               "<unknown, unknown, unknown, any>) => ",
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "server",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-server.PublicMethodsOf",
-                "text": "PublicMethodsOf"
-              },
+              "PublicMethodsOf",
               "<",
               {
                 "pluginId": "alerting",
@@ -3564,13 +3536,7 @@
             "label": "state",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "server",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-server.JsonObject",
-                "text": "JsonObject"
-              }
+              "JsonObject"
             ],
             "path": "x-pack/plugins/alerting/common/alert_navigation.ts",
             "deprecated": false