Skip to content

Commit

Permalink
Merge branch 'master' into tech-debt/remove_unused_lib_legacy_code
Browse files Browse the repository at this point in the history
  • Loading branch information
@TinaHeiligers
TinaHeiligers committed Sep 3, 2021
2 parents 91f992a + 1f06caf commit 9e9bceb
Show file tree
Hide file tree
Showing 427 changed files with 10,058 additions and 2,013 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
/src/plugins/kibana_legacy/ @elastic/kibana-vis-editors
/src/plugins/timelion/ @elastic/kibana-vis-editors
/src/plugins/vis_default_editor/ @elastic/kibana-vis-editors
/src/plugins/vis_type_metric/ @elastic/kibana-vis-editors
/src/plugins/vis_types/metric/ @elastic/kibana-vis-editors
/src/plugins/vis_type_table/ @elastic/kibana-vis-editors
/src/plugins/vis_type_tagcloud/ @elastic/kibana-vis-editors
/src/plugins/vis_types/tagcloud/ @elastic/kibana-vis-editors
/src/plugins/vis_type_timelion/ @elastic/kibana-vis-editors
/src/plugins/vis_type_timeseries/ @elastic/kibana-vis-editors
/src/plugins/vis_type_vega/ @elastic/kibana-vis-editors
/src/plugins/vis_types/vega/ @elastic/kibana-vis-editors
/src/plugins/vis_types/vislib/ @elastic/kibana-vis-editors
/src/plugins/vis_types/xy/ @elastic/kibana-vis-editors
/src/plugins/vis_types/pie/ @elastic/kibana-vis-editors
Expand Down
6 changes: 3 additions & 3 deletions .i18nrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
"uiActions": "src/plugins/ui_actions",
"visDefaultEditor": "src/plugins/vis_default_editor",
"visTypeMarkdown": "src/plugins/vis_type_markdown",
"visTypeMetric": "src/plugins/vis_type_metric",
"visTypeMetric": "src/plugins/vis_types/metric",
"visTypeTable": "src/plugins/vis_type_table",
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
"visTypeTagCloud": "src/plugins/vis_types/tagcloud",
"visTypeTimeseries": "src/plugins/vis_type_timeseries",
"visTypeVega": "src/plugins/vis_type_vega",
"visTypeVega": "src/plugins/vis_types/vega",
"visTypeVislib": "src/plugins/vis_types/vislib",
"visTypeXy": "src/plugins/vis_types/xy",
"visTypePie": "src/plugins/vis_types/pie",
Expand Down
8 changes: 4 additions & 4 deletions api_docs/core.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@
"references": [
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/plugin.ts"
"path": "src/plugins/vis_types/vega/public/plugin.ts"
}
]
},
Expand Down Expand Up @@ -1423,15 +1423,15 @@
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/data_model/search_api.ts"
"path": "src/plugins/vis_types/vega/public/data_model/search_api.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/plugin.ts"
"path": "src/plugins/vis_types/vega/public/plugin.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts"
"path": "src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts"
}
]
}
Expand Down
20 changes: 10 additions & 10 deletions api_docs/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16157,11 +16157,11 @@
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "dashboard",
Expand Down Expand Up @@ -20282,15 +20282,15 @@
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
}
],
"children": [
Expand Down Expand Up @@ -22396,7 +22396,7 @@
},
{
"plugin": "visTypeMetric",
"path": "src/plugins/vis_type_metric/public/plugin.ts"
"path": "src/plugins/vis_types/metric/public/plugin.ts"
},
{
"plugin": "visTypeTable",
Expand Down Expand Up @@ -30417,11 +30417,11 @@
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "dashboard",
Expand Down Expand Up @@ -36898,11 +36898,11 @@
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "visTypeVega",
"path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
"path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
},
{
"plugin": "dashboard",
Expand Down
14 changes: 7 additions & 7 deletions api_docs/deprecations_by_plugin.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex

| Deprecated API | Reference location(s) | Remove By |
| ---------------|-----------|-----------|
| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_metric/public/plugin.ts#:~:text=fieldFormats) | - |
| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/metric/public/plugin.ts#:~:text=fieldFormats) | - |



Expand Down Expand Up @@ -738,12 +738,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex

| Deprecated API | Reference location(s) | Remove By |
| ---------------|-----------|-----------|
| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata) | - |
| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata) | - |
| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |



