Skip to content

Commit 2d3d9e4

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into tsvb-eui-color-picker
2 parents 63a8012 + effd504 commit 2d3d9e4

File tree

867 files changed

+24255
-10093
lines changed

Some content is hidden

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

867 files changed

+24255
-10093
lines changed

‎.ci/end2end.groovy‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pipeline {
7676
}
7777
}
7878
steps{
79-
notifyStatus('Running smoke tests', 'PENDING')
79+
notifyTestStatus('Running smoke tests', 'PENDING')
8080
dir("${BASE_DIR}"){
8181
sh "${E2E_DIR}/ci/run-e2e.sh"
8282
}
@@ -95,10 +95,10 @@ pipeline {
9595
}
9696
}
9797
unsuccessful {
98-
notifyStatus('Test failures', 'FAILURE')
98+
notifyTestStatus('Test failures', 'FAILURE')
9999
}
100100
success {
101-
notifyStatus('Tests passed', 'SUCCESS')
101+
notifyTestStatus('Tests passed', 'SUCCESS')
102102
}
103103
}
104104
}
@@ -113,5 +113,9 @@ pipeline {
113113
}
114114

115115
def notifyStatus(String description, String status) {
116-
withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanDisplayURL())
116+
withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('pipeline'))
117+
}
118+
119+
def notifyTestStatus(String description, String status) {
120+
withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('tests'))
117121
}

‎.ci/packer_cache.sh‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,5 @@
22

33
set -e
44

5-
branch="$(git rev-parse --abbrev-ref HEAD 2> /dev/null)"
6-
7-
# run setup script that gives us node, yarn, and bootstraps the project
8-
source src/dev/ci_setup/setup.sh;
9-
10-
# download es snapshots
11-
node scripts/es snapshot --download-only;
12-
node scripts/es snapshot --license=oss --download-only;
13-
14-
# download reporting browsers
15-
(cd "x-pack" && yarn gulp prepare);
16-
17-
# cache the chromedriver archive
18-
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
19-
chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
20-
if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
21-
echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
22-
exit 1
23-
fi
24-
mkdir -p .chromedriver
25-
curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
26-
echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
27-
28-
# cache the geckodriver archive
29-
geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
30-
if [ -z "$geckodriverPkgVersion" ]; then
31-
echo "UNABLE TO DETERMINE geckodriver VERSIONS"
32-
exit 1
33-
fi
34-
mkdir -p ".geckodriver"
35-
cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
36-
echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
37-
38-
echo "Creating bootstrap_cache archive"
39-
40-
# archive cacheable directories
41-
mkdir -p "$HOME/.kibana/bootstrap_cache"
42-
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
43-
x-pack/plugins/reporting/.chromium \
44-
.es \
45-
.chromedriver \
46-
.geckodriver;
47-
48-
echo "Adding node_modules"
49-
# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
50-
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
51-
52-
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
53-
54-
if [ "$branch" == "master" ]; then
55-
echo "Creating bootstrap cache for 7.x";
56-
57-
git clone https://github.com/elastic/kibana.git --branch 7.x --depth 1 /tmp/kibana-7.x
58-
(cd /tmp/kibana-7.x && ./.ci/packer_cache.sh);
59-
rm -rf /tmp/kibana-7.x;
60-
fi
5+
./.ci/packer_cache_for_branch.sh master
6+
./.ci/packer_cache_for_branch.sh 7.x

