Merge branch 'main' into bump-backport-7.2.0

elastic · Feb 24, 2022 · ef31a4b · ef31a4b
2 parents 7333047 + 28bf2aa
commit ef31a4b
Show file tree

Hide file tree

Showing 664 changed files with 17,409 additions and 7,443 deletions.
diff --git a/.buildkite/scripts/steps/cloud/build_and_deploy.sh b/.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
 

diff --git a/.buildkite/scripts/steps/cloud/deploy.json b/.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": {

diff --git a/.buildkite/scripts/steps/cloud/stack_monitoring.json b/.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"
+        }
+      }
+    }
+  }
+}
diff --git a/.github/workflows/label-qa-fixed-in.yml b/.github/workflows/label-qa-fixed-in.yml
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -238,9 +238,9 @@ oss plugins.
 |The service exposed by this plugin informs consumers whether they should optimize for non-interactivity. In this way plugins can avoid loading unnecessary code, data or other services.
 
 
-|{kib-repo}blob/{branch}/src/plugins/share/README.md[share]
+|{kib-repo}blob/{branch}/src/plugins/share/README.mdx[share]
 |The share plugin contains various utilities for displaying sharing context menu,
-generating deep links to other apps, and creating short URLs.
+generating deep links to other apps using locators, and creating short URLs.
 
 
 |{kib-repo}blob/{branch}/src/plugins/shared_ux/README.md[sharedUX]

diff --git a/docs/user/dashboard/images/lens_visualizationTypeDropdown_7.16.png b/docs/user/dashboard/images/lens_visualizationTypeDropdown_7.16.png
diff --git a/docs/user/dashboard/images/lens_visualizationTypeDropdown_8.0.png b/docs/user/dashboard/images/lens_visualizationTypeDropdown_8.0.png
diff --git a/docs/user/dashboard/tutorial-create-a-dashboard-of-lens-panels.asciidoc b/docs/user/dashboard/tutorial-create-a-dashboard-of-lens-panels.asciidoc
@@ -68,7 +68,7 @@ The only number function that you can use with *clientip* is *Unique count*, als
 . Open the *Visualization type* dropdown, then select *Metric*.
 +
 [role="screenshot"]
-image::images/lens_visualizationTypeDropdown_7.16.png[Visualization type dropdown]
+image::images/lens_visualizationTypeDropdown_8.0.png[Visualization type dropdown]
 
 . From the *Available fields* list, drag *clientip* to the workspace or layer pane.
 +

diff --git a/docs/user/security/session-management.asciidoc b/docs/user/security/session-management.asciidoc
@@ -6,7 +6,7 @@ When you log in, {kib} creates a session that is used to authenticate subsequent
 
 When your session expires, or you log out, {kib} will invalidate your cookie and remove session information from the index. {kib} also periodically invalidates and removes any expired sessions that weren't explicitly invalidated.
 
-To manage user sessions programmatically, {kib} exposes <<session-management-api, session management APIs>>.
+To manage user sessions programmatically, {kib} exposes <<session-management-api, session management APIs>>. For details, check out <<security-session-and-cookie-settings, Session and cookie security settings>>.
 
 [[session-idle-timeout]]
 ==== Session idle timeout

diff --git a/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx b/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
@@ -82,6 +82,7 @@ const initialInput: DashboardContainerInput = {
     to: 'now',
     from: 'now-1d',
   },
+  timeRestore: false,
   title: 'test',
   query: {
     query: '',

diff --git a/examples/share_examples/README.md b/examples/share_examples/README.md
@@ -0,0 +1,3 @@
+# Share plugin examples
+
+Small demos of share plugin usage.
diff --git a/examples/share_examples/kibana.json b/examples/share_examples/kibana.json
@@ -0,0 +1,14 @@
+{
+  "id": "shareExamples",
+  "kibanaVersion": "kibana",
+  "version": "0.0.1",
+  "server": false,
+  "ui": true,
+  "owner": {
+    "name": "App Services",
+    "githubTeam": "kibana-app-services"
+  },
+  "description": "Small demos of share plugin usage",
+  "requiredPlugins": ["share"],
+  "optionalPlugins": []
+}
diff --git a/examples/share_examples/public/index.ts b/examples/share_examples/public/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ShareDemoPlugin } from './plugin';
+
+export const plugin = () => new ShareDemoPlugin();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Share plugin examples

		Small demos of share plugin usage.