Skip to content

Commit baf56d8

Browse files
Tyler Smalleykobelb
Tyler Smalley
and
kobelb
authored
[7.x] Updating the License (#88343) (#88745)
* Updating the Licenses, except for applying eslint, building * Applying ESLint rules,building @kbn/pm, regenerating api docs Co-authored-by: kobelb <brandon.kobel@elastic.co>
1 parent 4b1707a commit baf56d8

File tree

7,830 files changed

+40382
-124849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,830 files changed

+40382
-124849
lines changed

‎.eslintrc.js‎

Lines changed: 58 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch B.V. under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch B.V. licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* and the Server Side Public License, v 1; you may not use this file except in
5+
* compliance with, at your election, the Elastic License or the Server Side
6+
* Public License, v 1.
187
*/
198

209
const APACHE_2_0_LICENSE_HEADER = `
@@ -38,6 +27,16 @@ const APACHE_2_0_LICENSE_HEADER = `
3827
*/
3928
`;
4029

30+
const DUAL_LICENSE_HEADER = `
31+
/*
32+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33+
* or more contributor license agreements. Licensed under the Elastic License
34+
* and the Server Side Public License, v 1; you may not use this file except in
35+
* compliance with, at your election, the Elastic License or the Server Side
36+
* Public License, v 1.
37+
*/
38+
`;
39+
4140
const ELASTIC_LICENSE_HEADER = `
4241
/*
4342
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -119,12 +118,47 @@ module.exports = {
119118
},
120119

121120
/**
122-
* Files that require Apache 2.0 headers, settings
121+
* Files that require dual-license headers, settings
123122
* are overridden below for files that require Elastic
124123
* Licence headers
125124
*/
126125
{
127-
files: ['**/*.{js,mjs,ts,tsx}', '!plugins/**/*'],
126+
files: [
127+
'**/*.{js,mjs,ts,tsx}',
128+
'!plugins/**/*',
129+
'!packages/elastic-datemath/**/*',
130+
'!packages/elastic-eslint-config-kibana/**/*',
131+
],
132+
rules: {
133+
'@kbn/eslint/require-license-header': [
134+
'error',
135+
{
136+
license: DUAL_LICENSE_HEADER,
137+
},
138+
],
139+
'@kbn/eslint/disallow-license-headers': [
140+
'error',
141+
{
142+
licenses: [
143+
APACHE_2_0_LICENSE_HEADER,
144+
ELASTIC_LICENSE_HEADER,
145+
SAFER_LODASH_SET_HEADER,
146+
SAFER_LODASH_SET_LODASH_HEADER,
147+
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
148+
],
149+
},
150+
],
151+
},
152+
},
153+
154+
/**
155+
* Files that require Apache headers
156+
*/
157+
{
158+
files: [
159+
'packages/elastic-datemath/**/*.{js,mjs,ts,tsx}',
160+
'packages/elastic-eslint-config-kibana/**/*.{js,mjs,ts,tsx}',
161+
],
128162
rules: {
129163
'@kbn/eslint/require-license-header': [
130164
'error',
@@ -136,6 +170,7 @@ module.exports = {
136170
'error',
137171
{
138172
licenses: [
173+
DUAL_LICENSE_HEADER,
139174
ELASTIC_LICENSE_HEADER,
140175
SAFER_LODASH_SET_HEADER,
141176
SAFER_LODASH_SET_LODASH_HEADER,
@@ -157,7 +192,7 @@ module.exports = {
157192
},
158193

159194
/**
160-
* Files that require Elastic license headers instead of Apache 2.0 header
195+
* Files that require Elastic license headers instead of dual-license header
161196
*/
162197
{
163198
files: ['x-pack/**/*.{js,mjs,ts,tsx}'],
@@ -172,6 +207,7 @@ module.exports = {
172207
'error',
173208
{
174209
licenses: [
210+
DUAL_LICENSE_HEADER,
175211
APACHE_2_0_LICENSE_HEADER,
176212
SAFER_LODASH_SET_HEADER,
177213
SAFER_LODASH_SET_LODASH_HEADER,
@@ -198,6 +234,7 @@ module.exports = {
198234
'error',
199235
{
200236
licenses: [
237+
DUAL_LICENSE_HEADER,
201238
ELASTIC_LICENSE_HEADER,
202239
APACHE_2_0_LICENSE_HEADER,
203240
SAFER_LODASH_SET_HEADER,
@@ -220,6 +257,7 @@ module.exports = {
220257
'error',
221258
{
222259
licenses: [
260+
DUAL_LICENSE_HEADER,
223261
ELASTIC_LICENSE_HEADER,
224262
APACHE_2_0_LICENSE_HEADER,
225263
SAFER_LODASH_SET_LODASH_HEADER,
@@ -242,6 +280,7 @@ module.exports = {
242280
'error',
243281
{
244282
licenses: [
283+
DUAL_LICENSE_HEADER,
245284
ELASTIC_LICENSE_HEADER,
246285
APACHE_2_0_LICENSE_HEADER,
247286
SAFER_LODASH_SET_HEADER,

‎.teamcity/pom.xml‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
<?xml version="1.0"?>
22
<!--
3-
~ Licensed to Elasticsearch under one or more contributor
4-
~ license agreements. See the NOTICE file distributed with
5-
~ this work for additional information regarding copyright
6-
~ ownership. Elasticsearch licenses this file to you under
7-
~ the Apache License, Version 2.0 (the "License"); you may
8-
~ not use this file except in compliance with the License.
9-
~ You may obtain a copy of the License at
10-
~
11-
~ http://www.apache.org/licenses/LICENSE-2.0
12-
~
13-
~ Unless required by applicable law or agreed to in writing,
14-
~ software distributed under the License is distributed on an
15-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
~ KIND, either express or implied. See the License for the
17-
~ specific language governing permissions and limitations
18-
~ under the License.
3+
~ Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
4+
~ or more contributor license agreements. Licensed under the Elastic License
5+
~ and the Server Side Public License, v 1; you may not use this file except in
6+
~ compliance with, at your election, the Elastic License or the Server Side
7+
~ Public License, v 1.
198
-->
209

2110
<project>

‎Gruntfile.js‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch B.V. under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch B.V. licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* and the Server Side Public License, v 1; you may not use this file except in
5+
* compliance with, at your election, the Elastic License or the Server Side
6+
* Public License, v 1.
187
*/
198

209
require('./src/setup_node_env');

‎LICENSE.txt‎

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const myType: SavedObjectsType = {
3838
},
3939
migrations: {
4040
'2.0.0': migrations.migrateToV2,
41-
'2.1.0': migrations.migrateToV2_1,
41+
'2.1.0': migrations.migrateToV2_1
4242
},
4343
};
4444

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,15 @@ export declare class IndexPattern implements IIndexPattern
5252
| [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) | | |
5353
| [getFieldByName(name)](./kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md) | | |
5454
| [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) | | Provide a field, get its formatter |
55-
| [getIndex()](./kibana-plugin-plugins-data-public.indexpattern.getindex.md) | | |
5655
| [getFormatterForFieldNoDefault(fieldname)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfieldnodefault.md) | | Get formatter for a given field name. Return undefined if none exists |
56+
| [getIndex()](./kibana-plugin-plugins-data-public.indexpattern.getindex.md) | | |
5757
| [getNonScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md) | | |
5858
| [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) | | |
5959
| [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) | | Get the source filtering configuration for that index. |
6060
| [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) | | |
6161
| [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) | | |
6262
| [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) | | |
6363
| [isUnsupportedTimePattern()](./kibana-plugin-plugins-data-public.indexpattern.isunsupportedtimepattern.md) | | |
64-
| [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) | | |
6564
| [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) | | Remove scripted field from field list |
6665
| [setFieldAttrs(fieldName, attrName, value)](./kibana-plugin-plugins-data-public.indexpattern.setfieldattrs.md) | | |
6766
| [setFieldCount(fieldName, count)](./kibana-plugin-plugins-data-public.indexpattern.setfieldcount.md) | | |

‎docs/setup/docker.asciidoc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ ifeval::["{release-state}"!="unreleased"]
3939
docker pull {docker-repo}:{version}
4040
--------------------------------------------
4141

42-
Alternatively, you can download other Docker images that contain only features
43-
available under the Apache 2.0 license. To download the images, go to
44-
https://www.docker.elastic.co[www.docker.elastic.co].
45-
4642
[float]
4743
=== Run Kibana on Docker for development
4844
Kibana can be quickly started and connected to a local Elasticsearch container for development
@@ -133,9 +129,6 @@ images:
133129
`elasticsearch.hosts`:: `http://elasticsearch:9200`
134130
`monitoring.ui.container.elasticsearch.enabled`:: `true`
135131

136-
NOTE: The setting `monitoring.ui.container.elasticsearch.enabled` is not
137-
defined in the `-oss` image.
138-
139132
These settings are defined in the default `kibana.yml`. They can be overridden
140133
with a <<bind-mount-config,custom `kibana.yml`>> or via
141134
<<environment-variable-config,environment variables>>.

‎docs/setup/install/brew.asciidoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ install the default distribution of {kib}:
2121
brew install elastic/tap/kibana-full
2222
-------------------------
2323

24-
This installs the most recently released default distribution of {kib}. To install the OSS distribution,
25-
specify `elastic/tap/kibana-oss`.
24+
This installs the most recently released distribution of {kib}.
2625

2726
[[brew-layout]]
2827
==== Directory layout for Homebrew installs

‎docs/setup/install/deb.asciidoc‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -102,36 +102,6 @@ Examine +/etc/apt/sources.list.d/kibana-{major-version}.list+ for the duplicate
102102

103103
endif::[]
104104

105-
ifeval::["{release-state}"!="unreleased"]
106-
107-
[NOTE]
108-
==================================================
109-
110-
An alternative package, `kibana-oss`, which contains only features that are available under the
111-
Apache 2.0 license is also available. To install it, use the following sources list:
112-
113-
ifeval::["{release-state}"=="prerelease"]
114-
115-
["source","sh",subs="attributes,callouts"]
116-
--------------------------------------------------
117-
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
118-
--------------------------------------------------
119-
120-
endif::[]
121-
122-
ifeval::["{release-state}"!="prerelease"]
123-
124-
["source","sh",subs="attributes,callouts"]
125-
--------------------------------------------------
126-
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
127-
--------------------------------------------------
128-
129-
endif::[]
130-
131-
==================================================
132-
133-
endif::[]
134-
135105
[[install-deb]]
136106
==== Download and install the Debian package manually
137107

@@ -154,10 +124,6 @@ sudo dpkg -i kibana-{version}-amd64.deb
154124
<1> Compare the SHA produced by `shasum` with the
155125
https://artifacts.elastic.co/downloads/kibana/kibana-{version}-amd64.deb.sha512[published SHA].
156126

157-
Alternatively, you can download the following package, which contains only
158-
features that are available under the Apache 2.0 license:
159-
https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-amd64.deb
160-
161127
endif::[]
162128

163129
==== SysV `init` vs `systemd`

‎docs/setup/install/rpm.asciidoc‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,36 +95,6 @@ sudo zypper install kibana <3>
9595

9696
endif::[]
9797

98-
ifeval::["{release-state}"!="unreleased"]
99-
100-
[NOTE]
101-
==================================================
102-
103-
An alternative package, `kibana-oss`, which contains only features that are available under the
104-
Apache 2.0 license is also available. To install it, use the following `baseurl` in your `kibana.repo` file:
105-
106-
ifeval::["{release-state}"=="prerelease"]
107-
108-
["source","sh",subs="attributes,callouts"]
109-
--------------------------------------------------
110-
baseurl=https://artifacts.elastic.co/packages/oss-{major-version}-prerelease/yum
111-
--------------------------------------------------
112-
113-
endif::[]
114-
115-
ifeval::["{release-state}"!="prerelease"]
116-
117-
["source","sh",subs="attributes,callouts"]
118-
--------------------------------------------------
119-
baseurl=https://artifacts.elastic.co/packages/oss-{major-version}/yum
120-
--------------------------------------------------
121-
122-
endif::[]
123-
124-
==================================================
125-
126-
endif::[]
127-
12898
[[install-rpm]]
12999
==== Download and install the RPM manually
130100

@@ -147,10 +117,6 @@ sudo rpm --install kibana-{version}-x86_64.rpm
147117
<1> Compare the SHA produced by `shasum` with the
148118
https://artifacts.elastic.co/downloads/kibana/kibana-{version}-x86_64.rpm.sha512[published SHA].
149119

150-
Alternatively, you can download the following package, which contains only
151-
features that are available under the Apache 2.0 license:
152-
https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-x86_64.rpm
153-
154120
endif::[]
155121

156122
==== SysV `init` vs `systemd`

0 commit comments

Comments
 (0)