‎.ci/packer_cache_for_branch.sh‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
branch="$1"
6+
checkoutDir="$(pwd)"
7+
8+
if [[ "$branch" != "master" ]]; then
9+
checkoutDir="/tmp/kibana-$branch"
10+
git clone https://github.com/elastic/kibana.git --branch "$branch" --depth 1 "$checkoutDir"
11+
cd "$checkoutDir"
12+
fi
13+
14+
source src/dev/ci_setup/setup.sh;
15+
16+
# download es snapshots
17+
node scripts/es snapshot --download-only;
18+
node scripts/es snapshot --license=oss --download-only;
19+
20+
# download reporting browsers
21+
(cd "x-pack" && yarn gulp prepare);
22+
23+
# cache the chromedriver archive
24+
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
25+
chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
26+
if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
27+
echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
28+
exit 1
29+
fi
30+
mkdir -p .chromedriver
31+
curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
32+
echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
33+
34+
# cache the geckodriver archive
35+
geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
36+
if [ -z "$geckodriverPkgVersion" ]; then
37+
echo "UNABLE TO DETERMINE geckodriver VERSIONS"
38+
exit 1
39+
fi
40+
mkdir -p ".geckodriver"
41+
cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
42+
echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
43+
44+
echo "Creating bootstrap_cache archive"
45+
46+
# archive cacheable directories
47+
mkdir -p "$HOME/.kibana/bootstrap_cache"
48+
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
49+
x-pack/plugins/reporting/.chromium \
50+
.es \
51+
.chromedriver \
52+
.geckodriver;
53+
54+
echo "Adding node_modules"
55+
# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
56+
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
57+
58+
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
59+
60+
if [[ "$branch" != "master" ]]; then
61+
rm --preserve-root -rf "$checkoutDir"
62+
fi

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ module.exports = {
472472
{
473473
files: [
474474
'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
475+
'src/legacy/ui/ui_render/bootstrap/kbn_bundles_loader_source.js',
475476
'**/browser_exec_scripts/**/*.js',
476477
],
477478
rules: {

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,10 @@
6666

6767
# APM
6868
/x-pack/plugins/apm/ @elastic/apm-ui
69-
/x-pack/plugins/apm/ @elastic/apm-ui
7069
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
7170
/src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
7271
/src/plugins/apm_oss/ @elastic/apm-ui
73-
/src/apm.js @watson
72+
/src/apm.js @watson @vigneshshanmugam
7473

7574
# Beats
7675
/x-pack/legacy/plugins/beats_management/ @elastic/beats
@@ -168,15 +167,15 @@
168167
/src/core/public/i18n/ @elastic/kibana-localization
169168
/packages/kbn-i18n/ @elastic/kibana-localization
170169

171-
# Pulse
172-
/packages/kbn-analytics/ @elastic/pulse
173-
/src/plugins/kibana_usage_collection/ @elastic/pulse
174-
/src/plugins/newsfeed/ @elastic/pulse
175-
/src/plugins/telemetry/ @elastic/pulse
176-
/src/plugins/telemetry_collection_manager/ @elastic/pulse
177-
/src/plugins/telemetry_management_section/ @elastic/pulse
178-
/src/plugins/usage_collection/ @elastic/pulse
179-
/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
170+
# Kibana Telemetry
171+
/packages/kbn-analytics/ @elastic/kibana-telemetry
172+
/src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
173+
/src/plugins/newsfeed/ @elastic/kibana-telemetry
174+
/src/plugins/telemetry/ @elastic/kibana-telemetry
175+
/src/plugins/telemetry_collection_manager/ @elastic/kibana-telemetry
176+
/src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
177+
/src/plugins/usage_collection/ @elastic/kibana-telemetry
178+
/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
180179

181180
# Kibana Alerting Services
182181
/x-pack/plugins/alerts/ @elastic/kibana-alerting-services

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@ npm-debug.log*
5252
# apm plugin
5353
/x-pack/plugins/apm/tsconfig.json
5454
apm.tsconfig.json
55+
56+
# release notes script output
57+
report.csv
58+
report.asciidoc

‎CONTRIBUTING.md‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,8 @@ Distributable packages can be found in `target/` after the build completes.
657657
Kibana documentation is written in [asciidoc](http://asciidoc.org/) format in
658658
the `docs/` directory.
659659

660-
To build the docs, you must clone the [elastic/docs](https://github.com/elastic/docs)
661-
repo as a sibling of your kibana repo. Follow the instructions in that project's
660+
To build the docs, clone the [elastic/docs](https://github.com/elastic/docs)
661+
repo as a sibling of your Kibana repo. Follow the instructions in that project's
662662
README for getting the docs tooling set up.
663663

664664
**To build the Kibana docs and open them in your browser:**
@@ -676,14 +676,26 @@ node scripts/docs.js --open
676676

677677
Part of this process only applies to maintainers, since it requires access to GitHub labels.
678678

679-
Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. To generate the Release Notes, the writers run a script against this repo to collect the merged PRs against the release.
680-
To include your PRs in the Release Notes:
679+
Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. The Release Notes summarize what the PRs accomplish in language that is meaningful to users. To generate the Release Notes, the team runs a script against this repo to collect the merged PRs against the release.
681680

682-
1. In the title, summarize what the PR accomplishes in language that is meaningful to the user. In general, use present tense (for example, Adds, Fixes) in sentence case.
683-
2. Label the PR with the targeted version (ex: `v7.3.0`).
684-
3. Label the PR with the appropriate GitHub labels:
681+
#### Create the Release Notes text
682+
The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
683+
684+
To use a single paragraph of text, enter `Release note:` or a `## Release note` header in the PR description, followed by your text. For example, refer to this [PR](https://github.com/elastic/kibana/pull/65796) that uses the `## Release note` header.
685+
686+
When you create the Release Notes text, use the following best practices:
687+
* Use present tense.
688+
* Use sentence case.
689+
* When you create a feature PR, start with `Adds`.
690+
* When you create an enhancement PR, start with `Improves`.
691+
* When you create a bug fix PR, start with `Fixes`.
692+
* When you create a deprecation PR, start with `Deprecates`.
693+
694+
#### Add your labels
695+
1. Label the PR with the targeted version (ex: `v7.3.0`).
696+
2. Label the PR with the appropriate GitHub labels:
685697
* For a new feature or functionality, use `release_note:enhancement`.
686-
* For an external-facing fix, use `release_note:fix`. Exception: docs, build, and test fixes do not go in the Release Notes. Neither fixes for issues that were only on `master` and never have been released.
698+
* For an external-facing fix, use `release_note:fix`. We do not include docs, build, and test fixes in the Release Notes, or unreleased issues that are only on `master`.
687699
* For a deprecated feature, use `release_note:deprecation`.
688700
* For a breaking change, use `release_note:breaking`.
689701
* To **NOT** include your changes in the Release Notes, use `release_note:skip`.
@@ -695,7 +707,7 @@ We also produce a blog post that details more important breaking API changes in
695707
696708
## Name the feature with the break (ex: Visualize Loader)
697709
698-
Summary of the change. Anything Under `#Dev Docs` will be used in the blog.
710+
Summary of the change. Anything Under `#Dev Docs` is used in the blog.
699711
```
700712

701713
## Signing the contributor license agreement

‎NOTICE.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ used. Logarithmic ticks are places at powers of ten and at half those
2121
values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
2222
For details, see https://github.com/flot/flot/pull/1328
2323

24+
---
25+
This module was heavily inspired by the externals plugin that ships with webpack@97d58d31
26+
MIT License http://www.opensource.org/licenses/mit-license.php
27+
Author Tobias Koppers @sokra
28+
2429
---
2530
This product has relied on ASTExplorer that is licensed under MIT.
2631

‎docs/development/core/server/kibana-plugin-core-server.pluginmanifest.extrapublicdirs.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [PluginManifest](./kibana-plugin-core-server.pluginmanifest.md) &gt; [extraPublicDirs](./kibana-plugin-core-server.pluginmanifest.extrapublicdirs.md)
4+
5+
## PluginManifest.extraPublicDirs property
6+
7+
> Warning: This API is now obsolete.
8+
>
9+
>
10+
11+
Specifies directory names that can be imported by other ui-plugins built using the same instance of the @<!-- -->kbn/optimizer. A temporary measure we plan to replace with better mechanisms for sharing static code between plugins
12+
13+
<b>Signature:</b>
14+
15+
```typescript
16+
readonly extraPublicDirs?: string[];
17+
```

‎docs/development/core/server/kibana-plugin-core-server.pluginmanifest.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Should never be used in code outside of Core but is exported for documentation p
2121
| Property | Type | Description |
2222
| --- | --- | --- |
2323
| [configPath](./kibana-plugin-core-server.pluginmanifest.configpath.md) | <code>ConfigPath</code> | Root [configuration path](./kibana-plugin-core-server.configpath.md) used by the plugin, defaults to "id" in snake\_case format. |
24+
| [extraPublicDirs](./kibana-plugin-core-server.pluginmanifest.extrapublicdirs.md) | <code>string[]</code> | Specifies directory names that can be imported by other ui-plugins built using the same instance of the @<!-- -->kbn/optimizer. A temporary measure we plan to replace with better mechanisms for sharing static code between plugins |
2425
| [id](./kibana-plugin-core-server.pluginmanifest.id.md) | <code>PluginName</code> | Identifier of the plugin. Must be a string in camelCase. Part of a plugin public contract. Other plugins leverage it to access plugin API, navigate to the plugin, etc. |
2526
| [kibanaVersion](./kibana-plugin-core-server.pluginmanifest.kibanaversion.md) | <code>string</code> | The version of Kibana the plugin is compatible with, defaults to "version". |
2627
| [optionalPlugins](./kibana-plugin-core-server.pluginmanifest.optionalplugins.md) | <code>readonly PluginName[]</code> | An optional list of the other plugins that if installed and enabled \*\*may be\*\* leveraged by this plugin for some additional functionality but otherwise are not required for this plugin to work properly. |

0 commit comments

Comments
 (0)