Skip to content

Commit ee94ebf

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into ems-7.6
2 parents 49eff5c + 8259445 commit ee94ebf

220 files changed

Lines changed: 14722 additions & 693 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@
132132
/x-pack/test/alerting_api_integration @elastic/kibana-alerting-services
133133
/x-pack/test/plugin_api_integration/plugins/task_manager @elastic/kibana-alerting-services
134134
/x-pack/test/plugin_api_integration/test_suites/task_manager @elastic/kibana-alerting-services
135+
/x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
136+
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
137+
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
135138

136139
# Design
137140
**/*.scss @elastic/kibana-design

‎docs/development/core/server/kibana-plugin-server.uisettingsparams.deprecation.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) &gt; [deprecation](./kibana-plugin-server.uisettingsparams.deprecation.md)
4+
5+
## UiSettingsParams.deprecation property
6+
7+
optional deprecation information. Used to generate a deprecation warning.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
deprecation?: DeprecationSettings;
13+
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export interface UiSettingsParams
1717
| Property | Type | Description |
1818
| --- | --- | --- |
1919
| [category](./kibana-plugin-server.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
20+
| [deprecation](./kibana-plugin-server.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
2021
| [description](./kibana-plugin-server.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
2122
| [name](./kibana-plugin-server.uisettingsparams.name.md) | <code>string</code> | title in the UI |
2223
| [optionLabels](./kibana-plugin-server.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |

‎src/core/public/doc_links/doc_links_service.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ export class DocLinksService {
115115
date: {
116116
dateMath: `${ELASTICSEARCH_DOCS}common-options.html#date-math`,
117117
},
118+
management: {
119+
kibanaSearchSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-search-settings`,
120+
},
118121
},
119122
});
120123
}

‎src/core/server/server.api.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,6 +1928,8 @@ export type SharedGlobalConfig = RecursiveReadonly_2<{
19281928
// @public
19291929
export interface UiSettingsParams {
19301930
category?: string[];
1931+
// Warning: (ae-forgotten-export) The symbol "DeprecationSettings" needs to be exported by the entry point index.d.ts
1932+
deprecation?: DeprecationSettings;
19311933
description?: string;
19321934
name?: string;
19331935
optionLabels?: Record<string, string>;

‎src/core/server/ui_settings/types.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,15 @@ export interface UserProvidedValues<T = any> {
7373
isOverridden?: boolean;
7474
}
7575

76+
/**
77+
* UiSettings deprecation field options.
78+
* @public
79+
* */
80+
export interface DeprecationSettings {
81+
message: string;
82+
docLinksKey: string;
83+
}
84+
7685
/**
7786
* UI element type to represent the settings.
7887
* @public
@@ -102,6 +111,8 @@ export interface UiSettingsParams {
102111
readonly?: boolean;
103112
/** defines a type of UI element {@link UiSettingsType} */
104113
type?: UiSettingsType;
114+
/** optional deprecation information. Used to generate a deprecation warning. */
115+
deprecation?: DeprecationSettings;
105116
/*
106117
* Allows defining a custom validation applicable to value change on the client.
107118
* @deprecated

‎src/dev/sass/build_sass.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import { resolve } from 'path';
2121

22+
import * as Rx from 'rxjs';
2223
import { toArray } from 'rxjs/operators';
2324

2425
import { createFailError } from '@kbn/dev-utils';
@@ -61,9 +62,11 @@ export async function buildSass({ log, kibanaDir, watch }) {
6162

6263
const scanDirs = [resolve(kibanaDir, 'src/legacy/core_plugins')];
6364
const paths = [resolve(kibanaDir, 'x-pack')];
64-
const { spec$ } = findPluginSpecs({ plugins: { scanDirs, paths } });
65-
const enabledPlugins = await spec$.pipe(toArray()).toPromise();
66-
const uiExports = collectUiExports(enabledPlugins);
65+
const { spec$, disabledSpec$ } = findPluginSpecs({ plugins: { scanDirs, paths } });
66+
const allPlugins = await Rx.merge(spec$, disabledSpec$)
67+
.pipe(toArray())
68+
.toPromise();
69+
const uiExports = collectUiExports(allPlugins);
6770
const { styleSheetPaths } = uiExports;
6871

6972
log.info('%s %d styleSheetPaths', watch ? 'watching' : 'found', styleSheetPaths.length);

‎src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)