Skip to content

Commit 51143af

Browse files
author
Liza K
committed
Merge branch 'master' of github.com:elastic/kibana into sessions/retry-logic
2 parents 63c7d6a + fed6b3d commit 51143af

File tree

229 files changed

+13160
-5176
lines changed

Some content is hidden

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

229 files changed

+13160
-5176
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ snapshots.js
4444
/packages/kbn-ui-framework/doc_site/build
4545
/packages/kbn-ui-framework/generator-kui/*/templates/
4646
/packages/kbn-ui-shared-deps/flot_charts
47+
/packages/kbn-monaco/src/painless/antlr

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ readonly links: {
101101
readonly dateMath: string;
102102
};
103103
readonly management: Record<string, string>;
104+
readonly ml: {
105+
readonly guide: string;
106+
readonly anomalyDetection: string;
107+
readonly anomalyDetectionJobs: string;
108+
readonly dataFrameAnalytics: string;
109+
};
104110
readonly visualize: Record<string, string>;
105111
};
106112
```

docs/development/core/public/kibana-plugin-core-public.doclinksstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ export interface DocLinksStart
1717
| --- | --- | --- |
1818
| [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> | |
1919
| [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> | |
20-
| [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code> readonly dashboard: {</code><br/><code> readonly guide: string;</code><br/><code> readonly drilldowns: string;</code><br/><code> readonly drilldownsTriggerPicker: string;</code><br/><code> readonly urlDrilldownTemplateSyntax: string;</code><br/><code> readonly urlDrilldownVariables: string;</code><br/><code> };</code><br/><code> readonly filebeat: {</code><br/><code> readonly base: string;</code><br/><code> readonly installation: string;</code><br/><code> readonly configuration: string;</code><br/><code> readonly elasticsearchOutput: string;</code><br/><code> readonly startup: string;</code><br/><code> readonly exportedFields: string;</code><br/><code> };</code><br/><code> readonly auditbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly metricbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly heartbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly logstash: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly functionbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly winlogbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly aggs: {</code><br/><code> readonly date_histogram: string;</code><br/><code> readonly date_range: string;</code><br/><code> readonly filter: string;</code><br/><code> readonly filters: string;</code><br/><code> readonly geohash_grid: string;</code><br/><code> readonly histogram: string;</code><br/><code> readonly ip_range: string;</code><br/><code> readonly range: string;</code><br/><code> readonly significant_terms: string;</code><br/><code> readonly terms: string;</code><br/><code> readonly avg: string;</code><br/><code> readonly avg_bucket: string;</code><br/><code> readonly max_bucket: string;</code><br/><code> readonly min_bucket: string;</code><br/><code> readonly sum_bucket: string;</code><br/><code> readonly cardinality: string;</code><br/><code> readonly count: string;</code><br/><code> readonly cumulative_sum: string;</code><br/><code> readonly derivative: string;</code><br/><code> readonly geo_bounds: string;</code><br/><code> readonly geo_centroid: string;</code><br/><code> readonly max: string;</code><br/><code> readonly median: string;</code><br/><code> readonly min: string;</code><br/><code> readonly moving_avg: string;</code><br/><code> readonly percentile_ranks: string;</code><br/><code> readonly serial_diff: string;</code><br/><code> readonly std_dev: string;</code><br/><code> readonly sum: string;</code><br/><code> readonly top_hits: string;</code><br/><code> };</code><br/><code> readonly scriptedFields: {</code><br/><code> readonly scriptFields: string;</code><br/><code> readonly scriptAggs: string;</code><br/><code> readonly painless: string;</code><br/><code> readonly painlessApi: string;</code><br/><code> readonly painlessSyntax: string;</code><br/><code> readonly luceneExpressions: string;</code><br/><code> };</code><br/><code> readonly indexPatterns: {</code><br/><code> readonly loadingData: string;</code><br/><code> readonly introduction: string;</code><br/><code> };</code><br/><code> readonly addData: string;</code><br/><code> readonly kibana: string;</code><br/><code> readonly siem: {</code><br/><code> readonly guide: string;</code><br/><code> readonly gettingStarted: string;</code><br/><code> };</code><br/><code> readonly query: {</code><br/><code> readonly eql: string;</code><br/><code> readonly luceneQuerySyntax: string;</code><br/><code> readonly queryDsl: string;</code><br/><code> readonly kueryQuerySyntax: string;</code><br/><code> };</code><br/><code> readonly date: {</code><br/><code> readonly dateMath: string;</code><br/><code> };</code><br/><code> readonly management: Record&lt;string, string&gt;;</code><br/><code> readonly visualize: Record&lt;string, string&gt;;</code><br/><code> }</code> | |
20+
| [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code> readonly dashboard: {</code><br/><code> readonly guide: string;</code><br/><code> readonly drilldowns: string;</code><br/><code> readonly drilldownsTriggerPicker: string;</code><br/><code> readonly urlDrilldownTemplateSyntax: string;</code><br/><code> readonly urlDrilldownVariables: string;</code><br/><code> };</code><br/><code> readonly filebeat: {</code><br/><code> readonly base: string;</code><br/><code> readonly installation: string;</code><br/><code> readonly configuration: string;</code><br/><code> readonly elasticsearchOutput: string;</code><br/><code> readonly startup: string;</code><br/><code> readonly exportedFields: string;</code><br/><code> };</code><br/><code> readonly auditbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly metricbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly heartbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly logstash: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly functionbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly winlogbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly aggs: {</code><br/><code> readonly date_histogram: string;</code><br/><code> readonly date_range: string;</code><br/><code> readonly filter: string;</code><br/><code> readonly filters: string;</code><br/><code> readonly geohash_grid: string;</code><br/><code> readonly histogram: string;</code><br/><code> readonly ip_range: string;</code><br/><code> readonly range: string;</code><br/><code> readonly significant_terms: string;</code><br/><code> readonly terms: string;</code><br/><code> readonly avg: string;</code><br/><code> readonly avg_bucket: string;</code><br/><code> readonly max_bucket: string;</code><br/><code> readonly min_bucket: string;</code><br/><code> readonly sum_bucket: string;</code><br/><code> readonly cardinality: string;</code><br/><code> readonly count: string;</code><br/><code> readonly cumulative_sum: string;</code><br/><code> readonly derivative: string;</code><br/><code> readonly geo_bounds: string;</code><br/><code> readonly geo_centroid: string;</code><br/><code> readonly max: string;</code><br/><code> readonly median: string;</code><br/><code> readonly min: string;</code><br/><code> readonly moving_avg: string;</code><br/><code> readonly percentile_ranks: string;</code><br/><code> readonly serial_diff: string;</code><br/><code> readonly std_dev: string;</code><br/><code> readonly sum: string;</code><br/><code> readonly top_hits: string;</code><br/><code> };</code><br/><code> readonly scriptedFields: {</code><br/><code> readonly scriptFields: string;</code><br/><code> readonly scriptAggs: string;</code><br/><code> readonly painless: string;</code><br/><code> readonly painlessApi: string;</code><br/><code> readonly painlessSyntax: string;</code><br/><code> readonly luceneExpressions: string;</code><br/><code> };</code><br/><code> readonly indexPatterns: {</code><br/><code> readonly loadingData: string;</code><br/><code> readonly introduction: string;</code><br/><code> };</code><br/><code> readonly addData: string;</code><br/><code> readonly kibana: string;</code><br/><code> readonly siem: {</code><br/><code> readonly guide: string;</code><br/><code> readonly gettingStarted: string;</code><br/><code> };</code><br/><code> readonly query: {</code><br/><code> readonly eql: string;</code><br/><code> readonly luceneQuerySyntax: string;</code><br/><code> readonly queryDsl: string;</code><br/><code> readonly kueryQuerySyntax: string;</code><br/><code> };</code><br/><code> readonly date: {</code><br/><code> readonly dateMath: string;</code><br/><code> };</code><br/><code> readonly management: Record&lt;string, string&gt;;</code><br/><code> readonly ml: {</code><br/><code> readonly guide: string;</code><br/><code> readonly anomalyDetection: string;</code><br/><code> readonly anomalyDetectionJobs: string;</code><br/><code> readonly dataFrameAnalytics: string;</code><br/><code> };</code><br/><code> readonly visualize: Record&lt;string, string&gt;;</code><br/><code> }</code> | |
2121

docs/redirects.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ This content has moved. See <<discover, **Discover**>>.
168168

169169
This content has moved. See <<discover, **Discover**>>.
170170

171+
[role="exclude",id="lens"]
172+
== Lens
173+
174+
This content has moved. See <<create-panels-with-lens>>.
175+
171176
[role="exclude",id="known-plugins"]
172177
== Known plugins
173178

docs/user/dashboard/dashboard.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ image:images/Dashboard_add_new_visualization.png[Example add new visualization t
185185
{kib} provides you with several editors that help you create panels.
186186

187187
[float]
188-
[[lens]]
188+
[[create-panels-with-lens]]
189189
=== Create panels with Lens
190190

191191
*Lens* is the simplest and fastest way to create powerful visualizations of your data. To use *Lens*, you drag and drop as many data fields

docs/user/security/reporting.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ If you are using an external identity provider, such as
101101
LDAP or Active Directory, you can either assign
102102
roles on a per user basis, or assign roles to groups of users. By default, role
103103
mappings are configured in
104-
{ref}/mapping-roles.html[`config/shield/role_mapping.yml`].
104+
{ref}/mapping-roles.html[`config/role_mapping.yml`].
105105
For example, the following snippet assigns the user named Bill Murray the
106106
`kibana_admin` and `reporting_user` roles:
107107

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
"angular-resource": "1.8.0",
158158
"angular-sanitize": "^1.8.0",
159159
"angular-ui-ace": "0.2.3",
160+
"antlr4ts": "^0.5.0-alpha.3",
160161
"apollo-cache-inmemory": "1.6.2",
161162
"apollo-client": "^2.3.8",
162163
"apollo-link-http": "^1.5.16",
@@ -348,7 +349,7 @@
348349
"@babel/traverse": "^7.11.5",
349350
"@babel/types": "^7.11.0",
350351
"@cypress/snapshot": "^2.1.7",
351-
"@cypress/webpack-preprocessor": "^5.4.10",
352+
"@cypress/webpack-preprocessor": "^5.4.11",
352353
"@elastic/apm-rum": "^5.6.1",
353354
"@elastic/apm-rum-react": "^1.2.5",
354355
"@elastic/charts": "24.3.0",
@@ -576,6 +577,7 @@
576577
"angular-recursion": "^1.0.5",
577578
"angular-route": "^1.8.0",
578579
"angular-sortable-view": "^0.0.17",
580+
"antlr4ts-cli": "^0.5.0-alpha.3",
579581
"apidoc": "^0.25.0",
580582
"apidoc-markdown": "^5.1.8",
581583
"apollo-link": "^1.2.3",
@@ -608,7 +610,7 @@
608610
"cpy": "^8.1.1",
609611
"cronstrue": "^1.51.0",
610612
"css-loader": "^3.4.2",
611-
"cypress": "^5.5.0",
613+
"cypress": "^6.0.1",
612614
"cypress-cucumber-preprocessor": "^2.5.2",
613615
"cypress-multi-reporters": "^1.4.0",
614616
"d3": "3.5.17",

packages/kbn-monaco/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"license": "Apache-2.0",
77
"scripts": {
88
"build": "node ./scripts/build.js",
9-
"kbn:bootstrap": "yarn build --dev"
9+
"kbn:bootstrap": "yarn build --dev",
10+
"build:antlr4ts": "../../node_modules/antlr4ts-cli/antlr4ts ./src/painless/antlr/painless_lexer.g4 ./src/painless/antlr/painless_parser.g4 && node ./scripts/fix_generated_antlr.js"
1011
},
1112
"devDependencies": {
1213
"@kbn/babel-preset": "link:../kbn-babel-preset",
@@ -15,4 +16,4 @@
1516
"dependencies": {
1617
"@kbn/i18n": "link:../kbn-i18n"
1718
}
18-
}
19+
}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
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.
18+
*/
19+
20+
const { join } = require('path');
21+
const { readdirSync, readFileSync, writeFileSync, renameSync } = require('fs');
22+
const ora = require('ora');
23+
24+
const generatedAntlrFolder = join(__dirname, '..', 'src', 'painless', 'antlr');
25+
26+
const generatedAntlrFolderContents = readdirSync(generatedAntlrFolder);
27+
28+
const log = ora('Updating generated antlr grammar').start();
29+
30+
// The generated TS produces some TS linting errors
31+
// This script adds a //@ts-nocheck comment at the top of each generated file
32+
// so that the errors can be ignored for now
33+
generatedAntlrFolderContents
34+
.filter((file) => {
35+
const fileExtension = file.split('.')[1];
36+
return fileExtension.includes('ts');
37+
})
38+
.forEach((file) => {
39+
try {
40+
const fileContentRows = readFileSync(join(generatedAntlrFolder, file), 'utf8')
41+
.toString()
42+
.split('\n');
43+
44+
fileContentRows.unshift('// @ts-nocheck');
45+
46+
const filePath = join(generatedAntlrFolder, file);
47+
const fileContent = fileContentRows.join('\n');
48+
49+
writeFileSync(filePath, fileContent, { encoding: 'utf8' });
50+
} catch (err) {
51+
return log.fail(err.message);
52+
}
53+
});
54+
55+
// Rename generated parserListener file to snakecase to satisfy file casing check
56+
// There doesn't appear to be a way to fix this OOTB with antlr4ts-cli
57+
try {
58+
renameSync(
59+
join(generatedAntlrFolder, 'painless_parserListener.ts'),
60+
join(generatedAntlrFolder, 'painless_parser_listener.ts')
61+
);
62+
} catch (err) {
63+
log.warn(`Unable to rename parserListener file to snakecase: ${err.message}`);
64+
}
65+
66+
log.succeed('Updated generated antlr grammar successfully');

packages/kbn-monaco/scripts/utils/clone_es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const { accessSync, mkdirSync } = require('fs');
2121
const { join } = require('path');
2222
const simpleGit = require('simple-git');
2323

24-
// Note: The generated whitelists have not yet been merged to master
24+
// Note: The generated allowlists have not yet been merged to ES
2525
// so this script may fail until code in this branch has been merged:
2626
// https://github.com/stu-elastic/elasticsearch/tree/scripting/whitelists
2727
const esRepo = 'https://github.com/elastic/elasticsearch.git';

0 commit comments

Comments
 (0)