Expand Down
4 changes: 2 additions & 2 deletions api_docs/vis_type_vega.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"tags": [],
"label": "VisTypeVegaPluginStart",
"description": [],
"path": "src/plugins/vis_type_vega/server/types.ts",
"path": "src/plugins/vis_types/vega/server/types.ts",
"deprecated": false,
"children": [],
"lifecycle": "start",
Expand All @@ -35,7 +35,7 @@
"tags": [],
"label": "VisTypeVegaPluginSetup",
"description": [],
"path": "src/plugins/vis_type_vega/server/types.ts",
"path": "src/plugins/vis_types/vega/server/types.ts",
"deprecated": false,
"children": [],
"lifecycle": "setup",
Expand Down
6 changes: 3 additions & 3 deletions docs/developer/plugin-list.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ The plugin exposes the static DefaultEditorController class to consume.
|The markdown visualization that can be used to place text panels on dashboards.
|{kib-repo}blob/{branch}/src/plugins/vis_type_metric[visTypeMetric]
|{kib-repo}blob/{branch}/src/plugins/vis_types/metric[visTypeMetric]
|WARNING: Missing README.
Expand All @@ -298,7 +298,7 @@ The plugin exposes the static DefaultEditorController class to consume.
|Contains the data table visualization, that allows presenting data in a simple table format.
|{kib-repo}blob/{branch}/src/plugins/vis_type_tagcloud[visTypeTagcloud]
|{kib-repo}blob/{branch}/src/plugins/vis_types/tagcloud[visTypeTagcloud]
|WARNING: Missing README.
Expand All @@ -310,7 +310,7 @@ The plugin exposes the static DefaultEditorController class to consume.
|WARNING: Missing README.
|{kib-repo}blob/{branch}/src/plugins/vis_type_vega[visTypeVega]
|{kib-repo}blob/{branch}/src/plugins/vis_types/vega[visTypeVega]
|WARNING: Missing README.
Expand Down
4 changes: 2 additions & 2 deletions docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ async function getDeprecations({ esClient, savedObjectsClient }: GetDeprecations
// Example of a manual correctiveAction
deprecations.push({
title: i18n.translate('xpack.timelion.deprecations.worksheetsTitle', {
defaultMessage: 'Found Timelion worksheets.'
defaultMessage: 'Timelion worksheets are deprecated'
}),
message: i18n.translate('xpack.timelion.deprecations.worksheetsMessage', {
defaultMessage: 'You have {count} Timelion worksheets. The Timelion app will be removed in 8.0. To continue using your Timelion worksheets, migrate them to a dashboard.',
defaultMessage: 'You have {count} Timelion worksheets. Migrate your Timelion worksheets to a dashboard to continue using them.',
values: { count },
}),
documentationUrl:
Expand Down
2 changes: 1 addition & 1 deletion docs/management/connectors/action-types/email.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Use the <<action-settings, Action configuration settings>> to customize connecto

Config defines information for the connector type.

`service`:: The name of a https://nodemailer.com/smtp/well-known/[well-known email service provider]. If `service` is provided, `host`, `port`, and `secure` properties are ignored. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
`service`:: The name of the email service. If `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's https://nodemailer.com/smtp/well-known/[well-known email service providers], `host`, `port`, and `secure` properties are ignored. If `service` is `other`, `host` and `port` properties must be defined. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
`from`:: An email address that corresponds to *Sender*.
`host`:: A string that corresponds to *Host*.
`port`:: A number that corresponds to *Port*.
Expand Down
2 changes: 1 addition & 1 deletion docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Rules are taking a long time to execute and are impacting the overall health of

[IMPORTANT]
==============================================
By default, only users with a `superuser` role can query the {kib} event log because it is a system index. To enable additional users to execute this query, assign `read` privileges to the `.kibana-event-log*` index.
By default, only users with a `superuser` role can query the experimental[] {kib} event log because it is a system index. To enable additional users to execute this query, assign `read` privileges to the `.kibana-event-log*` index.
==============================================

*Solution*
Expand Down
2 changes: 2 additions & 0 deletions docs/user/alerting/troubleshooting/event-log-index.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
[[event-log-index]]
=== Event log index

experimental[]

Use the event log index to determine:

* Whether a rule successfully ran but its associated actions did not
Expand Down
2 changes: 2 additions & 0 deletions docs/user/production-considerations/alerting-production-considerations.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Predicting the buffer required to account for actions depends heavily on the rul
[[event-log-ilm]]
=== Event log index lifecycle managment

experimental[]

Alerts and actions log activity in a set of "event log" indices. These indices are configured with an index lifecycle management (ILM) policy, which you can customize. The default policy rolls over the index when it reaches 50GB, or after 30 days. Indices over 90 days old are deleted.

The name of the index policy is `kibana-event-log-policy`. {kib} creates the index policy on startup, if it doesn't already exist. The index policy can be customized for your environment, but {kib} never modifies the index policy after creating it.
Expand Down
14 changes: 1 addition & 13 deletions packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,14 @@

import { KbnClientStatus } from './kbn_client_status';

const PLUGIN_STATUS_ID = /^plugin:(.+?)@/;

export class KbnClientPlugins {
constructor(private readonly status: KbnClientStatus) {}
/**
* Get a list of plugin ids that are enabled on the server
*/
public async getEnabledIds() {
const pluginIds: string[] = [];
const apiResp = await this.status.get();

for (const status of apiResp.status.statuses) {
if (status.id) {
const match = status.id.match(PLUGIN_STATUS_ID);
if (match) {
pluginIds.push(match[1]);
}
}
}

return pluginIds;
return Object.keys(apiResp.status.plugins);
}
}
17 changes: 8 additions & 9 deletions packages/kbn-test/src/kbn_client/kbn_client_status.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
import { KbnClientRequester } from './kbn_client_requester';

interface Status {
state: 'green' | 'red' | 'yellow';
title?: string;
id?: string;
icon: string;
message: string;
uiColor: string;
since: string;
level: 'available' | 'degraded' | 'unavailable' | 'critical';
summary: string;
detail?: string;
documentationUrl?: string;
meta?: Record<string, unknown>;
}

interface ApiResponseStatus {
Expand All @@ -29,7 +27,8 @@ interface ApiResponseStatus {
};
status: {
overall: Status;
statuses: Status[];
core: Record<string, Status>;
plugins: Record<string, Status>;
};
metrics: unknown;
}
Expand All @@ -55,6 +54,6 @@ export class KbnClientStatus {
*/
public async getOverallState() {
const status = await this.get();
return status.status.overall.state;
return status.status.overall.level;
}
}
1 change: 1 addition & 0 deletions scripts/functional_tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const onlyNotInCoverageTests = [
require.resolve('../test/api_integration/config.js'),
require.resolve('../test/interpreter_functional/config.ts'),
require.resolve('../test/examples/config.js'),
require.resolve('../test/functional_execution_context/config.ts'),
];

require('../src/setup_node_env');
Expand Down
2 changes: 1 addition & 1 deletion src/core/public/core_app/status/lib/load_status.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export async function loadStatus({
let response: StatusResponse;

try {
response = await http.get('/api/status', { query: { v8format: true } });
response = await http.get('/api/status');
} catch (e) {
// API returns a 503 response if not all services are available.
// In this case, we want to treat this as a successful API call, so that we can
Expand Down
6 changes: 4 additions & 2 deletions src/core/server/core_usage_data/core_usage_data_service.mock.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ import { PublicMethodsOf } from '@kbn/utility-types';
import { BehaviorSubject } from 'rxjs';
import { CoreUsageDataService } from './core_usage_data_service';
import { coreUsageStatsClientMock } from './core_usage_stats_client.mock';
import { CoreUsageData, CoreUsageDataSetup, CoreUsageDataStart } from './types';
import { CoreUsageData, InternalCoreUsageDataSetup, CoreUsageDataStart } from './types';

const createSetupContractMock = (usageStatsClient = coreUsageStatsClientMock.create()) => {
const setupContract: jest.Mocked<CoreUsageDataSetup> = {
const setupContract: jest.Mocked<InternalCoreUsageDataSetup> = {
registerType: jest.fn(),
getClient: jest.fn().mockReturnValue(usageStatsClient),
registerUsageCounter: jest.fn(),
incrementUsageCounter: jest.fn(),
};
return setupContract;
};
Expand Down
Loading

0 comments on commit 9e9bceb

Please sign in to comment.