Skip to content

Commit

Permalink
Updating the License (#88343)
Browse files Browse the repository at this point in the history
* Updating the Licenses, except for applying eslint, building

* Applying ESLint rules,building @kbn/pm, regenerating api docs
  • Loading branch information
kobelb committed Jan 20, 2021
1 parent 3168b7d commit 170a295
Show file tree
Hide file tree
Showing 7,854 changed files with 40,505 additions and 125,247 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
77 changes: 58 additions & 19 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -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 = `
Expand All @@ -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
Expand Down Expand Up @@ -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',
Expand All @@ -130,6 +164,7 @@ module.exports = {
'error',
{
licenses: [
DUAL_LICENSE_HEADER,
ELASTIC_LICENSE_HEADER,
SAFER_LODASH_SET_HEADER,
SAFER_LODASH_SET_LODASH_HEADER,
Expand All @@ -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}'],
Expand All @@ -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,
Expand All @@ -192,6 +228,7 @@ module.exports = {
'error',
{
licenses: [
DUAL_LICENSE_HEADER,
ELASTIC_LICENSE_HEADER,
APACHE_2_0_LICENSE_HEADER,
SAFER_LODASH_SET_HEADER,
Expand All @@ -214,6 +251,7 @@ module.exports = {
'error',
{
licenses: [
DUAL_LICENSE_HEADER,
ELASTIC_LICENSE_HEADER,
APACHE_2_0_LICENSE_HEADER,
SAFER_LODASH_SET_LODASH_HEADER,
Expand All @@ -236,6 +274,7 @@ module.exports = {
'error',
{
licenses: [
DUAL_LICENSE_HEADER,
ELASTIC_LICENSE_HEADER,
APACHE_2_0_LICENSE_HEADER,
SAFER_LODASH_SET_HEADER,
Expand Down
21 changes: 5 additions & 16 deletions .teamcity/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
21 changes: 5 additions & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
20 changes: 7 additions & 13 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand Down
7 changes: 0 additions & 7 deletions docs/setup/docker.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>>.
Expand Down
3 changes: 1 addition & 2 deletions docs/setup/install/brew.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 0 additions & 34 deletions docs/setup/install/deb.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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::[]

[[deb-running-systemd]]
Expand Down
34 changes: 0 additions & 34 deletions docs/setup/install/rpm.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -95,36 +95,6 @@ sudo zypper install kibana <3>

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 `baseurl` in your `kibana.repo` file:
ifeval::["{release-state}"=="prerelease"]
["source","sh",subs="attributes,callouts"]
--------------------------------------------------
baseurl=https://artifacts.elastic.co/packages/oss-{major-version}-prerelease/yum
--------------------------------------------------
endif::[]
ifeval::["{release-state}"!="prerelease"]
["source","sh",subs="attributes,callouts"]
--------------------------------------------------
baseurl=https://artifacts.elastic.co/packages/oss-{major-version}/yum
--------------------------------------------------
endif::[]
==================================================

endif::[]

[[install-rpm]]
==== Download and install the RPM manually

Expand All @@ -147,10 +117,6 @@ sudo rpm --install kibana-{version}-x86_64.rpm
<1> Compare the SHA produced by `shasum` with the
https://artifacts.elastic.co/downloads/kibana/kibana-{version}-x86_64.rpm.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}-x86_64.rpm

endif::[]

[[rpm-running-systemd]]
Expand Down
4 changes: 0 additions & 4 deletions docs/setup/install/targz.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ cd kibana-{version}-darwin-x86_64/ <2>
`kibana-{version}-darwin-x86_64.tar.gz: OK`.
<2> This directory is known as `$KIBANA_HOME`.

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}-darwin-x86_64.tar.gz

endif::[]


Expand Down
4 changes: 0 additions & 4 deletions docs/setup/install/windows.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ terminal window, `CD` to the `$KIBANA_HOME` directory, for instance:
CD c:\kibana-{version}-windows-x86_64
----------------------------

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}-windows-x86_64.zip

endif::[]

[[windows-running]]
Expand Down
21 changes: 5 additions & 16 deletions examples/bfetch_explorer/public/components/count_until/index.tsx
Original file line number Diff line number Diff line change
@@ -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.
*/

import React, { useState } from 'react';
Expand Down
Loading

0 comments on commit 170a295

Please sign in to comment.