Merge branch 'main' into tsvb_discacrded_searches

.buildkite/scripts/bootstrap.sh

@@ -26,6 +26,8 @@ fi
 ### upload ts-refs-cache artifacts as quickly as possible so they are available for download
 ###
 if [[ "${BUILD_TS_REFS_CACHE_CAPTURE:-}" == "true" ]]; then
+  echo "--- Build ts-refs-cache"
+  node scripts/build_ts_refs.js --ignore-type-failures
   echo "--- Upload ts-refs-cache"
   cd "$KIBANA_DIR/target/ts_refs_cache"
   gsutil cp "*.zip" 'gs://kibana-ci-ts-refs-cache/'

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

@@ -42,7 +42,9 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
     .resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
     .name = "'$CLOUD_DEPLOYMENT_NAME'" |
     .resources.kibana[0].plan.kibana.version = "'$VERSION'" |
-    .resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
+    .resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'" |
+    .resources.enterprise_search[0].plan.enterprise_search.version = "'$VERSION'" |
+    .resources.integrations_server[0].plan.integrations_server.version = "'$VERSION'"
     ' .buildkite/scripts/steps/cloud/deploy.json > /tmp/deploy.json
 
   ecctl deployment create --track --output json --file /tmp/deploy.json &> "$JSON_FILE"
@@ -51,6 +53,13 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
   CLOUD_DEPLOYMENT_ID=$(jq -r --slurp '.[0].id' "$JSON_FILE")
   CLOUD_DEPLOYMENT_STATUS_MESSAGES=$(jq --slurp '[.[]|select(.resources == null)]' "$JSON_FILE")
 
+  # Enable stack monitoring
+  jq '
+    .settings.observability.metrics.destination.deployment_id = "'$CLOUD_DEPLOYMENT_ID'" |
+    .settings.observability.logging.destination.deployment_id = "'$CLOUD_DEPLOYMENT_ID'"
+    ' .buildkite/scripts/steps/cloud/stack_monitoring.json > /tmp/stack_monitoring.json
+  ecctl deployment update "$CLOUD_DEPLOYMENT_ID" --track --output json --file /tmp/stack_monitoring.json &> "$JSON_FILE"
+
   # Refresh vault token
   VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
   VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
@@ -59,11 +68,10 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
 
   retry 5 5 vault write "secret/kibana-issues/dev/cloud-deploy/$CLOUD_DEPLOYMENT_NAME" username="$CLOUD_DEPLOYMENT_USERNAME" password="$CLOUD_DEPLOYMENT_PASSWORD"
 else
-  ecctl deployment show "$CLOUD_DEPLOYMENT_ID" --generate-update-payload | jq '
-    .resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
-    .resources.kibana[0].plan.kibana.version = "'$VERSION'" |
-    .resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
-    ' > /tmp/deploy.json
+ecctl deployment show "$CLOUD_DEPLOYMENT_ID" --generate-update-payload | jq '
+  .resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
+  (.. | select(.version? != null).version) = "'$VERSION'"
+  ' > /tmp/deploy.json
   ecctl deployment update "$CLOUD_DEPLOYMENT_ID" --track --output json --file /tmp/deploy.json &> "$JSON_FILE"
 fi
 

.buildkite/scripts/steps/cloud/deploy.json

