Merge branch 'master' into improve-model-snapshot-revert-UI-experience

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -56,6 +56,8 @@ kibanaPipeline(timeoutMinutes: 150) {
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
             'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
+            'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
+            'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
           ]),
         ])
       }

.ci/jobs.yml

@@ -32,6 +32,8 @@ JOB:
   - x-pack-ciGroup9
   - x-pack-ciGroup10
   - x-pack-ciGroup11
+  - x-pack-ciGroup12
+  - x-pack-ciGroup13
   - x-pack-accessibility
   - x-pack-visualRegression
 

.ci/teamcity/default/build_plugins.sh

@@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
   --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
+  --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
   --verbose
 tc_end_block "Build Platform Plugins"
 

.eslintrc.js

@@ -1,20 +1,9 @@
 /*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
 
 const APACHE_2_0_LICENSE_HEADER = `
@@ -38,6 +27,16 @@ const APACHE_2_0_LICENSE_HEADER = `
  */
 `;
 
+const DUAL_LICENSE_HEADER = `
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+`;
+
 const ELASTIC_LICENSE_HEADER = `
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -113,12 +112,47 @@ module.exports = {
     },
 
     /**
-     * Files that require Apache 2.0 headers, settings
+     * Files that require dual-license headers, settings
      * are overridden below for files that require Elastic
      * Licence headers
      */
     {
-      files: ['**/*.{js,mjs,ts,tsx}', '!plugins/**/*'],
+      files: [
+        '**/*.{js,mjs,ts,tsx}',
+        '!plugins/**/*',
+        '!packages/elastic-datemath/**/*',
+        '!packages/elastic-eslint-config-kibana/**/*',
+      ],
+      rules: {
+        '@kbn/eslint/require-license-header': [
+          'error',
+          {
+            license: DUAL_LICENSE_HEADER,
+          },
+        ],
+        '@kbn/eslint/disallow-license-headers': [
+          'error',
+          {
+            licenses: [
+              APACHE_2_0_LICENSE_HEADER,
+              ELASTIC_LICENSE_HEADER,
+              SAFER_LODASH_SET_HEADER,
+              SAFER_LODASH_SET_LODASH_HEADER,
+              SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+            ],
+          },
+        ],
+      },
+    },
+
+    /**
+     * Files that require Apache headers
+     */
+    {
+      files: [
+        'packages/elastic-datemath/**/*.{js,mjs,ts,tsx}',
+        'packages/elastic-eslint-config-kibana/**/*.{js,mjs,ts,tsx}',
+      ],
       rules: {
         '@kbn/eslint/require-license-header': [
           'error',
@@ -130,6 +164,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -151,7 +186,7 @@ module.exports = {
     },
 
     /**
-     * Files that require Elastic license headers instead of Apache 2.0 header
+     * Files that require Elastic license headers instead of dual-license header
      */
     {
       files: ['x-pack/**/*.{js,mjs,ts,tsx}'],
@@ -166,6 +201,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -192,6 +228,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
@@ -214,6 +251,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -236,6 +274,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,

.teamcity/pom.xml

@@ -1,21 +1,10 @@
 <?xml version="1.0"?>
 <!--
-  ~ Licensed to Elasticsearch under one or more contributor
-  ~ license agreements. See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright
-  ~ ownership. Elasticsearch licenses this file to you under
-  ~ the Apache License, Version 2.0 (the "License"); you may
-  ~ not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  ~ Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+  ~ or more contributor license agreements. Licensed under the Elastic License
+  ~ and the Server Side Public License, v 1; you may not use this file except in
+  ~ compliance with, at your election, the Elastic License or the Server Side
+  ~ Public License, v 1.
   -->
 
 <project>

.teamcity/src/Common.kt

@@ -4,7 +4,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 const val ENABLE_REPORTING = false
 
 // If set to false, jobs with triggers (scheduled, on commit, etc) will be paused
-const val ENABLE_TRIGGERS = false
+const val ENABLE_TRIGGERS = true
 
 fun getProjectBranch(): String {
   return DslContext.projectName

.teamcity/src/Extensions.kt

@@ -50,7 +50,7 @@ fun BuildType.addTestSettings() {
 
 fun BuildType.addSlackNotifications(to: String = "#kibana-teamcity-testing") {
   params {
-    param("elastic.slack.enabled", "true")
+    param("elastic.slack.enabled", isReportingEnabled().toString())
     param("elastic.slack.channels", to)
   }
 }

.teamcity/src/builds/PullRequestCi.kt

@@ -3,6 +3,7 @@ package builds
 import builds.default.DefaultSavedObjectFieldMetrics
 import dependsOn
 import getProjectBranch
+import isReportingEnabled
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
 import vcs.Kibana
@@ -62,12 +63,15 @@ object PullRequestCi : BuildType({
   }
 
   features {
-    commitStatusPublisher {
-      vcsRootExtId = "${Kibana.id}"
-      publisher = github {
-        githubUrl = "https://api.github.com"
-        authType = personalToken {
-          token = "credentialsJSON:07d22002-12de-4627-91c3-672bdb23b55b"
+    if(isReportingEnabled()) {
+      commitStatusPublisher {
+        enabled = true
+        vcsRootExtId = "${Kibana.id}"
+        publisher = github {
+          githubUrl = "https://api.github.com"
+          authType = personalToken {
+            token = "credentialsJSON:07d22002-12de-4627-91c3-672bdb23b55b"
+          }
         }
       }
     }

.teamcity/src/builds/default/DefaultCiGroups.kt

@@ -3,7 +3,7 @@ package builds.default
 import dependsOn
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 
-const val DEFAULT_CI_GROUP_COUNT = 11
+const val DEFAULT_CI_GROUP_COUNT = 13
 val defaultCiGroups = (1..DEFAULT_CI_GROUP_COUNT).map { DefaultCiGroup(it) }
 
 object DefaultCiGroups : BuildType({

.teamcity/src/builds/test/QuickTests.kt

@@ -13,7 +13,7 @@ object QuickTests : BuildType({
 
   val testScripts = mapOf(
     "Test Hardening" to ".ci/teamcity/checks/test_hardening.sh",
-    "Test Projects" to ".ci/teamcity/tests/test_projects.sh",
+    "Test Projects" to ".ci/teamcity/tests/test_projects.sh"
   )
 
   steps {

Gruntfile.js

@@ -1,20 +1,9 @@
 /*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
 
 require('./src/setup_node_env');

LICENSE.txt

@@ -1,13 +1,7 @@
-Source code in this repository is variously licensed under the Apache License
-Version 2.0, an Apache compatible license, or the Elastic License. Outside of
-the "x-pack" folder, source code in a given file is licensed under the Apache
-License Version 2.0, unless otherwise noted at the beginning of the file or a
-LICENSE file present in the directory subtree declares a separate license.
-Within the "x-pack" folder, source code in a given file is licensed under the
-Elastic License, unless otherwise noted at the beginning of the file or a
-LICENSE file present in the directory subtree declares a separate license.
-
-The build produces two sets of binaries - one set that falls under the Elastic
-License and another set that falls under Apache License Version 2.0. The
-binaries that contain `-oss` in the artifact name are licensed under the Apache
-License Version 2.0.
+Source code in this repository is covered by (i) a dual license under the Server
+Side Public License, v 1 and the Elastic License or (ii) an Apache License 2.0
+compatible license or (iii) solely under the Elastic License, in each case, as
+noted in the applicable header. The default throughout the repository is a dual
+license under the Server Side Public License, v 1 and the Elastic License,
+unless the header specifies another license. Code that is licensed solely under
+the Elastic License is found only in the x-pack folder.

docs/api/saved-objects.asciidoc

@@ -10,6 +10,8 @@ The following saved objects APIs are available:
 
 * <<saved-objects-api-get, Get object API>> to retrieve a single {kib} saved object by ID
 
+* <<saved-objects-api-resolve, Resolve object API>> to retrieve a single {kib} saved object by ID, using any legacy URL alias if it exists
+
 * <<saved-objects-api-bulk-get, Bulk get objects API>> to retrieve multiple {kib} saved objects by ID
 
 * <<saved-objects-api-find, Find objects API>> to retrieve a paginated set of {kib} saved objects by various conditions
@@ -40,4 +42,5 @@ include::saved-objects/delete.asciidoc[]
 include::saved-objects/export.asciidoc[]
 include::saved-objects/import.asciidoc[]
 include::saved-objects/resolve_import_errors.asciidoc[]
+include::saved-objects/resolve.asciidoc[]
 include::saved-objects/rotate_encryption_key.asciidoc[]

docs/api/saved-objects/get.asciidoc

@@ -78,7 +78,7 @@ The API returns the following:
     "title": "[Flights] Global Flight Dashboard",
     "hits": 0,
     "description": "Analyze mock flight data for ES-Air, Logstash Airways, Kibana Airlines and JetBeats",
-    "panelsJSON": "[{\"panelIndex\":\"1\",\"gridData\":{\"x\":0,\"y\":0,\"w\":32,\"h\":7,\"i\":\"1\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_0\"},{\"panelIndex\":\"3\",\"gridData\":{\"x\":17,\"y\":7,\"w\":23,\"h\":12,\"i\":\"3\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"Average Ticket Price\":\"#0A50A1\",\"Flight Count\":\"#82B5D8\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_1\"},{\"panelIndex\":\"4\",\"gridData\":{\"x\":0,\"y\":85,\"w\":48,\"h\":15,\"i\":\"4\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_2\"},{\"panelIndex\":\"5\",\"gridData\":{\"x\":0,\"y\":7,\"w\":17,\"h\":12,\"i\":\"5\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"ES-Air\":\"#447EBC\",\"JetBeats\":\"#65C5DB\",\"Kibana Airlines\":\"#BA43A9\",\"Logstash Airways\":\"#E5AC0E\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_3\"},{\"panelIndex\":\"6\",\"gridData\":{\"x\":24,\"y\":33,\"w\":24,\"h\":14,\"i\":\"6\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"Carrier Delay\":\"#5195CE\",\"Late Aircraft Delay\":\"#1F78C1\",\"NAS Delay\":\"#70DBED\",\"No Delay\":\"#BADFF4\",\"Security Delay\":\"#052B51\",\"Weather Delay\":\"#6ED0E0\"}}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_4\"},{\"panelIndex\":\"7\",\"gridData\":{\"x\":24,\"y\":19,\"w\":24,\"h\":14,\"i\":\"7\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_5\"},{\"panelIndex\":\"10\",\"gridData\":{\"x\":0,\"y\":35,\"w\":24,\"h\":12,\"i\":\"10\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"Count\":\"#1F78C1\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_6\"},{\"panelIndex\":\"13\",\"gridData\":{\"x\":10,\"y\":19,\"w\":14,\"h\":8,\"i\":\"13\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"Count\":\"#1F78C1\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_7\"},{\"panelIndex\":\"14\",\"gridData\":{\"x\":10,\"y\":27,\"w\":14,\"h\":8,\"i\":\"14\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"Count\":\"#1F78C1\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_8\"},{\"panelIndex\":\"18\",\"gridData\":{\"x\":24,\"y\":70,\"w\":24,\"h\":15,\"i\":\"18\"},\"embeddableConfig\":{\"mapCenter\":[27.421687059550266,15.371002131141724],\"mapZoom\":1},\"version\":\"6.3.0\",\"panelRefName\":\"panel_9\"},{\"panelIndex\":\"21\",\"gridData\":{\"x\":0,\"y\":62,\"w\":48,\"h\":8,\"i\":\"21\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_10\"},{\"panelIndex\":\"22\",\"gridData\":{\"x\":32,\"y\":0,\"w\":16,\"h\":7,\"i\":\"22\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_11\"},{\"panelIndex\":\"23\",\"gridData\":{\"x\":0,\"y\":70,\"w\":24,\"h\":15,\"i\":\"23\"},\"embeddableConfig\":{\"mapCenter\":[42.19556096274418,9.536742995308601e-7],\"mapZoom\":1},\"version\":\"6.3.0\",\"panelRefName\":\"panel_12\"},{\"panelIndex\":\"25\",\"gridData\":{\"x\":0,\"y\":19,\"w\":10,\"h\":8,\"i\":\"25\"},\"embeddableConfig\":{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(247,251,255)\",\"100 - 150\":\"rgb(107,174,214)\",\"150 - 200\":\"rgb(33,113,181)\",\"200 - 250\":\"rgb(8,48,107)\",\"50 - 100\":\"rgb(198,219,239)\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_13\"},{\"panelIndex\":\"27\",\"gridData\":{\"x\":0,\"y\":27,\"w\":10,\"h\":8,\"i\":\"27\"},\"embeddableConfig\":{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(247,251,255)\",\"100 - 150\":\"rgb(107,174,214)\",\"150 - 200\":\"rgb(33,113,181)\",\"200 - 250\":\"rgb(8,48,107)\",\"50 - 100\":\"rgb(198,219,239)\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_14\"},{\"panelIndex\":\"28\",\"gridData\":{\"x\":0,\"y\":47,\"w\":24,\"h\":15,\"i\":\"28\"},\"embeddableConfig\":{\"vis\":{\"defaultColors\":{\"0 -* Connection #0 to host 69c72adb58fa46c69a01afdf4a6cbfd3.us-west1.gcp.cloud.es.io left intact\n 11\":\"rgb(247,251,255)\",\"11 - 22\":\"rgb(208,225,242)\",\"22 - 33\":\"rgb(148,196,223)\",\"33 - 44\":\"rgb(74,152,201)\",\"44 - 55\":\"rgb(23,100,171)\"},\"legendOpen\":false}},\"version\":\"6.3.0\",\"panelRefName\":\"panel_15\"},{\"panelIndex\":\"29\",\"gridData\":{\"x\":40,\"y\":7,\"w\":8,\"h\":6,\"i\":\"29\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_16\"},{\"panelIndex\":\"30\",\"gridData\":{\"x\":40,\"y\":13,\"w\":8,\"h\":6,\"i\":\"30\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_17\"},{\"panelIndex\":\"31\",\"gridData\":{\"x\":24,\"y\":47,\"w\":24,\"h\":15,\"i\":\"31\"},\"embeddableConfig\":{},\"version\":\"6.3.0\",\"panelRefName\":\"panel_18\"}]",
+    "panelsJSON": "[ . . . ]",
     "optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
     "version": 1,
     "timeRestore": true,