Skip to content

Commit 539828d

Browse files
chrisronlinechrisronline
committed
Merge remote-tracking branch 'elastic/master' into monitoring/move_karma_tests
2 parents a8cb789 + 8d85198 commit 539828d

File tree

1,994 files changed

+72561
-52873
lines changed

Some content is hidden

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

1,994 files changed

+72561
-52873
lines changed

‎.ci/Jenkinsfile_security_cypress‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/groovy
2+
3+
library 'kibana-pipeline-library'
4+
kibanaLibrary.load()
5+
6+
kibanaPipeline(timeoutMinutes: 180) {
7+
slackNotifications.onFailure(
8+
disabled: !params.NOTIFY_ON_FAILURE,
9+
channel: '#security-solution-slack-testing'
10+
) {
11+
catchError {
12+
withEnv([
13+
'CI_PARALLEL_PROCESS_NUMBER=1'
14+
]) {
15+
def job = 'xpack-securityCypress'
16+
17+
workers.ci(name: job, size: 'l', ramDisk: true) {
18+
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
19+
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress.sh')()
20+
}
21+
}
22+
}
23+
}
24+
25+
if (params.NOTIFY_ON_FAILURE) {
26+
kibanaPipeline.sendMail(to: 'siem_dev_team@elastic.co')
27+
}
28+
}

‎.eslintignore‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ target
1818

