Skip to content

Commit 35a981a

Browse files
Merge branch 'master' into adding-space-aware-jobs
2 parents 13ccded + ae007c2 commit 35a981a

File tree

687 files changed

+63068
-50972
lines changed

Some content is hidden

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

687 files changed

+63068
-50972
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/x-pack/build
1414
node_modules
1515
target
16+
snapshots.js
1617

1718
!/.eslintrc.js
1819

@@ -22,7 +23,6 @@ target
2223
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2324
/src/plugins/vis_type_timelion/public/_generated_/**
2425
/x-pack/legacy/plugins/**/__tests__/fixtures/**
25-
/x-pack/plugins/apm/e2e/**/snapshots.js
2626
/x-pack/plugins/apm/e2e/tmp/*
2727
/x-pack/plugins/canvas/canvas_plugin
2828
/x-pack/plugins/canvas/shareable_runtime/build

.eslintrc.js

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ module.exports = {
447447
{
448448
devDependencies: false,
449449
peerDependencies: true,
450+
packageDir: '.',
450451
},
451452
],
452453
},
@@ -478,6 +479,7 @@ module.exports = {
478479
{
479480
devDependencies: true,
480481
peerDependencies: true,
482+
packageDir: '.',
481483
},
482484
],
483485
},
@@ -732,22 +734,6 @@ module.exports = {
732734
},
733735
},
734736

735-
/**
736-
* ML overrides
737-
*/
738-
{
739-
files: ['x-pack/plugins/ml/**/*.js'],
740-
rules: {
741-
'no-shadow': 'error',
742-
'import/no-extraneous-dependencies': [
743-
'error',
744-
{
745-
packageDir: './x-pack',
746-
},
747-
],
748-
},
749-
},
750-
751737
/**
752738
* Security Solution overrides
753739
*/
@@ -1149,16 +1135,11 @@ module.exports = {
11491135
{
11501136
devDependencies: true,
11511137
peerDependencies: true,
1138+
packageDir: '.',
11521139
},
11531140
],
11541141
},
11551142
},
1156-
{
1157-
files: ['x-pack/plugins/canvas/storybook/**'],
1158-
rules: {
1159-
'import/no-extraneous-dependencies': 0,
1160-
},
1161-
},
11621143
{
11631144
files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
11641145
globals: { canvas: true, $: true },
@@ -1237,5 +1218,21 @@ module.exports = {
12371218
],
12381219
},
12391220
},
1221+
1222+
/**
1223+
* Single package.json rules, it tells eslint to ignore the child package.json files
1224+
* and look for dependencies declarations in the single and root level package.json
1225+
*/
1226+
{
1227+
files: ['**/*.{js,mjs,ts,tsx}'],
1228+
rules: {
1229+
'import/no-extraneous-dependencies': [
1230+
'error',
1231+
{
1232+
packageDir: '.',
1233+
},
1234+
],
1235+
},
1236+
},
12401237
],
12411238
};

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,15 @@
196196

197197
# Platform
198198
/src/core/ @elastic/kibana-platform
199+
/src/plugins/saved_objects_tagging_oss @elastic/kibana-platform
199200
/config/kibana.yml @elastic/kibana-platform
200201
/x-pack/plugins/features/ @elastic/kibana-platform
201202
/x-pack/plugins/licensing/ @elastic/kibana-platform
202203
/x-pack/plugins/global_search/ @elastic/kibana-platform
203204
/x-pack/plugins/cloud/ @elastic/kibana-platform
205+
/x-pack/plugins/saved_objects_tagging/ @elastic/kibana-platform
204206
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
207+
/x-pack/test/saved_object_tagging/ @elastic/kibana-platform
205208
/packages/kbn-config-schema/ @elastic/kibana-platform
206209
/packages/kbn-std/ @elastic/kibana-platform
207210
/src/legacy/server/config/ @elastic/kibana-platform

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ npm-debug.log*
5656
# apm plugin
5757
/x-pack/plugins/apm/tsconfig.json
5858
apm.tsconfig.json
59+
## @cypress/snapshot from apm plugin
60+
snapshots.js
5961

6062
# release notes script output
6163
report.csv

.yarnrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

NOTICE.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ This module was heavily inspired by the externals plugin that ships with webpack
2626
MIT License http://www.opensource.org/licenses/mit-license.php
2727
Author Tobias Koppers @sokra
2828

29+
---
30+
This product has relied on ASTExplorer that is licensed under MIT.
31+
2932
---
3033
This product includes code that is based on Ace editor, which was available
3134
under a "BSD" license.

