Skip to content

Commit fe7a9b2

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into ilm/notices-should-reflect-tier-preferences
2 parents 7775b06 + 3535956 commit fe7a9b2

File tree

601 files changed

+27628
-20474
lines changed

Some content is hidden

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

601 files changed

+27628
-20474
lines changed

‎.ci/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def handleIngestion(timestamp) {
3434
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
3535
kibanaCoverage.generateReports("### Merge coverage reports")
3636
kibanaCoverage.uploadCombinedReports()
37-
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, teamAssignmentsPath(), '### Generate Team Assignments && Ingest')
3837
kibanaCoverage.uploadCoverageStaticSite(timestamp)
38+
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, teamAssignmentsPath(), '### Generate Team Assignments && Ingest')
3939
}
4040

4141
def handlePreviousSha() {

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ module.exports = {
388388
*/
389389
{
390390
files: [
391+
'**/*.stories.tsx',
391392
'x-pack/test/apm_api_integration/**/*.ts',
392393
'x-pack/test/functional/apps/**/*.js',
393394
'x-pack/plugins/apm/**/*.js',

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
329329
# Shared
330330
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
331331
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
332-
# App Search
333-
/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
334-
/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
335-
/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
336-
/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
337-
# Workplace Search
338-
/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
339-
/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
340-
/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
341-
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
342332

343333
# Elasticsearch UI
344334
/src/plugins/dev_tools/ @elastic/es-ui

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Constructs a new instance of the `IndexPattern` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
12+
constructor({ spec, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
1313
```
1414

1515
## Parameters
1616

1717
| Parameter | Type | Description |
1818
| --- | --- | --- |
19-
| { spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> | |
19+
| { spec, fieldFormats, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> | |
2020

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
1414
1515
| Constructor | Modifiers | Description |
1616
| --- | --- | --- |
17-
| [(constructor)({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) | | Constructs a new instance of the <code>IndexPattern</code> class |
17+
| [(constructor)({ spec, fieldFormats, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) | | Constructs a new instance of the <code>IndexPattern</code> class |
1818
1919
## Properties
2020
@@ -53,7 +53,6 @@ export declare class IndexPattern implements IIndexPattern
5353
| [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) | | |
5454
| [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) | | |
5555
| [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) | | |
56-
| [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) | | |
5756
| [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) | | Remove scripted field from field list |
5857
| [toSpec()](./kibana-plugin-plugins-data-public.indexpattern.tospec.md) | | |
5958

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.popularizefield.md‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ export declare class IndexPatternsService
4343
| [createAndSave(spec, override, skipFetchFields)](./kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md) | | Create a new index pattern and save it right away |
4444
| [createSavedObject(indexPattern, override)](./kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md) | | Save a new index pattern |
4545
| [delete(indexPatternId)](./kibana-plugin-plugins-data-public.indexpatternsservice.delete.md) | | Deletes an index pattern from .kibana index |
46-
| [updateSavedObject(indexPattern, saveAttempts)](./kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md) | | Save existing index pattern. Will attempt to merge differences if there are conflicts |
46+
| [updateSavedObject(indexPattern, saveAttempts, ignoreErrors)](./kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md) | | Save existing index pattern. Will attempt to merge differences if there are conflicts |
4747

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Save existing index pattern. Will attempt to merge differences if there are conf
99
<b>Signature:</b>
1010

1111
```typescript
12-
updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number): Promise<void | Error>;
12+
updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number, ignoreErrors?: boolean): Promise<void | Error>;
1313
```
1414

1515
## Parameters
@@ -18,6 +18,7 @@ updateSavedObject(indexPattern: IndexPattern, saveAttempts?: number): Promise<vo
1818
| --- | --- | --- |
1919
| indexPattern | <code>IndexPattern</code> | |
2020
| saveAttempts | <code>number</code> | |
21+
| ignoreErrors | <code>boolean</code> | |
2122

2223
<b>Returns:</b>
2324

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern._constructor_.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Constructs a new instance of the `IndexPattern` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
12+
constructor({ spec, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
1313
```
1414

1515
## Parameters
1616

1717
| Parameter | Type | Description |
1818
| --- | --- | --- |
19-
| { spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> | |
19+
| { spec, fieldFormats, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> | |
2020

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
1414
1515
| Constructor | Modifiers | Description |
1616
| --- | --- | --- |
17-
| [(constructor)({ spec, savedObjectsClient, fieldFormats, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-server.indexpattern._constructor_.md) | | Constructs a new instance of the <code>IndexPattern</code> class |
17+
| [(constructor)({ spec, fieldFormats, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-server.indexpattern._constructor_.md) | | Constructs a new instance of the <code>IndexPattern</code> class |
1818
1919
## Properties
2020
@@ -53,7 +53,6 @@ export declare class IndexPattern implements IIndexPattern
5353
| [getTimeField()](./kibana-plugin-plugins-data-server.indexpattern.gettimefield.md) | | |
5454
| [isTimeBased()](./kibana-plugin-plugins-data-server.indexpattern.istimebased.md) | | |
5555
| [isTimeNanosBased()](./kibana-plugin-plugins-data-server.indexpattern.istimenanosbased.md) | | |
56-
| [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-server.indexpattern.popularizefield.md) | | |
5756
| [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md) | | Remove scripted field from field list |
5857
| [toSpec()](./kibana-plugin-plugins-data-server.indexpattern.tospec.md) | | |
5958

0 commit comments

Comments
 (0)