1919
# plugin overrides
2020
/src/core/lib/kbn_internal_native_observable
21-
/src/legacy/core_plugins/console/public/tests/webpackShims
22-
/src/legacy/core_plugins/console/public/webpackShims
2321
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
2422
/src/legacy/ui/public/flot-charts
25-
/src/legacy/ui/public/utils/decode_geo_hash.js
2623
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2724
/src/plugins/vis_type_timelion/public/_generated_/**
28-
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
29-
/src/plugins/timelion/public/webpackShims/jquery.flot.*
25+
/src/plugins/vis_type_timelion/public/flot/jquery.flot.*
26+
/src/plugins/timelion/public/flot/jquery.flot.*
3027
/x-pack/legacy/plugins/**/__tests__/fixtures/**
3128
/x-pack/plugins/apm/e2e/**/snapshots.js
3229
/x-pack/plugins/apm/e2e/tmp/*

‎.eslintrc.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ module.exports = {
400400
},
401401
{
402402
target: ['(src|x-pack)/plugins/*/public/**/*'],
403-
from: ['ui/**/*', 'uiExports/**/*'],
403+
from: ['ui/**/*'],
404404
errorMessage: 'Plugins cannot import legacy UI code.',
405405
},
406406
{
@@ -457,14 +457,13 @@ module.exports = {
457457
{
458458
files: [
459459
'**/public/**/*.js',
460-
'**/webpackShims/**/*.js',
461460
'packages/kbn-ui-framework/doc_site/src/**/*.js',
462461
'src/fixtures/**/*.js', // TODO: this directory needs to be more obviously "public" (or go away)
463462
],
464463
settings: {
465464
// instructs import/no-extraneous-dependencies to treat certain modules
466465
// as core modules, even if they aren't listed in package.json
467-
'import/core-modules': ['plugins', 'legacy/ui', 'uiExports'],
466+
'import/core-modules': ['plugins', 'legacy/ui'],
468467

469468
'import/resolver': {
470469
'@kbn/eslint-import-resolver-kibana': {
@@ -605,7 +604,6 @@ module.exports = {
605604
{
606605
files: [
607606
'.eslintrc.js',
608-
'**/webpackShims/**/*.js',
609607
'packages/kbn-plugin-generator/**/*.js',
610608
'packages/kbn-eslint-import-resolver-kibana/**/*.js',
611609
'packages/kbn-eslint-plugin-eslint/**/*',

‎.github/CODEOWNERS‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/x-pack/plugins/lens/ @elastic/kibana-app
99
/x-pack/plugins/graph/ @elastic/kibana-app
1010
/src/plugins/dashboard/ @elastic/kibana-app
11+
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
1112
/src/plugins/discover/ @elastic/kibana-app
1213
/src/plugins/input_control_vis/ @elastic/kibana-app
1314
/src/plugins/kibana_legacy/ @elastic/kibana-app
@@ -58,6 +59,7 @@
5859

5960
# APM
6061
/x-pack/plugins/apm/ @elastic/apm-ui
62+
/x-pack/plugins/apm/**/*.scss @elastic/observability-design
6163
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
6264
/src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
6365
/src/plugins/apm_oss/ @elastic/apm-ui
@@ -68,6 +70,7 @@
6870

6971
# Canvas
7072
/x-pack/plugins/canvas/ @elastic/kibana-canvas
73+
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
7174
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
7275

7376
# Core UI
@@ -77,15 +80,18 @@
7780
/src/plugins/home/server/services/ @elastic/kibana-core-ui
7881
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
7982
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
80-
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-core-ui
83+
/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
8184
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
8285

8386
# Observability UIs
8487
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
8588
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
89+
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
8690
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
91+
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
8792
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
8893
/x-pack/plugins/observability/ @elastic/observability-ui
94+
/x-pack/plugins/observability/**/*.scss @elastic/observability-design
8995
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
9096
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9197
/x-pack/plugins/uptime @elastic/uptime
@@ -159,11 +165,26 @@
159165
# Security
160166
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
161167
/x-pack/legacy/plugins/security/ @elastic/kibana-security
168+
/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
162169
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
170+
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
163171
/x-pack/plugins/spaces/ @elastic/kibana-security
172+
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
164173
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
165174
/x-pack/plugins/security/ @elastic/kibana-security
175+
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
166176
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
177+
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
178+
/x-pack/test/functional/apps/security/ @elastic/kibana-security
179+
/x-pack/test/kerberos_api_integration/ @elastic/kibana-security
180+
/x-pack/test/login_selector_api_integration/ @elastic/kibana-security
181+
/x-pack/test/oidc_api_integration/ @elastic/kibana-security
182+
/x-pack/test/pki_api_integration/ @elastic/kibana-security
183+
/x-pack/test/saml_api_integration/ @elastic/kibana-security
184+
/x-pack/test/security_api_integration/ @elastic/kibana-security
185+
/x-pack/test/security_functional/ @elastic/kibana-security
186+
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
187+
/x-pack/test/token_api_integration/ @elastic/kibana-security
167188

168189
# Kibana Localization
169190
/src/dev/i18n/ @elastic/kibana-localization
@@ -234,6 +255,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
234255

235256
# Endpoint
236257
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
258+
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
237259
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
238260
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
239261
/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
@@ -243,6 +265,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
243265

244266
# Security Solution
245267
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
268+
/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
246269
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
247270
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
248271
/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team

‎.sass-lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
4+
- 'src/plugins/index_pattern_management/**/*.s+(a|c)ss'
45
- 'src/plugins/timelion/**/*.s+(a|c)ss'
56
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
67
- 'src/plugins/vis_type_vega/**/*.s+(a|c)ss'

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ out an open PR:
3232

3333
- [CONTRIBUTING.md](CONTRIBUTING.md) will help you get Kibana up and running.
3434
- If you would like to contribute code, please follow our [STYLEGUIDE.md](STYLEGUIDE.md).
35-
- Learn more about our UI code with [UI_SYSTEMS.md](src/legacy/ui/public/UI_SYSTEMS.md).
3635
- For all other questions, check out the [FAQ.md](FAQ.md) and
3736
[wiki](https://github.com/elastic/kibana/wiki).
3837

‎STYLEGUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ Do not use setters, they cause more problems than they can solve.
593593
594594
When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
595595
596-
All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/legacy/ui/public/styles/_globals_v7light.scss).
596+
All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/core/public/core_app/styles/_globals_v7light.scss).
597597
598598
While the styles for this component will only be loaded if the component exists on the page,
599599
the styles **will** be global and so it is recommended to use a three letter prefix on your

‎docs/developer/architecture/code-exploration.asciidoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,10 @@ To access an elasticsearch instance that has live data you have two options:
313313
WARNING: Missing README.
314314
315315
316-
- {kib-repo}blob/{branch}/x-pack/plugins/beats_management[beats_management]
316+
- {kib-repo}blob/{branch}/x-pack/plugins/beats_management/readme.md[beatsManagement]
317317
318-
WARNING: Missing README.
318+
Notes:
319+
Failure to have auth enabled in Kibana will make for a broken UI. UI-based errors not yet in place
319320
320321
321322
- {kib-repo}blob/{branch}/x-pack/plugins/canvas/README.md[canvas]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ readonly links: {
8181
readonly loadingData: string;
8282
readonly introduction: string;
8383
};
84+
readonly addData: string;
8485
readonly kibana: string;
8586
readonly siem: {
8687
readonly guide: string;
@@ -95,5 +96,6 @@ readonly links: {
9596
readonly dateMath: string;
9697
};
9798
readonly management: Record<string, string>;
99+
readonly visualize: Record<string, string>;
98100
};
99101
```

‎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 drilldowns: 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 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 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> }</code> | |
20+
| [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code> readonly dashboard: {</code><br/><code> readonly drilldowns: 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 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> }</code> | |
2121

0 commit comments

Comments
 (0)