docs/developer/plugin-list.asciidoc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,9 @@ management section itself.
147147
It also provides a stateful version of it on the start contract.
148148
149149
150-
|{kib-repo}blob/{branch}/src/plugins/newsfeed[newsfeed]
151-
|WARNING: Missing README.
150+
|{kib-repo}blob/{branch}/src/plugins/newsfeed/README.md[newsfeed]
151+
|The newsfeed plugin adds a NewsfeedNavButton to the top navigation bar and renders the content in the flyout.
152+
Content is fetched from the remote (https://feeds.elastic.co and https://feeds-staging.elastic.co in dev mode) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
152153
153154
154155
|{kib-repo}blob/{branch}/src/plugins/region_map/README.md[regionMap]
@@ -163,6 +164,11 @@ It also provides a stateful version of it on the start contract.
163164
|WARNING: Missing README.
164165
165166
167+
|{kib-repo}blob/{branch}/src/plugins/saved_objects_tagging_oss/README.md[savedObjectsTaggingOss]
168+
|Bridge plugin for consumption of the saved object tagging feature from
169+
oss plugins.
170+
171+
166172
|{kib-repo}blob/{branch}/src/plugins/security_oss/README.md[securityOss]
167173
|securityOss is responsible for educating users about Elastic's free security features,
168174
so they can properly protect the data within their clusters.
@@ -465,6 +471,10 @@ Elastic.
465471
|Welcome to the Kibana rollup plugin! This plugin provides Kibana support for Elasticsearch's rollup feature. Please refer to the Elasticsearch documentation to understand rollup indices and how to create rollup jobs.
466472
467473
474+
|{kib-repo}blob/{branch}/x-pack/plugins/saved_objects_tagging/README.md[savedObjectsTagging]
475+
|Add tagging capability to saved objects
476+
477+
468478
|{kib-repo}blob/{branch}/x-pack/plugins/searchprofiler/README.md[searchprofiler]
469479
|The search profiler consumes the Profile API
470480
by sending a search API with profile: true enabled in the request body. The response contains
@@ -508,8 +518,9 @@ routes, etc.
508518
|This plugin provides access to the transforms features provided by Elastic.
509519
510520
511-
|{kib-repo}blob/{branch}/x-pack/plugins/translations[translations]
512-
|WARNING: Missing README.
521+
|<<translations-plugin>>
522+
|Contains Elastic-supported translations. Owned by the Localizations team.
523+
For adding localizations and instrument a ui to support translated content, see https://github.com/elastic/kibana/tree/master/packages/kbn-i18n
513524
514525
515526
|{kib-repo}blob/{branch}/x-pack/plugins/triggers_actions_ui/README.md[triggersActionsUi]
@@ -551,3 +562,4 @@ include::{kibana-root}/src/plugins/expressions/README.asciidoc[leveloffset=+1]
551562
include::{kibana-root}/src/plugins/ui_actions/README.asciidoc[leveloffset=+1]
552563
include::{kibana-root}/x-pack/plugins/dashboard_enhanced/README.asciidoc[leveloffset=+1]
553564
include::{kibana-root}/x-pack/plugins/embeddable_enhanced/README.asciidoc[leveloffset=+1]
565+
include::{kibana-root}/x-pack/plugins/translations/README.asciidoc[leveloffset=+1]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
9898
| [SavedObjectsBulkUpdateOptions](./kibana-plugin-core-public.savedobjectsbulkupdateoptions.md) | |
9999
| [SavedObjectsCreateOptions](./kibana-plugin-core-public.savedobjectscreateoptions.md) | |
100100
| [SavedObjectsFindOptions](./kibana-plugin-core-public.savedobjectsfindoptions.md) | |
101+
| [SavedObjectsFindOptionsReference](./kibana-plugin-core-public.savedobjectsfindoptionsreference.md) | |
101102
| [SavedObjectsFindResponsePublic](./kibana-plugin-core-public.savedobjectsfindresponsepublic.md) | Return type of the Saved Objects <code>find()</code> method.<!-- -->\*Note\*: this type is different between the Public and Server Saved Objects clients. |
102103
| [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md) | Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite. |
103104
| [SavedObjectsImportConflictError](./kibana-plugin-core-public.savedobjectsimportconflicterror.md) | Represents a failure to import due to a conflict. |

docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.defaultsearchoperator.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
## SavedObjectsFindOptions.defaultSearchOperator property
66

7+
The search operator to use with the provided filter. Defaults to `OR`
8+
79
<b>Signature:</b>
810

911
```typescript

docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.hasreference.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
## SavedObjectsFindOptions.hasReference property
66

7+
Search for documents having a reference to the specified objects. Use `hasReferenceOperator` to specify the operator to use when searching for multiple references.
8+
79
<b>Signature:</b>
810

911
```typescript
10-
hasReference?: {
11-
type: string;
12-
id: string;
13-
};
12+
hasReference?: SavedObjectsFindOptionsReference | SavedObjectsFindOptionsReference[];
1413
```

0 commit comments

Comments
 (0)