Merge branch '7.x' into backport/7.x/pr-88525

.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
@@ -119,12 +118,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',
@@ -136,6 +170,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -157,7 +192,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}'],
@@ -172,6 +207,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -198,6 +234,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
@@ -220,6 +257,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -242,6 +280,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/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({

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/developer/plugin-list.asciidoc

@@ -227,8 +227,7 @@ which also contains the timelion APIs and backend, look at the vis_type_timelion
 
 
 |{kib-repo}blob/{branch}/src/plugins/usage_collection/README.md[usageCollection]
-|Usage Collection allows collecting usage data for other services to consume (telemetry and monitoring).
-To integrate with the telemetry services for usage collection of your feature, there are 2 steps:
+|The Usage Collection Service defines a set of APIs for other plugins to report the usage of their features. At the same time, it provides necessary the APIs for other services (i.e.: telemetry, monitoring, ...) to consume that usage data.
 
 
 |{kib-repo}blob/{branch}/src/plugins/vis_default_editor/README.md[visDefaultEditor]

docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md

@@ -38,7 +38,7 @@ export const myType: SavedObjectsType = {
   },
   migrations: {
     '2.0.0': migrations.migrateToV2,
-    '2.1.0': migrations.migrateToV2_1,
+    '2.1.0': migrations.migrateToV2_1
   },
 };
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

@@ -52,16 +52,15 @@ export declare class IndexPattern implements IIndexPattern
 |  [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) |  |  |
 |  [getFieldByName(name)](./kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md) |  |  |
 |  [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) |  | Provide a field, get its formatter |
-|  [getIndex()](./kibana-plugin-plugins-data-public.indexpattern.getindex.md) |  |  |
 |  [getFormatterForFieldNoDefault(fieldname)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfieldnodefault.md) |  | Get formatter for a given field name. Return undefined if none exists |
+|  [getIndex()](./kibana-plugin-plugins-data-public.indexpattern.getindex.md) |  |  |
 |  [getNonScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md) |  |  |
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  | Get the source filtering configuration for that index. |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) |  |  |
 |  [isUnsupportedTimePattern()](./kibana-plugin-plugins-data-public.indexpattern.isunsupportedtimepattern.md) |  |  |
-|  [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) |  |  |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  | Remove scripted field from field list |
 |  [setFieldAttrs(fieldName, attrName, value)](./kibana-plugin-plugins-data-public.indexpattern.setfieldattrs.md) |  |  |
 |  [setFieldCount(fieldName, count)](./kibana-plugin-plugins-data-public.indexpattern.setfieldcount.md) |  |  |

docs/setup/docker.asciidoc

@@ -39,10 +39,6 @@ ifeval::["{release-state}"!="unreleased"]
 docker pull {docker-repo}:{version}
 --------------------------------------------
 
-Alternatively, you can download other Docker images that contain only features
-available under the Apache 2.0 license. To download the images, go to
-https://www.docker.elastic.co[www.docker.elastic.co].
-
 [float]
 === Run Kibana on Docker for development
 Kibana can be quickly started and connected to a local Elasticsearch container for development
@@ -133,9 +129,6 @@ images:
 `elasticsearch.hosts`:: `http://elasticsearch:9200`
 `monitoring.ui.container.elasticsearch.enabled`:: `true`
 
-NOTE: The setting `monitoring.ui.container.elasticsearch.enabled` is not
-defined in the `-oss` image.
-
 These settings are defined in the default `kibana.yml`. They can be overridden
 with a <<bind-mount-config,custom `kibana.yml`>> or via
 <<environment-variable-config,environment variables>>.

docs/setup/install/brew.asciidoc

@@ -21,8 +21,7 @@ install the default distribution of {kib}:
 brew install elastic/tap/kibana-full
 -------------------------
 
-This installs the most recently released default distribution of {kib}. To install the OSS distribution,
-specify `elastic/tap/kibana-oss`.
+This installs the most recently released distribution of {kib}.
 
 [[brew-layout]]
 ==== Directory layout for Homebrew installs

docs/setup/install/deb.asciidoc

@@ -102,36 +102,6 @@ Examine +/etc/apt/sources.list.d/kibana-{major-version}.list+ for the duplicate
 
 endif::[]
 
-ifeval::["{release-state}"!="unreleased"]
-
-[NOTE]
-==================================================
-
-An alternative package, `kibana-oss`,  which contains only features that are available under the
-Apache 2.0 license is also available. To install it, use the following sources list:
-
-ifeval::["{release-state}"=="prerelease"]
-
-["source","sh",subs="attributes,callouts"]
---------------------------------------------------
-echo "deb https://artifacts.elastic.co/packages/oss-{major-version}-prerelease/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list
---------------------------------------------------
-
-endif::[]
-
-ifeval::["{release-state}"!="prerelease"]
-
-["source","sh",subs="attributes,callouts"]
---------------------------------------------------
-echo "deb https://artifacts.elastic.co/packages/oss-{major-version}/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list
---------------------------------------------------
-
-endif::[]
-
-==================================================
-
-endif::[]
-
 [[install-deb]]
 ==== Download and install the Debian package manually
 
@@ -154,10 +124,6 @@ sudo dpkg -i kibana-{version}-amd64.deb
 <1> Compare the SHA produced by `shasum` with the
     https://artifacts.elastic.co/downloads/kibana/kibana-{version}-amd64.deb.sha512[published SHA].
 
-Alternatively, you can download the following package, which contains only
-features that are available under the Apache 2.0 license:
-https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-amd64.deb
-
 endif::[]
 
 ==== SysV `init` vs `systemd`