@@ -1,5 +1,27 @@
 {
   "resources": {
+    "integrations_server": [
+      {
+        "elasticsearch_cluster_ref_id": "main-elasticsearch",
+        "region": "gcp-us-west2",
+        "plan": {
+          "cluster_topology": [
+            {
+              "instance_configuration_id": "gcp.integrationsserver.1",
+              "zone_count": 1,
+              "size": {
+                "value": 512,
+                "resource": "memory"
+              }
+            }
+          ],
+          "integrations_server": {
+            "version": null
+          }
+        },
+        "ref_id": "main-integrations_server"
+      }
+    ],
     "elasticsearch": [
       {
         "region": "gcp-us-west2",
@@ -12,7 +34,10 @@
             {
               "zone_count": 2,
               "instance_configuration_id": "gcp.coordinating.1",
-              "node_roles": ["ingest", "remote_cluster_client"],
+              "node_roles": [
+                "ingest",
+                "remote_cluster_client"
+              ],
               "id": "coordinating",
               "size": {
                 "resource": "memory",
@@ -54,7 +79,10 @@
                 "enabled_built_in_plugins": []
               },
               "instance_configuration_id": "gcp.data.highstorage.1",
-              "node_roles": ["data_warm", "remote_cluster_client"],
+              "node_roles": [
+                "data_warm",
+                "remote_cluster_client"
+              ],
               "id": "warm",
               "size": {
                 "resource": "memory",
@@ -70,7 +98,10 @@
                 "enabled_built_in_plugins": []
               },
               "instance_configuration_id": "gcp.data.highstorage.1",
-              "node_roles": ["data_cold", "remote_cluster_client"],
+              "node_roles": [
+                "data_cold",
+                "remote_cluster_client"
+              ],
               "id": "cold",
               "size": {
                 "resource": "memory",
@@ -86,7 +117,9 @@
                 "enabled_built_in_plugins": []
               },
               "instance_configuration_id": "gcp.es.datafrozen.n1.64x10x95",
-              "node_roles": ["data_frozen"],
+              "node_roles": [
+                "data_frozen"
+              ],
               "id": "frozen",
               "size": {
                 "resource": "memory",
@@ -96,7 +129,10 @@
             {
               "zone_count": 3,
               "instance_configuration_id": "gcp.master.1",
-              "node_roles": ["master", "remote_cluster_client"],
+              "node_roles": [
+                "master",
+                "remote_cluster_client"
+              ],
               "id": "master",
               "size": {
                 "resource": "memory",
@@ -109,11 +145,14 @@
             {
               "zone_count": 1,
               "instance_configuration_id": "gcp.ml.1",
-              "node_roles": ["ml", "remote_cluster_client"],
+              "node_roles": [
+                "ml",
+                "remote_cluster_client"
+              ],
               "id": "ml",
               "size": {
-                "resource": "memory",
-                "value": 0
+                "value": 1024,
+                "resource": "memory"
               },
               "elasticsearch": {
                 "enabled_built_in_plugins": []
@@ -130,7 +169,33 @@
         "ref_id": "main-elasticsearch"
       }
     ],
-    "enterprise_search": [],
+    "enterprise_search": [
+      {
+        "elasticsearch_cluster_ref_id": "main-elasticsearch",
+        "region": "gcp-us-west2",
+        "plan": {
+          "cluster_topology": [
+            {
+              "node_type": {
+                "connector": true,
+                "appserver": true,
+                "worker": true
+              },
+              "instance_configuration_id": "gcp.enterprisesearch.1",
+              "zone_count": 1,
+              "size": {
+                "resource": "memory",
+                "value": 2048
+              }
+            }
+          ],
+          "enterprise_search": {
+            "version": null
+          }
+        },
+        "ref_id": "main-enterprise_search"
+      }
+    ],
     "kibana": [
       {
         "elasticsearch_cluster_ref_id": "main-elasticsearch",
@@ -153,8 +218,7 @@
         },
         "ref_id": "main-kibana"
       }
-    ],
-    "apm": []
+    ]
   },
   "name": null,
   "metadata": {

.buildkite/scripts/steps/cloud/stack_monitoring.json

@@ -0,0 +1,19 @@
+{
+  "prune_orphans": false,
+  "settings": {
+    "observability": {
+      "metrics": {
+        "destination": {
+          "deployment_id": null,
+          "ref_id": "main-elasticsearch"
+        }
+      },
+      "logging": {
+        "destination": {
+          "deployment_id": null,
+          "ref_id": "main-elasticsearch"
+        }
+      }
+    }
+  }
+}

.github/CODEOWNERS

@@ -56,8 +56,6 @@
 /examples/state_containers_examples/ @elastic/kibana-app-services
 /examples/ui_action_examples/ @elastic/kibana-app-services
 /examples/ui_actions_explorer/ @elastic/kibana-app-services
-/examples/url_generators_examples/ @elastic/kibana-app-services
-/examples/url_generators_explorer/ @elastic/kibana-app-services
 /examples/field_formats_example/ @elastic/kibana-app-services
 /examples/partial_results_example/ @elastic/kibana-app-services
 /examples/search_examples/ @elastic/kibana-app-services
@@ -344,8 +342,8 @@
 /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
+/docs/user/alerting/ @elastic/response-ops @elastic/mlr-docs
+/docs/management/connectors/ @elastic/response-ops @elastic/mlr-docs
 #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

dev_docs/key_concepts/building_blocks.mdx

@@ -124,7 +124,7 @@ sharing and space isolation, and tags.
 
 ## Advanced Settings
 
-<DocLink id="kibDevTutorialAdvancedSettings" text="Advanced Settings and the uiSettings service /> should be used if you need to add application-level configuration options. If you wanted to add a setting for listing a number of items per page in your TODO application, then `pageListing` would be a configuration option.
+<DocLink id="kibDevTutorialAdvancedSettings" text="Advanced Settings and the uiSettings service" /> should be used if you need to add application-level configuration options. If you wanted to add a setting for listing a number of items per page in your TODO application, then `pageListing` would be a configuration option.
 
 **Github labels**: `Team:Core`, `Feature:uiSettings`, `Feature:Advanced Settings`
 

dev_docs/tutorials/ci.mdx

@@ -0,0 +1,48 @@
+---
+id: kibDevTutorialCI
+slug: /kibana-dev-docs/tutorials/ci
+title: CI
+summary: CI
+date: 2022-02-03
+tags: ['kibana', 'onboarding', 'dev', 'ci']
+---
+
+## CI
+
+Kibana uses BuildKite to run a series of checks against each pull requests and tracked branch.  Results are posted in pull requests as comments and from the BuildKite UI
+
+### Comments
+
+Comments in pull requests can be used to trigger CI operations.
+
+#### `buildkite test this`
+
+Run test suites and checks.
+
+#### `@elasticmachine merge upstream`
+
+Merge in the most recent changes from upstream.
+
+#### `@elasticmachine run elasticsearch-ci/docs`
+
+Build documentation from the root `docs` folder.
+
+### Labels
+
+Labels can be added to a pull request to run conditional pipelines.
+
+#### `ci:deploy-cloud`
+
+Deploy a pull request to Elastic Cloud.  Deployment information will be available as an annotation at the top of a build.  Access credentials will be available in vault.
+
+#### `ci:build-all-platforms`
+
+Build Windows, macOS, and Linux archives.  Artifacts will be available on the "Artifacts" tab of the "Build Kibana Distribution and Plugins" step.
+
+#### `ci:build-os-packages`
+
+Build Docker images, and Debian and RPM packages.  Artifacts will be available on the "Artifacts" tab of the "Build Kibana Distribution and Plugins" step.
+
+#### `ci:all-cypress-suites`
+
+By default, Cypress test suites are only run when code changes are made in certain files, typically files with overlapping test coverage.  Adding this label will cause all Cypress tests to run.

docs/apm/correlations.asciidoc

@@ -60,8 +60,6 @@ filtered out, you can begin viewing sample traces to continue your investigation
 [[correlations-error-rate]]
 ==== Find failed transaction correlations
 
-beta::[]
-
 The correlations on the *Failed transaction correlations* tab help you discover
 which attributes are most influential in distinguishing between transaction
 failures and successes. In this context, the success or failure of a transaction

docs/apm/transactions.asciidoc

@@ -151,7 +151,7 @@ Learn more about a trace sample in the *Metadata* tab:
 * User - Requires additional configuration, but allows you to see which user experienced the current transaction.
 
 TIP: All of this data is stored in documents in Elasticsearch.
-This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.
+This means you can select "Actions - View transaction in Discover" to see the actual Elasticsearch document under the discover tab.
 
 *Trace sample logs*