|
-
+ {field ? (
+
+ ) : (
+
+ )}
|
{isCollapsible && (
)}
{displayUnderscoreWarning && }
+ {field ? null : {key}: }
void;
+ /**
+ * Counter how often data was fetched (used for testing)
+ */
+ fetchCounter: number;
+ /**
+ * Error in case of a failing document fetch
+ */
+ fetchError?: Error;
+ /**
+ * Statistics by fields calculated using the fetched documents
+ */
+ fieldCounts: Record ;
+ /**
+ * Histogram aggregation data
+ */
+ histogramData?: Chart;
+ /**
+ * Number of documents found by recent fetch
+ */
+ hits: number;
+ /**
+ * Current IndexPattern
+ */
+ indexPattern: IndexPattern;
+ /**
+ * Value needed for legacy "infinite" loading functionality
+ * Determins how much records are rendered using the legacy table
+ * Increased when scrolling down
+ */
+ minimumVisibleRows: number;
+ /**
+ * Function to add a column to state
+ */
+ onAddColumn: (column: string) => void;
+ /**
+ * Function to add a filter to state
+ */
+ onAddFilter: DocViewFilterFn;
+ /**
+ * Function to change the used time interval of the date histogram
+ */
+ onChangeInterval: (interval: string) => void;
+ /**
+ * Function to move a given column to a given index, used in legacy table
+ */
+ onMoveColumn: (columns: string, newIdx: number) => void;
+ /**
+ * Function to remove a given column from state
+ */
+ onRemoveColumn: (column: string) => void;
+ /**
+ * Function to replace columns in state
+ */
+ onSetColumns: (columns: string[]) => void;
+ /**
+ * Function to scroll down the legacy table to the bottom
+ */
+ onSkipBottomButtonClick: () => void;
+ /**
+ * Function to change sorting of the table, triggers a fetch
+ */
+ onSort: (sort: string[][]) => void;
+ opts: {
+ /**
+ * Date histogram aggregation config
+ */
+ chartAggConfigs?: AggConfigs;
+ /**
+ * Client of uiSettings
+ */
+ config: IUiSettingsClient;
+ /**
+ * Data plugin
+ */
+ data: DataPublicPluginStart;
+ /**
+ * Data plugin filter manager
+ */
+ filterManager: FilterManager;
+ /**
+ * List of available index patterns
+ */
+ indexPatternList: Array>;
+ /**
+ * The number of documents that can be displayed in the table/grid
+ */
+ sampleSize: number;
+ /**
+ * Current instance of SavedSearch
+ */
+ savedSearch: SavedSearch;
+ /**
+ * Function to set the header menu
+ */
+ setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
+ /**
+ * Timefield of the currently used index pattern
+ */
+ timefield: string;
+ /**
+ * Function to set the current state
+ */
+ setAppState: (state: Partial) => void;
+ };
+ /**
+ * Function to reset the current query
+ */
+ resetQuery: () => void;
+ /**
+ * Current state of the actual query, one of 'uninitialized', 'loading' ,'ready', 'none'
+ */
+ resultState: string;
+ /**
+ * Array of document of the recent successful search request
+ */
+ rows: ElasticSearchHit[];
+ /**
+ * Instance of SearchSource, the high level search API
+ */
+ searchSource: ISearchSource;
+ /**
+ * Function to change the current index pattern
+ */
+ setIndexPattern: (id: string) => void;
+ /**
+ * Current app state of URL
+ */
+ state: AppState;
+ /**
+ * Function to update the time filter
+ */
+ timefilterUpdateHandler: (ranges: { from: number; to: number }) => void;
+ /**
+ * Currently selected time range
+ */
+ timeRange?: { from: string; to: string };
+ /**
+ * Menu data of top navigation (New, save ...)
+ */
+ topNavMenu: TopNavMenuData[];
+ /**
+ * Function to update the actual query
+ */
+ updateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
+ /**
+ * Function to update the actual savedQuery id
+ */
+ updateSavedQueryId: (savedQueryId?: string) => void;
+}
diff --git a/src/plugins/discover/public/application/helpers/columns.test.ts b/src/plugins/discover/public/application/helpers/columns.test.ts
new file mode 100644
index 0000000000000..d455fd1f42c6d
--- /dev/null
+++ b/src/plugins/discover/public/application/helpers/columns.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+
+import { getDisplayedColumns } from './columns';
+import { indexPatternWithTimefieldMock } from '../../__mocks__/index_pattern_with_timefield';
+import { indexPatternMock } from '../../__mocks__/index_pattern';
+
+describe('getDisplayedColumns', () => {
+ test('returns default columns given a index pattern without timefield', async () => {
+ const result = getDisplayedColumns([], indexPatternMock);
+ expect(result).toMatchInlineSnapshot(`
+ Array [
+ "_source",
+ ]
+ `);
+ });
+ test('returns default columns given a index pattern with timefield', async () => {
+ const result = getDisplayedColumns([], indexPatternWithTimefieldMock);
+ expect(result).toMatchInlineSnapshot(`
+ Array [
+ "_source",
+ ]
+ `);
+ });
+ test('returns default columns when just timefield is in state', async () => {
+ const result = getDisplayedColumns(['timestamp'], indexPatternWithTimefieldMock);
+ expect(result).toMatchInlineSnapshot(`
+ Array [
+ "_source",
+ ]
+ `);
+ });
+ test('returns columns given by argument, no fallback ', async () => {
+ const result = getDisplayedColumns(['test'], indexPatternWithTimefieldMock);
+ expect(result).toMatchInlineSnapshot(`
+ Array [
+ "test",
+ ]
+ `);
+ });
+});
diff --git a/src/plugins/discover/public/application/helpers/columns.ts b/src/plugins/discover/public/application/helpers/columns.ts
new file mode 100644
index 0000000000000..d2d47c932b7bd
--- /dev/null
+++ b/src/plugins/discover/public/application/helpers/columns.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+import { IndexPattern } from '../../../../data/common';
+
+/**
+ * Function to provide fallback when
+ * 1) no columns are given
+ * 2) Just one column is given, which is the configured timefields
+ */
+export function getDisplayedColumns(stateColumns: string[] = [], indexPattern: IndexPattern) {
+ return stateColumns &&
+ stateColumns.length > 0 &&
+ // check if all columns where removed except the configured timeField (this can't be removed)
+ !(stateColumns.length === 1 && stateColumns[0] === indexPattern.timeFieldName)
+ ? stateColumns
+ : ['_source'];
+}
diff --git a/src/plugins/discover/public/get_inner_angular.ts b/src/plugins/discover/public/get_inner_angular.ts
index b27426a6c0621..4eda742d967f4 100644
--- a/src/plugins/discover/public/get_inner_angular.ts
+++ b/src/plugins/discover/public/get_inner_angular.ts
@@ -42,7 +42,6 @@ import {
} from '../../kibana_legacy/public';
import { DiscoverStartPlugins } from './plugin';
import { getScopedHistory } from './kibana_services';
-import { createDiscoverLegacyDirective } from './application/components/create_discover_legacy_directive';
import { createDiscoverDirective } from './application/components/create_discover_directive';
/**
@@ -124,7 +123,6 @@ export function initializeInnerAngularModule(
.config(watchMultiDecorator)
.run(registerListenEventListener)
.directive('renderComplete', createRenderCompleteDirective)
- .directive('discoverLegacy', createDiscoverLegacyDirective)
.directive('discover', createDiscoverDirective);
}
diff --git a/src/plugins/kibana_usage_collection/README.md b/src/plugins/kibana_usage_collection/README.md
index 69711d30cdc74..85d362cf0a9b1 100644
--- a/src/plugins/kibana_usage_collection/README.md
+++ b/src/plugins/kibana_usage_collection/README.md
@@ -6,6 +6,6 @@ This plugin registers the basic usage collectors from Kibana:
- UI Metrics
- Ops stats
- Number of Saved Objects per type
-- Non-default UI Settings
+- [User-changed UI Settings](./server/collectors/management/README.md)
- CSP configuration
- Core Metrics
diff --git a/src/plugins/kibana_usage_collection/common/constants.ts b/src/plugins/kibana_usage_collection/common/constants.ts
index 4505c59e0f630..052367765a6ec 100644
--- a/src/plugins/kibana_usage_collection/common/constants.ts
+++ b/src/plugins/kibana_usage_collection/common/constants.ts
@@ -13,3 +13,7 @@ export const PLUGIN_NAME = 'kibana_usage_collection';
* The type name used to publish Kibana usage stats in the formatted as bulk.
*/
export const KIBANA_STATS_TYPE = 'kibana_stats';
+/**
+ * Redacted keyword; used as a value for sensitive ui settings
+ */
+export const REDACTED_KEYWORD = '[REDACTED]';
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/README.md b/src/plugins/kibana_usage_collection/server/collectors/management/README.md
new file mode 100644
index 0000000000000..b539136d57b89
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/README.md
@@ -0,0 +1,51 @@
+# User-changed UI Settings - Management Collector
+
+The Usage Collector `stack_management` reports user changed settings.
+All user changed UI Settings are automatically collected.
+
+After adding a new setting you will be required to do the following steps:
+
+1. Update the [schema](./schema.ts) to include the setting name and schema type.
+```
+export const stackManagementSchema: MakeSchemaFrom = {
+ 'MY_UI_SETTING': { type: 'keyword' },
+}
+```
+
+2. Update the [UsageStats interface](./types.ts) with the setting name and typescript type.
+```
+export interface UsageStats {
+ 'MY_UI_SETTING': string;
+}
+```
+3. Run the telemetry checker with `--fix` flag to automatically fix the mappings
+
+```
+node scripts/telemetry_check --fix
+```
+
+If you forget any of the steps our telemetry tools and tests will help you through the process!
+
+## Sensitive fields
+
+If the configured UI setting might contain user sensitive information simply add the property `sensitive: true` to the ui setting registration config.
+
+```
+uiSettings.register({
+ [NEWS_FEED_URL_SETTING]: {
+ name: i18n.translate('xpack.securitySolution.uiSettings.newsFeedUrl', {
+ defaultMessage: 'News feed URL',
+ }),
+ value: NEWS_FEED_URL_SETTING_DEFAULT,
+ sensitive: true,
+ description: i18n.translate('xpack.securitySolution.uiSettings.newsFeedUrlDescription', {
+ defaultMessage: 'News feed content will be retrieved from this URL ',
+ }),
+ category: [APP_ID],
+ requiresPageReload: true,
+ schema: schema.string(),
+ },
+}),
+```
+
+The value of any UI setting marked as `sensitive` will be reported as a keyword `[REDACTED]` instead of the actual value. This hides the actual sensitive information while giving us some intelligence over which fields the users are interactive with the most.
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/__snapshots__/index.test.ts.snap b/src/plugins/kibana_usage_collection/server/collectors/management/__snapshots__/index.test.ts.snap
deleted file mode 100644
index def230dea8d70..0000000000000
--- a/src/plugins/kibana_usage_collection/server/collectors/management/__snapshots__/index.test.ts.snap
+++ /dev/null
@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`telemetry_application_usage_collector fetch() 1`] = `
-Object {
- "my-key": "my-value",
-}
-`;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/index.test.ts b/src/plugins/kibana_usage_collection/server/collectors/management/index.test.ts
deleted file mode 100644
index 38baf02d6fe1b..0000000000000
--- a/src/plugins/kibana_usage_collection/server/collectors/management/index.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { loggingSystemMock, uiSettingsServiceMock } from '../../../../../core/server/mocks';
-import {
- Collector,
- createUsageCollectionSetupMock,
- createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/usage_collection.mock';
-
-import { registerManagementUsageCollector } from './';
-
-const logger = loggingSystemMock.createLogger();
-
-describe('telemetry_application_usage_collector', () => {
- let collector: Collector;
-
- const usageCollectionMock = createUsageCollectionSetupMock();
- usageCollectionMock.makeUsageCollector.mockImplementation((config) => {
- collector = new Collector(logger, config);
- return createUsageCollectionSetupMock().makeUsageCollector(config);
- });
-
- const uiSettingsClient = uiSettingsServiceMock.createClient();
- const getUiSettingsClient = jest.fn(() => uiSettingsClient);
- const mockedFetchContext = createCollectorFetchContextMock();
-
- beforeAll(() => {
- registerManagementUsageCollector(usageCollectionMock, getUiSettingsClient);
- });
-
- test('registered collector is set', () => {
- expect(collector).not.toBeUndefined();
- });
-
- test('isReady() => false if no client', () => {
- getUiSettingsClient.mockImplementationOnce(() => undefined as any);
- expect(collector.isReady()).toBe(false);
- });
-
- test('isReady() => true', () => {
- expect(collector.isReady()).toBe(true);
- });
-
- test('fetch()', async () => {
- uiSettingsClient.getUserProvided.mockImplementationOnce(async () => ({
- 'my-key': { userValue: 'my-value' },
- }));
- await expect(collector.fetch(mockedFetchContext)).resolves.toMatchSnapshot();
- });
-
- test('fetch() should not fail if invoked when not ready', async () => {
- getUiSettingsClient.mockImplementationOnce(() => undefined as any);
- await expect(collector.fetch(mockedFetchContext)).resolves.toBe(undefined);
- });
-});
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index 28eeb461f7a86..b644f282c1f36 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -7,18 +7,25 @@
*/
import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
-import { UsageStats } from './telemetry_management_collector';
+import { UsageStats } from './types';
-// Retrieved by changing all the current settings in Kibana (we'll need to revisit it in the future).
-// I would suggest we use flattened type for the mappings of this collector.
export const stackManagementSchema: MakeSchemaFrom = {
+ // sensitive
+ 'timelion:quandl.key': { type: 'keyword' },
+ 'securitySolution:defaultIndex': { type: 'keyword' },
+ 'securitySolution:newsFeedUrl': { type: 'keyword' },
+ 'xpackReporting:customPdfLogo': { type: 'keyword' },
+ 'notifications:banner': { type: 'keyword' },
+ 'timelion:graphite.url': { type: 'keyword' },
+ 'xpackDashboardMode:roles': { type: 'keyword' },
+ 'securitySolution:ipReputationLinks': { type: 'keyword' },
+ // non-sensitive
'visualize:enableLabs': { type: 'boolean' },
'visualization:heatmap:maxBuckets': { type: 'long' },
'visualization:colorMapping': { type: 'text' },
'visualization:regionmap:showWarnings': { type: 'boolean' },
'visualization:dimmingOpacity': { type: 'float' },
'visualization:tileMap:maxPrecision': { type: 'long' },
- 'securitySolution:ipReputationLinks': { type: 'text' },
'csv:separator': { type: 'keyword' },
'visualization:tileMap:WMSdefaults': { type: 'text' },
'timelion:target_buckets': { type: 'long' },
@@ -27,14 +34,11 @@ export const stackManagementSchema: MakeSchemaFrom = {
'timelion:min_interval': { type: 'keyword' },
'timelion:default_rows': { type: 'long' },
'timelion:default_columns': { type: 'long' },
- 'timelion:quandl.key': { type: 'keyword' },
'timelion:es.default_index': { type: 'keyword' },
'timelion:showTutorial': { type: 'boolean' },
'securitySolution:timeDefaults': { type: 'keyword' },
'securitySolution:defaultAnomalyScore': { type: 'long' },
- 'securitySolution:defaultIndex': { type: 'keyword' }, // it's an array
'securitySolution:refreshIntervalDefaults': { type: 'keyword' },
- 'securitySolution:newsFeedUrl': { type: 'keyword' },
'securitySolution:enableNewsFeed': { type: 'boolean' },
'search:includeFrozen': { type: 'boolean' },
'courier:maxConcurrentShardRequests': { type: 'long' },
@@ -43,21 +47,29 @@ export const stackManagementSchema: MakeSchemaFrom = {
'courier:customRequestPreference': { type: 'keyword' },
'courier:ignoreFilterIfFieldNotInIndex': { type: 'boolean' },
'rollups:enableIndexPatterns': { type: 'boolean' },
- 'xpackReporting:customPdfLogo': { type: 'text' },
'notifications:lifetime:warning': { type: 'long' },
'notifications:lifetime:banner': { type: 'long' },
'notifications:lifetime:info': { type: 'long' },
- 'notifications:banner': { type: 'text' },
'notifications:lifetime:error': { type: 'long' },
'doc_table:highlight': { type: 'boolean' },
'discover:searchOnPageLoad': { type: 'boolean' },
// eslint-disable-next-line @typescript-eslint/naming-convention
'doc_table:hideTimeColumn': { type: 'boolean' },
'discover:sampleSize': { type: 'long' },
- defaultColumns: { type: 'keyword' }, // it's an array
+ defaultColumns: {
+ type: 'array',
+ items: {
+ type: 'keyword',
+ },
+ },
'context:defaultSize': { type: 'long' },
'discover:aggs:terms:size': { type: 'long' },
- 'context:tieBreakerFields': { type: 'keyword' }, // it's an array
+ 'context:tieBreakerFields': {
+ type: 'array',
+ items: {
+ type: 'keyword',
+ },
+ },
'discover:sort:defaultOrder': { type: 'keyword' },
'context:step': { type: 'long' },
'accessibility:disableAnimations': { type: 'boolean' },
@@ -79,7 +91,12 @@ export const stackManagementSchema: MakeSchemaFrom = {
'query:queryString:options': { type: 'keyword' },
'metrics:max_buckets': { type: 'long' },
'query:allowLeadingWildcards': { type: 'boolean' },
- metaFields: { type: 'keyword' }, // it's an array
+ metaFields: {
+ type: 'array',
+ items: {
+ type: 'keyword',
+ },
+ },
'indexPattern:placeholder': { type: 'keyword' },
'histogram:barTarget': { type: 'long' },
'histogram:maxBars': { type: 'long' },
@@ -101,4 +118,14 @@ export const stackManagementSchema: MakeSchemaFrom = {
'csv:quoteValues': { type: 'boolean' },
'dateFormat:dow': { type: 'keyword' },
dateFormat: { type: 'keyword' },
+ 'autocomplete:useTimeRange': { type: 'boolean' },
+ 'search:timeout': { type: 'long' },
+ 'visualization:visualize:legacyChartsLibrary': { type: 'boolean' },
+ 'doc_table:legacy': { type: 'boolean' },
+ 'discover:modifyColumnsOnSwitch': { type: 'boolean' },
+ 'discover:searchFieldsFromSource': { type: 'boolean' },
+ 'securitySolution:rulesTableRefresh': { type: 'text' },
+ 'apm:enableSignificantTerms': { type: 'boolean' },
+ 'apm:enableServiceOverview': { type: 'boolean' },
+ 'apm:enableCorrelations': { type: 'boolean' },
};
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
new file mode 100644
index 0000000000000..4bcd98f894e2a
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+
+import { loggingSystemMock, uiSettingsServiceMock } from '../../../../../core/server/mocks';
+import {
+ Collector,
+ createUsageCollectionSetupMock,
+ createCollectorFetchContextMock,
+} from '../../../../usage_collection/server/usage_collection.mock';
+
+import {
+ registerManagementUsageCollector,
+ createCollectorFetch,
+} from './telemetry_management_collector';
+
+const logger = loggingSystemMock.createLogger();
+
+describe('telemetry_application_usage_collector', () => {
+ let collector: Collector;
+
+ const usageCollectionMock = createUsageCollectionSetupMock();
+ usageCollectionMock.makeUsageCollector.mockImplementation((config) => {
+ collector = new Collector(logger, config);
+ return createUsageCollectionSetupMock().makeUsageCollector(config);
+ });
+
+ const uiSettingsClient = uiSettingsServiceMock.createClient();
+ const getUiSettingsClient = jest.fn(() => uiSettingsClient);
+ const mockedFetchContext = createCollectorFetchContextMock();
+
+ beforeAll(() => {
+ registerManagementUsageCollector(usageCollectionMock, getUiSettingsClient);
+ });
+
+ test('registered collector is set', () => {
+ expect(collector).not.toBeUndefined();
+ });
+
+ test('isReady() => false if no client', () => {
+ getUiSettingsClient.mockImplementationOnce(() => undefined as any);
+ expect(collector.isReady()).toBe(false);
+ });
+
+ test('isReady() => true', () => {
+ expect(collector.isReady()).toBe(true);
+ });
+
+ test('fetch()', async () => {
+ uiSettingsClient.getUserProvided.mockImplementationOnce(async () => ({
+ 'visualization:colorMapping': { userValue: 'red' },
+ }));
+ await expect(collector.fetch(mockedFetchContext)).resolves.toEqual({
+ 'visualization:colorMapping': 'red',
+ });
+ });
+
+ test('fetch() should not fail if invoked when not ready', async () => {
+ getUiSettingsClient.mockImplementationOnce(() => undefined as any);
+ await expect(collector.fetch(mockedFetchContext)).resolves.toBe(undefined);
+ });
+});
+
+describe('createCollectorFetch', () => {
+ const mockUserSettings = {
+ item1: { userValue: 'test' },
+ item2: { userValue: 123 },
+ item3: { userValue: false },
+ };
+
+ const mockIsSensitive = (key: string) => {
+ switch (key) {
+ case 'item1':
+ case 'item2':
+ return false;
+ case 'item3':
+ return true;
+ default:
+ throw new Error(`Unexpected ui setting: ${key}`);
+ }
+ };
+
+ it('returns #fetchUsageStats function', () => {
+ const getUiSettingsClient = jest.fn(() => undefined);
+ const fetchFunction = createCollectorFetch(getUiSettingsClient);
+ expect(typeof fetchFunction).toBe('function');
+ });
+
+ describe('#fetchUsageStats', () => {
+ it('returns undefined if no uiSettingsClient returned from getUiSettingsClient', async () => {
+ const getUiSettingsClient = jest.fn(() => undefined);
+ const fetchFunction = createCollectorFetch(getUiSettingsClient);
+ const result = await fetchFunction();
+ expect(result).toBe(undefined);
+ expect(getUiSettingsClient).toBeCalledTimes(1);
+ });
+
+ it('returns all user changed settings', async () => {
+ const uiSettingsClient = uiSettingsServiceMock.createClient();
+ const getUiSettingsClient = jest.fn(() => uiSettingsClient);
+ uiSettingsClient.getUserProvided.mockResolvedValue(mockUserSettings);
+ uiSettingsClient.isSensitive.mockImplementation(mockIsSensitive);
+ const fetchFunction = createCollectorFetch(getUiSettingsClient);
+ const result = await fetchFunction();
+ expect(typeof result).toBe('object');
+ expect(Object.keys(result!)).toEqual(Object.keys(mockUserSettings));
+ });
+
+ it('returns the actual values of non-sensitive settings', async () => {
+ const uiSettingsClient = uiSettingsServiceMock.createClient();
+ const getUiSettingsClient = jest.fn(() => uiSettingsClient);
+ uiSettingsClient.getUserProvided.mockResolvedValue(mockUserSettings);
+ uiSettingsClient.isSensitive.mockImplementation(mockIsSensitive);
+ const fetchFunction = createCollectorFetch(getUiSettingsClient);
+ const result = await fetchFunction();
+ expect(typeof result).toBe('object');
+ expect(result!).toMatchObject({
+ item1: 'test',
+ item2: 123,
+ });
+ });
+
+ it('returns [REDACTED] as a value for sensitive settings', async () => {
+ const uiSettingsClient = uiSettingsServiceMock.createClient();
+ const getUiSettingsClient = jest.fn(() => uiSettingsClient);
+ uiSettingsClient.getUserProvided.mockResolvedValue(mockUserSettings);
+ uiSettingsClient.isSensitive.mockImplementation(mockIsSensitive);
+ const fetchFunction = createCollectorFetch(getUiSettingsClient);
+ const result = await fetchFunction();
+ expect(typeof result).toBe('object');
+ expect(result!).toMatchObject({
+ item3: '[REDACTED]',
+ });
+ });
+ });
+});
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
index c45f3d6139d95..651fbbd5a897a 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
@@ -9,12 +9,8 @@
import { IUiSettingsClient } from 'kibana/server';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import { stackManagementSchema } from './schema';
-
-export interface UsageStats extends Record {
- // We don't support `type` yet. Only interfaces. So I added at least 1 known key to the generic
- // Record extension to avoid eslint reverting it back to a `type`
- 'visualize:enableLabs': boolean;
-}
+import { UsageStats } from './types';
+import { REDACTED_KEYWORD } from '../../../common/constants';
export function createCollectorFetch(getUiSettingsClient: () => IUiSettingsClient | undefined) {
return async function fetchUsageStats(): Promise {
@@ -23,11 +19,12 @@ export function createCollectorFetch(getUiSettingsClient: () => IUiSettingsClien
return;
}
- const user = await uiSettingsClient.getUserProvided();
- const modifiedEntries = Object.keys(user)
- .filter((key: string) => key !== 'buildNum')
- .reduce((obj: any, key: string) => {
- obj[key] = user[key].userValue;
+ const userProvided = await uiSettingsClient.getUserProvided();
+ const modifiedEntries = Object.entries(userProvided)
+ .filter(([key]) => key !== 'buildNum')
+ .reduce((obj: any, [key, { userValue }]) => {
+ const sensitive = uiSettingsClient.isSensitive(key);
+ obj[key] = sensitive ? REDACTED_KEYWORD : userValue;
return obj;
}, {});
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
new file mode 100644
index 0000000000000..417841ee89569
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+
+export interface UsageStats {
+ /**
+ * sensitive settings
+ */
+ 'timelion:quandl.key': string;
+ 'securitySolution:defaultIndex': string;
+ 'securitySolution:newsFeedUrl': string;
+ 'xpackReporting:customPdfLogo': string;
+ 'notifications:banner': string;
+ 'timelion:graphite.url': string;
+ 'xpackDashboardMode:roles': string;
+ 'securitySolution:ipReputationLinks': string;
+ /**
+ * non-sensitive settings
+ */
+ 'autocomplete:useTimeRange': boolean;
+ 'search:timeout': number;
+ 'visualization:visualize:legacyChartsLibrary': boolean;
+ 'doc_table:legacy': boolean;
+ 'discover:modifyColumnsOnSwitch': boolean;
+ 'discover:searchFieldsFromSource': boolean;
+ 'securitySolution:rulesTableRefresh': string;
+ 'apm:enableSignificantTerms': boolean;
+ 'apm:enableServiceOverview': boolean;
+ 'apm:enableCorrelations': boolean;
+ 'visualize:enableLabs': boolean;
+ 'visualization:heatmap:maxBuckets': number;
+ 'visualization:colorMapping': string;
+ 'visualization:regionmap:showWarnings': boolean;
+ 'visualization:dimmingOpacity': number;
+ 'visualization:tileMap:maxPrecision': number;
+ 'csv:separator': string;
+ 'visualization:tileMap:WMSdefaults': string;
+ 'timelion:target_buckets': number;
+ 'timelion:max_buckets': number;
+ 'timelion:es.timefield': string;
+ 'timelion:min_interval': string;
+ 'timelion:default_rows': number;
+ 'timelion:default_columns': number;
+ 'timelion:es.default_index': string;
+ 'timelion:showTutorial': boolean;
+ 'securitySolution:timeDefaults': string;
+ 'securitySolution:defaultAnomalyScore': number;
+ 'securitySolution:refreshIntervalDefaults': string;
+ 'securitySolution:enableNewsFeed': boolean;
+ 'search:includeFrozen': boolean;
+ 'courier:maxConcurrentShardRequests': number;
+ 'courier:batchSearches': boolean;
+ 'courier:setRequestPreference': string;
+ 'courier:customRequestPreference': string;
+ 'courier:ignoreFilterIfFieldNotInIndex': boolean;
+ 'rollups:enableIndexPatterns': boolean;
+ 'notifications:lifetime:warning': number;
+ 'notifications:lifetime:banner': number;
+ 'notifications:lifetime:info': number;
+ 'notifications:lifetime:error': number;
+ 'doc_table:highlight': boolean;
+ 'discover:searchOnPageLoad': boolean;
+ // eslint-disable-next-line @typescript-eslint/naming-convention
+ 'doc_table:hideTimeColumn': boolean;
+ 'discover:sampleSize': number;
+ defaultColumns: string[];
+ 'context:defaultSize': number;
+ 'discover:aggs:terms:size': number;
+ 'context:tieBreakerFields': string[];
+ 'discover:sort:defaultOrder': string;
+ 'context:step': number;
+ 'accessibility:disableAnimations': boolean;
+ 'ml:fileDataVisualizerMaxFileSize': string;
+ 'ml:anomalyDetection:results:enableTimeDefaults': boolean;
+ 'ml:anomalyDetection:results:timeDefaults': string;
+ 'truncate:maxHeight': number;
+ 'timepicker:timeDefaults': string;
+ 'timepicker:refreshIntervalDefaults': string;
+ 'timepicker:quickRanges': string;
+ 'theme:version': string;
+ 'theme:darkMode': boolean;
+ 'state:storeInSessionStorage': boolean;
+ 'savedObjects:perPage': number;
+ 'search:queryLanguage': string;
+ 'shortDots:enable': boolean;
+ 'sort:options': string;
+ 'savedObjects:listingLimit': number;
+ 'query:queryString:options': string;
+ 'metrics:max_buckets': number;
+ 'query:allowLeadingWildcards': boolean;
+ metaFields: string[];
+ 'indexPattern:placeholder': string;
+ 'histogram:barTarget': number;
+ 'histogram:maxBars': number;
+ 'format:number:defaultLocale': string;
+ 'format:percent:defaultPattern': string;
+ 'format:number:defaultPattern': string;
+ 'history:limit': number;
+ 'format:defaultTypeMap': string;
+ 'format:currency:defaultPattern': string;
+ defaultIndex: string;
+ 'format:bytes:defaultPattern': string;
+ 'filters:pinnedByDefault': boolean;
+ 'filterEditor:suggestValues': boolean;
+ 'fields:popularLimit': number;
+ dateNanosFormat: string;
+ defaultRoute: string;
+ 'dateFormat:tz': string;
+ 'dateFormat:scaled': string;
+ 'csv:quoteValues': boolean;
+ 'dateFormat:dow': string;
+ dateFormat: string;
+}
diff --git a/src/plugins/lens_oss/README.md b/src/plugins/lens_oss/README.md
deleted file mode 100644
index 187da2497026e..0000000000000
--- a/src/plugins/lens_oss/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# lens_oss
-
-The lens_oss plugin registers the lens visualization on OSS.
-It is registered as disabled. The x-pack plugin should unregister this.
-
-`visualizations.unregisterAlias('lensOss')`
\ No newline at end of file
diff --git a/src/plugins/lens_oss/common/constants.ts b/src/plugins/lens_oss/common/constants.ts
deleted file mode 100644
index 0ff5cdd78bb1b..0000000000000
--- a/src/plugins/lens_oss/common/constants.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-export const APP_NAME = 'lens';
-export const PLUGIN_ID_OSS = 'lensOss';
-export const APP_PATH = '#/';
-export const APP_ICON = 'lensApp';
diff --git a/src/plugins/lens_oss/kibana.json b/src/plugins/lens_oss/kibana.json
deleted file mode 100644
index 3e3d3585f37fb..0000000000000
--- a/src/plugins/lens_oss/kibana.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id": "lensOss",
- "version": "kibana",
- "ui": true,
- "server": true,
- "requiredPlugins": [
- "visualizations"
- ],
- "extraPublicDirs": ["common/constants"]
-}
diff --git a/src/plugins/lens_oss/public/plugin.ts b/src/plugins/lens_oss/public/plugin.ts
deleted file mode 100644
index 5a441614b7e24..0000000000000
--- a/src/plugins/lens_oss/public/plugin.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { DocLinksStart, CoreSetup } from 'src/core/public';
-import { VisualizationsSetup } from '../../visualizations/public';
-import { getLensAliasConfig } from './vis_type_alias';
-
-export interface LensPluginSetupDependencies {
- visualizations: VisualizationsSetup;
-}
-
-export interface LensPluginStartDependencies {
- docLinks: DocLinksStart;
-}
-
-export class LensOSSPlugin {
- setup(
- core: CoreSetup,
- { visualizations }: LensPluginSetupDependencies
- ) {
- core.getStartServices().then(([coreStart]) => {
- visualizations.registerAlias(getLensAliasConfig(coreStart.docLinks));
- });
- }
-
- start() {}
-}
diff --git a/src/plugins/lens_oss/public/vis_type_alias.ts b/src/plugins/lens_oss/public/vis_type_alias.ts
deleted file mode 100644
index b9806bbf3b4e5..0000000000000
--- a/src/plugins/lens_oss/public/vis_type_alias.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { i18n } from '@kbn/i18n';
-import { VisTypeAlias } from 'src/plugins/visualizations/public';
-import { DocLinksStart } from 'src/core/public';
-import { APP_NAME, PLUGIN_ID_OSS, APP_PATH, APP_ICON } from '../common';
-
-export const getLensAliasConfig = ({ links }: DocLinksStart): VisTypeAlias => ({
- aliasPath: APP_PATH,
- aliasApp: APP_NAME,
- name: PLUGIN_ID_OSS,
- title: i18n.translate('lensOss.visTypeAlias.title', {
- defaultMessage: 'Lens',
- }),
- description: i18n.translate('lensOss.visTypeAlias.description', {
- defaultMessage:
- 'Create visualizations with our drag-and-drop editor. Switch between visualization types at any time. Best for most visualizations.',
- }),
- icon: APP_ICON,
- stage: 'production',
- disabled: true,
- note: i18n.translate('lensOss.visTypeAlias.note', {
- defaultMessage: 'Recommended for most users.',
- }),
- promoTooltip: {
- description: i18n.translate('lensOss.visTypeAlias.promoTooltip.description', {
- defaultMessage: 'Try Lens for free with Elastic. Learn more.',
- }),
- link: `${links.visualize.lens}?blade=kibanaossvizwizard`,
- },
-});
diff --git a/src/plugins/lens_oss/server/index.ts b/src/plugins/lens_oss/server/index.ts
deleted file mode 100644
index d13a9b2caaeb2..0000000000000
--- a/src/plugins/lens_oss/server/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { PluginConfigDescriptor } from 'kibana/server';
-import { copyFromRoot } from '@kbn/config';
-import { configSchema, ConfigSchema } from '../config';
-
-export const config: PluginConfigDescriptor = {
- schema: configSchema,
- deprecations: () => [copyFromRoot('xpack.lens.enabled', 'lens_oss.enabled')],
-};
-
-export const plugin = () => ({
- setup() {},
- start() {},
-});
diff --git a/src/plugins/maps_legacy/public/index.ts b/src/plugins/maps_legacy/public/index.ts
index 95550fab1ba17..9268f14995f44 100644
--- a/src/plugins/maps_legacy/public/index.ts
+++ b/src/plugins/maps_legacy/public/index.ts
@@ -8,9 +8,7 @@
import { PluginInitializerContext } from 'kibana/public';
import { MapsLegacyPlugin } from './plugin';
-// @ts-ignore
import * as colorUtil from './map/color_util';
-// @ts-ignore
import { KibanaMapLayer } from './map/kibana_map_layer';
import {
VectorLayer,
@@ -19,7 +17,6 @@ import {
TmsLayer,
IServiceSettings,
} from './map/service_settings_types';
-// @ts-ignore
import { mapTooltipProvider } from './tooltip_provider';
import './map/index.scss';
diff --git a/src/plugins/maps_oss/public/index.ts b/src/plugins/maps_legacy/public/map/color_util.d.ts
similarity index 69%
rename from src/plugins/maps_oss/public/index.ts
rename to src/plugins/maps_legacy/public/map/color_util.d.ts
index 1d27dc4b6d996..9ec6b3c1fb007 100644
--- a/src/plugins/maps_oss/public/index.ts
+++ b/src/plugins/maps_legacy/public/map/color_util.d.ts
@@ -6,6 +6,6 @@
* Public License, v 1.
*/
-import { MapsOSSPlugin } from './plugin';
+export function getLegendColors(colorRamp: unknown, numLegendColors?: number): string[];
-export const plugin = () => new MapsOSSPlugin();
+export function getColor(colorRamp: unknown, i: number): string;
diff --git a/src/plugins/lens_oss/config.ts b/src/plugins/maps_legacy/public/map/kibana_map_layer.d.ts
similarity index 54%
rename from src/plugins/lens_oss/config.ts
rename to src/plugins/maps_legacy/public/map/kibana_map_layer.d.ts
index 58c50f0104f46..222cb6b215f9a 100644
--- a/src/plugins/lens_oss/config.ts
+++ b/src/plugins/maps_legacy/public/map/kibana_map_layer.d.ts
@@ -6,10 +6,20 @@
* Public License, v 1.
*/
-import { schema, TypeOf } from '@kbn/config-schema';
+export class KibanaMapLayer {
+ constructor();
-export const configSchema = schema.object({
- enabled: schema.boolean({ defaultValue: true }),
-});
+ getBounds(): Promise;
-export type ConfigSchema = TypeOf;
+ addToLeafletMap(leafletMap: unknown): void;
+
+ removeFromLeafletMap(leafletMap: unknown): void;
+
+ appendLegendContents(): void;
+
+ updateExtent(): void;
+
+ movePointer(): void;
+
+ getAttributions(): unknown;
+}
diff --git a/src/plugins/lens_oss/common/index.ts b/src/plugins/maps_legacy/public/tooltip_provider.d.ts
similarity index 79%
rename from src/plugins/lens_oss/common/index.ts
rename to src/plugins/maps_legacy/public/tooltip_provider.d.ts
index 7f60b8508dc27..4082a6ef83c4d 100644
--- a/src/plugins/lens_oss/common/index.ts
+++ b/src/plugins/maps_legacy/public/tooltip_provider.d.ts
@@ -6,4 +6,4 @@
* Public License, v 1.
*/
-export * from './constants';
+export function mapTooltipProvider(element: unknown, formatter: unknown): () => unknown;
diff --git a/src/plugins/lens_oss/tsconfig.json b/src/plugins/maps_legacy/tsconfig.json
similarity index 56%
rename from src/plugins/lens_oss/tsconfig.json
rename to src/plugins/maps_legacy/tsconfig.json
index d7bbc593fa87b..e7ea06706b64f 100644
--- a/src/plugins/lens_oss/tsconfig.json
+++ b/src/plugins/maps_legacy/tsconfig.json
@@ -7,14 +7,8 @@
"declaration": true,
"declarationMap": true
},
- "include": [
- "common/**/*",
- "public/**/*",
- "server/**/*",
- "*.ts"
- ],
+ "include": ["common/**/*", "public/**/*", "server/**/*", "config.ts"],
"references": [
- { "path": "../../core/tsconfig.json" },
- { "path": "../visualizations/tsconfig.json" }
+ { "path": "../vis_default_editor/tsconfig.json" },
]
}
diff --git a/src/plugins/maps_oss/README.md b/src/plugins/maps_oss/README.md
deleted file mode 100644
index ed91de500fbfb..0000000000000
--- a/src/plugins/maps_oss/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# maps_oss
-
-The maps_oss plugin registers the maps visualization on OSS.
-It is registered as disabled. The x-pack plugin should unregister this.
-
-`visualizations.unregisterAlias('mapsOss')`
\ No newline at end of file
diff --git a/src/plugins/maps_oss/common/constants.ts b/src/plugins/maps_oss/common/constants.ts
deleted file mode 100644
index db29f541a03df..0000000000000
--- a/src/plugins/maps_oss/common/constants.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-export const APP_NAME = 'maps';
-export const PLUGIN_ID_OSS = 'mapsOss';
-export const APP_PATH = '/map';
-export const APP_ICON = 'gisApp';
diff --git a/src/plugins/maps_oss/config.ts b/src/plugins/maps_oss/config.ts
deleted file mode 100644
index 58c50f0104f46..0000000000000
--- a/src/plugins/maps_oss/config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { schema, TypeOf } from '@kbn/config-schema';
-
-export const configSchema = schema.object({
- enabled: schema.boolean({ defaultValue: true }),
-});
-
-export type ConfigSchema = TypeOf;
diff --git a/src/plugins/maps_oss/kibana.json b/src/plugins/maps_oss/kibana.json
deleted file mode 100644
index 19770dcffaadd..0000000000000
--- a/src/plugins/maps_oss/kibana.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "id": "mapsOss",
- "version": "kibana",
- "ui": true,
- "server": true,
- "requiredPlugins": [
- "visualizations"
- ],
- "extraPublicDirs": ["common/constants"]
-}
diff --git a/src/plugins/maps_oss/public/plugin.ts b/src/plugins/maps_oss/public/plugin.ts
deleted file mode 100644
index 5e27ae34257bf..0000000000000
--- a/src/plugins/maps_oss/public/plugin.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { DocLinksStart, CoreSetup } from 'src/core/public';
-import { VisualizationsSetup } from '../../visualizations/public';
-import { getMapsAliasConfig } from './vis_type_alias';
-
-export interface MapsPluginSetupDependencies {
- visualizations: VisualizationsSetup;
-}
-
-export interface MapsPluginStartDependencies {
- docLinks: DocLinksStart;
-}
-
-export class MapsOSSPlugin {
- setup(
- core: CoreSetup,
- { visualizations }: MapsPluginSetupDependencies
- ) {
- core.getStartServices().then(([coreStart]) => {
- visualizations.registerAlias(getMapsAliasConfig(coreStart.docLinks));
- });
- }
-
- start() {}
-}
diff --git a/src/plugins/maps_oss/public/vis_type_alias.ts b/src/plugins/maps_oss/public/vis_type_alias.ts
deleted file mode 100644
index a27c628755cf6..0000000000000
--- a/src/plugins/maps_oss/public/vis_type_alias.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { i18n } from '@kbn/i18n';
-import { VisTypeAlias } from 'src/plugins/visualizations/public';
-import { DocLinksStart } from 'src/core/public';
-import { APP_NAME, PLUGIN_ID_OSS, APP_PATH, APP_ICON } from '../common';
-
-export const getMapsAliasConfig = ({ links }: DocLinksStart): VisTypeAlias => ({
- aliasPath: APP_PATH,
- aliasApp: APP_NAME,
- name: PLUGIN_ID_OSS,
- title: i18n.translate('mapsOss.visTypeAlias.title', {
- defaultMessage: 'Maps',
- }),
- description: i18n.translate('mapsOss.visTypeAlias.description', {
- defaultMessage: 'Plot and style your geo data in a multi layer map.',
- }),
- icon: APP_ICON,
- stage: 'production',
- disabled: true,
- promoTooltip: {
- description: i18n.translate('mapsOss.visTypeAlias.promoTooltip.description', {
- defaultMessage: 'Try maps for free with Elastic. Learn more.',
- }),
- link: `${links.visualize.maps}?blade=kibanaossvizwizard`,
- },
-});
diff --git a/src/plugins/maps_oss/server/index.ts b/src/plugins/maps_oss/server/index.ts
deleted file mode 100644
index 8f07beee705a6..0000000000000
--- a/src/plugins/maps_oss/server/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { PluginConfigDescriptor } from 'kibana/server';
-import { copyFromRoot } from '@kbn/config';
-import { configSchema, ConfigSchema } from '../config';
-
-export const config: PluginConfigDescriptor = {
- schema: configSchema,
- deprecations: () => [copyFromRoot('xpack.maps.enabled', 'maps_oss.enabled')],
-};
-
-export const plugin = () => ({
- setup() {},
- start() {},
-});
diff --git a/src/plugins/maps_oss/tsconfig.json b/src/plugins/maps_oss/tsconfig.json
new file mode 100644
index 0000000000000..03c30c3c49fd3
--- /dev/null
+++ b/src/plugins/maps_oss/tsconfig.json
@@ -0,0 +1,14 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "composite": true,
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": ["common/**/*", "public/**/*", "server/**/*", "config.ts"],
+ "references": [
+ { "path": "../visualizations/tsconfig.json" },
+ ]
+}
diff --git a/src/plugins/region_map/tsconfig.json b/src/plugins/region_map/tsconfig.json
new file mode 100644
index 0000000000000..40f76ece2a6ff
--- /dev/null
+++ b/src/plugins/region_map/tsconfig.json
@@ -0,0 +1,15 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "composite": true,
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": ["public/**/*", "server/**/*"],
+ "references": [
+ { "path": "../maps_legacy/tsconfig.json" },
+ { "path": "../vis_default_editor/tsconfig.json" },
+ ]
+}
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 7bac6a809eca3..950fdf9405b75 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -4076,6 +4076,27 @@
},
"stack_management": {
"properties": {
+ "timelion:quandl.key": {
+ "type": "keyword"
+ },
+ "securitySolution:defaultIndex": {
+ "type": "keyword"
+ },
+ "securitySolution:newsFeedUrl": {
+ "type": "keyword"
+ },
+ "xpackReporting:customPdfLogo": {
+ "type": "keyword"
+ },
+ "notifications:banner": {
+ "type": "keyword"
+ },
+ "timelion:graphite.url": {
+ "type": "keyword"
+ },
+ "xpackDashboardMode:roles": {
+ "type": "keyword"
+ },
"visualize:enableLabs": {
"type": "boolean"
},
@@ -4095,7 +4116,7 @@
"type": "long"
},
"securitySolution:ipReputationLinks": {
- "type": "text"
+ "type": "keyword"
},
"csv:separator": {
"type": "keyword"
@@ -4121,9 +4142,6 @@
"timelion:default_columns": {
"type": "long"
},
- "timelion:quandl.key": {
- "type": "keyword"
- },
"timelion:es.default_index": {
"type": "keyword"
},
@@ -4136,15 +4154,9 @@
"securitySolution:defaultAnomalyScore": {
"type": "long"
},
- "securitySolution:defaultIndex": {
- "type": "keyword"
- },
"securitySolution:refreshIntervalDefaults": {
"type": "keyword"
},
- "securitySolution:newsFeedUrl": {
- "type": "keyword"
- },
"securitySolution:enableNewsFeed": {
"type": "boolean"
},
@@ -4169,9 +4181,6 @@
"rollups:enableIndexPatterns": {
"type": "boolean"
},
- "xpackReporting:customPdfLogo": {
- "type": "text"
- },
"notifications:lifetime:warning": {
"type": "long"
},
@@ -4181,9 +4190,6 @@
"notifications:lifetime:info": {
"type": "long"
},
- "notifications:banner": {
- "type": "text"
- },
"notifications:lifetime:error": {
"type": "long"
},
@@ -4200,7 +4206,10 @@
"type": "long"
},
"defaultColumns": {
- "type": "keyword"
+ "type": "array",
+ "items": {
+ "type": "keyword"
+ }
},
"context:defaultSize": {
"type": "long"
@@ -4209,7 +4218,10 @@
"type": "long"
},
"context:tieBreakerFields": {
- "type": "keyword"
+ "type": "array",
+ "items": {
+ "type": "keyword"
+ }
},
"discover:sort:defaultOrder": {
"type": "keyword"
@@ -4275,7 +4287,10 @@
"type": "boolean"
},
"metaFields": {
- "type": "keyword"
+ "type": "array",
+ "items": {
+ "type": "keyword"
+ }
},
"indexPattern:placeholder": {
"type": "keyword"
@@ -4339,6 +4354,36 @@
},
"dateFormat": {
"type": "keyword"
+ },
+ "autocomplete:useTimeRange": {
+ "type": "boolean"
+ },
+ "search:timeout": {
+ "type": "long"
+ },
+ "visualization:visualize:legacyChartsLibrary": {
+ "type": "boolean"
+ },
+ "doc_table:legacy": {
+ "type": "boolean"
+ },
+ "discover:modifyColumnsOnSwitch": {
+ "type": "boolean"
+ },
+ "discover:searchFieldsFromSource": {
+ "type": "boolean"
+ },
+ "securitySolution:rulesTableRefresh": {
+ "type": "text"
+ },
+ "apm:enableSignificantTerms": {
+ "type": "boolean"
+ },
+ "apm:enableServiceOverview": {
+ "type": "boolean"
+ },
+ "apm:enableCorrelations": {
+ "type": "boolean"
}
}
},
diff --git a/src/plugins/tile_map/tsconfig.json b/src/plugins/tile_map/tsconfig.json
new file mode 100644
index 0000000000000..40f76ece2a6ff
--- /dev/null
+++ b/src/plugins/tile_map/tsconfig.json
@@ -0,0 +1,15 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "composite": true,
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": ["public/**/*", "server/**/*"],
+ "references": [
+ { "path": "../maps_legacy/tsconfig.json" },
+ { "path": "../vis_default_editor/tsconfig.json" },
+ ]
+}
diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts
index ccc17ea1c5967..8e8a74902d479 100644
--- a/src/plugins/usage_collection/server/collector/collector.ts
+++ b/src/plugins/usage_collection/server/collector/collector.ts
@@ -14,17 +14,38 @@ import {
KibanaRequest,
} from 'src/core/server';
-export type AllowedSchemaNumberTypes = 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float';
+export type AllowedSchemaNumberTypes =
+ | 'long'
+ | 'integer'
+ | 'short'
+ | 'byte'
+ | 'double'
+ | 'float'
+ | 'date';
+export type AllowedSchemaStringTypes = 'keyword' | 'text' | 'date';
+export type AllowedSchemaBooleanTypes = 'boolean';
-export type AllowedSchemaTypes = AllowedSchemaNumberTypes | 'keyword' | 'text' | 'boolean' | 'date';
+export type AllowedSchemaTypes =
+ | AllowedSchemaNumberTypes
+ | AllowedSchemaStringTypes
+ | AllowedSchemaBooleanTypes;
export interface SchemaField {
type: string;
}
+export type PossibleSchemaTypes = U extends string
+ ? AllowedSchemaStringTypes
+ : U extends number
+ ? AllowedSchemaNumberTypes
+ : U extends boolean
+ ? AllowedSchemaBooleanTypes
+ : // allow any schema type from the union if typescript is unable to resolve the exact U type
+ AllowedSchemaTypes;
+
export type RecursiveMakeSchemaFrom = U extends object
? MakeSchemaFrom
- : { type: AllowedSchemaTypes };
+ : { type: PossibleSchemaTypes };
// Using Required to enforce all optional keys in the object
export type MakeSchemaFrom = {
diff --git a/src/plugins/vis_type_timelion/server/plugin.ts b/src/plugins/vis_type_timelion/server/plugin.ts
index f999c1dfc773a..fca557efc01e3 100644
--- a/src/plugins/vis_type_timelion/server/plugin.ts
+++ b/src/plugins/vis_type_timelion/server/plugin.ts
@@ -173,6 +173,7 @@ export class Plugin {
defaultMessage: '{experimentalLabel} Your API key from www.quandl.com',
values: { experimentalLabel: `[${experimentalLabel}]` },
}),
+ sensitive: true,
category: ['timelion'],
schema: schema.string(),
},
diff --git a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
index 839d2b1f57c34..cb6bc624801d9 100644
--- a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
+++ b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
@@ -31,11 +31,6 @@ export interface VisualizationsAppExtension {
toListItem: (savedObject: SavedObject) => VisualizationListItem;
}
-export interface VisTypeAliasPromoTooltip {
- description: string;
- link: string;
-}
-
export interface VisTypeAlias {
aliasPath: string;
aliasApp: string;
@@ -43,10 +38,8 @@ export interface VisTypeAlias {
title: string;
icon: string;
promotion?: boolean;
- promoTooltip?: VisTypeAliasPromoTooltip;
description: string;
note?: string;
- disabled?: boolean;
getSupportedTriggers?: () => string[];
stage: VisualizationStage;
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
index 74163296e31fd..396be30aca6d0 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
@@ -39,11 +39,6 @@ describe('GroupSelection', () => {
title: 'Vis with alias Url',
aliasApp: 'aliasApp',
aliasPath: '#/aliasApp',
- disabled: true,
- promoTooltip: {
- description: 'Learn More',
- link: '#/anotherUrl',
- },
description: 'Vis with alias Url',
stage: 'production',
group: VisGroups.PROMOTED,
@@ -227,41 +222,6 @@ describe('GroupSelection', () => {
]);
});
- it('should render disabled aliases with a disabled class', () => {
- const wrapper = mountWithIntl(
-
- );
- expect(wrapper.find('[data-test-subj="visType-visWithAliasUrl"]').exists()).toBe(true);
- expect(
- wrapper
- .find('[data-test-subj="visType-visWithAliasUrl"]')
- .at(1)
- .hasClass('euiCard-isDisabled')
- ).toBe(true);
- });
-
- it('should render a basic badge with link for disabled aliases with promoTooltip', () => {
- const wrapper = mountWithIntl(
-
- );
- expect(wrapper.find('[data-test-subj="visTypeBadge"]').exists()).toBe(true);
- expect(wrapper.find('[data-test-subj="visTypeBadge"]').at(0).prop('tooltipContent')).toBe(
- 'Learn More'
- );
- });
-
it('should not show tools experimental visualizations if showExperimentalis false', () => {
const expVis = {
name: 'visExp',
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
index 9b61b2c415e9f..594e37f6a7608 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
@@ -48,10 +48,6 @@ interface VisCardProps {
showExperimental?: boolean | undefined;
}
-function isVisTypeAlias(type: BaseVisType | VisTypeAlias): type is VisTypeAlias {
- return 'aliasPath' in type;
-}
-
function GroupSelection(props: GroupSelectionProps) {
const visualizeGuideLink = props.docLinks.links.dashboard.guide;
const promotedVisGroups = useMemo(
@@ -185,29 +181,8 @@ const VisGroup = ({ visType, onVisTypeSelected }: VisCardProps) => {
const onClick = useCallback(() => {
onVisTypeSelected(visType);
}, [onVisTypeSelected, visType]);
- const shouldDisableCard = isVisTypeAlias(visType) && visType.disabled;
- const betaBadgeContent =
- shouldDisableCard && 'promoTooltip' in visType ? (
-
-
-
- ) : undefined;
return (
- {betaBadgeContent}
{
}
onClick={onClick}
- isDisabled={shouldDisableCard}
data-test-subj={`visType-${visType.name}`}
data-vis-stage={!('aliasPath' in visType) ? visType.stage : 'alias'}
aria-label={`visType-${visType.name}`}
diff --git a/test/common/config.js b/test/common/config.js
index 8a42e6c87b214..b6d12444b7017 100644
--- a/test/common/config.js
+++ b/test/common/config.js
@@ -61,6 +61,8 @@ export default function () {
...(!!process.env.CODE_COVERAGE
? [`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'coverage')}`]
: []),
+ // Disable v2 migrations in tests for now
+ '--migrations.enableV2=false',
],
},
services,
diff --git a/test/functional/apps/dashboard/dashboard_save.ts b/test/functional/apps/dashboard/dashboard_save.ts
index 27cbba7db393d..e36136cd45141 100644
--- a/test/functional/apps/dashboard/dashboard_save.ts
+++ b/test/functional/apps/dashboard/dashboard_save.ts
@@ -12,7 +12,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['dashboard', 'header']);
const listingTable = getService('listingTable');
- describe('dashboard save', function describeIndexTests() {
+ // FLAKY: https://github.com/elastic/kibana/issues/89476
+ describe.skip('dashboard save', function describeIndexTests() {
this.tags('includeFirefox');
const dashboardName = 'Dashboard Save Test';
const dashboardNameEnterKey = 'Dashboard Save Test with Enter Key';
diff --git a/test/functional/apps/discover/_data_grid.ts b/test/functional/apps/discover/_data_grid.ts
index 3bac05c5b18fc..1329e7657ad9c 100644
--- a/test/functional/apps/discover/_data_grid.ts
+++ b/test/functional/apps/discover/_data_grid.ts
@@ -38,7 +38,7 @@ export default function ({
const getTitles = async () =>
(await testSubjects.getVisibleText('dataGridHeader')).replace(/\s|\r?\n|\r/g, ' ');
- expect(await getTitles()).to.be('Time (@timestamp) _source');
+ expect(await getTitles()).to.be('Time (@timestamp) Document');
await PageObjects.discover.clickFieldListItemAdd('bytes');
expect(await getTitles()).to.be('Time (@timestamp) bytes');
@@ -50,7 +50,7 @@ export default function ({
expect(await getTitles()).to.be('Time (@timestamp) agent');
await PageObjects.discover.clickFieldListItemAdd('agent');
- expect(await getTitles()).to.be('Time (@timestamp) _source');
+ expect(await getTitles()).to.be('Time (@timestamp) Document');
});
});
}
diff --git a/test/functional/apps/discover/_data_grid_field_data.ts b/test/functional/apps/discover/_data_grid_field_data.ts
index bdbaacc33c1bd..3eec84ad3d7c0 100644
--- a/test/functional/apps/discover/_data_grid_field_data.ts
+++ b/test/functional/apps/discover/_data_grid_field_data.ts
@@ -57,7 +57,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
it('doc view should show Time and _source columns', async function () {
- const expectedHeader = 'Time (@timestamp) _source';
+ const expectedHeader = 'Time (@timestamp) Document';
const DocHeader = await dataGrid.getHeaderFields();
expect(DocHeader.join(' ')).to.be(expectedHeader);
});
diff --git a/test/functional/apps/discover/_saved_queries.ts b/test/functional/apps/discover/_saved_queries.ts
index 6e6c53ec04985..ec6c455ecc979 100644
--- a/test/functional/apps/discover/_saved_queries.ts
+++ b/test/functional/apps/discover/_saved_queries.ts
@@ -26,7 +26,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const savedQueryManagementComponent = getService('savedQueryManagementComponent');
const testSubjects = getService('testSubjects');
- describe('saved queries saved objects', function describeIndexTests() {
+ // FLAKY: https://github.com/elastic/kibana/issues/89477
+ describe.skip('saved queries saved objects', function describeIndexTests() {
before(async function () {
log.debug('load kibana index with default index pattern');
await esArchiver.load('discover');
diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts
index 07811c9c68e45..754406938e47b 100644
--- a/test/functional/apps/management/_import_objects.ts
+++ b/test/functional/apps/management/_import_objects.ts
@@ -23,7 +23,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const log = getService('log');
- describe('import objects', function describeIndexTests() {
+ // FLAKY: https://github.com/elastic/kibana/issues/89478
+ describe.skip('import objects', function describeIndexTests() {
describe('.ndjson file', () => {
beforeEach(async function () {
await kibanaServer.uiSettings.replace({});
diff --git a/test/functional/apps/management/_scripted_fields_preview.js b/test/functional/apps/management/_scripted_fields_preview.js
index 104d41b7e2a75..46619b89dfc59 100644
--- a/test/functional/apps/management/_scripted_fields_preview.js
+++ b/test/functional/apps/management/_scripted_fields_preview.js
@@ -13,7 +13,8 @@ export default function ({ getService, getPageObjects }) {
const PageObjects = getPageObjects(['settings']);
const SCRIPTED_FIELD_NAME = 'myScriptedField';
- describe('scripted fields preview', () => {
+ // FLAKY: https://github.com/elastic/kibana/issues/89475
+ describe.skip('scripted fields preview', () => {
before(async function () {
await browser.setWindowSize(1200, 800);
await PageObjects.settings.createIndexPattern();
diff --git a/test/functional/apps/visualize/_chart_types.ts b/test/functional/apps/visualize/_chart_types.ts
index 55b68b7370148..69403f2090594 100644
--- a/test/functional/apps/visualize/_chart_types.ts
+++ b/test/functional/apps/visualize/_chart_types.ts
@@ -12,21 +12,17 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
- const deployment = getService('deployment');
const log = getService('log');
const PageObjects = getPageObjects(['visualize']);
- let isOss = true;
describe('chart types', function () {
before(async function () {
log.debug('navigateToApp visualize');
- isOss = await deployment.isOss();
await PageObjects.visualize.navigateToNewVisualization();
});
it('should show the promoted vis types for the first step', async function () {
const expectedChartTypes = ['Custom visualization', 'Lens', 'Maps', 'TSVB'];
- log.debug('oss= ' + isOss);
// find all the chart types and make sure there all there
const chartTypes = (await PageObjects.visualize.getPromotedVisTypes()).sort();
@@ -37,9 +33,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should show the correct agg based chart types', async function () {
await PageObjects.visualize.clickAggBasedVisualizations();
- let expectedChartTypes = [
+ const expectedChartTypes = [
'Area',
- 'Coordinate Map',
'Data table',
'Gauge',
'Goal',
@@ -48,21 +43,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'Line',
'Metric',
'Pie',
- 'Region Map',
'Tag cloud',
'Timelion',
'Vertical bar',
];
- if (!isOss) {
- expectedChartTypes = _.remove(expectedChartTypes, function (n) {
- return n !== 'Coordinate Map';
- });
- expectedChartTypes = _.remove(expectedChartTypes, function (n) {
- return n !== 'Region Map';
- });
- expectedChartTypes.sort();
- }
- log.debug('oss= ' + isOss);
// find all the chart types and make sure there all there
const chartTypes = (await PageObjects.visualize.getChartTypes()).sort();
diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts
index 8dd2854419693..4170ada692e67 100644
--- a/test/functional/apps/visualize/index.ts
+++ b/test/functional/apps/visualize/index.ts
@@ -67,11 +67,15 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
this.tags('ciGroup9');
loadTestFile(require.resolve('./_embedding_chart'));
- loadTestFile(require.resolve('./_chart_types'));
loadTestFile(require.resolve('./_area_chart'));
loadTestFile(require.resolve('./_data_table'));
loadTestFile(require.resolve('./_data_table_nontimeindex'));
loadTestFile(require.resolve('./_data_table_notimeindex_filters'));
+
+ // this check is not needed when the CI doesn't run anymore for the OSS
+ if (!isOss) {
+ loadTestFile(require.resolve('./_chart_types'));
+ }
});
describe('', function () {
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index 1149f1b100788..ed817b8b55e80 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -376,7 +376,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
}
async closeToast() {
- const toast = await find.byCssSelector('.euiToast', 2 * defaultFindTimeout);
+ const toast = await find.byCssSelector('.euiToast', 6 * defaultFindTimeout);
await toast.moveMouseTo();
const title = await (await find.byCssSelector('.euiToastHeader__title')).getVisibleText();
diff --git a/test/scripts/checks/test_projects.sh b/test/scripts/checks/test_projects.sh
index 56f15f6839e9d..be3fe4c4be9d0 100755
--- a/test/scripts/checks/test_projects.sh
+++ b/test/scripts/checks/test_projects.sh
@@ -3,4 +3,4 @@
source src/dev/ci_setup/setup_env.sh
checks-reporter-with-killswitch "Test Projects" \
- yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
+ yarn kbn run test --exclude kibana --oss --skip-kibana-plugins --skip-missing
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
index 6e28f9c3ef56a..9e387f97a016e 100755
--- a/test/scripts/jenkins_unit.sh
+++ b/test/scripts/jenkins_unit.sh
@@ -2,12 +2,6 @@
source test/scripts/jenkins_test_setup.sh
-rename_coverage_file() {
- test -f target/kibana-coverage/jest/coverage-final.json \
- && mv target/kibana-coverage/jest/coverage-final.json \
- target/kibana-coverage/jest/$1-coverage-final.json
-}
-
if [[ -z "$CODE_COVERAGE" ]] ; then
# Lint
./test/scripts/lint/eslint.sh
@@ -34,13 +28,8 @@ if [[ -z "$CODE_COVERAGE" ]] ; then
./test/scripts/checks/test_hardening.sh
else
echo " -> Running jest tests with coverage"
- node scripts/jest --ci --verbose --coverage --config jest.config.oss.js || true;
- rename_coverage_file "oss"
- echo ""
- echo ""
+ node scripts/jest --ci --verbose --maxWorkers=6 --coverage || true;
+
echo " -> Running jest integration tests with coverage"
- node --max-old-space-size=8192 scripts/jest_integration --ci --verbose --coverage || true;
- rename_coverage_file "oss-integration"
- echo ""
- echo ""
+ node scripts/jest_integration --ci --verbose --coverage || true;
fi
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
deleted file mode 100755
index 66fb5ae5370bc..0000000000000
--- a/test/scripts/jenkins_xpack.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-source test/scripts/jenkins_test_setup.sh
-
-if [[ -z "$CODE_COVERAGE" ]] ; then
- echo " -> Running jest tests"
-
- ./test/scripts/test/xpack_jest_unit.sh
-else
- echo " -> Build runtime for canvas"
- # build runtime for canvas
- echo "NODE_ENV=$NODE_ENV"
- node ./x-pack/plugins/canvas/scripts/shareable_runtime
- echo " -> Running jest tests with coverage"
- cd x-pack
- node --max-old-space-size=6144 scripts/jest --ci --verbose --maxWorkers=5 --coverage --config jest.config.js || true;
- # rename file in order to be unique one
- test -f ../target/kibana-coverage/jest/coverage-final.json \
- && mv ../target/kibana-coverage/jest/coverage-final.json \
- ../target/kibana-coverage/jest/xpack-coverage-final.json
- echo ""
- echo ""
-fi
diff --git a/test/scripts/test/jest_integration.sh b/test/scripts/test/jest_integration.sh
index 78ed804f88430..c48d9032466a3 100755
--- a/test/scripts/test/jest_integration.sh
+++ b/test/scripts/test/jest_integration.sh
@@ -3,4 +3,4 @@
source src/dev/ci_setup/setup_env.sh
checks-reporter-with-killswitch "Jest Integration Tests" \
- node scripts/jest_integration --ci --verbose
+ node scripts/jest_integration --ci --verbose --coverage
diff --git a/test/scripts/test/jest_unit.sh b/test/scripts/test/jest_unit.sh
index 88c0fe528b88c..14d7268c6f36d 100755
--- a/test/scripts/test/jest_unit.sh
+++ b/test/scripts/test/jest_unit.sh
@@ -3,4 +3,4 @@
source src/dev/ci_setup/setup_env.sh
checks-reporter-with-killswitch "Jest Unit Tests" \
- node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5
+ node scripts/jest --ci --verbose --maxWorkers=10 --coverage
diff --git a/test/scripts/test/xpack_jest_unit.sh b/test/scripts/test/xpack_jest_unit.sh
deleted file mode 100755
index 33b1c8a2b5183..0000000000000
--- a/test/scripts/test/xpack_jest_unit.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-source src/dev/ci_setup/setup_env.sh
-
-checks-reporter-with-killswitch "X-Pack Jest" \
- node scripts/jest x-pack --ci --verbose --maxWorkers=5
diff --git a/tsconfig.json b/tsconfig.json
index b6742bffeab55..334a3febfddda 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,10 +26,12 @@
"src/plugins/kibana_react/**/*",
"src/plugins/kibana_usage_collection/**/*",
"src/plugins/kibana_utils/**/*",
- "src/plugins/lens_oss/**/*",
"src/plugins/management/**/*",
+ "src/plugins/maps_legacy/**/*",
+ "src/plugins/maps_oss/**/*",
"src/plugins/navigation/**/*",
"src/plugins/newsfeed/**/*",
+ "src/plugins/region_map/**/*",
"src/plugins/saved_objects/**/*",
"src/plugins/saved_objects_management/**/*",
"src/plugins/saved_objects_tagging_oss/**/*",
@@ -38,6 +40,7 @@
"src/plugins/spaces_oss/**/*",
"src/plugins/telemetry/**/*",
"src/plugins/telemetry_collection_manager/**/*",
+ "src/plugins/tile_map/**/*",
"src/plugins/timelion/**/*",
"src/plugins/ui_actions/**/*",
"src/plugins/url_forwarding/**/*",
@@ -81,10 +84,12 @@
{ "path": "./src/plugins/kibana_react/tsconfig.json" },
{ "path": "./src/plugins/kibana_usage_collection/tsconfig.json" },
{ "path": "./src/plugins/kibana_utils/tsconfig.json" },
- { "path": "./src/plugins/lens_oss/tsconfig.json" },
{ "path": "./src/plugins/management/tsconfig.json" },
+ { "path": "./src/plugins/maps_legacy/tsconfig.json" },
+ { "path": "./src/plugins/maps_oss/tsconfig.json" },
{ "path": "./src/plugins/navigation/tsconfig.json" },
{ "path": "./src/plugins/newsfeed/tsconfig.json" },
+ { "path": "./src/plugins/region_map/tsconfig.json" },
{ "path": "./src/plugins/saved_objects/tsconfig.json" },
{ "path": "./src/plugins/saved_objects_management/tsconfig.json" },
{ "path": "./src/plugins/saved_objects_tagging_oss/tsconfig.json" },
@@ -93,6 +98,7 @@
{ "path": "./src/plugins/spaces_oss/tsconfig.json" },
{ "path": "./src/plugins/telemetry/tsconfig.json" },
{ "path": "./src/plugins/telemetry_collection_manager/tsconfig.json" },
+ { "path": "./src/plugins/tile_map/tsconfig.json" },
{ "path": "./src/plugins/timelion/tsconfig.json" },
{ "path": "./src/plugins/ui_actions/tsconfig.json" },
{ "path": "./src/plugins/url_forwarding/tsconfig.json" },
diff --git a/tsconfig.refs.json b/tsconfig.refs.json
index 1bce19e2ee44a..a8eecd278160c 100644
--- a/tsconfig.refs.json
+++ b/tsconfig.refs.json
@@ -22,10 +22,12 @@
{ "path": "./src/plugins/kibana_react/tsconfig.json" },
{ "path": "./src/plugins/kibana_usage_collection/tsconfig.json" },
{ "path": "./src/plugins/kibana_utils/tsconfig.json" },
- { "path": "./src/plugins/lens_oss/tsconfig.json" },
{ "path": "./src/plugins/management/tsconfig.json" },
+ { "path": "./src/plugins/maps_legacy/tsconfig.json" },
+ { "path": "./src/plugins/maps_oss/tsconfig.json" },
{ "path": "./src/plugins/navigation/tsconfig.json" },
{ "path": "./src/plugins/newsfeed/tsconfig.json" },
+ { "path": "./src/plugins/region_map/tsconfig.json" },
{ "path": "./src/plugins/saved_objects/tsconfig.json" },
{ "path": "./src/plugins/saved_objects_management/tsconfig.json" },
{ "path": "./src/plugins/saved_objects_tagging_oss/tsconfig.json" },
@@ -35,6 +37,7 @@
{ "path": "./src/plugins/spaces_oss/tsconfig.json" },
{ "path": "./src/plugins/telemetry/tsconfig.json" },
{ "path": "./src/plugins/telemetry_collection_manager/tsconfig.json" },
+ { "path": "./src/plugins/tile_map/tsconfig.json" },
{ "path": "./src/plugins/timelion/tsconfig.json" },
{ "path": "./src/plugins/ui_actions/tsconfig.json" },
{ "path": "./src/plugins/url_forwarding/tsconfig.json" },
diff --git a/vars/kibanaCoverage.groovy b/vars/kibanaCoverage.groovy
index 609d8f78aeb96..e393f3a5d2150 100644
--- a/vars/kibanaCoverage.groovy
+++ b/vars/kibanaCoverage.groovy
@@ -197,13 +197,6 @@ def ingest(jobName, buildNumber, buildUrl, timestamp, previousSha, teamAssignmen
def runTests() {
parallel([
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
- 'x-pack-intake-agent': {
- withEnv([
- 'NODE_ENV=test' // Needed for jest tests only
- ]) {
- workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh')()
- }
- },
'kibana-oss-agent' : workers.functional(
'kibana-oss-tests',
{ kibanaPipeline.buildOss() },
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 93cb7a719bbe8..e49692568cec8 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -179,20 +179,21 @@ def uploadCoverageArtifacts(prefix, pattern) {
def withGcsArtifactUpload(workerName, closure) {
def uploadPrefix = "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}"
def ARTIFACT_PATTERNS = [
+ 'target/junit/**/*',
'target/kibana-*',
- 'target/test-metrics/*',
+ 'target/kibana-coverage/**/*',
'target/kibana-security-solution/**/*.png',
- 'target/junit/**/*',
+ 'target/test-metrics/*',
'target/test-suites-ci-plan.json',
- 'test/**/screenshots/session/*.png',
- 'test/**/screenshots/failure/*.png',
'test/**/screenshots/diff/*.png',
+ 'test/**/screenshots/failure/*.png',
+ 'test/**/screenshots/session/*.png',
'test/functional/failure_debug/html/*.html',
- 'x-pack/test/**/screenshots/session/*.png',
- 'x-pack/test/**/screenshots/failure/*.png',
'x-pack/test/**/screenshots/diff/*.png',
- 'x-pack/test/functional/failure_debug/html/*.html',
+ 'x-pack/test/**/screenshots/failure/*.png',
+ 'x-pack/test/**/screenshots/session/*.png',
'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
+ 'x-pack/test/functional/failure_debug/html/*.html',
]
withEnv([
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index 3493a95f0bdce..74ad1267e9355 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -35,7 +35,6 @@ def test() {
kibanaPipeline.scriptTask('Jest Unit Tests', 'test/scripts/test/jest_unit.sh'),
kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh'),
- kibanaPipeline.scriptTask('X-Pack Jest Unit Tests', 'test/scripts/test/xpack_jest_unit.sh'),
])
}
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
index 1b0fe03633531..08a3fd007554e 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
@@ -4,16 +4,16 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { getTotalCount } from './actions_telemetry';
+import { getInUseTotalCount, getTotalCount } from './actions_telemetry';
describe('actions telemetry', () => {
- test('getTotalCount should replace action types names with . to __', async () => {
+ test('getTotalCount should replace first symbol . to __ for action types names', async () => {
const mockEsClient = jest.fn();
mockEsClient.mockReturnValue({
aggregations: {
byActionTypeId: {
value: {
- types: { '.index': 1, '.server-log': 1 },
+ types: { '.index': 1, '.server-log': 1, 'some.type': 1, 'another.type.': 1 },
},
},
},
@@ -56,6 +56,38 @@ describe('actions telemetry', () => {
updated_at: '2020-03-26T18:46:44.449Z',
},
},
+ {
+ _id: 'action:00000000-1',
+ _index: '.kibana_1',
+ _score: 0,
+ _source: {
+ action: {
+ actionTypeId: 'some.type',
+ config: {},
+ name: 'test type',
+ secrets: {},
+ },
+ references: [],
+ type: 'action',
+ updated_at: '2020-03-26T18:46:44.449Z',
+ },
+ },
+ {
+ _id: 'action:00000000-2',
+ _index: '.kibana_1',
+ _score: 0,
+ _source: {
+ action: {
+ actionTypeId: 'another.type.',
+ config: {},
+ name: 'test another type',
+ secrets: {},
+ },
+ references: [],
+ type: 'action',
+ updated_at: '2020-03-26T18:46:44.449Z',
+ },
+ },
],
},
});
@@ -69,6 +101,58 @@ Object {
"countByType": Object {
"__index": 1,
"__server-log": 1,
+ "another.type__": 1,
+ "some.type": 1,
+ },
+ "countTotal": 4,
+}
+`);
+ });
+
+ test('getInUseTotalCount', async () => {
+ const mockEsClient = jest.fn();
+ mockEsClient.mockReturnValue({
+ aggregations: {
+ refs: {
+ actionRefIds: {
+ value: {
+ connectorIds: { '1': 'action-0', '123': 'action-0' },
+ total: 2,
+ },
+ },
+ },
+ hits: {
+ hits: [],
+ },
+ },
+ });
+ const actionsBulkGet = jest.fn();
+ actionsBulkGet.mockReturnValue({
+ saved_objects: [
+ {
+ id: '1',
+ attributes: {
+ actionTypeId: '.server-log',
+ },
+ },
+ {
+ id: '123',
+ attributes: {
+ actionTypeId: '.slack',
+ },
+ },
+ ],
+ });
+ const telemetry = await getInUseTotalCount(mockEsClient, actionsBulkGet, 'test');
+
+ expect(mockEsClient).toHaveBeenCalledTimes(1);
+ expect(actionsBulkGet).toHaveBeenCalledTimes(1);
+
+ expect(telemetry).toMatchInlineSnapshot(`
+Object {
+ "countByType": Object {
+ "__server-log": 1,
+ "__slack": 1,
},
"countTotal": 2,
}
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
index e3ff2552fed9c..cc49232150eee 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
@@ -4,7 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { LegacyAPICaller } from 'kibana/server';
+import {
+ LegacyAPICaller,
+ SavedObjectsBaseOptions,
+ SavedObjectsBulkGetObject,
+ SavedObjectsBulkResponse,
+} from 'kibana/server';
+import { ActionResult } from '../types';
export async function getTotalCount(callCluster: LegacyAPICaller, kibanaIndex: string) {
const scriptedMetric = {
@@ -58,14 +64,23 @@ export async function getTotalCount(callCluster: LegacyAPICaller, kibanaIndex: s
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(obj: any, key: string) => ({
...obj,
- [key.replace('.', '__')]: searchResult.aggregations.byActionTypeId.value.types[key],
+ [replaceFirstAndLastDotSymbols(key)]: searchResult.aggregations.byActionTypeId.value.types[
+ key
+ ],
}),
{}
),
};
}
-export async function getInUseTotalCount(callCluster: LegacyAPICaller, kibanaIndex: string) {
+export async function getInUseTotalCount(
+ callCluster: LegacyAPICaller,
+ actionsBulkGet: (
+ objects?: SavedObjectsBulkGetObject[] | undefined,
+ options?: SavedObjectsBaseOptions | undefined
+ ) => Promise>>>,
+ kibanaIndex: string
+): Promise<{ countTotal: number; countByType: Record }> {
const scriptedMetric = {
scripted_metric: {
init_script: 'state.connectorIds = new HashMap(); state.total = 0;',
@@ -145,7 +160,32 @@ export async function getInUseTotalCount(callCluster: LegacyAPICaller, kibanaInd
},
});
- return actionResults.aggregations.refs.actionRefIds.value.total;
+ const bulkFilter = Object.entries(
+ actionResults.aggregations.refs.actionRefIds.value.connectorIds
+ ).map(([key]) => ({
+ id: key,
+ type: 'action',
+ fields: ['id', 'actionTypeId'],
+ }));
+ const actions = await actionsBulkGet(bulkFilter);
+ const countByType = actions.saved_objects.reduce(
+ (actionTypeCount: Record, action) => {
+ const alertTypeId = replaceFirstAndLastDotSymbols(action.attributes.actionTypeId);
+ const currentCount =
+ actionTypeCount[alertTypeId] !== undefined ? actionTypeCount[alertTypeId] : 0;
+ actionTypeCount[alertTypeId] = currentCount + 1;
+ return actionTypeCount;
+ },
+ {}
+ );
+ return { countTotal: actionResults.aggregations.refs.actionRefIds.value.total, countByType };
+}
+
+function replaceFirstAndLastDotSymbols(strToReplace: string) {
+ const hasFirstSymbolDot = strToReplace.startsWith('.');
+ const appliedString = hasFirstSymbolDot ? strToReplace.replace('.', '__') : strToReplace;
+ const hasLastSymbolDot = strToReplace.endsWith('.');
+ return hasLastSymbolDot ? `${appliedString.slice(0, -1)}__` : appliedString;
}
// TODO: Implement executions count telemetry with eventLog, when it will write to index
diff --git a/x-pack/plugins/actions/server/usage/task.ts b/x-pack/plugins/actions/server/usage/task.ts
index 176ba29ef748a..001db21ffebcc 100644
--- a/x-pack/plugins/actions/server/usage/task.ts
+++ b/x-pack/plugins/actions/server/usage/task.ts
@@ -4,13 +4,20 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { Logger, CoreSetup, LegacyAPICaller } from 'kibana/server';
+import {
+ Logger,
+ CoreSetup,
+ LegacyAPICaller,
+ SavedObjectsBulkGetObject,
+ SavedObjectsBaseOptions,
+} from 'kibana/server';
import moment from 'moment';
import {
RunContext,
TaskManagerSetupContract,
TaskManagerStartContract,
} from '../../../task_manager/server';
+import { ActionResult } from '../types';
import { getTotalCount, getInUseTotalCount } from './actions_telemetry';
export const TELEMETRY_TASK_TYPE = 'actions_telemetry';
@@ -66,19 +73,30 @@ export function telemetryTaskRunner(logger: Logger, core: CoreSetup, kibanaIndex
client.callAsInternalUser(...args)
);
};
+ const actionsBulkGet = (
+ objects?: SavedObjectsBulkGetObject[],
+ options?: SavedObjectsBaseOptions
+ ) => {
+ return core
+ .getStartServices()
+ .then(([{ savedObjects }]) =>
+ savedObjects.createInternalRepository(['action']).bulkGet(objects, options)
+ );
+ };
return {
async run() {
return Promise.all([
getTotalCount(callCluster, kibanaIndex),
- getInUseTotalCount(callCluster, kibanaIndex),
+ getInUseTotalCount(callCluster, actionsBulkGet, kibanaIndex),
])
- .then(([totalAggegations, countActiveTotal]) => {
+ .then(([totalAggegations, totalInUse]) => {
return {
state: {
runs: (state.runs || 0) + 1,
count_total: totalAggegations.countTotal,
count_by_type: totalAggegations.countByType,
- count_active_total: countActiveTotal,
+ count_active_total: totalInUse.countTotal,
+ count_active_by_type: totalInUse.countByType,
},
runAt: getNextMidnight(),
};
diff --git a/x-pack/plugins/alerts/server/usage/alerts_telemetry.test.ts b/x-pack/plugins/alerts/server/usage/alerts_telemetry.test.ts
index 171f80cf11cb8..843100194e4b6 100644
--- a/x-pack/plugins/alerts/server/usage/alerts_telemetry.test.ts
+++ b/x-pack/plugins/alerts/server/usage/alerts_telemetry.test.ts
@@ -7,13 +7,13 @@
import { getTotalCountInUse } from './alerts_telemetry';
describe('alerts telemetry', () => {
- test('getTotalCountInUse should replace action types names with . to __', async () => {
+ test('getTotalCountInUse should replace first "." symbol to "__" in alert types names', async () => {
const mockEsClient = jest.fn();
mockEsClient.mockReturnValue({
aggregations: {
byAlertTypeId: {
value: {
- types: { '.index-threshold': 2 },
+ types: { '.index-threshold': 2, 'logs.alert.document.count': 1, 'document.test.': 1 },
},
},
},
@@ -30,8 +30,10 @@ describe('alerts telemetry', () => {
Object {
"countByType": Object {
"__index-threshold": 2,
+ "document.test__": 1,
+ "logs.alert.document.count": 1,
},
- "countTotal": 2,
+ "countTotal": 4,
}
`);
});
diff --git a/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts b/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts
index 6edebb1decb61..72b189aa67f4b 100644
--- a/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts
+++ b/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts
@@ -250,7 +250,7 @@ export async function getTotalCountAggregations(callCluster: LegacyAPICaller, ki
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(obj: any, key: string) => ({
...obj,
- [key.replace('.', '__')]: results.aggregations.byAlertTypeId.value.types[key],
+ [replaceFirstAndLastDotSymbols(key)]: results.aggregations.byAlertTypeId.value.types[key],
}),
{}
),
@@ -310,11 +310,20 @@ export async function getTotalCountInUse(callCluster: LegacyAPICaller, kibanaIne
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(obj: any, key: string) => ({
...obj,
- [key.replace('.', '__')]: searchResult.aggregations.byAlertTypeId.value.types[key],
+ [replaceFirstAndLastDotSymbols(key)]: searchResult.aggregations.byAlertTypeId.value.types[
+ key
+ ],
}),
{}
),
};
}
+function replaceFirstAndLastDotSymbols(strToReplace: string) {
+ const hasFirstSymbolDot = strToReplace.startsWith('.');
+ const appliedString = hasFirstSymbolDot ? strToReplace.replace('.', '__') : strToReplace;
+ const hasLastSymbolDot = strToReplace.endsWith('.');
+ return hasLastSymbolDot ? `${appliedString.slice(0, -1)}__` : appliedString;
+}
+
// TODO: Implement executions count telemetry with eventLog, when it will write to index
diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx b/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
index 8174f06e06b8b..2b58f30a9ec64 100644
--- a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
@@ -24,6 +24,21 @@ export interface FetcherResult {
error?: IHttpFetchError;
}
+function getDetailsFromErrorResponse(error: IHttpFetchError) {
+ const message = error.body?.message ?? error.response?.statusText;
+ return (
+ <>
+ {message} ({error.response?.status})
+
+ {i18n.translate('xpack.apm.fetcher.error.url', {
+ defaultMessage: `URL`,
+ })}
+
+ {error.response?.url}
+
+ );
+}
+
// fetcher functions can return undefined OR a promise. Previously we had a more simple type
// but it led to issues when using object destructuring with default values
type InferResponseType = Exclude extends Promise<
@@ -82,25 +97,14 @@ export function useFetcher(
if (!didCancel) {
const errorDetails =
- 'response' in err ? (
- <>
- {err.response?.statusText} ({err.response?.status})
-
- {i18n.translate('xpack.apm.fetcher.error.url', {
- defaultMessage: `URL`,
- })}
-
- {err.response?.url}
-
- ) : (
- err.message
- );
+ 'response' in err ? getDetailsFromErrorResponse(err) : err.message;
if (showToastOnError) {
- notifications.toasts.addWarning({
+ notifications.toasts.addDanger({
title: i18n.translate('xpack.apm.fetcher.error.title', {
defaultMessage: `Error while fetching resource`,
}),
+
text: toMountPoint(
diff --git a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
index 8c64c37d9b7f7..e3221c17f3f2a 100644
--- a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
+++ b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -17,6 +17,8 @@ import { argv } from 'yargs';
import { Logger } from 'kibana/server';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { CollectTelemetryParams } from '../../server/lib/apm_telemetry/collect_data_telemetry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { unwrapEsResponse } from '../../../observability/server/utils/unwrap_es_response';
import { downloadTelemetryTemplate } from '../shared/download-telemetry-template';
import { mergeApmTelemetryMapping } from '../../common/apm_telemetry';
import { generateSampleDocuments } from './generate-sample-documents';
@@ -80,18 +82,18 @@ async function uploadData() {
apmAgentConfigurationIndex: '.apm-agent-configuration',
},
search: (body) => {
- return client.search(body as any).then((res) => res.body as any);
+ return unwrapEsResponse(client.search(body));
},
indicesStats: (body) => {
- return client.indices.stats(body as any).then((res) => res.body);
+ return unwrapEsResponse(client.indices.stats(body));
},
transportRequest: ((params) => {
- return client.transport
- .request({
+ return unwrapEsResponse(
+ client.transport.request({
method: params.method,
path: params.path,
})
- .then((res) => res.body);
+ );
}) as CollectTelemetryParams['transportRequest'],
},
});
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
index 730645c609cb6..90aad48fe20b9 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
@@ -4,8 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { merge } from 'lodash';
-import { Logger, LegacyCallAPIOptions } from 'kibana/server';
-import { IndicesStatsParams, Client } from 'elasticsearch';
+import { Logger } from 'kibana/server';
+import { RequestParams } from '@elastic/elasticsearch';
import {
ESSearchRequest,
ESSearchResponse,
@@ -20,9 +20,17 @@ type TelemetryTaskExecutor = (params: {
params: TSearchRequest
): Promise>;
indicesStats(
- params: IndicesStatsParams,
- options?: LegacyCallAPIOptions
- ): ReturnType;
+ params: RequestParams.IndicesStats
+ // promise returned by client has an abort property
+ // so we cannot use its ReturnType
+ ): Promise<{
+ _all?: {
+ total?: { store?: { size_in_bytes?: number }; docs?: { count?: number } };
+ };
+ _shards?: {
+ total?: number;
+ };
+ }>;
transportRequest: (params: {
path: string;
method: 'get';
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index 6d91e64be034d..98abff08dab5e 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -11,6 +11,7 @@ import {
Logger,
SavedObjectsErrorHelpers,
} from '../../../../../../src/core/server';
+import { unwrapEsResponse } from '../../../../observability/server';
import { APMConfig } from '../..';
import {
TaskManagerSetupContract,
@@ -65,27 +66,22 @@ export async function createApmTelemetry({
const collectAndStore = async () => {
const config = await config$.pipe(take(1)).toPromise();
const [{ elasticsearch }] = await core.getStartServices();
- const esClient = elasticsearch.legacy.client;
+ const esClient = elasticsearch.client;
const indices = await getApmIndices({
config,
savedObjectsClient,
});
- const search = esClient.callAsInternalUser.bind(
- esClient,
- 'search'
- ) as CollectTelemetryParams['search'];
+ const search: CollectTelemetryParams['search'] = (params) =>
+ unwrapEsResponse(esClient.asInternalUser.search(params));
- const indicesStats = esClient.callAsInternalUser.bind(
- esClient,
- 'indices.stats'
- ) as CollectTelemetryParams['indicesStats'];
+ const indicesStats: CollectTelemetryParams['indicesStats'] = (params) =>
+ unwrapEsResponse(esClient.asInternalUser.indices.stats(params));
- const transportRequest = esClient.callAsInternalUser.bind(
- esClient,
- 'transport.request'
- ) as CollectTelemetryParams['transportRequest'];
+ const transportRequest: CollectTelemetryParams['transportRequest'] = (
+ params
+ ) => unwrapEsResponse(esClient.asInternalUser.transport.request(params));
const dataTelemetry = await collectDataTelemetry({
search,
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
similarity index 51%
rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts
rename to x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
index 9f7aaafbefb8c..9d612d82d99bb 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
@@ -7,34 +7,31 @@
/* eslint-disable no-console */
import chalk from 'chalk';
-import {
- LegacyAPICaller,
- KibanaRequest,
-} from '../../../../../../../src/core/server';
+import { KibanaRequest } from '../../../../../../../src/core/server';
function formatObj(obj: Record) {
return JSON.stringify(obj, null, 2);
}
-export async function callClientWithDebug({
- apiCaller,
- operationName,
- params,
+export async function callAsyncWithDebug({
+ cb,
+ getDebugMessage,
debug,
- request,
}: {
- apiCaller: LegacyAPICaller;
- operationName: string;
- params: Record;
+ cb: () => Promise;
+ getDebugMessage: () => { body: string; title: string };
debug: boolean;
- request: KibanaRequest;
}) {
+ if (!debug) {
+ return cb();
+ }
+
const startTime = process.hrtime();
let res: any;
let esError = null;
try {
- res = await apiCaller(operationName, params);
+ res = await cb();
} catch (e) {
// catch error and throw after outputting debug info
esError = e;
@@ -44,23 +41,14 @@ export async function callClientWithDebug({
const highlightColor = esError ? 'bgRed' : 'inverse';
const diff = process.hrtime(startTime);
const duration = `${Math.round(diff[0] * 1000 + diff[1] / 1e6)}ms`;
- const routeInfo = `${request.route.method.toUpperCase()} ${
- request.route.path
- }`;
+
+ const { title, body } = getDebugMessage();
console.log(
- chalk.bold[highlightColor](`=== Debug: ${routeInfo} (${duration}) ===`)
+ chalk.bold[highlightColor](`=== Debug: ${title} (${duration}) ===`)
);
- if (operationName === 'search') {
- console.log(`GET ${params.index}/_${operationName}`);
- console.log(formatObj(params.body));
- } else {
- console.log(chalk.bold('ES operation:'), operationName);
-
- console.log(chalk.bold('ES query:'));
- console.log(formatObj(params));
- }
+ console.log(body);
console.log(`\n`);
}
@@ -70,3 +58,19 @@ export async function callClientWithDebug({
return res;
}
+
+export const getDebugBody = (
+ params: Record,
+ operationName: string
+) => {
+ if (operationName === 'search') {
+ return `GET ${params.index}/_search\n${formatObj(params.body)}`;
+ }
+
+ return `${chalk.bold('ES operation:')} ${operationName}\n${chalk.bold(
+ 'ES query:'
+ )}\n${formatObj(params)}`;
+};
+
+export const getDebugTitle = (request: KibanaRequest) =>
+ `${request.route.method.toUpperCase()} ${request.route.path}`;
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
new file mode 100644
index 0000000000000..e9b61a27f4380
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
+import { KibanaRequest } from 'src/core/server';
+
+export function cancelEsRequestOnAbort>(
+ promise: T,
+ request: KibanaRequest
+) {
+ const subscription = request.events.aborted$.subscribe(() => {
+ promise.abort();
+ });
+
+ // using .catch() here means unsubscribe will be called
+ // after it has thrown an error, so we use .then(onSuccess, onFailure)
+ // syntax
+ promise.then(
+ () => subscription.unsubscribe(),
+ () => subscription.unsubscribe()
+ );
+
+ return promise;
+}
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
new file mode 100644
index 0000000000000..f58e04061254d
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { contextServiceMock } from 'src/core/server/mocks';
+import { createHttpServer } from 'src/core/server/test_utils';
+import supertest from 'supertest';
+import { createApmEventClient } from '.';
+
+describe('createApmEventClient', () => {
+ let server: ReturnType;
+
+ beforeEach(() => {
+ server = createHttpServer();
+ });
+
+ afterEach(async () => {
+ await server.stop();
+ });
+ it('cancels a search when a request is aborted', async () => {
+ const { server: innerServer, createRouter } = await server.setup({
+ context: contextServiceMock.createSetupContract(),
+ });
+ const router = createRouter('/');
+
+ const abort = jest.fn();
+ router.get(
+ { path: '/', validate: false },
+ async (context, request, res) => {
+ const eventClient = createApmEventClient({
+ esClient: {
+ search: () => {
+ return Object.assign(
+ new Promise((resolve) => setTimeout(resolve, 3000)),
+ { abort }
+ );
+ },
+ } as any,
+ debug: false,
+ request,
+ indices: {} as any,
+ options: {
+ includeFrozen: false,
+ },
+ });
+
+ await eventClient.search({
+ apm: {
+ events: [],
+ },
+ });
+
+ return res.ok({ body: 'ok' });
+ }
+ );
+
+ await server.start();
+
+ const incomingRequest = supertest(innerServer.listener)
+ .get('/')
+ // end required to send request
+ .end();
+
+ await new Promise((resolve) => {
+ setTimeout(() => {
+ incomingRequest.abort();
+ setTimeout(() => {
+ resolve(undefined);
+ }, 0);
+ }, 50);
+ });
+
+ expect(abort).toHaveBeenCalled();
+ });
+});
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
index b7c38068eb93e..b2e25994d6fe6 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
@@ -5,10 +5,11 @@
*/
import { ValuesType } from 'utility-types';
+import { unwrapEsResponse } from '../../../../../../observability/server';
import { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
import {
+ ElasticsearchClient,
KibanaRequest,
- LegacyScopedClusterClient,
} from '../../../../../../../../src/core/server';
import { ProcessorEvent } from '../../../../../common/processor_event';
import {
@@ -17,11 +18,16 @@ import {
} from '../../../../../../../typings/elasticsearch';
import { ApmIndicesConfig } from '../../../settings/apm_indices/get_apm_indices';
import { addFilterToExcludeLegacyData } from './add_filter_to_exclude_legacy_data';
-import { callClientWithDebug } from '../call_client_with_debug';
import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
import { Span } from '../../../../../typings/es_schemas/ui/span';
import { Metric } from '../../../../../typings/es_schemas/ui/metric';
import { unpackProcessorEvents } from './unpack_processor_events';
+import {
+ callAsyncWithDebug,
+ getDebugTitle,
+ getDebugBody,
+} from '../call_async_with_debug';
+import { cancelEsRequestOnAbort } from '../cancel_es_request_on_abort';
export type APMEventESSearchRequest = Omit & {
apm: {
@@ -59,10 +65,7 @@ export function createApmEventClient({
indices,
options: { includeFrozen } = { includeFrozen: false },
}: {
- esClient: Pick<
- LegacyScopedClusterClient,
- 'callAsInternalUser' | 'callAsCurrentUser'
- >;
+ esClient: ElasticsearchClient;
debug: boolean;
request: KibanaRequest;
indices: ApmIndicesConfig;
@@ -71,9 +74,9 @@ export function createApmEventClient({
};
}) {
return {
- search(
+ async search(
params: TParams,
- { includeLegacyData } = { includeLegacyData: false }
+ { includeLegacyData = false } = {}
): Promise> {
const withProcessorEventFilter = unpackProcessorEvents(params, indices);
@@ -81,15 +84,25 @@ export function createApmEventClient({
? addFilterToExcludeLegacyData(withProcessorEventFilter)
: withProcessorEventFilter;
- return callClientWithDebug({
- apiCaller: esClient.callAsCurrentUser,
- operationName: 'search',
- params: {
- ...withPossibleLegacyDataFilter,
- ignore_throttled: !includeFrozen,
- ignore_unavailable: true,
+ const searchParams = {
+ ...withPossibleLegacyDataFilter,
+ ignore_throttled: !includeFrozen,
+ ignore_unavailable: true,
+ };
+
+ return callAsyncWithDebug({
+ cb: () => {
+ const searchPromise = cancelEsRequestOnAbort(
+ esClient.search(searchParams),
+ request
+ );
+
+ return unwrapEsResponse(searchPromise);
},
- request,
+ getDebugMessage: () => ({
+ body: getDebugBody(searchParams, 'search'),
+ title: getDebugTitle(request),
+ }),
debug,
});
},
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
index 8e74a7992e9ea..69f596520d216 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
@@ -3,23 +3,23 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-
-import {
- IndexDocumentParams,
- IndicesCreateParams,
- DeleteDocumentResponse,
- DeleteDocumentParams,
-} from 'elasticsearch';
import { KibanaRequest } from 'src/core/server';
+import { RequestParams } from '@elastic/elasticsearch';
+import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
+import { unwrapEsResponse } from '../../../../../../observability/server';
import { APMRequestHandlerContext } from '../../../../routes/typings';
import {
ESSearchResponse,
ESSearchRequest,
} from '../../../../../../../typings/elasticsearch';
-import { callClientWithDebug } from '../call_client_with_debug';
+import {
+ callAsyncWithDebug,
+ getDebugBody,
+ getDebugTitle,
+} from '../call_async_with_debug';
+import { cancelEsRequestOnAbort } from '../cancel_es_request_on_abort';
-// `type` was deprecated in 7.0
-export type APMIndexDocumentParams = Omit, 'type'>;
+export type APMIndexDocumentParams = RequestParams.Index;
export type APMInternalClient = ReturnType;
@@ -30,17 +30,26 @@ export function createInternalESClient({
context: APMRequestHandlerContext;
request: KibanaRequest;
}) {
- const { callAsInternalUser } = context.core.elasticsearch.legacy.client;
+ const { asInternalUser } = context.core.elasticsearch.client;
- const callEs = (operationName: string, params: Record) => {
- return callClientWithDebug({
- apiCaller: callAsInternalUser,
- operationName,
- params,
- request,
+ function callEs({
+ cb,
+ operationName,
+ params,
+ }: {
+ operationName: string;
+ cb: () => TransportRequestPromise;
+ params: Record;
+ }) {
+ return callAsyncWithDebug({
+ cb: () => unwrapEsResponse(cancelEsRequestOnAbort(cb(), request)),
+ getDebugMessage: () => ({
+ title: getDebugTitle(request),
+ body: getDebugBody(params, operationName),
+ }),
debug: context.params.query._debug,
});
- };
+ }
return {
search: async <
@@ -49,18 +58,32 @@ export function createInternalESClient({
>(
params: TSearchRequest
): Promise> => {
- return callEs('search', params);
+ return callEs({
+ operationName: 'search',
+ cb: () => asInternalUser.search(params),
+ params,
+ });
},
- index: (params: APMIndexDocumentParams) => {
- return callEs('index', params);
+ index: (params: APMIndexDocumentParams) => {
+ return callEs({
+ operationName: 'index',
+ cb: () => asInternalUser.index(params),
+ params,
+ });
},
- delete: (
- params: Omit
- ): Promise => {
- return callEs('delete', params);
+ delete: (params: RequestParams.Delete): Promise<{ result: string }> => {
+ return callEs({
+ operationName: 'delete',
+ cb: () => asInternalUser.delete(params),
+ params,
+ });
},
- indicesCreate: (params: IndicesCreateParams) => {
- return callEs('indices.create', params);
+ indicesCreate: (params: RequestParams.IndicesCreate) => {
+ return callEs({
+ operationName: 'indices.create',
+ cb: () => asInternalUser.indices.create(params),
+ params,
+ });
},
};
}
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index f2d291cd053bb..f00941d6e6800 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -31,6 +31,15 @@ jest.mock('../index_pattern/get_dynamic_index_pattern', () => ({
}));
function getMockRequest() {
+ const esClientMock = {
+ asCurrentUser: {
+ search: jest.fn().mockResolvedValue({ body: {} }),
+ },
+ asInternalUser: {
+ search: jest.fn().mockResolvedValue({ body: {} }),
+ },
+ };
+
const mockContext = ({
config: new Proxy(
{},
@@ -45,12 +54,7 @@ function getMockRequest() {
},
core: {
elasticsearch: {
- legacy: {
- client: {
- callAsCurrentUser: jest.fn(),
- callAsInternalUser: jest.fn(),
- },
- },
+ client: esClientMock,
},
uiSettings: {
client: {
@@ -69,12 +73,7 @@ function getMockRequest() {
} as unknown) as APMRequestHandlerContext & {
core: {
elasticsearch: {
- legacy: {
- client: {
- callAsCurrentUser: jest.Mock;
- callAsInternalUser: jest.Mock;
- };
- };
+ client: typeof esClientMock;
};
uiSettings: {
client: {
@@ -91,6 +90,11 @@ function getMockRequest() {
const mockRequest = ({
url: '',
+ events: {
+ aborted$: {
+ subscribe: jest.fn(),
+ },
+ },
} as unknown) as KibanaRequest;
return { mockContext, mockRequest };
@@ -106,8 +110,8 @@ describe('setupRequest', () => {
body: { foo: 'bar' },
});
expect(
- mockContext.core.elasticsearch.legacy.client.callAsCurrentUser
- ).toHaveBeenCalledWith('search', {
+ mockContext.core.elasticsearch.client.asCurrentUser.search
+ ).toHaveBeenCalledWith({
index: ['apm-*'],
body: {
foo: 'bar',
@@ -133,8 +137,8 @@ describe('setupRequest', () => {
body: { foo: 'bar' },
} as any);
expect(
- mockContext.core.elasticsearch.legacy.client.callAsInternalUser
- ).toHaveBeenCalledWith('search', {
+ mockContext.core.elasticsearch.client.asInternalUser.search
+ ).toHaveBeenCalledWith({
index: ['apm-*'],
body: {
foo: 'bar',
@@ -154,8 +158,8 @@ describe('setupRequest', () => {
body: { query: { bool: { filter: [{ term: 'someTerm' }] } } },
});
const params =
- mockContext.core.elasticsearch.legacy.client.callAsCurrentUser.mock
- .calls[0][1];
+ mockContext.core.elasticsearch.client.asCurrentUser.search.mock
+ .calls[0][0];
expect(params.body).toEqual({
query: {
bool: {
@@ -184,8 +188,8 @@ describe('setupRequest', () => {
}
);
const params =
- mockContext.core.elasticsearch.legacy.client.callAsCurrentUser.mock
- .calls[0][1];
+ mockContext.core.elasticsearch.client.asCurrentUser.search.mock
+ .calls[0][0];
expect(params.body).toEqual({
query: {
bool: {
@@ -214,8 +218,8 @@ describe('without a bool filter', () => {
},
});
const params =
- mockContext.core.elasticsearch.legacy.client.callAsCurrentUser.mock
- .calls[0][1];
+ mockContext.core.elasticsearch.client.asCurrentUser.search.mock
+ .calls[0][0];
expect(params.body).toEqual({
query: {
bool: {
@@ -245,8 +249,8 @@ describe('with includeFrozen=false', () => {
});
const params =
- mockContext.core.elasticsearch.legacy.client.callAsCurrentUser.mock
- .calls[0][1];
+ mockContext.core.elasticsearch.client.asCurrentUser.search.mock
+ .calls[0][0];
expect(params.ignore_throttled).toBe(true);
});
});
@@ -265,8 +269,8 @@ describe('with includeFrozen=true', () => {
});
const params =
- mockContext.core.elasticsearch.legacy.client.callAsCurrentUser.mock
- .calls[0][1];
+ mockContext.core.elasticsearch.client.asCurrentUser.search.mock
+ .calls[0][0];
expect(params.ignore_throttled).toBe(false);
});
});
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
index 47529de1042a1..947eb68e10093 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
@@ -86,7 +86,7 @@ export async function setupRequest(
const coreSetupRequest = {
indices,
apmEventClient: createApmEventClient({
- esClient: context.core.elasticsearch.legacy.client,
+ esClient: context.core.elasticsearch.client.asCurrentUser,
debug: context.params.query._debug,
request,
indices,
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
index 3903298415aed..55395f3a4ca4e 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
@@ -4,7 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { LegacyAPICaller, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from 'kibana/server';
+import { unwrapEsResponse } from '../../../../../observability/server';
import { rangeFilter } from '../../../../common/utils/range_filter';
import { ESSearchResponse } from '../../../../../../typings/elasticsearch';
import { Annotation as ESAnnotation } from '../../../../../observability/common/annotations';
@@ -18,14 +19,14 @@ export async function getStoredAnnotations({
setup,
serviceName,
environment,
- apiCaller,
+ client,
annotationsClient,
logger,
}: {
setup: Setup & SetupTimeRange;
serviceName: string;
environment?: string;
- apiCaller: LegacyAPICaller;
+ client: ElasticsearchClient;
annotationsClient: ScopedAnnotationsClient;
logger: Logger;
}): Promise {
@@ -50,10 +51,12 @@ export async function getStoredAnnotations({
const response: ESSearchResponse<
ESAnnotation,
{ body: typeof body }
- > = (await apiCaller('search', {
- index: annotationsClient.index,
- body,
- })) as any;
+ > = await unwrapEsResponse(
+ client.search({
+ index: annotationsClient.index,
+ body,
+ })
+ );
return response.hits.hits.map((hit) => {
return {
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/index.ts b/x-pack/plugins/apm/server/lib/services/annotations/index.ts
index 9516ed3777297..304485822be28 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/index.ts
@@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { LegacyAPICaller, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from 'kibana/server';
import { ScopedAnnotationsClient } from '../../../../../observability/server';
import { getDerivedServiceAnnotations } from './get_derived_service_annotations';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
@@ -15,7 +15,7 @@ export async function getServiceAnnotations({
serviceName,
environment,
annotationsClient,
- apiCaller,
+ client,
logger,
}: {
serviceName: string;
@@ -23,7 +23,7 @@ export async function getServiceAnnotations({
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
annotationsClient?: ScopedAnnotationsClient;
- apiCaller: LegacyAPICaller;
+ client: ElasticsearchClient;
logger: Logger;
}) {
// start fetching derived annotations (based on transactions), but don't wait on it
@@ -41,7 +41,7 @@ export async function getServiceAnnotations({
serviceName,
environment,
annotationsClient,
- apiCaller,
+ client,
logger,
})
: [];
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
index 83117db1167b5..190c99d0002d8 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ILegacyClusterClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from 'src/core/server';
import {
createOrUpdateIndex,
MappingsDefinition,
@@ -13,18 +13,18 @@ import { APMConfig } from '../../..';
import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
export async function createApmAgentConfigurationIndex({
- esClient,
+ client,
config,
logger,
}: {
- esClient: ILegacyClusterClient;
+ client: ElasticsearchClient;
config: APMConfig;
logger: Logger;
}) {
const index = getApmIndicesConfig(config).apmAgentConfigurationIndex;
return createOrUpdateIndex({
index,
- apiCaller: esClient.callAsInternalUser,
+ client,
logger,
mappings,
});
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
index 2bfe0d620e4e8..aa9e7411d1014 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ILegacyClusterClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from 'src/core/server';
import {
createOrUpdateIndex,
MappingsDefinition,
@@ -13,18 +13,18 @@ import { APMConfig } from '../../..';
import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
export const createApmCustomLinkIndex = async ({
- esClient,
+ client,
config,
logger,
}: {
- esClient: ILegacyClusterClient;
+ client: ElasticsearchClient;
config: APMConfig;
logger: Logger;
}) => {
const index = getApmIndicesConfig(config).apmCustomLinkIndex;
return createOrUpdateIndex({
index,
- apiCaller: esClient.callAsInternalUser,
+ client,
logger,
mappings,
});
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index 09b75137e12df..3e01523aa8e31 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -173,7 +173,7 @@ export class APMPlugin implements Plugin {
context.core.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN),
]);
- const esClient = context.core.elasticsearch.legacy.client;
+ const esClient = context.core.elasticsearch.client.asCurrentUser;
return createApmEventClient({
debug: debug ?? false,
@@ -195,13 +195,13 @@ export class APMPlugin implements Plugin {
// create agent configuration index without blocking start lifecycle
createApmAgentConfigurationIndex({
- esClient: core.elasticsearch.legacy.client,
+ client: core.elasticsearch.client.asInternalUser,
config: this.currentConfig,
logger: this.logger,
});
// create custom action index without blocking start lifecycle
createApmCustomLinkIndex({
- esClient: core.elasticsearch.legacy.client,
+ client: core.elasticsearch.client.asInternalUser,
config: this.currentConfig,
logger: this.logger,
});
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.ts b/x-pack/plugins/apm/server/routes/create_api/index.ts
index cfb31670bd521..721badf7fc025 100644
--- a/x-pack/plugins/apm/server/routes/create_api/index.ts
+++ b/x-pack/plugins/apm/server/routes/create_api/index.ts
@@ -147,7 +147,7 @@ function convertBoomToKibanaResponse(
error: Boom.Boom,
response: KibanaResponseFactory
) {
- const opts = { body: error.message };
+ const opts = { body: { message: error.message } };
switch (error.output.statusCode) {
case 404:
return response.notFound(opts);
@@ -159,9 +159,6 @@ function convertBoomToKibanaResponse(
return response.forbidden(opts);
default:
- return response.custom({
- statusCode: error.output.statusCode,
- ...opts,
- });
+ throw error;
}
}
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index bfc2ebf062ac3..ef74437f5f0e7 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -194,7 +194,7 @@ export const serviceAnnotationsRoute = createRoute({
serviceName,
environment,
annotationsClient,
- apiCaller: context.core.elasticsearch.legacy.client.callAsCurrentUser,
+ client: context.core.elasticsearch.client.asCurrentUser,
logger: context.logger,
});
},
diff --git a/x-pack/plugins/dashboard_mode/server/ui_settings.ts b/x-pack/plugins/dashboard_mode/server/ui_settings.ts
index f692ec8a33fc9..59de82cf7b3ab 100644
--- a/x-pack/plugins/dashboard_mode/server/ui_settings.ts
+++ b/x-pack/plugins/dashboard_mode/server/ui_settings.ts
@@ -22,6 +22,7 @@ export function getUiSettings(): Record> {
}),
value: [DASHBOARD_ONLY_USER_ROLE],
category: ['dashboard'],
+ sensitive: true,
deprecation: {
message: i18n.translate('xpack.dashboardMode.uiSettings.dashboardsOnlyRolesDeprecation', {
defaultMessage: 'This setting is deprecated and will be removed in Kibana 8.0.',
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
index 2c74f9c995a5a..f4bb7577bee53 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
@@ -28,6 +28,12 @@ timeFilter.getRefreshInterval.mockImplementation(() => refreshInterval$.getValue
beforeEach(() => {
refreshInterval$.next({ value: 0, pause: true });
+ sessionService.isSessionStorageReady.mockImplementation(() => true);
+ sessionService.getSearchSessionIndicatorUiConfig.mockImplementation(() => ({
+ isDisabled: () => ({
+ disabled: false,
+ }),
+ }));
});
test("shouldn't show indicator in case no active search session", async () => {
@@ -45,6 +51,22 @@ test("shouldn't show indicator in case no active search session", async () => {
expect(container).toMatchInlineSnapshot(``);
});
+test("shouldn't show indicator in case app hasn't opt-in", async () => {
+ const SearchSessionIndicator = createConnectedSearchSessionIndicator({
+ sessionService,
+ application: coreStart.application,
+ timeFilter,
+ });
+ const { getByTestId, container } = render();
+ sessionService.isSessionStorageReady.mockImplementation(() => false);
+
+ // make sure `searchSessionIndicator` isn't appearing after some time (lazy-loading)
+ await expect(
+ waitFor(() => getByTestId('searchSessionIndicator'), { timeout: 100 })
+ ).rejects.toThrow();
+ expect(container).toMatchInlineSnapshot(``);
+});
+
test('should show indicator in case there is an active search session', async () => {
const state$ = new BehaviorSubject(SearchSessionState.Loading);
const SearchSessionIndicator = createConnectedSearchSessionIndicator({
@@ -57,7 +79,7 @@ test('should show indicator in case there is an active search session', async ()
await waitFor(() => getByTestId('searchSessionIndicator'));
});
-test('should be disabled when permissions are off', async () => {
+test('should be disabled in case uiConfig says so ', async () => {
const state$ = new BehaviorSubject(SearchSessionState.Loading);
coreStart.application.currentAppId$ = new BehaviorSubject('discover');
(coreStart.application.capabilities as any) = {
@@ -65,6 +87,12 @@ test('should be disabled when permissions are off', async () => {
storeSearchSession: false,
},
};
+ sessionService.getSearchSessionIndicatorUiConfig.mockImplementation(() => ({
+ isDisabled: () => ({
+ disabled: true,
+ reasonText: 'reason',
+ }),
+ }));
const SearchSessionIndicator = createConnectedSearchSessionIndicator({
sessionService: { ...sessionService, state$ },
application: coreStart.application,
@@ -80,12 +108,7 @@ test('should be disabled when permissions are off', async () => {
test('should be disabled during auto-refresh', async () => {
const state$ = new BehaviorSubject(SearchSessionState.Loading);
- coreStart.application.currentAppId$ = new BehaviorSubject('discover');
- (coreStart.application.capabilities as any) = {
- discover: {
- storeSearchSession: true,
- },
- };
+
const SearchSessionIndicator = createConnectedSearchSessionIndicator({
sessionService: { ...sessionService, state$ },
application: coreStart.application,
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
index 5c8c01064bff4..59c1bb4a223b1 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
@@ -29,35 +29,14 @@ export const createConnectedSearchSessionIndicator = ({
.getRefreshIntervalUpdate$()
.pipe(map(isAutoRefreshEnabled), distinctUntilChanged());
- const getCapabilitiesByAppId = (
- capabilities: ApplicationStart['capabilities'],
- appId?: string
- ) => {
- switch (appId) {
- case 'dashboards':
- return capabilities.dashboard;
- case 'discover':
- return capabilities.discover;
- default:
- return undefined;
- }
- };
-
return () => {
const state = useObservable(sessionService.state$.pipe(debounceTime(500)));
const autoRefreshEnabled = useObservable(isAutoRefreshEnabled$, isAutoRefreshEnabled());
- const appId = useObservable(application.currentAppId$, undefined);
+ const isDisabledByApp = sessionService.getSearchSessionIndicatorUiConfig().isDisabled();
let disabled = false;
let disabledReasonText: string = '';
- if (getCapabilitiesByAppId(application.capabilities, appId)?.storeSearchSession !== true) {
- disabled = true;
- disabledReasonText = i18n.translate('xpack.data.searchSessionIndicator.noCapability', {
- defaultMessage: "You don't have permissions to send to background.",
- });
- }
-
if (autoRefreshEnabled) {
disabled = true;
disabledReasonText = i18n.translate(
@@ -68,6 +47,12 @@ export const createConnectedSearchSessionIndicator = ({
);
}
+ if (isDisabledByApp.disabled) {
+ disabled = true;
+ disabledReasonText = isDisabledByApp.reasonText;
+ }
+
+ if (!sessionService.isSessionStorageReady()) return null;
if (!state) return null;
return (
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
index 1ffbae39d3705..1b49416ebbbe9 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
@@ -21,6 +21,9 @@ const PERCENT_SIGN_NAME = 'test%';
const PERCENT_SIGN_WITH_OTHER_CHARS_NAME = 'test%#';
const PERCENT_SIGN_25_SEQUENCE = 'test%25';
+const createPolicyTitle = 'Create Policy';
+const editPolicyTitle = 'Edit Policy';
+
window.scrollTo = jest.fn();
jest.mock('@elastic/eui', () => {
@@ -52,7 +55,7 @@ describe('', () => {
await actions.clickCreatePolicyButton();
component.update();
- expect(testBed.find('policyTitle').text()).toBe(`Create an index lifecycle policy`);
+ expect(testBed.find('policyTitle').text()).toBe(createPolicyTitle);
expect(testBed.find('policyNameField').props().value).toBe('');
});
@@ -68,7 +71,7 @@ describe('', () => {
await actions.clickCreatePolicyButton();
component.update();
- expect(testBed.find('policyTitle').text()).toBe(`Create an index lifecycle policy`);
+ expect(testBed.find('policyTitle').text()).toBe(createPolicyTitle);
expect(testBed.find('policyNameField').props().value).toBe('');
});
});
@@ -89,9 +92,7 @@ describe('', () => {
await actions.clickPolicyNameLink();
component.update();
- expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${SPECIAL_CHARS_NAME}`
- );
+ expect(testBed.find('policyTitle').text()).toBe(`${editPolicyTitle} ${SPECIAL_CHARS_NAME}`);
});
test('loading edit policy page url works', async () => {
@@ -102,9 +103,7 @@ describe('', () => {
const { component } = testBed;
component.update();
- expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${SPECIAL_CHARS_NAME}`
- );
+ expect(testBed.find('policyTitle').text()).toBe(`${editPolicyTitle} ${SPECIAL_CHARS_NAME}`);
});
// using double encoding to counteract react-router's v5 internal decodeURI call
@@ -117,9 +116,7 @@ describe('', () => {
const { component } = testBed;
component.update();
- expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${SPECIAL_CHARS_NAME}`
- );
+ expect(testBed.find('policyTitle').text()).toBe(`${editPolicyTitle} ${SPECIAL_CHARS_NAME}`);
});
});
@@ -136,9 +133,7 @@ describe('', () => {
const { component } = testBed;
component.update();
- expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_NAME}`
- );
+ expect(testBed.find('policyTitle').text()).toBe(`${editPolicyTitle} ${PERCENT_SIGN_NAME}`);
});
test('loading edit policy page url with double encoding works', async () => {
@@ -149,9 +144,7 @@ describe('', () => {
const { component } = testBed;
component.update();
- expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_NAME}`
- );
+ expect(testBed.find('policyTitle').text()).toBe(`${editPolicyTitle} ${PERCENT_SIGN_NAME}`);
});
});
@@ -174,7 +167,7 @@ describe('', () => {
component.update();
expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_WITH_OTHER_CHARS_NAME}`
+ `${editPolicyTitle} ${PERCENT_SIGN_WITH_OTHER_CHARS_NAME}`
);
});
@@ -188,7 +181,7 @@ describe('', () => {
// known issue https://github.com/elastic/kibana/issues/82440
expect(testBed.find('policyTitle').text()).not.toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_WITH_OTHER_CHARS_NAME}`
+ `${editPolicyTitle} ${PERCENT_SIGN_WITH_OTHER_CHARS_NAME}`
);
});
@@ -203,7 +196,7 @@ describe('', () => {
component.update();
expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_WITH_OTHER_CHARS_NAME}`
+ `${editPolicyTitle} ${PERCENT_SIGN_WITH_OTHER_CHARS_NAME}`
);
});
});
@@ -225,7 +218,7 @@ describe('', () => {
component.update();
expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_25_SEQUENCE}`
+ `${editPolicyTitle} ${PERCENT_SIGN_25_SEQUENCE}`
);
});
@@ -239,7 +232,7 @@ describe('', () => {
// known issue https://github.com/elastic/kibana/issues/82440
expect(testBed.find('policyTitle').text()).not.toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_25_SEQUENCE}`
+ `${editPolicyTitle} ${PERCENT_SIGN_25_SEQUENCE}`
);
});
@@ -254,7 +247,7 @@ describe('', () => {
component.update();
expect(testBed.find('policyTitle').text()).toBe(
- `Edit index lifecycle policy ${PERCENT_SIGN_25_SEQUENCE}`
+ `${editPolicyTitle} ${PERCENT_SIGN_25_SEQUENCE}`
);
});
});
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
index 72a0372628a22..64b654b030236 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
@@ -89,6 +89,13 @@ export const setup = async (arg?: { appServicesContext: Partial async (checked: boolean) => {
+ await act(async () => {
+ form.selectCheckBox(dataTestSubject, checked);
+ });
+ component.update();
+ };
+
function createFormSetValueAction(dataTestSubject: string) {
return async (value: V) => {
await act(async () => {
@@ -146,17 +153,21 @@ export const setup = async (arg?: { appServicesContext: Partial exists(toggleSelector),
toggleForceMerge: createFormToggleAction(toggleSelector),
setForcemergeSegmentsCount: createFormSetValueAction(`${phase}-selectedForceMergeSegments`),
- setBestCompression: createFormToggleAction(`${phase}-bestCompression`),
+ setBestCompression: createFormCheckboxAction(`${phase}-bestCompression`),
};
};
- const setIndexPriority = (phase: Phases) =>
- createFormSetValueAction(`${phase}-phaseIndexPriority`);
+ const createIndexPriorityActions = (phase: Phases) => {
+ const toggleSelector = `${phase}-indexPrioritySwitch`;
+ return {
+ indexPriorityExists: () => exists(toggleSelector),
+ toggleIndexPriority: createFormToggleAction(toggleSelector),
+ setIndexPriority: createFormSetValueAction(`${phase}-indexPriority`),
+ };
+ };
const enable = (phase: Phases) => createFormToggleAction(`enablePhaseSwitch-${phase}`);
- const warmPhaseOnRollover = createFormToggleAction(`warm-warmPhaseOnRollover`);
-
const setMinAgeValue = (phase: Phases) => createFormSetValueAction(`${phase}-selectedMinimumAge`);
const setMinAgeUnits = (phase: Phases) =>
@@ -190,13 +201,15 @@ export const setup = async (arg?: { appServicesContext: Partial async (value: string) => {
- await createFormToggleAction(`${phase}-shrinkSwitch`)(true);
- await createFormSetValueAction(`${phase}-selectedPrimaryShardCount`)(value);
+ const createShrinkActions = (phase: Phases) => {
+ const toggleSelector = `${phase}-shrinkSwitch`;
+ return {
+ shrinkExists: () => exists(toggleSelector),
+ toggleShrink: createFormToggleAction(toggleSelector),
+ setShrink: createFormSetValueAction(`${phase}-primaryShardCount`),
+ };
};
- const shrinkExists = (phase: Phases) => () => exists(`${phase}-shrinkSwitch`);
-
const setFreeze = createFormToggleAction('freezeSwitch');
const freezeExists = () => exists('freezeSwitch');
@@ -250,25 +263,22 @@ export const setup = async (arg?: { appServicesContext: Partial', () => {
max_size: '50gb',
unknown_setting: 123, // Made up setting that should stay preserved
},
- set_priority: {
- priority: 100,
- },
},
min_age: '0ms',
},
@@ -126,8 +123,10 @@ describe('', () => {
await actions.hot.toggleForceMerge(true);
await actions.hot.setForcemergeSegmentsCount('123');
await actions.hot.setBestCompression(true);
+ await actions.hot.toggleShrink(true);
await actions.hot.setShrink('2');
await actions.hot.setReadonly(true);
+ await actions.hot.toggleIndexPriority(true);
await actions.hot.setIndexPriority('123');
await actions.savePolicy();
@@ -186,13 +185,7 @@ describe('', () => {
const hotActions = policy.phases.hot.actions;
const rolloverAction = hotActions.rollover;
expect(rolloverAction).toBe(undefined);
- expect(hotActions).toMatchInlineSnapshot(`
- Object {
- "set_priority": Object {
- "priority": 100,
- },
- }
- `);
+ expect(hotActions).toMatchInlineSnapshot(`Object {}`);
});
test('enabling searchable snapshot should hide force merge, freeze and shrink in subsequent phases', async () => {
@@ -260,6 +253,7 @@ describe('', () => {
"priority": 50,
},
},
+ "min_age": "0ms",
}
`);
});
@@ -270,6 +264,7 @@ describe('', () => {
await actions.warm.setDataAllocation('node_attrs');
await actions.warm.setSelectedNodeAttribute('test:123');
await actions.warm.setReplicas('123');
+ await actions.warm.toggleShrink(true);
await actions.warm.setShrink('123');
await actions.warm.toggleForceMerge(true);
await actions.warm.setForcemergeSegmentsCount('123');
@@ -290,9 +285,6 @@ describe('', () => {
"max_age": "30d",
"max_size": "50gb",
},
- "set_priority": Object {
- "priority": 100,
- },
},
"min_age": "0ms",
},
@@ -316,24 +308,12 @@ describe('', () => {
"number_of_shards": 123,
},
},
+ "min_age": "0ms",
},
},
}
`);
});
-
- test('setting warm phase on rollover to "false"', async () => {
- const { actions } = testBed;
- await actions.warm.enable(true);
- await actions.warm.warmPhaseOnRollover(false);
- await actions.warm.setMinAgeValue('123');
- await actions.warm.setMinAgeUnits('d');
- await actions.savePolicy();
- const latestRequest = server.requests[server.requests.length - 1];
- const warmPhaseMinAge = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm
- .min_age;
- expect(warmPhaseMinAge).toBe('123d');
- });
});
describe('policy with include and exclude', () => {
@@ -458,9 +438,6 @@ describe('', () => {
"max_age": "30d",
"max_size": "50gb",
},
- "set_priority": Object {
- "priority": 100,
- },
},
"min_age": "0ms",
},
@@ -662,9 +639,6 @@ describe('', () => {
"allocate": Object {
"number_of_replicas": 123,
},
- "set_priority": Object {
- "priority": 50,
- },
}
`);
});
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.tsx
index 6aa6c3177ca5d..d847c3a7f9766 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.tsx
@@ -157,7 +157,7 @@ const setPhaseIndexPriority = async (
phase: string,
priority: string | number
) => {
- const priorityInput = findTestSubject(rendered, `${phase}-phaseIndexPriority`);
+ const priorityInput = findTestSubject(rendered, `${phase}-indexPriority`);
await act(async () => {
priorityInput.simulate('change', { target: { value: priority } });
});
@@ -324,9 +324,6 @@ describe('edit policy', () => {
max_age: '30d',
max_size: '50gb',
},
- set_priority: {
- priority: 100,
- },
},
min_age: '0ms',
},
@@ -451,6 +448,7 @@ describe('edit policy', () => {
const rendered = mountWithIntl(component);
await noRollover(rendered);
await setPolicyName(rendered, 'mypolicy');
+
await setPhaseIndexPriority(rendered, 'hot', '-1');
waitForFormLibValidation(rendered);
expectedErrorMessages(rendered, [i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
@@ -512,7 +510,7 @@ describe('edit policy', () => {
});
rendered.update();
await setPhaseAfter(rendered, 'warm', '1');
- const shrinkInput = findTestSubject(rendered, 'warm-selectedPrimaryShardCount');
+ const shrinkInput = findTestSubject(rendered, 'warm-primaryShardCount');
await act(async () => {
shrinkInput.simulate('change', { target: { value: '0' } });
});
@@ -529,7 +527,7 @@ describe('edit policy', () => {
findTestSubject(rendered, 'warm-shrinkSwitch').simulate('click');
});
rendered.update();
- const shrinkInput = findTestSubject(rendered, 'warm-selectedPrimaryShardCount');
+ const shrinkInput = findTestSubject(rendered, 'warm-primaryShardCount');
await act(async () => {
shrinkInput.simulate('change', { target: { value: '-1' } });
});
@@ -845,7 +843,7 @@ describe('edit policy', () => {
await activatePhase(rendered, 'warm');
expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
- // Assert that only the custom and off options exist
+ // Assert that default, custom and 'none' options exist
findTestSubject(rendered, 'dataTierSelect').simulate('click');
expect(findTestSubject(rendered, 'defaultDataAllocationOption').exists()).toBeTruthy();
expect(findTestSubject(rendered, 'customDataAllocationOption').exists()).toBeTruthy();
@@ -885,7 +883,7 @@ describe('edit policy', () => {
await activatePhase(rendered, 'warm');
expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
- // Assert that only the custom and off options exist
+ // Assert that default, custom and 'none' options exist
findTestSubject(rendered, 'dataTierSelect').simulate('click');
expect(findTestSubject(rendered, 'defaultDataAllocationOption').exists()).toBeFalsy();
expect(findTestSubject(rendered, 'customDataAllocationOption').exists()).toBeTruthy();
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
index a892a7a031a87..6eae59ec4e6ea 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
@@ -4,16 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import {
- SerializedPhase,
- DeletePhase,
- SerializedPolicy,
- RolloverAction,
-} from '../../../common/types';
+import { SerializedPolicy, RolloverAction } from '../../../common/types';
-export const defaultSetPriority: string = '100';
-
-export const defaultPhaseIndexPriority: string = '50';
+export const defaultIndexPriority = {
+ hot: '100',
+ warm: '50',
+ cold: '0',
+};
export const defaultRolloverAction: RolloverAction = {
max_age: '30d',
@@ -30,15 +27,3 @@ export const defaultPolicy: SerializedPolicy = {
},
},
};
-
-export const defaultNewDeletePhase: DeletePhase = {
- phaseEnabled: false,
- selectedMinimumAge: '0',
- selectedMinimumAgeUnits: 'd',
- waitForSnapshotPolicy: '',
-};
-
-export const serializedPhaseInitialization: SerializedPhase = {
- min_age: '0ms',
- actions: {},
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/active_highlight.scss b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/active_highlight.scss
new file mode 100644
index 0000000000000..96ca0c3a61067
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/active_highlight.scss
@@ -0,0 +1,16 @@
+.ilmActivePhaseHighlight {
+ border-left: $euiBorderWidthThin solid $euiColorLightShade;
+ height: 100%;
+
+ &.hotPhase.active {
+ border-left-color: $euiColorVis9_behindText;
+ }
+
+ &.warmPhase.active {
+ border-left-color: $euiColorVis5_behindText;
+ }
+
+ &.coldPhase.active {
+ border-left-color: $euiColorVis1_behindText;
+ }
+}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/active_highlight.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/active_highlight.tsx
new file mode 100644
index 0000000000000..64db9e1ec5481
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/active_highlight.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+
+import './active_highlight.scss';
+
+interface Props {
+ phase: 'hot' | 'warm' | 'cold';
+ enabled: boolean;
+}
+export const ActiveHighlight: FunctionComponent = ({ phase, enabled }) => {
+ return ;
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/index.ts
similarity index 80%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/index.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/index.ts
index 0228a524f8129..a1db0c3997edb 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/active_highlight/index.ts
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { MinAgeInputField } from './min_age_input_field';
+export { ActiveHighlight } from './active_highlight';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts
index d22206d7ae4de..960b632d70bd4 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts
@@ -11,6 +11,7 @@ export { OptionalLabel } from './optional_label';
export { PolicyJsonFlyout } from './policy_json_flyout';
export { DescribedFormRow, ToggleFieldWithDescribedFormRow } from './described_form_row';
export { FieldLoadingError } from './field_loading_error';
+export { ActiveHighlight } from './active_highlight';
export { Timeline } from './timeline';
export * from './phases';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
index 4e1ec76c52a77..976f584ef4d3a 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
@@ -9,28 +9,21 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { get } from 'lodash';
-import { EuiDescribedFormGroup, EuiTextColor, EuiAccordion } from '@elastic/eui';
+import { EuiTextColor } from '@elastic/eui';
-import { Phases } from '../../../../../../../common/types';
+import { useFormData } from '../../../../../../shared_imports';
-import { useFormData, UseField, ToggleField, NumericField } from '../../../../../../shared_imports';
-
-import { useEditPolicyContext } from '../../../edit_policy_context';
import { useConfigurationIssues } from '../../../form';
-import {
- LearnMoreLink,
- ActiveBadge,
- DescribedFormRow,
- ToggleFieldWithDescribedFormRow,
-} from '../../';
+import { LearnMoreLink, ToggleFieldWithDescribedFormRow } from '../../';
import {
- MinAgeInputField,
DataTierAllocationField,
- SetPriorityInputField,
SearchableSnapshotField,
+ IndexPriorityField,
+ ReplicasField,
} from '../shared_fields';
+import { Phase } from '../phase';
const i18nTexts = {
dataTierAllocation: {
@@ -41,166 +34,64 @@ const i18nTexts = {
},
};
-const coldProperty: keyof Phases = 'cold';
-
const formFieldPaths = {
enabled: '_meta.cold.enabled',
searchableSnapshot: 'phases.cold.actions.searchable_snapshot.snapshot_repository',
};
export const ColdPhase: FunctionComponent = () => {
- const { policy } = useEditPolicyContext();
const { isUsingSearchableSnapshotInHotPhase } = useConfigurationIssues();
const [formData] = useFormData({
- watch: [formFieldPaths.enabled, formFieldPaths.searchableSnapshot],
+ watch: [formFieldPaths.searchableSnapshot],
});
- const enabled = get(formData, formFieldPaths.enabled);
const showReplicasField = get(formData, formFieldPaths.searchableSnapshot) == null;
return (
-
- <>
- {/* Section title group; containing min age */}
-
+
+
+ {showReplicasField && }
+
+ {/* Freeze section */}
+ {!isUsingSearchableSnapshotInHotPhase && (
+
-
-
- {' '}
- {enabled && }
-
+
+
}
- titleSize="s"
description={
- <>
-
-
-
-
-
+
+ {' '}
+
+
}
fullWidth
+ titleSize="xs"
+ switchProps={{
+ 'data-test-subj': 'freezeSwitch',
+ path: '_meta.cold.freezeEnabled',
+ }}
>
- {enabled && }
-
- {enabled && (
- <>
-
-
-
- {
- /* Replicas section */
- showReplicasField && (
-
- {i18n.translate('xpack.indexLifecycleMgmt.coldPhase.replicasTitle', {
- defaultMessage: 'Replicas',
- })}
-
- }
- description={i18n.translate(
- 'xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasDescription',
- {
- defaultMessage:
- 'Set the number of replicas. Remains the same as the previous phase by default.',
- }
- )}
- switchProps={{
- 'data-test-subj': 'cold-setReplicasSwitch',
- label: i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.coldPhase.numberOfReplicas.switchLabel',
- { defaultMessage: 'Set replicas' }
- ),
- initialValue:
- policy.phases.cold?.actions?.allocate?.number_of_replicas != null,
- }}
- fullWidth
- >
-
-
- )
- }
-
- {/* Freeze section */}
- {!isUsingSearchableSnapshotInHotPhase && (
-
-
-
- }
- description={
-
- {' '}
-
-
- }
- fullWidth
- titleSize="xs"
- switchProps={{
- 'data-test-subj': 'freezeSwitch',
- path: '_meta.cold.freezeEnabled',
- }}
- >
-
-
- )}
- {/* Data tier allocation section */}
-
-
-
-
- )}
-
-
+
+
+ )}
+
+ {/* Data tier allocation section */}
+
+
+
+
);
};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
index 37323b97edc92..5c43bb413eb5e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
@@ -13,7 +13,7 @@ import { useFormData, UseField, ToggleField } from '../../../../../../shared_imp
import { ActiveBadge, LearnMoreLink, OptionalLabel } from '../../index';
-import { MinAgeInputField, SnapshotPoliciesField } from '../shared_fields';
+import { MinAgeField, SnapshotPoliciesField } from '../shared_fields';
const formFieldPaths = {
enabled: '_meta.delete.enabled',
@@ -63,7 +63,7 @@ export const DeletePhase: FunctionComponent = () => {
}
fullWidth
>
- {enabled && }
+ {enabled && }
{enabled ? (
{
const { license } = useEditPolicyContext();
const [formData] = useFormData({
@@ -56,245 +51,210 @@ export const HotPhase: FunctionComponent = () => {
const [showEmptyRolloverFieldsError, setShowEmptyRolloverFieldsError] = useState(false);
return (
- <>
-
+
-
-
- {' '}
-
-
+ {i18n.translate('xpack.indexLifecycleMgmt.hotPhase.rolloverFieldTitle', {
+ defaultMessage: 'Rollover',
+ })}
+
}
description={
-
-
-
+ <>
+
+
+ {' '}
+
+ }
+ docPath="ilm-rollover.html"
+ />
+
+
+
+ path={isUsingDefaultRolloverPath}>
+ {(field) => (
+ <>
+ field.setValue(e.target.checked)}
+ data-test-subj="useDefaultRolloverSwitch"
+ />
+
+
+ }
+ />
+
+ )}
+
+
}
+ fullWidth
>
-
-
-
-
-
- {i18n.translate('xpack.indexLifecycleMgmt.hotPhase.rolloverFieldTitle', {
- defaultMessage: 'Rollover',
- })}
-
- }
- description={
- <>
-
-
- {' '}
-
+ path="_meta.hot.customRollover.enabled">
+ {(field) => (
+ <>
+ field.setValue(e.target.checked)}
+ data-test-subj="rolloverSwitch"
+ />
+
+
}
- docPath="ilm-rollover.html"
/>
-
-
-
- path={isUsingDefaultRolloverPath}>
- {(field) => (
+
+ )}
+
+ {isUsingRollover && (
+ <>
+
+ {showEmptyRolloverFieldsError && (
<>
- field.setValue(e.target.checked)}
- data-test-subj="useDefaultRolloverSwitch"
- />
-
-
- }
- />
+
+ {i18nTexts.editPolicy.errors.rollOverConfigurationCallout.body}
+
+
)}
-
-
- }
- fullWidth
- >
- {isUsingDefaultRollover === false ? (
-
- path="_meta.hot.customRollover.enabled">
- {(field) => (
- <>
- field.setValue(e.target.checked)}
- data-test-subj="rolloverSwitch"
+
+
+
+ {(field) => {
+ const showErrorCallout = field.errors.some(
+ (e) => e.code === ROLLOVER_EMPTY_VALIDATION
+ );
+ if (showErrorCallout !== showEmptyRolloverFieldsError) {
+ setShowEmptyRolloverFieldsError(showErrorCallout);
+ }
+ return (
+
+ );
+ }}
+
+
+
+
-
-
- }
+
+
+
+
+
+
-
- )}
-
- {isUsingRollover && (
- <>
-
- {showEmptyRolloverFieldsError && (
- <>
-
- {i18nTexts.editPolicy.errors.rollOverConfigurationCallout.body}
-
-
-
- )}
-
-
-
- {(field) => {
- const showErrorCallout = field.errors.some(
- (e) => e.code === ROLLOVER_EMPTY_VALIDATION
- );
- if (showErrorCallout !== showEmptyRolloverFieldsError) {
- setShowEmptyRolloverFieldsError(showErrorCallout);
- }
- return (
-
- );
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )}
- {i18nTexts.editPolicy.titles[phase]}
+
+
+
+
+ {enabled && (
+
+
+
+ {phase !== 'hot' && }
+
+
+ {
+ setShowingSettings(!isShowingSettings);
+ }}
+ size="xs"
+ iconType="controlsVertical"
+ iconSide="left"
+ aria-controls={`${phase}-phaseContent`}
+ >
+
+
+
+
+
+ )}
+
+
+
+ {i18nTexts.editPolicy.descriptions[phase]}
+
+
+ {enabled && (
+
+
+ {children}
+
+ )}
+
+
+
+ );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
index 8776dbbbc7553..8d6807c90dae8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
@@ -6,9 +6,8 @@
import React, { useMemo } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiSpacer, EuiTextColor } from '@elastic/eui';
-import { UseField, ToggleField, NumericField } from '../../../../../../shared_imports';
+import { UseField, CheckBoxField, NumericField } from '../../../../../../shared_imports';
import { i18nTexts } from '../../../i18n_texts';
@@ -38,50 +37,43 @@ export const ForcemergeField: React.FunctionComponent = ({ phase }) => {
}
description={
-
+ <>
{' '}
-
+
}
titleSize="xs"
fullWidth
switchProps={{
- 'aria-label': i18nTexts.editPolicy.forceMergeEnabledFieldLabel,
- 'data-test-subj': `${phase}-forceMergeSwitch`,
- 'aria-controls': 'forcemergeContent',
label: i18nTexts.editPolicy.forceMergeEnabledFieldLabel,
+ 'data-test-subj': `${phase}-forceMergeSwitch`,
initialValue: initialToggleValue,
}}
>
-
-
-
-
-
+
+
);
};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index.ts
index 15167672265fd..710df7e95f8fc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index.ts
@@ -8,9 +8,7 @@ export { DataTierAllocationField } from './data_tier_allocation_field';
export { ForcemergeField } from './forcemerge_field';
-export { SetPriorityInputField } from './set_priority_input_field';
-
-export { MinAgeInputField } from './min_age_input_field';
+export { MinAgeField } from './min_age_field';
export { SnapshotPoliciesField } from './snapshot_policies_field';
@@ -19,3 +17,7 @@ export { ShrinkField } from './shrink_field';
export { SearchableSnapshotField } from './searchable_snapshot_field';
export { ReadonlyField } from './readonly_field';
+
+export { ReplicasField } from './replicas_field';
+
+export { IndexPriorityField } from './index_priority_field';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/set_priority_input_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
similarity index 50%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/set_priority_input_field.tsx
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
index 328587a379b76..570033812c247 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/set_priority_input_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
@@ -4,23 +4,32 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { FunctionComponent } from 'react';
+import React, { FunctionComponent, useMemo } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiTextColor, EuiDescribedFormGroup } from '@elastic/eui';
-
-import { Phases } from '../../../../../../../common/types';
+import { i18n } from '@kbn/i18n';
+import { EuiSpacer, EuiTextColor } from '@elastic/eui';
import { UseField, NumericField } from '../../../../../../shared_imports';
-
-import { LearnMoreLink } from '../..';
+import { LearnMoreLink, DescribedFormRow } from '../..';
+import { useEditPolicyContext } from '../../../edit_policy_context';
interface Props {
- phase: keyof Phases & string;
+ phase: 'hot' | 'warm' | 'cold';
}
-export const SetPriorityInputField: FunctionComponent = ({ phase }) => {
+export const IndexPriorityField: FunctionComponent = ({ phase }) => {
+ const { policy, isNewPolicy } = useEditPolicyContext();
+
+ const initialToggleValue = useMemo(() => {
+ return (
+ isNewPolicy || // enable index priority for new policies
+ !policy.phases[phase]?.actions || // enable index priority for new phases
+ policy.phases[phase]?.actions?.set_priority != null // enable index priority if it's set
+ );
+ }, [isNewPolicy, policy.phases, phase]);
+
return (
-
= ({ phase }) => {
}
titleSize="xs"
fullWidth
+ switchProps={{
+ label: i18n.translate(
+ 'xpack.indexLifecycleMgmt.editPolicy.indexPriority.indexPriorityEnabledFieldLabel',
+ {
+ defaultMessage: 'Set index priority',
+ }
+ ),
+ 'data-test-subj': `${phase}-indexPrioritySwitch`,
+ initialValue: initialToggleValue,
+ }}
>
+
-
+
);
};
diff --git a/x-pack/test/upgrade_assistant_integration/services/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/index.ts
similarity index 83%
rename from x-pack/test/upgrade_assistant_integration/services/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/index.ts
index 83424ad1eb50c..43ef0cf5d9b71 100644
--- a/x-pack/test/upgrade_assistant_integration/services/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/index.ts
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { LegacyEsProvider } from './legacy_es';
+export { MinAgeField } from './min_age_field';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
new file mode 100644
index 0000000000000..8a84b7fa0e762
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
@@ -0,0 +1,158 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import {
+ EuiFieldNumber,
+ EuiFieldNumberProps,
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiFormRow,
+ EuiSelect,
+ EuiText,
+} from '@elastic/eui';
+
+import { UseField, getFieldValidityAndErrorMessage } from '../../../../../../../shared_imports';
+
+import { getUnitsAriaLabelForPhase, getTimingLabelForPhase } from './util';
+
+type PhaseWithMinAgeAction = 'warm' | 'cold' | 'delete';
+
+const i18nTexts = {
+ daysOptionLabel: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.daysOptionLabel', {
+ defaultMessage: 'days',
+ }),
+
+ hoursOptionLabel: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.hoursOptionLabel', {
+ defaultMessage: 'hours',
+ }),
+ minutesOptionLabel: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.minutesOptionLabel', {
+ defaultMessage: 'minutes',
+ }),
+
+ secondsOptionLabel: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.secondsOptionLabel', {
+ defaultMessage: 'seconds',
+ }),
+ millisecondsOptionLabel: i18n.translate(
+ 'xpack.indexLifecycleMgmt.editPolicy.milliSecondsOptionLabel',
+ {
+ defaultMessage: 'milliseconds',
+ }
+ ),
+
+ microsecondsOptionLabel: i18n.translate(
+ 'xpack.indexLifecycleMgmt.editPolicy.microSecondsOptionLabel',
+ {
+ defaultMessage: 'microseconds',
+ }
+ ),
+
+ nanosecondsOptionLabel: i18n.translate(
+ 'xpack.indexLifecycleMgmt.editPolicy.nanoSecondsOptionLabel',
+ {
+ defaultMessage: 'nanoseconds',
+ }
+ ),
+};
+
+interface Props {
+ phase: PhaseWithMinAgeAction;
+}
+
+export const MinAgeField: FunctionComponent = ({ phase }): React.ReactElement => {
+ return (
+
+ {(field) => {
+ const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {(unitField) => {
+ const { isInvalid: isUnitFieldInvalid } = getFieldValidityAndErrorMessage(
+ unitField
+ );
+ return (
+ {
+ unitField.setValue(e.target.value);
+ }}
+ isInvalid={isUnitFieldInvalid}
+ append={'old'}
+ data-test-subj={`${phase}-selectedMinimumAgeUnits`}
+ aria-label={getUnitsAriaLabelForPhase(phase)}
+ options={[
+ {
+ value: 'd',
+ text: i18nTexts.daysOptionLabel,
+ },
+ {
+ value: 'h',
+ text: i18nTexts.hoursOptionLabel,
+ },
+ {
+ value: 'm',
+ text: i18nTexts.minutesOptionLabel,
+ },
+ {
+ value: 's',
+ text: i18nTexts.secondsOptionLabel,
+ },
+ {
+ value: 'ms',
+ text: i18nTexts.millisecondsOptionLabel,
+ },
+ {
+ value: 'micros',
+ text: i18nTexts.microsecondsOptionLabel,
+ },
+ {
+ value: 'nanos',
+ text: i18nTexts.nanosecondsOptionLabel,
+ },
+ ]}
+ />
+ );
+ }}
+
+
+
+
+
+
+ );
+ }}
+
+ );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/util.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/util.ts
similarity index 100%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/util.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/util.ts
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/min_age_input_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/min_age_input_field.tsx
deleted file mode 100644
index 59086ce572252..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_input_field/min_age_input_field.tsx
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React, { FunctionComponent } from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-
-import { UseField, NumericField, SelectField } from '../../../../../../../shared_imports';
-
-import { LearnMoreLink } from '../../../learn_more_link';
-import { useConfigurationIssues } from '../../../../form';
-
-import { getUnitsAriaLabelForPhase, getTimingLabelForPhase } from './util';
-
-type PhaseWithMinAgeAction = 'warm' | 'cold' | 'delete';
-
-interface Props {
- phase: PhaseWithMinAgeAction;
-}
-
-export const MinAgeInputField: FunctionComponent = ({ phase }): React.ReactElement => {
- const { isUsingRollover: rolloverEnabled } = useConfigurationIssues();
-
- let daysOptionLabel;
- let hoursOptionLabel;
- let minutesOptionLabel;
- let secondsOptionLabel;
- let millisecondsOptionLabel;
- let microsecondsOptionLabel;
- let nanosecondsOptionLabel;
-
- if (rolloverEnabled) {
- daysOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverDaysOptionLabel',
- {
- defaultMessage: 'days from rollover',
- }
- );
-
- hoursOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverHoursOptionLabel',
- {
- defaultMessage: 'hours from rollover',
- }
- );
- minutesOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverMinutesOptionLabel',
- {
- defaultMessage: 'minutes from rollover',
- }
- );
-
- secondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverSecondsOptionLabel',
- {
- defaultMessage: 'seconds from rollover',
- }
- );
- millisecondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverMilliSecondsOptionLabel',
- {
- defaultMessage: 'milliseconds from rollover',
- }
- );
-
- microsecondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverMicroSecondsOptionLabel',
- {
- defaultMessage: 'microseconds from rollover',
- }
- );
-
- nanosecondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.rolloverNanoSecondsOptionLabel',
- {
- defaultMessage: 'nanoseconds from rollover',
- }
- );
- } else {
- daysOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationDaysOptionLabel',
- {
- defaultMessage: 'days from index creation',
- }
- );
-
- hoursOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationHoursOptionLabel',
- {
- defaultMessage: 'hours from index creation',
- }
- );
-
- minutesOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationMinutesOptionLabel',
- {
- defaultMessage: 'minutes from index creation',
- }
- );
-
- secondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationSecondsOptionLabel',
- {
- defaultMessage: 'seconds from index creation',
- }
- );
-
- millisecondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationMilliSecondsOptionLabel',
- {
- defaultMessage: 'milliseconds from index creation',
- }
- );
-
- microsecondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationMicroSecondsOptionLabel',
- {
- defaultMessage: 'microseconds from index creation',
- }
- );
-
- nanosecondsOptionLabel = i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.creationNanoSecondsOptionLabel',
- {
- defaultMessage: 'nanoseconds from index creation',
- }
- );
- }
-
- return (
-
-
-
- }
- />
- ),
- euiFieldProps: {
- 'data-test-subj': `${phase}-selectedMinimumAge`,
- min: 0,
- },
- }}
- />
-
-
-
-
-
- );
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx
new file mode 100644
index 0000000000000..6d8e019ff8a0c
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { UseField, NumericField } from '../../../../../../shared_imports';
+import { useEditPolicyContext } from '../../../edit_policy_context';
+import { DescribedFormRow } from '../../described_form_row';
+
+interface Props {
+ phase: 'warm' | 'cold';
+}
+
+export const ReplicasField: FunctionComponent = ({ phase }) => {
+ const { policy } = useEditPolicyContext();
+ const initialValue = policy.phases[phase]?.actions?.allocate?.number_of_replicas != null;
+ return (
+
+ {i18n.translate('xpack.indexLifecycleMgmt.numberOfReplicas.formRowTitle', {
+ defaultMessage: 'Replicas',
+ })}
+
+ }
+ description={i18n.translate(
+ 'xpack.indexLifecycleMgmt.editPolicy.numberOfReplicas.formRowDescription',
+ {
+ defaultMessage:
+ 'Set the number of replicas. Remains the same as the previous phase by default.',
+ }
+ )}
+ switchProps={{
+ 'data-test-subj': `${phase}-setReplicasSwitch`,
+ label: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.numberOfReplicas.switchLabel', {
+ defaultMessage: 'Set replicas',
+ }),
+ initialValue,
+ }}
+ fullWidth
+ >
+
+
+ );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
index c5fc31d9839bd..da200e9e68d17 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
@@ -42,32 +42,28 @@ export const ShrinkField: FunctionComponent = ({ phase }) => {
}
titleSize="xs"
switchProps={{
- 'aria-controls': 'shrinkContent',
'data-test-subj': `${phase}-shrinkSwitch`,
label: i18nTexts.editPolicy.shrinkLabel,
- 'aria-label': i18nTexts.editPolicy.shrinkLabel,
initialValue: Boolean(policy.phases[phase]?.actions?.shrink),
}}
fullWidth
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
);
};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
index 77078e94d7e98..47255da08df72 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
@@ -5,30 +5,21 @@
*/
import React, { FunctionComponent } from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { get } from 'lodash';
-import { EuiSpacer, EuiDescribedFormGroup, EuiAccordion } from '@elastic/eui';
-
-import { useFormData, UseField, ToggleField, NumericField } from '../../../../../../shared_imports';
-
-import { Phases } from '../../../../../../../common/types';
-
-import { useEditPolicyContext } from '../../../edit_policy_context';
import { useConfigurationIssues } from '../../../form';
-import { ActiveBadge, DescribedFormRow } from '../../';
-
import {
- MinAgeInputField,
ForcemergeField,
- SetPriorityInputField,
+ IndexPriorityField,
DataTierAllocationField,
ShrinkField,
ReadonlyField,
+ ReplicasField,
} from '../shared_fields';
+import { Phase } from '../phase';
+
const i18nTexts = {
dataTierAllocation: {
description: i18n.translate('xpack.indexLifecycleMgmt.warmPhase.dataTier.description', {
@@ -37,153 +28,26 @@ const i18nTexts = {
},
};
-const warmProperty: keyof Phases = 'warm';
-
-const formFieldPaths = {
- enabled: '_meta.warm.enabled',
- warmPhaseOnRollover: '_meta.warm.warmPhaseOnRollover',
-};
-
export const WarmPhase: FunctionComponent = () => {
- const { policy } = useEditPolicyContext();
- const { isUsingSearchableSnapshotInHotPhase, isUsingRollover } = useConfigurationIssues();
- const [formData] = useFormData({
- watch: [formFieldPaths.enabled, formFieldPaths.warmPhaseOnRollover],
- });
-
- const enabled = get(formData, formFieldPaths.enabled);
- const warmPhaseOnRollover = get(formData, formFieldPaths.warmPhaseOnRollover);
+ const { isUsingSearchableSnapshotInHotPhase } = useConfigurationIssues();
return (
-
- <>
-
-
-
- {' '}
- {enabled && }
-
-
-
-
-
- }
- fullWidth
- >
- <>
- {enabled && (
- <>
- {isUsingRollover && (
-
- )}
- {(!warmPhaseOnRollover || !isUsingRollover) && (
- <>
-
-
-
- )}
-
- )}
-
-
+
+
- {enabled && (
-
-
- {i18n.translate('xpack.indexLifecycleMgmt.warmPhase.replicasTitle', {
- defaultMessage: 'Replicas',
- })}
-
- }
- description={i18n.translate(
- 'xpack.indexLifecycleMgmt.warmPhase.numberOfReplicasDescription',
- {
- defaultMessage:
- 'Set the number of replicas. Remains the same as the previous phase by default.',
- }
- )}
- switchProps={{
- 'data-test-subj': 'warm-setReplicasSwitch',
- label: i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.warmPhase.numberOfReplicas.switchLabel',
- { defaultMessage: 'Set replicas' }
- ),
- initialValue: policy.phases.warm?.actions?.allocate?.number_of_replicas != null,
- }}
- fullWidth
- >
-
-
+ {!isUsingSearchableSnapshotInHotPhase && }
- {!isUsingSearchableSnapshotInHotPhase && }
+ {!isUsingSearchableSnapshotInHotPhase && }
- {!isUsingSearchableSnapshotInHotPhase && }
+
-
+ {/* Data tier allocation section */}
+
- {/* Data tier allocation section */}
-
-
-
- )}
-
-
+
+
);
};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
index 228a0f9fdb942..b1cf41773de3c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { Fragment, useEffect, useState, useMemo } from 'react';
+import React, { Fragment, useEffect, useMemo, useState } from 'react';
import { get } from 'lodash';
import { RouteComponentProps } from 'react-router-dom';
@@ -16,7 +16,6 @@ import { i18n } from '@kbn/i18n';
import {
EuiButton,
EuiButtonEmpty,
- EuiDescribedFormGroup,
EuiFlexGroup,
EuiFlexItem,
EuiFormRow,
@@ -24,33 +23,35 @@ import {
EuiPage,
EuiPageBody,
EuiPageContent,
+ EuiPageContentHeader,
+ EuiPageContentHeaderSection,
EuiSpacer,
EuiSwitch,
EuiText,
EuiTitle,
} from '@elastic/eui';
-import { useForm, UseField, TextField, useFormData } from '../../../shared_imports';
+import { TextField, UseField, useForm, useFormData } from '../../../shared_imports';
import { toasts } from '../../services/notification';
import { savePolicy } from './save_policy';
import {
- LearnMoreLink,
- PolicyJsonFlyout,
ColdPhase,
DeletePhase,
HotPhase,
+ PolicyJsonFlyout,
WarmPhase,
Timeline,
} from './components';
-import { schema, deserializer, createSerializer, createPolicyNameValidations, Form } from './form';
+import { createPolicyNameValidations, createSerializer, deserializer, Form, schema } from './form';
import { useEditPolicyContext } from './edit_policy_context';
import { FormInternal } from './types';
+import { createDocLink } from '../../services/documentation';
export interface Props {
history: RouteComponentProps['history'];
@@ -75,7 +76,7 @@ export const EditPolicy: React.FunctionComponent = ({ history }) => {
return createSerializer(isNewPolicy ? undefined : currentPolicy);
}, [isNewPolicy, currentPolicy]);
- const [saveAsNew, setSaveAsNew] = useState(isNewPolicy);
+ const [saveAsNew, setSaveAsNew] = useState(false);
const originalPolicyName: string = isNewPolicy ? '' : policyName!;
const { form } = useForm({
@@ -116,7 +117,7 @@ export const EditPolicy: React.FunctionComponent = ({ history }) => {
);
} else {
const success = await savePolicy(
- { ...policy, name: saveAsNew ? currentPolicyName : originalPolicyName },
+ { ...policy, name: saveAsNew || isNewPolicy ? currentPolicyName : originalPolicyName },
isNewPolicy || saveAsNew
);
if (success) {
@@ -132,216 +133,187 @@ export const EditPolicy: React.FunctionComponent = ({ history }) => {
return (
-
-
-
- {isNewPolicy
- ? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage', {
- defaultMessage: 'Create an index lifecycle policy',
- })
- : i18n.translate('xpack.indexLifecycleMgmt.editPolicy.editPolicyMessage', {
- defaultMessage: 'Edit index lifecycle policy {originalPolicyName}',
- values: { originalPolicyName },
- })}
-
-
-
-
- }
- titleSize="s"
- fullWidth
- >
-
- path={policyNamePath}
- config={{
- label: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.policyNameLabel', {
- defaultMessage: 'Policy name',
- }),
- helpText: i18n.translate(
- 'xpack.indexLifecycleMgmt.editPolicy.validPolicyNameMessage',
- {
- defaultMessage:
- 'A policy name cannot start with an underscore and cannot contain a comma or a space.',
- }
- ),
- validations: policyNameValidations,
- }}
- component={TextField}
- componentProps={{
- fullWidth: false,
- euiFieldProps: {
- 'data-test-subj': 'policyNameField',
- },
- }}
+ }
/>
-
- ) : null}
-
-
+
+
+ )}
+
+ {saveAsNew || isNewPolicy ? (
+
+ path={policyNamePath}
+ config={{
+ label: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.policyNameLabel', {
+ defaultMessage: 'Policy name',
+ }),
+ helpText: i18n.translate(
+ 'xpack.indexLifecycleMgmt.editPolicy.validPolicyNameMessage',
+ {
+ defaultMessage:
+ 'A policy name cannot start with an underscore and cannot contain a comma or a space.',
+ }
+ ),
+ validations: policyNameValidations,
+ }}
+ component={TextField}
+ componentProps={{
+ fullWidth: false,
+ euiFieldProps: {
+ 'data-test-subj': 'policyNameField',
+ },
+ }}
+ />
+ ) : null}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
- {saveAsNew ? (
-
- ) : (
-
- )}
-
-
+
-
-
-
-
-
-
-
-
-
-
- {isShowingPolicyJsonFlyout ? (
-
- ) : (
+
+
+
+ {isShowingPolicyJsonFlyout ? (
+
+ ) : (
+
+ )}
+
+
+
+
+
+
+
- )}
-
-
-
-
- {isShowingPolicyJsonFlyout ? (
- setIsShowingPolicyJsonFlyout(false)}
- />
- ) : null}
-
-
+
+
+
+
+
+ {saveAsNew ? (
+
+ ) : (
+
+ )}
+
+
+
+
+
+
+ {isShowingPolicyJsonFlyout ? (
+ setIsShowingPolicyJsonFlyout(false)}
+ />
+ ) : null}
+
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
index b5abf51c29028..44512c2a511ec 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
@@ -260,15 +260,6 @@ describe('deserializer and serializer', () => {
expect(result.phases.hot!.actions.readonly).toBeUndefined();
});
- it('removes min_age from warm when rollover is enabled', () => {
- formInternal._meta.hot.customRollover.enabled = true;
- formInternal._meta.warm.warmPhaseOnRollover = true;
-
- const result = serializer(formInternal);
-
- expect(result.phases.warm!.min_age).toBeUndefined();
- });
-
it('adds default rollover configuration when enabled, but previously not configured', () => {
delete formInternal.phases.hot!.actions.rollover;
formInternal._meta.hot.isUsingDefaultRollover = true;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
index 4bdf902d27b6d..9883c2de0685d 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
@@ -7,13 +7,13 @@
import { i18n } from '@kbn/i18n';
import { FormSchema, fieldValidators } from '../../../../shared_imports';
-import { defaultSetPriority, defaultPhaseIndexPriority } from '../../../constants';
+import { defaultIndexPriority } from '../../../constants';
import { ROLLOVER_FORM_PATHS } from '../constants';
-const rolloverFormPaths = Object.values(ROLLOVER_FORM_PATHS);
-
import { FormInternal } from '../types';
+const rolloverFormPaths = Object.values(ROLLOVER_FORM_PATHS);
+
import {
ifExistsNumberGreaterThanZero,
ifExistsNumberNonNegative,
@@ -54,7 +54,6 @@ export const schema: FormSchema = {
},
bestCompression: {
label: i18nTexts.editPolicy.bestCompressionFieldLabel,
- helpText: i18nTexts.editPolicy.bestCompressionFieldHelpText,
},
readonlyEnabled: {
defaultValue: false,
@@ -69,18 +68,11 @@ export const schema: FormSchema = {
{ defaultMessage: 'Activate warm phase' }
),
},
- warmPhaseOnRollover: {
- defaultValue: true,
- label: i18n.translate('xpack.indexLifecycleMgmt.warmPhase.moveToWarmPhaseOnRolloverLabel', {
- defaultMessage: 'Move to warm phase on rollover',
- }),
- },
minAgeUnit: {
defaultValue: 'ms',
},
bestCompression: {
label: i18nTexts.editPolicy.bestCompressionFieldLabel,
- helpText: i18nTexts.editPolicy.bestCompressionFieldHelpText,
},
dataTierAllocationType: {
label: i18nTexts.editPolicy.allocationTypeOptionsFieldLabel,
@@ -218,9 +210,14 @@ export const schema: FormSchema = {
},
set_priority: {
priority: {
- defaultValue: defaultSetPriority as any,
- label: i18nTexts.editPolicy.setPriorityFieldLabel,
- validations: [{ validator: ifExistsNumberNonNegative }],
+ defaultValue: defaultIndexPriority.hot as any,
+ label: i18nTexts.editPolicy.indexPriorityFieldLabel,
+ validations: [
+ {
+ validator: emptyField(i18nTexts.editPolicy.errors.numberRequired),
+ },
+ { validator: ifExistsNumberNonNegative },
+ ],
serializer: serializers.stringToNumber,
},
},
@@ -239,9 +236,12 @@ export const schema: FormSchema = {
allocate: {
number_of_replicas: {
label: i18n.translate('xpack.indexLifecycleMgmt.warmPhase.numberOfReplicasLabel', {
- defaultMessage: 'Number of replicas (optional)',
+ defaultMessage: 'Number of replicas',
}),
validations: [
+ {
+ validator: emptyField(i18nTexts.editPolicy.errors.numberRequired),
+ },
{
validator: ifExistsNumberNonNegative,
},
@@ -289,9 +289,14 @@ export const schema: FormSchema = {
},
set_priority: {
priority: {
- defaultValue: defaultPhaseIndexPriority as any,
- label: i18nTexts.editPolicy.setPriorityFieldLabel,
- validations: [{ validator: ifExistsNumberNonNegative }],
+ defaultValue: defaultIndexPriority.warm as any,
+ label: i18nTexts.editPolicy.indexPriorityFieldLabel,
+ validations: [
+ {
+ validator: emptyField(i18nTexts.editPolicy.errors.numberRequired),
+ },
+ { validator: ifExistsNumberNonNegative },
+ ],
serializer: serializers.stringToNumber,
},
},
@@ -310,9 +315,12 @@ export const schema: FormSchema = {
allocate: {
number_of_replicas: {
label: i18n.translate('xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasLabel', {
- defaultMessage: 'Number of replicas (optional)',
+ defaultMessage: 'Number of replicas',
}),
validations: [
+ {
+ validator: emptyField(i18nTexts.editPolicy.errors.numberRequired),
+ },
{
validator: ifExistsNumberNonNegative,
},
@@ -322,9 +330,14 @@ export const schema: FormSchema = {
},
set_priority: {
priority: {
- defaultValue: '0' as any,
- label: i18nTexts.editPolicy.setPriorityFieldLabel,
- validations: [{ validator: ifExistsNumberNonNegative }],
+ defaultValue: defaultIndexPriority.cold as any,
+ label: i18nTexts.editPolicy.indexPriorityFieldLabel,
+ validations: [
+ {
+ validator: emptyField(i18nTexts.editPolicy.errors.numberRequired),
+ },
+ { validator: ifExistsNumberNonNegative },
+ ],
serializer: serializers.stringToNumber,
},
},
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
index f718073afa352..f7cdecdc352fb 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
@@ -20,9 +20,7 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
): SerializedPolicy => {
const { _meta, ...updatedPolicy } = data;
- if (!updatedPolicy.phases || !updatedPolicy.phases.hot) {
- updatedPolicy.phases = { hot: { actions: {} } };
- }
+ updatedPolicy.phases = { hot: { actions: {} }, ...updatedPolicy.phases };
return produce(originalPolicy ?? defaultPolicy, (draft) => {
// Copy over all updated fields
@@ -32,7 +30,7 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
* Important shared values for serialization
*/
const isUsingRollover = Boolean(
- _meta.hot.isUsingDefaultRollover || _meta.hot.customRollover.enabled
+ _meta.hot?.isUsingDefaultRollover || _meta.hot?.customRollover.enabled
);
// Next copy over all meta fields and delete any fields that have been removed
@@ -53,7 +51,7 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
* HOT PHASE ROLLOVER
*/
if (isUsingRollover) {
- if (_meta.hot.isUsingDefaultRollover) {
+ if (_meta.hot?.isUsingDefaultRollover) {
hotPhaseActions.rollover = cloneDeep(defaultRolloverAction);
} else {
// Rollover may not exist if editing an existing policy with initially no rollover configured
@@ -63,7 +61,7 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
// We are using user-defined, custom rollover settings.
if (updatedPolicy.phases.hot!.actions.rollover?.max_age) {
- hotPhaseActions.rollover.max_age = `${hotPhaseActions.rollover.max_age}${_meta.hot.customRollover.maxAgeUnit}`;
+ hotPhaseActions.rollover.max_age = `${hotPhaseActions.rollover.max_age}${_meta.hot?.customRollover.maxAgeUnit}`;
} else {
delete hotPhaseActions.rollover.max_age;
}
@@ -73,7 +71,7 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
}
if (updatedPolicy.phases.hot!.actions.rollover?.max_size) {
- hotPhaseActions.rollover.max_size = `${hotPhaseActions.rollover.max_size}${_meta.hot.customRollover.maxStorageSizeUnit}`;
+ hotPhaseActions.rollover.max_size = `${hotPhaseActions.rollover.max_size}${_meta.hot?.customRollover.maxStorageSizeUnit}`;
} else {
delete hotPhaseActions.rollover.max_size;
}
@@ -84,20 +82,20 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
*/
if (!updatedPolicy.phases.hot!.actions?.forcemerge) {
delete hotPhaseActions.forcemerge;
- } else if (_meta.hot.bestCompression) {
+ } else if (_meta.hot?.bestCompression) {
hotPhaseActions.forcemerge!.index_codec = 'best_compression';
} else {
delete hotPhaseActions.forcemerge!.index_codec;
}
- if (_meta.hot.bestCompression && hotPhaseActions.forcemerge) {
+ if (_meta.hot?.bestCompression && hotPhaseActions.forcemerge) {
hotPhaseActions.forcemerge.index_codec = 'best_compression';
}
/**
* HOT PHASE READ-ONLY
*/
- if (_meta.hot.readonlyEnabled) {
+ if (_meta.hot?.readonlyEnabled) {
hotPhaseActions.readonly = hotPhaseActions.readonly ?? {};
} else {
delete hotPhaseActions.readonly;
@@ -140,17 +138,9 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
/**
* WARM PHASE MIN AGE
*
- * If warm phase on rollover is enabled, delete min age field
- * An index lifecycle switches to warm phase when rollover occurs, so you cannot specify a warm phase time
- * They are mutually exclusive
*/
- if (
- (!isUsingRollover || !_meta.warm.warmPhaseOnRollover) &&
- updatedPolicy.phases.warm?.min_age
- ) {
+ if (updatedPolicy.phases.warm?.min_age) {
warmPhase.min_age = `${updatedPolicy.phases.warm!.min_age}${_meta.warm.minAgeUnit}`;
- } else {
- delete warmPhase.min_age;
}
/**
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts
index f30a40fdd2bb9..71085a6d7a2b8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts
@@ -40,10 +40,10 @@ export const i18nTexts = {
defaultMessage: 'Number of segments',
}
),
- setPriorityFieldLabel: i18n.translate(
+ indexPriorityFieldLabel: i18n.translate(
'xpack.indexLifecycleMgmt.editPolicy.indexPriorityLabel',
{
- defaultMessage: 'Index priority (optional)',
+ defaultMessage: 'Index priority',
}
),
bestCompressionFieldLabel: i18n.translate(
@@ -170,5 +170,30 @@ export const i18nTexts = {
}
),
},
+ titles: {
+ hot: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseTitle', {
+ defaultMessage: 'Hot phase',
+ }),
+ warm: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseTitle', {
+ defaultMessage: 'Warm phase',
+ }),
+ cold: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseTitle', {
+ defaultMessage: 'Cold phase',
+ }),
+ },
+ descriptions: {
+ hot: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseDescription', {
+ defaultMessage:
+ 'This phase is required. You are actively querying and writing to your index. For faster updates, you can roll over the index when it gets too big or too old.',
+ }),
+ warm: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseDescription', {
+ defaultMessage:
+ 'You are still querying your index, but it is read-only. You can allocate shards to less performant hardware. For faster searches, you can reduce the number of shards and force merge segments.',
+ }),
+ cold: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseDescription', {
+ defaultMessage:
+ 'You are querying your index less frequently, so you can allocate shards on significantly less performant hardware. Because your queries are slower, you can reduce the number of replicas.',
+ }),
+ },
},
};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
index c77b171a56bed..2f37608b2d7ae 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
@@ -70,9 +70,10 @@ export interface PhaseAgeInMilliseconds {
const phaseOrder: Phase[] = ['hot', 'warm', 'cold', 'delete'];
const getMinAge = (phase: MinAgePhase, formData: FormInternal) => ({
- min_age: formData.phases[phase]?.min_age
- ? formData.phases[phase]!.min_age! + formData._meta[phase].minAgeUnit
- : '0ms',
+ min_age:
+ formData.phases && formData.phases[phase]?.min_age
+ ? formData.phases[phase]!.min_age! + formData._meta[phase].minAgeUnit
+ : '0ms',
});
const formDataToAbsoluteTimings = (formData: FormInternal): AbsoluteTimings => {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
index 2f1c7798e7a4d..4b22d1c8448b5 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
@@ -9,7 +9,7 @@ import {
UIM_CONFIG_WARM_PHASE,
UIM_CONFIG_SET_PRIORITY,
UIM_CONFIG_FREEZE_INDEX,
- defaultPhaseIndexPriority,
+ defaultIndexPriority,
} from '../constants/';
import { getUiMetricsForPhases } from './ui_metric';
@@ -22,7 +22,7 @@ describe('getUiMetricsForPhases', () => {
min_age: '0ms',
actions: {
set_priority: {
- priority: parseInt(defaultPhaseIndexPriority, 10),
+ priority: parseInt(defaultIndexPriority.cold, 10),
},
},
},
@@ -37,7 +37,7 @@ describe('getUiMetricsForPhases', () => {
min_age: '0ms',
actions: {
set_priority: {
- priority: parseInt(defaultPhaseIndexPriority, 10),
+ priority: parseInt(defaultIndexPriority.warm, 10),
},
},
},
@@ -52,7 +52,7 @@ describe('getUiMetricsForPhases', () => {
min_age: '0ms',
actions: {
set_priority: {
- priority: parseInt(defaultPhaseIndexPriority, 10) + 1,
+ priority: parseInt(defaultIndexPriority.warm, 10) + 1,
},
},
},
@@ -68,7 +68,7 @@ describe('getUiMetricsForPhases', () => {
actions: {
freeze: {},
set_priority: {
- priority: parseInt(defaultPhaseIndexPriority, 10),
+ priority: parseInt(defaultIndexPriority.cold, 10),
},
},
},
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
index bcf4b6cf1da0d..ffdcf927a5b67 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -19,8 +19,7 @@ import {
UIM_CONFIG_FREEZE_INDEX,
UIM_CONFIG_SET_PRIORITY,
UIM_CONFIG_WARM_PHASE,
- defaultSetPriority,
- defaultPhaseIndexPriority,
+ defaultIndexPriority,
} from '../constants';
import { Phases } from '../../../common/types';
@@ -50,17 +49,17 @@ export function getUiMetricsForPhases(phases: Phases): string[] {
const isHotPhasePriorityChanged =
phases.hot &&
phases.hot.actions.set_priority &&
- phases.hot.actions.set_priority.priority !== parseInt(defaultSetPriority, 10);
+ phases.hot.actions.set_priority.priority !== parseInt(defaultIndexPriority.hot, 10);
const isWarmPhasePriorityChanged =
phases.warm &&
phases.warm.actions.set_priority &&
- phases.warm.actions.set_priority.priority !== parseInt(defaultPhaseIndexPriority, 10);
+ phases.warm.actions.set_priority.priority !== parseInt(defaultIndexPriority.warm, 10);
const isColdPhasePriorityChanged =
phases.cold &&
phases.cold.actions.set_priority &&
- phases.cold.actions.set_priority.priority !== parseInt(defaultPhaseIndexPriority, 10);
+ phases.cold.actions.set_priority.priority !== parseInt(defaultIndexPriority.cold, 10);
// If the priority is different than the default, we'll consider it a user interaction,
// even if the user has set it to undefined.
return (
diff --git a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
index 4cb5d95239408..fdb25dec6f1fd 100644
--- a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
@@ -31,6 +31,7 @@ export {
SuperSelectField,
ComboBoxField,
TextField,
+ CheckBoxField,
} from '../../../../src/plugins/es_ui_shared/static/forms/components';
export { attemptToURIDecode } from '../../../../src/plugins/es_ui_shared/public';
diff --git a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_anomalies.ts b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_anomalies.ts
index 62b76a0ae475e..614684d29ae76 100644
--- a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_anomalies.ts
@@ -7,48 +7,17 @@
import * as rt from 'io-ts';
import { timeRangeRT, routeTimingMetadataRT } from '../../shared';
+import {
+ logEntryAnomalyRT,
+ logEntryAnomalyDatasetsRT,
+ anomaliesSortRT,
+ paginationRT,
+ paginationCursorRT,
+} from '../../../log_analysis';
export const LOG_ANALYSIS_GET_LOG_ENTRY_ANOMALIES_PATH =
'/api/infra/log_analysis/results/log_entry_anomalies';
-// [Sort field value, tiebreaker value]
-const paginationCursorRT = rt.tuple([
- rt.union([rt.string, rt.number]),
- rt.union([rt.string, rt.number]),
-]);
-
-export type PaginationCursor = rt.TypeOf;
-
-export const anomalyTypeRT = rt.keyof({
- logRate: null,
- logCategory: null,
-});
-
-export type AnomalyType = rt.TypeOf;
-
-const logEntryAnomalyCommonFieldsRT = rt.type({
- id: rt.string,
- anomalyScore: rt.number,
- dataset: rt.string,
- typical: rt.number,
- actual: rt.number,
- type: anomalyTypeRT,
- duration: rt.number,
- startTime: rt.number,
- jobId: rt.string,
-});
-const logEntrylogRateAnomalyRT = logEntryAnomalyCommonFieldsRT;
-const logEntrylogCategoryAnomalyRT = rt.partial({
- categoryId: rt.string,
-});
-const logEntryAnomalyRT = rt.intersection([
- logEntryAnomalyCommonFieldsRT,
- logEntrylogRateAnomalyRT,
- logEntrylogCategoryAnomalyRT,
-]);
-
-export type LogEntryAnomaly = rt.TypeOf;
-
export const getLogEntryAnomaliesSuccessReponsePayloadRT = rt.intersection([
rt.type({
data: rt.intersection([
@@ -78,43 +47,6 @@ export type GetLogEntryAnomaliesSuccessResponsePayload = rt.TypeOf<
typeof getLogEntryAnomaliesSuccessReponsePayloadRT
>;
-const sortOptionsRT = rt.keyof({
- anomalyScore: null,
- dataset: null,
- startTime: null,
-});
-
-const sortDirectionsRT = rt.keyof({
- asc: null,
- desc: null,
-});
-
-const paginationPreviousPageCursorRT = rt.type({
- searchBefore: paginationCursorRT,
-});
-
-const paginationNextPageCursorRT = rt.type({
- searchAfter: paginationCursorRT,
-});
-
-const paginationRT = rt.intersection([
- rt.type({
- pageSize: rt.number,
- }),
- rt.partial({
- cursor: rt.union([paginationPreviousPageCursorRT, paginationNextPageCursorRT]),
- }),
-]);
-
-export type Pagination = rt.TypeOf;
-
-const sortRT = rt.type({
- field: sortOptionsRT,
- direction: sortDirectionsRT,
-});
-
-export type Sort = rt.TypeOf;
-
export const getLogEntryAnomaliesRequestPayloadRT = rt.type({
data: rt.intersection([
rt.type({
@@ -127,9 +59,9 @@ export const getLogEntryAnomaliesRequestPayloadRT = rt.type({
// Pagination properties
pagination: paginationRT,
// Sort properties
- sort: sortRT,
+ sort: anomaliesSortRT,
// Dataset filters
- datasets: rt.array(rt.string),
+ datasets: logEntryAnomalyDatasetsRT,
}),
]),
});
diff --git a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts
index 0554192398fc5..019ae01c1437c 100644
--- a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts
+++ b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts
@@ -13,6 +13,8 @@ import {
routeTimingMetadataRT,
} from '../../shared';
+import { logEntryCategoryRT, categoriesSortRT } from '../../../log_analysis';
+
export const LOG_ANALYSIS_GET_LOG_ENTRY_CATEGORIES_PATH =
'/api/infra/log_analysis/results/log_entry_categories';
@@ -30,23 +32,6 @@ export type LogEntryCategoriesHistogramParameters = rt.TypeOf<
typeof logEntryCategoriesHistogramParametersRT
>;
-const sortOptionsRT = rt.keyof({
- maximumAnomalyScore: null,
- logEntryCount: null,
-});
-
-const sortDirectionsRT = rt.keyof({
- asc: null,
- desc: null,
-});
-
-const categorySortRT = rt.type({
- field: sortOptionsRT,
- direction: sortDirectionsRT,
-});
-
-export type CategorySort = rt.TypeOf;
-
export const getLogEntryCategoriesRequestPayloadRT = rt.type({
data: rt.intersection([
rt.type({
@@ -59,7 +44,7 @@ export const getLogEntryCategoriesRequestPayloadRT = rt.type({
// a list of histograms to create
histograms: rt.array(logEntryCategoriesHistogramParametersRT),
// the criteria to the categories by
- sort: categorySortRT,
+ sort: categoriesSortRT,
}),
rt.partial({
// the datasets to filter for (optional, unfiltered if not present)
@@ -76,39 +61,6 @@ export type GetLogEntryCategoriesRequestPayload = rt.TypeOf<
* response
*/
-export const logEntryCategoryHistogramBucketRT = rt.type({
- startTime: rt.number,
- bucketDuration: rt.number,
- logEntryCount: rt.number,
-});
-
-export type LogEntryCategoryHistogramBucket = rt.TypeOf;
-
-export const logEntryCategoryHistogramRT = rt.type({
- histogramId: rt.string,
- buckets: rt.array(logEntryCategoryHistogramBucketRT),
-});
-
-export type LogEntryCategoryHistogram = rt.TypeOf;
-
-export const logEntryCategoryDatasetRT = rt.type({
- name: rt.string,
- maximumAnomalyScore: rt.number,
-});
-
-export type LogEntryCategoryDataset = rt.TypeOf;
-
-export const logEntryCategoryRT = rt.type({
- categoryId: rt.number,
- datasets: rt.array(logEntryCategoryDatasetRT),
- histograms: rt.array(logEntryCategoryHistogramRT),
- logEntryCount: rt.number,
- maximumAnomalyScore: rt.number,
- regularExpression: rt.string,
-});
-
-export type LogEntryCategory = rt.TypeOf;
-
export const getLogEntryCategoriesSuccessReponsePayloadRT = rt.intersection([
rt.type({
data: rt.type({
diff --git a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_category_examples.ts b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_category_examples.ts
index e9e3c6e0ca3f9..3166d40d70392 100644
--- a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_category_examples.ts
+++ b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_category_examples.ts
@@ -12,7 +12,7 @@ import {
timeRangeRT,
routeTimingMetadataRT,
} from '../../shared';
-import { logEntryContextRT } from '../../log_entries';
+import { logEntryContextRT } from '../../../log_entry';
export const LOG_ANALYSIS_GET_LOG_ENTRY_CATEGORY_EXAMPLES_PATH =
'/api/infra/log_analysis/results/log_entry_category_examples';
diff --git a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_examples.ts b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_examples.ts
index 1eed29cd37560..c061545ec09ed 100644
--- a/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_examples.ts
+++ b/x-pack/plugins/infra/common/http_api/log_analysis/results/log_entry_examples.ts
@@ -5,7 +5,7 @@
*/
import * as rt from 'io-ts';
-
+import { logEntryExampleRT } from '../../../log_analysis';
import {
badRequestErrorRT,
forbiddenErrorRT,
@@ -46,16 +46,6 @@ export type GetLogEntryExamplesRequestPayload = rt.TypeOf<
* response
*/
-const logEntryExampleRT = rt.type({
- id: rt.string,
- dataset: rt.string,
- message: rt.string,
- timestamp: rt.number,
- tiebreaker: rt.number,
-});
-
-export type LogEntryExample = rt.TypeOf;
-
export const getLogEntryExamplesSuccessReponsePayloadRT = rt.intersection([
rt.type({
data: rt.type({
diff --git a/x-pack/plugins/infra/common/http_api/log_entries/entries.ts b/x-pack/plugins/infra/common/http_api/log_entries/entries.ts
index 31bc62f48791a..b4d9a5744d5ac 100644
--- a/x-pack/plugins/infra/common/http_api/log_entries/entries.ts
+++ b/x-pack/plugins/infra/common/http_api/log_entries/entries.ts
@@ -5,8 +5,7 @@
*/
import * as rt from 'io-ts';
-import { logEntryCursorRT } from '../../log_entry';
-import { jsonArrayRT } from '../../typed_json';
+import { logEntryCursorRT, logEntryRT } from '../../log_entry';
import { logSourceColumnConfigurationRT } from '../log_sources';
export const LOG_ENTRIES_PATH = '/api/log_entries/entries';
@@ -52,54 +51,6 @@ export type LogEntriesAfterRequest = rt.TypeOf;
export type LogEntriesCenteredRequest = rt.TypeOf;
export type LogEntriesRequest = rt.TypeOf;
-export const logMessageConstantPartRT = rt.type({
- constant: rt.string,
-});
-export const logMessageFieldPartRT = rt.type({
- field: rt.string,
- value: jsonArrayRT,
- highlights: rt.array(rt.string),
-});
-
-export const logMessagePartRT = rt.union([logMessageConstantPartRT, logMessageFieldPartRT]);
-
-export const logTimestampColumnRT = rt.type({ columnId: rt.string, timestamp: rt.number });
-export const logFieldColumnRT = rt.type({
- columnId: rt.string,
- field: rt.string,
- value: jsonArrayRT,
- highlights: rt.array(rt.string),
-});
-export const logMessageColumnRT = rt.type({
- columnId: rt.string,
- message: rt.array(logMessagePartRT),
-});
-
-export const logColumnRT = rt.union([logTimestampColumnRT, logFieldColumnRT, logMessageColumnRT]);
-
-export const logEntryContextRT = rt.union([
- rt.type({}),
- rt.type({ 'container.id': rt.string }),
- rt.type({ 'host.name': rt.string, 'log.file.path': rt.string }),
-]);
-
-export const logEntryRT = rt.type({
- id: rt.string,
- cursor: logEntryCursorRT,
- columns: rt.array(logColumnRT),
- context: logEntryContextRT,
-});
-
-export type LogMessageConstantPart = rt.TypeOf;
-export type LogMessageFieldPart = rt.TypeOf;
-export type LogMessagePart = rt.TypeOf;
-export type LogTimestampColumn = rt.TypeOf;
-export type LogFieldColumn = rt.TypeOf;
-export type LogMessageColumn = rt.TypeOf;
-export type LogColumn = rt.TypeOf;
-export type LogEntryContext = rt.TypeOf;
-export type LogEntry = rt.TypeOf;
-
export const logEntriesResponseRT = rt.type({
data: rt.intersection([
rt.type({
diff --git a/x-pack/plugins/infra/common/http_api/log_entries/highlights.ts b/x-pack/plugins/infra/common/http_api/log_entries/highlights.ts
index 648da43134a27..96bf8beb29021 100644
--- a/x-pack/plugins/infra/common/http_api/log_entries/highlights.ts
+++ b/x-pack/plugins/infra/common/http_api/log_entries/highlights.ts
@@ -5,13 +5,12 @@
*/
import * as rt from 'io-ts';
-import { logEntryCursorRT } from '../../log_entry';
+import { logEntryCursorRT, logEntryRT } from '../../log_entry';
import {
logEntriesBaseRequestRT,
logEntriesBeforeRequestRT,
logEntriesAfterRequestRT,
logEntriesCenteredRequestRT,
- logEntryRT,
} from './entries';
export const LOG_ENTRIES_HIGHLIGHTS_PATH = '/api/log_entries/highlights';
diff --git a/x-pack/plugins/infra/common/http_api/shared/time_range.ts b/x-pack/plugins/infra/common/http_api/shared/time_range.ts
index efda07423748b..07317092cdedb 100644
--- a/x-pack/plugins/infra/common/http_api/shared/time_range.ts
+++ b/x-pack/plugins/infra/common/http_api/shared/time_range.ts
@@ -4,11 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import * as rt from 'io-ts';
-
-export const timeRangeRT = rt.type({
- startTime: rt.number,
- endTime: rt.number,
-});
-
-export type TimeRange = rt.TypeOf;
+export * from '../../time/time_range';
diff --git a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_docker_overview.ts b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_docker_overview.ts
index d7026d7648d37..b8cf094d7bd4c 100644
--- a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_docker_overview.ts
+++ b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_docker_overview.ts
@@ -15,7 +15,7 @@ export const hostDockerOverview: TSVBMetricModelCreator = (
index_pattern: indexPattern,
interval,
time_field: timeField,
- type: 'gauge',
+ type: 'top_n',
series: [
{
id: 'total',
diff --git a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_k8s_overview.ts b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_k8s_overview.ts
index 86d615231f070..1488fe5504c0b 100644
--- a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_k8s_overview.ts
+++ b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_k8s_overview.ts
@@ -16,7 +16,7 @@ export const hostK8sOverview: TSVBMetricModelCreator = (
index_pattern: indexPattern,
interval,
time_field: timeField,
- type: 'gauge',
+ type: 'top_n',
series: [
{
id: 'cpucap',
diff --git a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_system_overview.ts b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_system_overview.ts
index 953c14ab2a9ce..cbd76dd8e9637 100644
--- a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_system_overview.ts
+++ b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_system_overview.ts
@@ -16,7 +16,7 @@ export const hostSystemOverview: TSVBMetricModelCreator = (
index_pattern: indexPattern,
interval,
time_field: timeField,
- type: 'gauge',
+ type: 'top_n',
series: [
{
id: 'cpu',
diff --git a/x-pack/plugins/infra/common/inventory_models/shared/metrics/tsvb/aws_overview.ts b/x-pack/plugins/infra/common/inventory_models/shared/metrics/tsvb/aws_overview.ts
index 5ba61d1f92517..28e1b7860aab4 100644
--- a/x-pack/plugins/infra/common/inventory_models/shared/metrics/tsvb/aws_overview.ts
+++ b/x-pack/plugins/infra/common/inventory_models/shared/metrics/tsvb/aws_overview.ts
@@ -14,7 +14,7 @@ export const awsOverview: TSVBMetricModelCreator = (timeField, indexPattern): TS
id_type: 'cloud',
interval: '>=5m',
time_field: timeField,
- type: 'gauge',
+ type: 'top_n',
series: [
{
id: 'cpu-util',
diff --git a/x-pack/plugins/infra/common/log_analysis/index.ts b/x-pack/plugins/infra/common/log_analysis/index.ts
index 0b4fa374a5da9..f055f642c8d1b 100644
--- a/x-pack/plugins/infra/common/log_analysis/index.ts
+++ b/x-pack/plugins/infra/common/log_analysis/index.ts
@@ -10,3 +10,5 @@ export * from './log_analysis_results';
export * from './log_entry_rate_analysis';
export * from './log_entry_categories_analysis';
export * from './job_parameters';
+export * from './log_entry_anomalies';
+export * from './log_entry_examples';
diff --git a/x-pack/plugins/infra/common/log_analysis/log_analysis_results.ts b/x-pack/plugins/infra/common/log_analysis/log_analysis_results.ts
index f4497dbba5056..897a5a4bb84df 100644
--- a/x-pack/plugins/infra/common/log_analysis/log_analysis_results.ts
+++ b/x-pack/plugins/infra/common/log_analysis/log_analysis_results.ts
@@ -4,6 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import * as rt from 'io-ts';
+
export const ML_SEVERITY_SCORES = {
warning: 3,
minor: 25,
@@ -55,3 +57,44 @@ export const compareDatasetsByMaximumAnomalyScore = <
firstDataset: Dataset,
secondDataset: Dataset
) => firstDataset.maximumAnomalyScore - secondDataset.maximumAnomalyScore;
+
+// Generic Sort
+
+const sortDirectionsRT = rt.keyof({
+ asc: null,
+ desc: null,
+});
+
+export const sortRT = (fields: Fields) =>
+ rt.type({
+ field: fields,
+ direction: sortDirectionsRT,
+ });
+
+// Pagination
+// [Sort field value, tiebreaker value]
+export const paginationCursorRT = rt.tuple([
+ rt.union([rt.string, rt.number]),
+ rt.union([rt.string, rt.number]),
+]);
+
+export type PaginationCursor = rt.TypeOf;
+
+const paginationPreviousPageCursorRT = rt.type({
+ searchBefore: paginationCursorRT,
+});
+
+const paginationNextPageCursorRT = rt.type({
+ searchAfter: paginationCursorRT,
+});
+
+export const paginationRT = rt.intersection([
+ rt.type({
+ pageSize: rt.number,
+ }),
+ rt.partial({
+ cursor: rt.union([paginationPreviousPageCursorRT, paginationNextPageCursorRT]),
+ }),
+]);
+
+export type Pagination = rt.TypeOf;
diff --git a/x-pack/plugins/infra/common/log_analysis/log_entry_anomalies.ts b/x-pack/plugins/infra/common/log_analysis/log_entry_anomalies.ts
new file mode 100644
index 0000000000000..c426646e8e847
--- /dev/null
+++ b/x-pack/plugins/infra/common/log_analysis/log_entry_anomalies.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { sortRT } from './log_analysis_results';
+
+export const anomalyTypeRT = rt.keyof({
+ logRate: null,
+ logCategory: null,
+});
+
+export type AnomalyType = rt.TypeOf;
+
+export const logEntryAnomalyCommonFieldsRT = rt.type({
+ id: rt.string,
+ anomalyScore: rt.number,
+ dataset: rt.string,
+ typical: rt.number,
+ actual: rt.number,
+ type: anomalyTypeRT,
+ duration: rt.number,
+ startTime: rt.number,
+ jobId: rt.string,
+});
+export const logEntrylogRateAnomalyRT = logEntryAnomalyCommonFieldsRT;
+export type RateAnomaly = rt.TypeOf;
+
+export const logEntrylogCategoryAnomalyRT = rt.intersection([
+ logEntryAnomalyCommonFieldsRT,
+ rt.type({
+ categoryId: rt.string,
+ categoryRegex: rt.string,
+ categoryTerms: rt.string,
+ }),
+]);
+export type CategoryAnomaly = rt.TypeOf;
+
+export const logEntryAnomalyRT = rt.union([logEntrylogRateAnomalyRT, logEntrylogCategoryAnomalyRT]);
+
+export type LogEntryAnomaly = rt.TypeOf;
+
+export const logEntryAnomalyDatasetsRT = rt.array(rt.string);
+export type LogEntryAnomalyDatasets = rt.TypeOf;
+
+export const isCategoryAnomaly = (anomaly: LogEntryAnomaly): anomaly is CategoryAnomaly => {
+ return anomaly.type === 'logCategory';
+};
+
+const sortOptionsRT = rt.keyof({
+ anomalyScore: null,
+ dataset: null,
+ startTime: null,
+});
+
+export const anomaliesSortRT = sortRT(sortOptionsRT);
+export type AnomaliesSort = rt.TypeOf;
diff --git a/x-pack/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts
index 0957126ee52e3..4292eaeb5f98c 100644
--- a/x-pack/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts
+++ b/x-pack/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts
@@ -5,6 +5,7 @@
*/
import * as rt from 'io-ts';
+import { sortRT } from './log_analysis_results';
export const logEntryCategoriesJobTypeRT = rt.keyof({
'log-entry-categories-count': null,
@@ -15,3 +16,44 @@ export type LogEntryCategoriesJobType = rt.TypeOf;
+
+export const logEntryCategoryHistogramBucketRT = rt.type({
+ startTime: rt.number,
+ bucketDuration: rt.number,
+ logEntryCount: rt.number,
+});
+
+export type LogEntryCategoryHistogramBucket = rt.TypeOf;
+
+export const logEntryCategoryHistogramRT = rt.type({
+ histogramId: rt.string,
+ buckets: rt.array(logEntryCategoryHistogramBucketRT),
+});
+
+export type LogEntryCategoryHistogram = rt.TypeOf;
+
+export const logEntryCategoryRT = rt.type({
+ categoryId: rt.number,
+ datasets: rt.array(logEntryCategoryDatasetRT),
+ histograms: rt.array(logEntryCategoryHistogramRT),
+ logEntryCount: rt.number,
+ maximumAnomalyScore: rt.number,
+ regularExpression: rt.string,
+});
+
+export type LogEntryCategory = rt.TypeOf;
+
+const sortOptionsRT = rt.keyof({
+ maximumAnomalyScore: null,
+ logEntryCount: null,
+});
+
+export const categoriesSortRT = sortRT(sortOptionsRT);
+export type CategoriesSort = rt.TypeOf;
diff --git a/x-pack/plugins/infra/common/log_analysis/log_entry_examples.ts b/x-pack/plugins/infra/common/log_analysis/log_entry_examples.ts
new file mode 100644
index 0000000000000..78d230e35dc74
--- /dev/null
+++ b/x-pack/plugins/infra/common/log_analysis/log_entry_examples.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const logEntryExampleRT = rt.type({
+ id: rt.string,
+ dataset: rt.string,
+ message: rt.string,
+ timestamp: rt.number,
+ tiebreaker: rt.number,
+});
+
+export type LogEntryExample = rt.TypeOf;
diff --git a/x-pack/plugins/infra/common/log_entry/log_entry.ts b/x-pack/plugins/infra/common/log_entry/log_entry.ts
index e02acebe27711..eec1fb59f3091 100644
--- a/x-pack/plugins/infra/common/log_entry/log_entry.ts
+++ b/x-pack/plugins/infra/common/log_entry/log_entry.ts
@@ -4,10 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import * as rt from 'io-ts';
import { TimeKey } from '../time';
-import { InfraLogEntry } from '../graphql/types';
-
-export type LogEntry = InfraLogEntry;
+import { logEntryCursorRT } from './log_entry_cursor';
+import { jsonArrayRT } from '../typed_json';
export interface LogEntryOrigin {
id: string;
@@ -42,3 +42,51 @@ export function isLessOrEqual(time1: LogEntryTime, time2: LogEntryTime) {
export function isBetween(min: LogEntryTime, max: LogEntryTime, operand: LogEntryTime) {
return isLessOrEqual(min, operand) && isLessOrEqual(operand, max);
}
+
+export const logMessageConstantPartRT = rt.type({
+ constant: rt.string,
+});
+export const logMessageFieldPartRT = rt.type({
+ field: rt.string,
+ value: jsonArrayRT,
+ highlights: rt.array(rt.string),
+});
+
+export const logMessagePartRT = rt.union([logMessageConstantPartRT, logMessageFieldPartRT]);
+
+export const logTimestampColumnRT = rt.type({ columnId: rt.string, timestamp: rt.number });
+export const logFieldColumnRT = rt.type({
+ columnId: rt.string,
+ field: rt.string,
+ value: jsonArrayRT,
+ highlights: rt.array(rt.string),
+});
+export const logMessageColumnRT = rt.type({
+ columnId: rt.string,
+ message: rt.array(logMessagePartRT),
+});
+
+export const logColumnRT = rt.union([logTimestampColumnRT, logFieldColumnRT, logMessageColumnRT]);
+
+export const logEntryContextRT = rt.union([
+ rt.type({}),
+ rt.type({ 'container.id': rt.string }),
+ rt.type({ 'host.name': rt.string, 'log.file.path': rt.string }),
+]);
+
+export const logEntryRT = rt.type({
+ id: rt.string,
+ cursor: logEntryCursorRT,
+ columns: rt.array(logColumnRT),
+ context: logEntryContextRT,
+});
+
+export type LogMessageConstantPart = rt.TypeOf;
+export type LogMessageFieldPart = rt.TypeOf;
+export type LogMessagePart = rt.TypeOf;
+export type LogEntryContext = rt.TypeOf;
+export type LogEntry = rt.TypeOf;
+export type LogTimestampColumn = rt.TypeOf;
+export type LogFieldColumn = rt.TypeOf;
+export type LogMessageColumn = rt.TypeOf;
+export type LogColumn = rt.TypeOf;
diff --git a/x-pack/plugins/infra/common/time/index.ts b/x-pack/plugins/infra/common/time/index.ts
index f49d46fa4920f..63bba2fa807ac 100644
--- a/x-pack/plugins/infra/common/time/index.ts
+++ b/x-pack/plugins/infra/common/time/index.ts
@@ -7,3 +7,4 @@
export * from './time_unit';
export * from './time_scale';
export * from './time_key';
+export * from './time_range';
diff --git a/x-pack/plugins/infra/common/time/time_range.ts b/x-pack/plugins/infra/common/time/time_range.ts
new file mode 100644
index 0000000000000..efda07423748b
--- /dev/null
+++ b/x-pack/plugins/infra/common/time/time_range.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const timeRangeRT = rt.type({
+ startTime: rt.number,
+ endTime: rt.number,
+});
+
+export type TimeRange = rt.TypeOf;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_expression.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
similarity index 95%
rename from x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_expression.tsx
rename to x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
index d5480977e7f9e..9684777ac9216 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_expression.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
@@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import React, { memo } from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
export const RegularExpressionRepresentation: React.FunctionComponent<{
maximumSegmentCount?: number;
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts b/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts
index 19e8108ee50e8..b0ff36574bede 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts
@@ -7,7 +7,7 @@
import { bisector } from 'd3-array';
import { compareToTimeKey, TimeKey } from '../../../../common/time';
-import { LogEntry } from '../../../../common/http_api';
+import { LogEntry } from '../../../../common/log_entry';
export type StreamItem = LogEntryStreamItem;
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
index 8de9e565b00be..2b30d43f8c38d 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
@@ -7,7 +7,7 @@
import { render } from '@testing-library/react';
import React from 'react';
import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { LogFieldColumn } from '../../../../common/http_api';
+import { LogFieldColumn } from '../../../../common/log_entry';
import { LogEntryFieldColumn } from './log_entry_field_column';
describe('LogEntryFieldColumn', () => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
index 4a9b0d0906a76..0d295b4df5566 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
@@ -7,7 +7,7 @@
import React from 'react';
import { JsonValue } from '../../../../../../../src/plugins/kibana_utils/common';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { LogColumn } from '../../../../common/http_api';
+import { LogColumn } from '../../../../common/log_entry';
import { isFieldColumn, isHighlightFieldColumn } from '../../../utils/log_entry';
import { FieldValue } from './field_value';
import { LogEntryColumnContent } from './log_entry_column';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
index 5d36e5cd47c59..00281c2df3133 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
@@ -7,7 +7,7 @@
import { render } from '@testing-library/react';
import React from 'react';
import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { LogMessageColumn } from '../../../../common/http_api';
+import { LogMessageColumn } from '../../../../common/log_entry';
import { LogEntryMessageColumn } from './log_entry_message_column';
describe('LogEntryMessageColumn', () => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
index bfc160ada2e6a..92214dee9de22 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
@@ -6,7 +6,7 @@
import React, { memo, useMemo } from 'react';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { LogColumn, LogMessagePart } from '../../../../common/http_api';
+import { LogColumn, LogMessagePart } from '../../../../common/log_entry';
import {
isConstantSegment,
isFieldSegment,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
index 93c657fbdda97..1a472df2b5c90 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
@@ -17,7 +17,7 @@ import { LogEntryFieldColumn } from './log_entry_field_column';
import { LogEntryMessageColumn } from './log_entry_message_column';
import { LogEntryTimestampColumn } from './log_entry_timestamp_column';
import { monospaceTextStyle, hoveredContentStyle, highlightedContentStyle } from './text_styles';
-import { LogEntry, LogColumn } from '../../../../common/http_api';
+import { LogEntry, LogColumn } from '../../../../common/log_entry';
import { LogEntryContextMenu } from './log_entry_context_menu';
import {
LogColumnRenderConfiguration,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index d399e47a73562..8fb63533cf61b 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -25,7 +25,7 @@ import { MeasurableItemView } from './measurable_item_view';
import { VerticalScrollPanel } from './vertical_scroll_panel';
import { useColumnWidths, LogEntryColumnWidths } from './log_entry_column';
import { LogDateRow } from './log_date_row';
-import { LogEntry } from '../../../../common/http_api';
+import { LogEntry } from '../../../../common/log_entry';
import { LogColumnRenderConfiguration } from '../../../utils/log_column_render_configuration';
interface ScrollableLogTextStreamViewProps {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_entries/index.ts b/x-pack/plugins/infra/public/containers/logs/log_entries/index.ts
index bf4c5fbe0b13b..f1b820857e340 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_entries/index.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_entries/index.ts
@@ -10,10 +10,10 @@ import { pick, throttle } from 'lodash';
import { TimeKey, timeKeyIsBetween } from '../../../../common/time';
import {
LogEntriesResponse,
- LogEntry,
LogEntriesRequest,
LogEntriesBaseRequest,
} from '../../../../common/http_api';
+import { LogEntry } from '../../../../common/log_entry';
import { fetchLogEntries } from './api/fetch_log_entries';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_highlights/log_entry_highlights.tsx b/x-pack/plugins/infra/public/containers/logs/log_highlights/log_entry_highlights.tsx
index b4edebe8f8207..fb72874df5409 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_highlights/log_entry_highlights.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_highlights/log_entry_highlights.tsx
@@ -9,7 +9,8 @@ import { useEffect, useMemo, useState } from 'react';
import { TimeKey } from '../../../../common/time';
import { useTrackedPromise } from '../../../utils/use_tracked_promise';
import { fetchLogEntriesHighlights } from './api/fetch_log_entries_highlights';
-import { LogEntry, LogEntriesHighlightsResponse } from '../../../../common/http_api';
+import { LogEntriesHighlightsResponse } from '../../../../common/http_api';
+import { LogEntry } from '../../../../common/log_entry';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
export const useLogEntryHighlights = (
diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
index ff30e993aa3a9..da7176125dae4 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
@@ -10,8 +10,7 @@ import usePrevious from 'react-use/lib/usePrevious';
import { esKuery } from '../../../../../../../src/plugins/data/public';
import { fetchLogEntries } from '../log_entries/api/fetch_log_entries';
import { useTrackedPromise } from '../../../utils/use_tracked_promise';
-import { LogEntry } from '../../../../common/http_api';
-import { LogEntryCursor } from '../../../../common/log_entry';
+import { LogEntryCursor, LogEntry } from '../../../../common/log_entry';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
import { LogSourceConfigurationProperties } from '../log_source';
diff --git a/x-pack/plugins/infra/public/containers/logs/view_log_in_context/view_log_in_context.ts b/x-pack/plugins/infra/public/containers/logs/view_log_in_context/view_log_in_context.ts
index 61e1ea353880a..2888e5a2b3ac5 100644
--- a/x-pack/plugins/infra/public/containers/logs/view_log_in_context/view_log_in_context.ts
+++ b/x-pack/plugins/infra/public/containers/logs/view_log_in_context/view_log_in_context.ts
@@ -5,7 +5,7 @@
*/
import { useState } from 'react';
import createContainer from 'constate';
-import { LogEntry } from '../../../../common/http_api';
+import { LogEntry } from '../../../../common/log_entry';
interface ViewLogInContextProps {
sourceId: string;
diff --git a/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts b/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts
index 2b8986820d5a4..89b5d993fa01e 100644
--- a/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts
+++ b/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts
@@ -11,7 +11,7 @@ import { RendererFunction } from '../../utils/typed_react';
import { LogHighlightsState } from './log_highlights/log_highlights';
import { LogEntriesState, LogEntriesStateParams, LogEntriesCallbacks } from './log_entries';
import { UniqueTimeKey } from '../../../common/time';
-import { LogEntry } from '../../../common/http_api';
+import { LogEntry } from '../../../common/log_entry';
export const WithStreamItems: React.FunctionComponent<{
children: RendererFunction<
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
index ecddd8a9aa5be..4445b735bedc9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
@@ -12,7 +12,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
import { useTrackPageview } from '../../../../../observability/public';
-import { TimeRange } from '../../../../common/http_api/shared/time_range';
+import { TimeRange } from '../../../../common/time/time_range';
import { CategoryJobNoticesSection } from '../../../components/logging/log_analysis_job_status';
import { useLogEntryCategoriesModuleContext } from '../../../containers/logs/log_analysis/modules/log_entry_categories';
import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
index 3e1398c804686..8fe87c14c1a7c 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
@@ -8,7 +8,7 @@ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { TimeRange } from '../../../../../../common/time/time_range';
import { getEntitySpecificSingleMetricViewerLink } from '../../../../../components/logging/log_analysis_results';
import { useLinkProps } from '../../../../../hooks/use_link_props';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/anomaly_severity_indicator_list.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/anomaly_severity_indicator_list.tsx
index 47bb31ab4ae3e..20f0ee00bd505 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/anomaly_severity_indicator_list.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/anomaly_severity_indicator_list.tsx
@@ -6,7 +6,7 @@
import React from 'react';
-import { LogEntryCategoryDataset } from '../../../../../../common/http_api/log_analysis';
+import { LogEntryCategoryDataset } from '../../../../../../common/log_analysis';
import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
import { AnomalySeverityIndicator } from '../../../../../components/logging/log_analysis_results/anomaly_severity_indicator';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_details_row.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_details_row.tsx
index de07f3eb02029..8b4f075b782a9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_details_row.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_details_row.tsx
@@ -7,7 +7,7 @@
import React, { useEffect } from 'react';
import { useLogEntryCategoryExamples } from '../../use_log_entry_category_examples';
import { LogEntryExampleMessages } from '../../../../../components/logging/log_entry_examples/log_entry_examples';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { TimeRange } from '../../../../../../common/time/time_range';
import { CategoryExampleMessage } from './category_example_message';
const exampleCount = 5;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
index 84d7e198636e9..e24fdd06bc6d9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
@@ -9,8 +9,8 @@ import { i18n } from '@kbn/i18n';
import { encode } from 'rison-node';
import moment from 'moment';
-import { LogEntry, LogEntryContext } from '../../../../../../common/http_api';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { LogEntry, LogEntryContext } from '../../../../../../common/log_entry';
+import { TimeRange } from '../../../../../../common/time';
import {
getFriendlyNameForPartitionId,
partitionField,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_action_list.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_action_list.tsx
index 2321dafaead1c..6bbc640b5b007 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_action_list.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_action_list.tsx
@@ -6,8 +6,8 @@
import React from 'react';
-import { LogEntryCategoryDataset } from '../../../../../../common/http_api/log_analysis';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { LogEntryCategoryDataset } from '../../../../../../common/log_analysis';
+import { TimeRange } from '../../../../../../common/time';
import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
import { AnalyzeCategoryDatasetInMlAction } from './analyze_dataset_in_ml_action';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
index 779ac3e8c3a07..78690285180d7 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
@@ -7,7 +7,7 @@
import React from 'react';
import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
-import { LogEntryCategoryDataset } from '../../../../../../common/http_api/log_analysis';
+import { LogEntryCategoryDataset } from '../../../../../../common/log_analysis';
import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
export const DatasetsList: React.FunctionComponent<{
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/log_entry_count_sparkline.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/log_entry_count_sparkline.tsx
index 42d6509802ed4..d94dbb9d33556 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/log_entry_count_sparkline.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/log_entry_count_sparkline.tsx
@@ -6,8 +6,8 @@
import React, { useMemo } from 'react';
-import { LogEntryCategoryHistogram } from '../../../../../../common/http_api/log_analysis';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { LogEntryCategoryHistogram } from '../../../../../../common/log_analysis';
+import { TimeRange } from '../../../../../../common/time';
import { SingleMetricComparison } from './single_metric_comparison';
import { SingleMetricSparkline } from './single_metric_sparkline';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_sparkline.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_sparkline.tsx
index 5fb8e3380f23f..c8453bdcdefbd 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_sparkline.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_sparkline.tsx
@@ -13,7 +13,7 @@ import {
} from '@elastic/eui/dist/eui_charts_theme';
import { useKibanaUiSetting } from '../../../../../utils/use_kibana_ui_setting';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { TimeRange } from '../../../../../../common/time';
interface TimeSeriesPoint {
timestamp: number;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_section.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_section.tsx
index c7a6c89012a3a..f810a675a18d1 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_section.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_section.tsx
@@ -8,8 +8,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSpacer, EuiTitle } fro
import { i18n } from '@kbn/i18n';
import React from 'react';
-import { LogEntryCategory } from '../../../../../../common/http_api/log_analysis';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+import { LogEntryCategory } from '../../../../../../common/log_analysis';
+import { TimeRange } from '../../../../../../common/time';
import { BetaBadge } from '../../../../../components/beta_badge';
import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
import { RecreateJobButton } from '../../../../../components/logging/log_analysis_setup/create_job_button';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
index 954b6a9ab3ed3..834c99502a590 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
@@ -15,12 +15,12 @@ import {
LogEntryCategory,
LogEntryCategoryDataset,
LogEntryCategoryHistogram,
-} from '../../../../../../common/http_api/log_analysis';
-import { TimeRange } from '../../../../../../common/http_api/shared';
+} from '../../../../../../common/log_analysis';
+import { TimeRange } from '../../../../../../common/time';
import { RowExpansionButton } from '../../../../../components/basic_table';
import { AnomalySeverityIndicatorList } from './anomaly_severity_indicator_list';
import { CategoryDetailsRow } from './category_details_row';
-import { RegularExpressionRepresentation } from './category_expression';
+import { RegularExpressionRepresentation } from '../../../../../components/logging/log_analysis_results/category_expression';
import { DatasetActionsList } from './datasets_action_list';
import { DatasetsList } from './datasets_list';
import { LogEntryCountSparkline } from './log_entry_count_sparkline';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
index a0eaecf04fa4b..b25b6cbe6f631 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
@@ -10,8 +10,8 @@ import {
getLogEntryCategoriesRequestPayloadRT,
getLogEntryCategoriesSuccessReponsePayloadRT,
LOG_ANALYSIS_GET_LOG_ENTRY_CATEGORIES_PATH,
- CategorySort,
} from '../../../../../common/http_api/log_analysis';
+import { CategoriesSort } from '../../../../../common/log_analysis';
import { decodeOrThrow } from '../../../../../common/runtime_types';
interface RequestArgs {
@@ -20,7 +20,7 @@ interface RequestArgs {
endTime: number;
categoryCount: number;
datasets?: string[];
- sort: CategorySort;
+ sort: CategoriesSort;
}
export const callGetTopLogEntryCategoriesAPI = async (
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_results.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_results.ts
index a64b73dea25e6..e3fba92610955 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_results.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_results.ts
@@ -9,8 +9,8 @@ import { useMemo, useState } from 'react';
import {
GetLogEntryCategoriesSuccessResponsePayload,
GetLogEntryCategoryDatasetsSuccessResponsePayload,
- CategorySort,
} from '../../../../common/http_api/log_analysis';
+import { CategoriesSort } from '../../../../common/log_analysis';
import { useTrackedPromise, CanceledPromiseError } from '../../../utils/use_tracked_promise';
import { callGetTopLogEntryCategoriesAPI } from './service_calls/get_top_log_entry_categories';
import { callGetLogEntryCategoryDatasetsAPI } from './service_calls/get_log_entry_category_datasets';
@@ -19,8 +19,8 @@ import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
type TopLogEntryCategories = GetLogEntryCategoriesSuccessResponsePayload['data']['categories'];
type LogEntryCategoryDatasets = GetLogEntryCategoryDatasetsSuccessResponsePayload['data']['datasets'];
-export type SortOptions = CategorySort;
-export type ChangeSortOptions = (sortOptions: CategorySort) => void;
+export type SortOptions = CategoriesSort;
+export type ChangeSortOptions = (sortOptions: CategoriesSort) => void;
export const useLogEntryCategoriesResults = ({
categoriesCount,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
index 09d3746c6ace6..f5007a1d48c4a 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
@@ -13,7 +13,7 @@ import { encode, RisonValue } from 'rison-node';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
import { useTrackPageview } from '../../../../../observability/public';
-import { TimeRange } from '../../../../common/http_api/shared/time_range';
+import { TimeRange } from '../../../../common/time/time_range';
import { bucketSpan } from '../../../../common/log_analysis';
import { TimeKey } from '../../../../common/time';
import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx
index ae5c3b5b93b47..503d383201592 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx
@@ -23,7 +23,7 @@ import moment from 'moment';
import React, { useCallback, useMemo } from 'react';
import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
-import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
+import { TimeRange } from '../../../../../../common/time/time_range';
import {
MLSeverityScoreCategories,
ML_SEVERITY_COLORS,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
index 37032a95e9640..39fb1a5e6ae19 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
@@ -10,8 +10,8 @@ import { i18n } from '@kbn/i18n';
import React from 'react';
import useMount from 'react-use/lib/useMount';
import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
-import { LogEntryAnomaly } from '../../../../../../common/http_api';
-import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
+import { LogEntryAnomaly, isCategoryAnomaly } from '../../../../../../common/log_analysis';
+import { TimeRange } from '../../../../../../common/time/time_range';
import { LogEntryExampleMessages } from '../../../../../components/logging/log_entry_examples/log_entry_examples';
import { useLogSourceContext } from '../../../../../containers/logs/log_source';
import { useLogEntryExamples } from '../../use_log_entry_examples';
@@ -40,7 +40,7 @@ export const AnomaliesTableExpandedRow: React.FunctionComponent<{
exampleCount: EXAMPLE_COUNT,
sourceId,
startTime: anomaly.startTime,
- categoryId: anomaly.categoryId,
+ categoryId: isCategoryAnomaly(anomaly) ? anomaly.categoryId : undefined,
});
useMount(() => {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx
index c89f0329e9f2e..780e8c7ec5ec9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx
@@ -16,7 +16,7 @@ import { i18n } from '@kbn/i18n';
import React, { useMemo } from 'react';
import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
import { LogEntryRateResults } from '../../use_log_entry_rate_results';
-import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
+import { TimeRange } from '../../../../../../common/time/time_range';
import { getAnnotationsForAll, getLogEntryRateCombinedSeries } from '../helpers/data_formatters';
import { AnomaliesChart } from './chart';
import { AnomaliesTable } from './table';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
index ab3476cd78eb3..7446b3c348606 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
@@ -25,10 +25,10 @@ import {
LogColumnHeader,
} from '../../../../../components/logging/log_text_stream/column_headers';
import { useLinkProps } from '../../../../../hooks/use_link_props';
-import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
+import { TimeRange } from '../../../../../../common/time/time_range';
import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
import { getEntitySpecificSingleMetricViewerLink } from '../../../../../components/logging/log_analysis_results/analyze_in_ml_button';
-import { LogEntryExample } from '../../../../../../common/http_api/log_analysis/results';
+import { LogEntryExample, isCategoryAnomaly } from '../../../../../../common/log_analysis';
import {
LogColumnConfiguration,
isTimestampLogColumnConfiguration,
@@ -36,7 +36,7 @@ import {
isMessageLogColumnConfiguration,
} from '../../../../../utils/source_configuration';
import { localizedDate } from '../../../../../../common/formatters/datetime';
-import { LogEntryAnomaly } from '../../../../../../common/http_api';
+import { LogEntryAnomaly } from '../../../../../../common/log_analysis';
import { useLogEntryFlyoutContext } from '../../../../../containers/logs/log_flyout';
export const exampleMessageScale = 'medium' as const;
@@ -116,7 +116,7 @@ export const LogEntryExampleMessage: React.FunctionComponent = ({
const viewAnomalyInMachineLearningLinkProps = useLinkProps(
getEntitySpecificSingleMetricViewerLink(anomaly.jobId, timeRange, {
[partitionField]: dataset,
- ...(anomaly.categoryId ? { mlcategory: anomaly.categoryId } : {}),
+ ...(isCategoryAnomaly(anomaly) ? { mlcategory: anomaly.categoryId } : {}),
})
);
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
index 855113d66f510..4b8c2b02bb8af 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
@@ -18,16 +18,18 @@ import moment from 'moment';
import { i18n } from '@kbn/i18n';
import React, { useCallback, useMemo } from 'react';
import useSet from 'react-use/lib/useSet';
-import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
+import { TimeRange } from '../../../../../../common/time/time_range';
import {
+ AnomalyType,
formatAnomalyScore,
getFriendlyNameForPartitionId,
formatOneDecimalPlace,
+ isCategoryAnomaly,
} from '../../../../../../common/log_analysis';
-import { AnomalyType } from '../../../../../../common/http_api/log_analysis';
import { RowExpansionButton } from '../../../../../components/basic_table';
import { AnomaliesTableExpandedRow } from './expanded_row';
import { AnomalySeverityIndicator } from '../../../../../components/logging/log_analysis_results/anomaly_severity_indicator';
+import { RegularExpressionRepresentation } from '../../../../../components/logging/log_analysis_results/category_expression';
import { useKibanaUiSetting } from '../../../../../utils/use_kibana_ui_setting';
import {
Page,
@@ -50,6 +52,7 @@ interface TableItem {
typical: number;
actual: number;
type: AnomalyType;
+ categoryRegex?: string;
}
const anomalyScoreColumnName = i18n.translate(
@@ -124,6 +127,7 @@ export const AnomaliesTable: React.FunctionComponent<{
type: anomaly.type,
typical: anomaly.typical,
actual: anomaly.actual,
+ categoryRegex: isCategoryAnomaly(anomaly) ? anomaly.categoryRegex : undefined,
};
});
}, [results]);
@@ -166,9 +170,7 @@ export const AnomaliesTable: React.FunctionComponent<{
{
name: anomalyMessageColumnName,
truncateText: true,
- render: (item: TableItem) => (
-
- ),
+ render: (item: TableItem) => ,
},
{
field: 'startTime',
@@ -226,15 +228,9 @@ export const AnomaliesTable: React.FunctionComponent<{
);
};
-const AnomalyMessage = ({
- actual,
- typical,
- type,
-}: {
- actual: number;
- typical: number;
- type: AnomalyType;
-}) => {
+const AnomalyMessage = ({ anomaly }: { anomaly: TableItem }) => {
+ const { type, actual, typical } = anomaly;
+
const moreThanExpectedAnomalyMessage = i18n.translate(
'xpack.infra.logs.analysis.anomaliesTableMoreThanExpectedAnomalyMessage',
{
@@ -262,9 +258,20 @@ const AnomalyMessage = ({
const ratioMessage = useRatio ? `${formatOneDecimalPlace(ratio)}x` : '';
return (
-
- {`${ratioMessage} ${message}`}
-
+
+
+
+
+
+ {`${ratioMessage} ${message}`}
+ {anomaly.categoryRegex && (
+ <>
+ {': '}
+
+
+ )}
+
+
);
};
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
index 7f90604bfefdd..f915b0d78c43d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
@@ -11,13 +11,13 @@ import {
LOG_ANALYSIS_GET_LOG_ENTRY_ANOMALIES_PATH,
} from '../../../../../common/http_api/log_analysis';
import { decodeOrThrow } from '../../../../../common/runtime_types';
-import { Sort, Pagination } from '../../../../../common/http_api/log_analysis';
+import { AnomaliesSort, Pagination } from '../../../../../common/log_analysis';
interface RequestArgs {
sourceId: string;
startTime: number;
endTime: number;
- sort: Sort;
+ sort: AnomaliesSort;
pagination: Pagination;
datasets?: string[];
}
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_anomalies_results.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_anomalies_results.ts
index 396c1ad3e1857..fbfe76f1473f5 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_anomalies_results.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_anomalies_results.ts
@@ -9,21 +9,21 @@ import useMount from 'react-use/lib/useMount';
import { useTrackedPromise, CanceledPromiseError } from '../../../utils/use_tracked_promise';
import { callGetLogEntryAnomaliesAPI } from './service_calls/get_log_entry_anomalies';
import { callGetLogEntryAnomaliesDatasetsAPI } from './service_calls/get_log_entry_anomalies_datasets';
+import { GetLogEntryAnomaliesDatasetsSuccessResponsePayload } from '../../../../common/http_api/log_analysis';
import {
- Sort,
+ AnomaliesSort,
Pagination,
PaginationCursor,
- GetLogEntryAnomaliesDatasetsSuccessResponsePayload,
LogEntryAnomaly,
-} from '../../../../common/http_api/log_analysis';
+} from '../../../../common/log_analysis';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-export type SortOptions = Sort;
+export type SortOptions = AnomaliesSort;
export type PaginationOptions = Pick;
export type Page = number;
export type FetchNextPage = () => void;
export type FetchPreviousPage = () => void;
-export type ChangeSortOptions = (sortOptions: Sort) => void;
+export type ChangeSortOptions = (sortOptions: AnomaliesSort) => void;
export type ChangePaginationOptions = (paginationOptions: PaginationOptions) => void;
export type LogEntryAnomalies = LogEntryAnomaly[];
type LogEntryAnomaliesDatasets = GetLogEntryAnomaliesDatasetsSuccessResponsePayload['data']['datasets'];
@@ -38,7 +38,7 @@ interface ReducerState {
paginationCursor: Pagination['cursor'] | undefined;
hasNextPage: boolean;
paginationOptions: PaginationOptions;
- sortOptions: Sort;
+ sortOptions: AnomaliesSort;
timeRange: {
start: number;
end: number;
@@ -53,7 +53,7 @@ type ReducerStateDefaults = Pick<
type ReducerAction =
| { type: 'changePaginationOptions'; payload: { paginationOptions: PaginationOptions } }
- | { type: 'changeSortOptions'; payload: { sortOptions: Sort } }
+ | { type: 'changeSortOptions'; payload: { sortOptions: AnomaliesSort } }
| { type: 'fetchNextPage' }
| { type: 'fetchPreviousPage' }
| { type: 'changeHasNextPage'; payload: { hasNextPage: boolean } }
@@ -144,7 +144,7 @@ export const useLogEntryAnomaliesResults = ({
endTime: number;
startTime: number;
sourceId: string;
- defaultSortOptions: Sort;
+ defaultSortOptions: AnomaliesSort;
defaultPaginationOptions: Pick;
onGetLogEntryAnomaliesDatasetsError?: (error: Error) => void;
filteredDatasets?: string[];
@@ -225,7 +225,7 @@ export const useLogEntryAnomaliesResults = ({
);
const changeSortOptions = useCallback(
- (nextSortOptions: Sort) => {
+ (nextSortOptions: AnomaliesSort) => {
dispatch({ type: 'changeSortOptions', payload: { sortOptions: nextSortOptions } });
},
[dispatch]
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_examples.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_examples.ts
index e809ab9cd5a6f..90b8b03a81602 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_examples.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_examples.ts
@@ -6,7 +6,7 @@
import { useMemo, useState } from 'react';
-import { LogEntryExample } from '../../../../common/http_api';
+import { LogEntryExample } from '../../../../common/log_analysis';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
import { useTrackedPromise } from '../../../utils/use_tracked_promise';
import { callGetLogEntryExamplesAPI } from './service_calls/get_log_entry_examples';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
index 3fa89da5b5e51..011653fd6eb47 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
@@ -16,7 +16,7 @@ import {
import { FormattedMessage } from '@kbn/i18n/react';
import { isEmpty } from 'lodash';
import React, { useCallback, useContext, useMemo } from 'react';
-import { LogEntry } from '../../../../common/http_api';
+import { LogEntry } from '../../../../common/log_entry';
import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
import { useViewportDimensions } from '../../../utils/use_viewport_dimensions';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
diff --git a/x-pack/plugins/infra/public/test_utils/entries.ts b/x-pack/plugins/infra/public/test_utils/entries.ts
index 04c87d5f73902..96737fb175365 100644
--- a/x-pack/plugins/infra/public/test_utils/entries.ts
+++ b/x-pack/plugins/infra/public/test_utils/entries.ts
@@ -5,7 +5,7 @@
*/
import faker from 'faker';
-import { LogEntry } from '../../common/http_api';
+import { LogEntry } from '../../common/log_entry';
import { LogSourceConfiguration } from '../containers/logs/log_source';
export const ENTRIES_EMPTY = {
diff --git a/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts b/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts
index bb528ee5b18c5..c69104ad6177e 100644
--- a/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts
+++ b/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts
@@ -17,7 +17,7 @@ import {
LogMessagePart,
LogMessageFieldPart,
LogMessageConstantPart,
-} from '../../../common/http_api';
+} from '../../../common/log_entry';
export type LogEntryMessageSegment = InfraLogEntryFields.Message;
export type LogEntryConstantMessageSegment = InfraLogEntryFields.InfraLogMessageConstantSegmentInlineFragment;
diff --git a/x-pack/plugins/infra/public/utils/log_entry/log_entry_highlight.ts b/x-pack/plugins/infra/public/utils/log_entry/log_entry_highlight.ts
index abb004911214b..208316c693d4d 100644
--- a/x-pack/plugins/infra/public/utils/log_entry/log_entry_highlight.ts
+++ b/x-pack/plugins/infra/public/utils/log_entry/log_entry_highlight.ts
@@ -12,7 +12,7 @@ import {
LogFieldColumn,
LogMessagePart,
LogMessageFieldPart,
-} from '../../../common/http_api';
+} from '../../../common/log_entry';
export type LogEntryHighlightColumn = InfraLogEntryHighlightFields.Columns;
export type LogEntryHighlightMessageColumn = InfraLogEntryHighlightFields.InfraLogEntryMessageColumnInlineFragment;
diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
index 0b1df3abd465a..4c5debe58ed26 100644
--- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
@@ -10,10 +10,9 @@ import type { InfraPluginRequestHandlerContext } from '../../../types';
import {
LogEntriesSummaryBucket,
LogEntriesSummaryHighlightsBucket,
- LogEntry,
- LogColumn,
LogEntriesRequest,
} from '../../../../common/http_api';
+import { LogEntry, LogColumn } from '../../../../common/log_entry';
import {
InfraSourceConfiguration,
InfraSources,
diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts
index 19ab82c9c5ac1..d04e036b33b21 100644
--- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts
+++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { LogMessagePart } from '../../../../common/http_api/log_entries';
+import { LogMessagePart } from '../../../../common/log_entry';
import { JsonArray, JsonValue } from '../../../../../../../src/plugins/kibana_utils/common';
import {
LogMessageFormattingCondition,
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
index c6a4593912280..fbcc3671f08a2 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts
@@ -12,12 +12,11 @@ import {
logEntryCategoriesJobTypes,
logEntryRateJobTypes,
jobCustomSettingsRT,
-} from '../../../common/log_analysis';
-import {
- Sort,
+ LogEntryAnomalyDatasets,
+ AnomaliesSort,
Pagination,
- GetLogEntryAnomaliesRequestPayload,
-} from '../../../common/http_api/log_analysis';
+ isCategoryAnomaly,
+} from '../../../common/log_analysis';
import type { MlSystem, MlAnomalyDetectors } from '../../types';
import { createLogEntryAnomaliesQuery, logEntryAnomaliesResponseRT } from './queries';
import {
@@ -95,9 +94,9 @@ export async function getLogEntryAnomalies(
sourceId: string,
startTime: number,
endTime: number,
- sort: Sort,
+ sort: AnomaliesSort,
pagination: Pagination,
- datasets: GetLogEntryAnomaliesRequestPayload['data']['datasets']
+ datasets?: LogEntryAnomalyDatasets
) {
const finalizeLogEntryAnomaliesSpan = startTracingSpan('get log entry anomalies');
@@ -131,7 +130,7 @@ export async function getLogEntryAnomalies(
datasets
);
- const data = anomalies.map((anomaly) => {
+ const parsedAnomalies = anomalies.map((anomaly) => {
const { jobId } = anomaly;
if (!anomaly.categoryId) {
@@ -141,10 +140,41 @@ export async function getLogEntryAnomalies(
}
});
+ const categoryIds = parsedAnomalies.reduce((acc, anomaly) => {
+ return isCategoryAnomaly(anomaly) ? [...acc, parseInt(anomaly.categoryId, 10)] : acc;
+ }, []);
+
+ const logEntryCategoriesCountJobId = getJobId(
+ context.infra.spaceId,
+ sourceId,
+ logEntryCategoriesJobTypes[0]
+ );
+
+ const { logEntryCategoriesById } = await fetchLogEntryCategories(
+ context,
+ logEntryCategoriesCountJobId,
+ categoryIds
+ );
+
+ const parsedAnomaliesWithExpandedCategoryInformation = parsedAnomalies.map((anomaly) => {
+ if (isCategoryAnomaly(anomaly)) {
+ if (logEntryCategoriesById[parseInt(anomaly.categoryId, 10)]) {
+ const {
+ _source: { regex, terms },
+ } = logEntryCategoriesById[parseInt(anomaly.categoryId, 10)];
+ return { ...anomaly, ...{ categoryRegex: regex, categoryTerms: terms } };
+ } else {
+ return { ...anomaly, ...{ categoryRegex: '', categoryTerms: '' } };
+ }
+ } else {
+ return anomaly;
+ }
+ });
+
const logEntryAnomaliesSpan = finalizeLogEntryAnomaliesSpan();
return {
- data,
+ data: parsedAnomaliesWithExpandedCategoryInformation,
paginationCursors,
hasMoreEntries,
timing: {
@@ -208,9 +238,9 @@ async function fetchLogEntryAnomalies(
jobIds: string[],
startTime: number,
endTime: number,
- sort: Sort,
+ sort: AnomaliesSort,
pagination: Pagination,
- datasets: GetLogEntryAnomaliesRequestPayload['data']['datasets']
+ datasets?: LogEntryAnomalyDatasets
) {
// We'll request 1 extra entry on top of our pageSize to determine if there are
// more entries to be fetched. This avoids scenarios where the client side can't
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
index 7dd5aae9784f5..071a8a94e009b 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
@@ -5,14 +5,14 @@
*/
import type { ILegacyScopedClusterClient } from 'src/core/server';
-import { LogEntryContext } from '../../../common/http_api';
+import { LogEntryContext } from '../../../common/log_entry';
import {
compareDatasetsByMaximumAnomalyScore,
getJobId,
jobCustomSettingsRT,
logEntryCategoriesJobTypes,
+ CategoriesSort,
} from '../../../common/log_analysis';
-import { CategorySort } from '../../../common/http_api/log_analysis';
import { startTracingSpan } from '../../../common/performance_tracing';
import { decodeOrThrow } from '../../../common/runtime_types';
import type { MlAnomalyDetectors, MlSystem } from '../../types';
@@ -51,7 +51,7 @@ export async function getTopLogEntryCategories(
categoryCount: number,
datasets: string[],
histograms: HistogramParameters[],
- sort: CategorySort
+ sort: CategoriesSort
) {
const finalizeTopLogEntryCategoriesSpan = startTracingSpan('get top categories');
@@ -218,7 +218,7 @@ async function fetchTopLogEntryCategories(
endTime: number,
categoryCount: number,
datasets: string[],
- sort: CategorySort
+ sort: CategoriesSort
) {
const finalizeEsSearchSpan = startTracingSpan('Fetch top categories from ES');
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_anomalies.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_anomalies.ts
index e692ed019cf86..8e01cafcf62ae 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_anomalies.ts
@@ -14,10 +14,10 @@ import {
createDatasetsFilters,
} from './common';
import {
- Sort,
+ AnomaliesSort,
+ LogEntryAnomalyDatasets,
Pagination,
- GetLogEntryAnomaliesRequestPayload,
-} from '../../../../common/http_api/log_analysis';
+} from '../../../../common/log_analysis';
// TODO: Reassess validity of this against ML docs
const TIEBREAKER_FIELD = '_doc';
@@ -32,9 +32,9 @@ export const createLogEntryAnomaliesQuery = (
jobIds: string[],
startTime: number,
endTime: number,
- sort: Sort,
+ sort: AnomaliesSort,
pagination: Pagination,
- datasets: GetLogEntryAnomaliesRequestPayload['data']['datasets']
+ datasets?: LogEntryAnomalyDatasets
) => {
const { field } = sort;
const { pageSize } = pagination;
@@ -118,7 +118,7 @@ export const logEntryAnomaliesResponseRT = rt.intersection([
export type LogEntryAnomaliesResponseRT = rt.TypeOf;
-const parsePaginationCursor = (sort: Sort, pagination: Pagination) => {
+const parsePaginationCursor = (sort: AnomaliesSort, pagination: Pagination) => {
const { cursor } = pagination;
const { direction } = sort;
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/top_log_entry_categories.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/top_log_entry_categories.ts
index 057054b427227..f1363900d3696 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/queries/top_log_entry_categories.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/top_log_entry_categories.ts
@@ -14,13 +14,13 @@ import {
createDatasetsFilters,
} from './common';
-import { CategorySort } from '../../../../common/http_api/log_analysis';
+import { CategoriesSort } from '../../../../common/log_analysis';
type CategoryAggregationOrder =
| 'filter_record>maximum_record_score'
| 'filter_model_plot>sum_actual';
const getAggregationOrderForSortField = (
- field: CategorySort['field']
+ field: CategoriesSort['field']
): CategoryAggregationOrder => {
switch (field) {
case 'maximumAnomalyScore':
@@ -40,7 +40,7 @@ export const createTopLogEntryCategoriesQuery = (
endTime: number,
size: number,
datasets: string[],
- sort: CategorySort
+ sort: CategoriesSort
) => ({
...defaultRequestParameters,
body: {
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts
index ec2bc6e5ed739..42d126d4ef036 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_anomalies.ts
@@ -11,9 +11,8 @@ import {
getLogEntryAnomaliesSuccessReponsePayloadRT,
getLogEntryAnomaliesRequestPayloadRT,
GetLogEntryAnomaliesRequestPayload,
- Sort,
- Pagination,
} from '../../../../common/http_api/log_analysis';
+import { AnomaliesSort, Pagination } from '../../../../common/log_analysis';
import { createValidationFunction } from '../../../../common/runtime_types';
import { assertHasInfraMlPlugins } from '../../../utils/request_context';
import { getLogEntryAnomalies } from '../../../lib/log_analysis';
@@ -98,7 +97,7 @@ const getSortAndPagination = (
sort: Partial = {},
pagination: Partial = {}
): {
- sort: Sort;
+ sort: AnomaliesSort;
pagination: Pagination;
} => {
const sortDefaults = {
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
index dc0a92ac702d0..9df3f41fbd855 100644
--- a/x-pack/plugins/lens/kibana.json
+++ b/x-pack/plugins/lens/kibana.json
@@ -19,5 +19,5 @@
"optionalPlugins": ["usageCollection", "taskManager", "globalSearch", "savedObjectsTagging"],
"configPath": ["xpack", "lens"],
"extraPublicDirs": ["common/constants"],
- "requiredBundles": ["savedObjects", "kibanaUtils", "kibanaReact", "embeddable", "lensOss", "presentationUtil"]
+ "requiredBundles": ["savedObjects", "kibanaUtils", "kibanaReact", "embeddable", "presentationUtil"]
}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
index 0891dd27fcf17..ed1b695640922 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
@@ -13,7 +13,7 @@ import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'k
import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import type { DataPublicPluginStart } from 'src/plugins/data/public';
import { OperationMetadata } from '../../types';
-import { createMockedIndexPattern } from '../mocks';
+import { createMockedIndexPattern, createMockedIndexPatternWithoutType } from '../mocks';
import { ReferenceEditor, ReferenceEditorProps } from './reference_editor';
import { insertOrReplaceColumn } from '../operations';
import { FieldSelect } from './field_select';
@@ -260,6 +260,48 @@ describe('reference editor', () => {
);
});
+ it("should show the sub-function as invalid if there's no field compatible with it", () => {
+ // This may happen for saved objects after changing the type of a field
+ wrapper = mount(
+ true,
+ }}
+ />
+ );
+
+ const subFunctionSelect = wrapper
+ .find('[data-test-subj="indexPattern-reference-function"]')
+ .first();
+
+ expect(subFunctionSelect.prop('isInvalid')).toEqual(true);
+ expect(subFunctionSelect.prop('selectedOptions')).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ 'data-test-subj': 'lns-indexPatternDimension-avg incompatible',
+ label: 'Average',
+ value: 'avg',
+ }),
+ ])
+ );
+ });
+
it('should hide the function selector when using a field-only selection style', () => {
wrapper = mount(
{
expect(fieldSelect.prop('markAllFieldsCompatible')).toEqual(true);
});
+ it('should show the FieldSelect as invalid if the selected field is missing', () => {
+ wrapper = mount(
+ true,
+ }}
+ />
+ );
+
+ const fieldSelect = wrapper.find(FieldSelect);
+ expect(fieldSelect.prop('fieldIsInvalid')).toEqual(true);
+ expect(fieldSelect.prop('selectedField')).toEqual('missing');
+ expect(fieldSelect.prop('selectedOperationType')).toEqual('avg');
+ expect(fieldSelect.prop('incompleteOperation')).toBeUndefined();
+ expect(fieldSelect.prop('markAllFieldsCompatible')).toEqual(false);
+ });
+
it('should show the ParamEditor for functions that offer one', () => {
wrapper = mount(
value === incompleteInfo.operationType)!]
+ const selectedOption = incompleteOperation
+ ? [functionOptions.find(({ value }) => value === incompleteOperation)!]
: column
? [functionOptions.find(({ value }) => value === column.operationType)!]
: [];
// If the operationType is incomplete, the user needs to select a field- so
// the function is marked as valid.
- const showOperationInvalid = !column && !Boolean(incompleteInfo?.operationType);
+ const showOperationInvalid = !column && !Boolean(incompleteOperation);
// The field is invalid if the operation has been updated without a field,
// or if we are in a field-only mode but empty state
- const showFieldInvalid =
- Boolean(incompleteInfo?.operationType) || (selectionStyle === 'field' && !column);
+ const showFieldInvalid = Boolean(incompleteOperation) || (selectionStyle === 'field' && !column);
+ // Check if the field still exists to protect from changes
+ const showFieldMissingInvalid = !currentIndexPattern.getFieldByName(
+ incompleteField ?? (column as FieldBasedIndexPatternColumn)?.sourceField
+ );
+
+ // what about a field changing type and becoming invalid?
+ // Let's say this change makes the indexpattern without any number field but the operation was set to a numeric operation.
+ // At this point the ComboBox will crash.
+ // Therefore check if the selectedOption is in functionOptions and in case fill it in as disabled option
+ const showSelectionFunctionInvalid = Boolean(selectedOption.length && selectedOption[0] == null);
+ if (showSelectionFunctionInvalid) {
+ const selectedOperationType = incompleteOperation || column.operationType;
+ const brokenFunctionOption = {
+ label: operationPanels[selectedOperationType].displayName,
+ value: selectedOperationType,
+ className: 'lnsIndexPatternDimensionEditor__operation',
+ 'data-test-subj': `lns-indexPatternDimension-${selectedOperationType} incompatible`,
+ };
+ functionOptions.push(brokenFunctionOption);
+ selectedOption[0] = brokenFunctionOption;
+ }
return (
@@ -216,7 +236,7 @@ export function ReferenceEditor(props: ReferenceEditorProps) {
defaultMessage: 'Choose a sub-function',
})}
fullWidth
- isInvalid={showOperationInvalid}
+ isInvalid={showOperationInvalid || showSelectionFunctionInvalid}
>
{
@@ -258,11 +278,11 @@ export function ReferenceEditor(props: ReferenceEditorProps) {
defaultMessage: 'Select a field',
})}
fullWidth
- isInvalid={showFieldInvalid}
+ isInvalid={showFieldInvalid || showFieldMissingInvalid}
labelAppend={labelAppend}
>
- (getErrorMessages(layer) ?? []).map((message) => ({
- shortMessage: '', // Not displayed currently
- longMessage: message,
- }))
+ (getErrorMessages(layer, state.indexPatterns[layer.indexPatternId]) ?? []).map(
+ (message) => ({
+ shortMessage: '', // Not displayed currently
+ longMessage: message,
+ })
+ )
);
// Single layer case, no need to explain more
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
index d0cbcee61db6f..4aea9e8ac67a9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
@@ -6,7 +6,83 @@
import { DragContextState } from '../drag_drop';
import { getFieldByNameFactory } from './pure_helpers';
-import type { IndexPattern } from './types';
+import type { IndexPattern, IndexPatternField } from './types';
+
+export const createMockedIndexPatternWithoutType = (
+ typeToFilter: IndexPatternField['type']
+): IndexPattern => {
+ const fields = [
+ {
+ name: 'timestamp',
+ displayName: 'timestampLabel',
+ type: 'date',
+ aggregatable: true,
+ searchable: true,
+ },
+ {
+ name: 'start_date',
+ displayName: 'start_date',
+ type: 'date',
+ aggregatable: true,
+ searchable: true,
+ },
+ {
+ name: 'bytes',
+ displayName: 'bytes',
+ type: 'number',
+ aggregatable: true,
+ searchable: true,
+ },
+ {
+ name: 'memory',
+ displayName: 'memory',
+ type: 'number',
+ aggregatable: true,
+ searchable: true,
+ },
+ {
+ name: 'source',
+ displayName: 'source',
+ type: 'string',
+ aggregatable: true,
+ searchable: true,
+ esTypes: ['keyword'],
+ },
+ {
+ name: 'unsupported',
+ displayName: 'unsupported',
+ type: 'geo',
+ aggregatable: true,
+ searchable: true,
+ },
+ {
+ name: 'dest',
+ displayName: 'dest',
+ type: 'string',
+ aggregatable: true,
+ searchable: true,
+ esTypes: ['keyword'],
+ },
+ {
+ name: 'scripted',
+ displayName: 'Scripted',
+ type: 'string',
+ searchable: true,
+ aggregatable: true,
+ scripted: true,
+ lang: 'painless',
+ script: '1234',
+ },
+ ].filter(({ type }) => type !== typeToFilter);
+ return {
+ id: '1',
+ title: 'my-fake-index-pattern',
+ timeFieldName: 'timestamp',
+ hasRestrictions: false,
+ fields,
+ getFieldByName: getFieldByNameFactory(fields),
+ };
+};
export const createMockedIndexPattern = (): IndexPattern => {
const fields = [
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
index 7dbc7d3b986a5..1cdaff53c5458 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
@@ -197,7 +197,7 @@ interface BaseOperationDefinitionProps {
getErrorMessage?: (
layer: IndexPatternLayer,
columnId: string,
- indexPattern?: IndexPattern
+ indexPattern: IndexPattern
) => string[] | undefined;
/*
@@ -301,7 +301,7 @@ interface FieldBasedOperationDefinition {
getErrorMessage: (
layer: IndexPatternLayer,
columnId: string,
- indexPattern?: IndexPattern
+ indexPattern: IndexPattern
) => string[] | undefined;
}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
index fe0efe3bf1ce1..63f8bfb97d8f8 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
@@ -2147,14 +2147,17 @@ describe('state_helpers', () => {
it('should collect errors from metric-type operation definitions', () => {
const mock = jest.fn().mockReturnValue(['error 1']);
operationDefinitionMap.avg.getErrorMessage = mock;
- const errors = getErrorMessages({
- indexPatternId: '1',
- columnOrder: [],
- columns: {
- // @ts-expect-error invalid column
- col1: { operationType: 'avg' },
+ const errors = getErrorMessages(
+ {
+ indexPatternId: '1',
+ columnOrder: [],
+ columns: {
+ // @ts-expect-error invalid column
+ col1: { operationType: 'avg' },
+ },
},
- });
+ indexPattern
+ );
expect(mock).toHaveBeenCalled();
expect(errors).toHaveLength(1);
});
@@ -2162,15 +2165,18 @@ describe('state_helpers', () => {
it('should collect errors from reference-type operation definitions', () => {
const mock = jest.fn().mockReturnValue(['error 1']);
operationDefinitionMap.testReference.getErrorMessage = mock;
- const errors = getErrorMessages({
- indexPatternId: '1',
- columnOrder: [],
- columns: {
- col1:
- // @ts-expect-error not statically analyzed
- { operationType: 'testReference', references: [] },
+ const errors = getErrorMessages(
+ {
+ indexPatternId: '1',
+ columnOrder: [],
+ columns: {
+ col1:
+ // @ts-expect-error not statically analyzed
+ { operationType: 'testReference', references: [] },
+ },
},
- });
+ indexPattern
+ );
expect(mock).toHaveBeenCalled();
expect(errors).toHaveLength(1);
});
@@ -2184,24 +2190,55 @@ describe('state_helpers', () => {
getErrorMessage: incompleteRef,
};
- const errors = getErrorMessages({
- indexPatternId: '1',
- columnOrder: [],
- columns: {
- col1:
+ const errors = getErrorMessages(
+ {
+ indexPatternId: '1',
+ columnOrder: [],
+ columns: {
+ col1:
+ // @ts-expect-error not statically analyzed
+ { operationType: 'testReference', references: [] },
+ },
+ incompleteColumns: {
// @ts-expect-error not statically analyzed
- { operationType: 'testReference', references: [] },
- },
- incompleteColumns: {
- // @ts-expect-error not statically analyzed
- col1: { operationType: 'testIncompleteReference' },
+ col1: { operationType: 'testIncompleteReference' },
+ },
},
- });
+ indexPattern
+ );
expect(savedRef).toHaveBeenCalled();
expect(incompleteRef).not.toHaveBeenCalled();
expect(errors).toHaveLength(1);
delete operationDefinitionMap.testIncompleteReference;
});
+
+ it('should forward the indexpattern when available', () => {
+ const mock = jest.fn();
+ operationDefinitionMap.testReference.getErrorMessage = mock;
+ getErrorMessages(
+ {
+ indexPatternId: '1',
+ columnOrder: [],
+ columns: {
+ col1:
+ // @ts-expect-error not statically analyzed
+ { operationType: 'testReference', references: [] },
+ },
+ },
+ indexPattern
+ );
+ expect(mock).toHaveBeenCalledWith(
+ {
+ indexPatternId: '1',
+ columnOrder: [],
+ columns: {
+ col1: { operationType: 'testReference', references: [] },
+ },
+ },
+ 'col1',
+ indexPattern
+ );
+ });
});
});
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
index fffe47f91658a..7c0036de62124 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
@@ -864,14 +864,19 @@ export function updateLayerIndexPattern(
* - All column references are valid
* - All prerequisites are met
*/
-export function getErrorMessages(layer: IndexPatternLayer): string[] | undefined {
- const errors: string[] = [];
- Object.entries(layer.columns).forEach(([columnId, column]) => {
- const def = operationDefinitionMap[column.operationType];
- if (def.getErrorMessage) {
- errors.push(...(def.getErrorMessage(layer, columnId) ?? []));
- }
- });
+export function getErrorMessages(
+ layer: IndexPatternLayer,
+ indexPattern: IndexPattern
+): string[] | undefined {
+ const errors: string[] = Object.entries(layer.columns)
+ .flatMap(([columnId, column]) => {
+ const def = operationDefinitionMap[column.operationType];
+ if (def.getErrorMessage) {
+ return def.getErrorMessage(layer, columnId, indexPattern);
+ }
+ })
+ // remove the undefined values
+ .filter((v: string | undefined): v is string => v != null);
return errors.length ? errors : undefined;
}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
index 57cc4abeb723a..b5a4905a29738 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
@@ -7,9 +7,10 @@
import { DataType } from '../types';
import { IndexPattern, IndexPatternLayer } from './types';
import { DraggedField } from './indexpattern';
-import {
+import type {
BaseIndexPatternColumn,
FieldBasedIndexPatternColumn,
+ ReferenceBasedIndexPatternColumn,
} from './operations/definitions/column_types';
import { operationDefinitionMap, IndexPatternColumn } from './operations';
@@ -53,12 +54,29 @@ export function isColumnInvalid(
if (!column) return;
const operationDefinition = column.operationType && operationDefinitionMap[column.operationType];
- return !!(
- operationDefinition.getErrorMessage &&
- operationDefinition.getErrorMessage(layer, columnId, indexPattern)
+ // check also references for errors
+ const referencesHaveErrors =
+ true &&
+ 'references' in column &&
+ Boolean(getReferencesErrors(layer, column, indexPattern).filter(Boolean).length);
+
+ return (
+ !!operationDefinition.getErrorMessage?.(layer, columnId, indexPattern) || referencesHaveErrors
);
}
+function getReferencesErrors(
+ layer: IndexPatternLayer,
+ column: ReferenceBasedIndexPatternColumn,
+ indexPattern: IndexPattern
+) {
+ return column.references?.map((referenceId: string) => {
+ const referencedOperation = layer.columns[referenceId]?.operationType;
+ const referencedDefinition = operationDefinitionMap[referencedOperation];
+ return referencedDefinition?.getErrorMessage?.(layer, referenceId, indexPattern);
+ });
+}
+
export function fieldIsInvalid(column: IndexPatternColumn | undefined, indexPattern: IndexPattern) {
if (!column || !hasField(column)) {
return false;
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index cdffdb342fd23..3fb7186aeac59 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -39,7 +39,6 @@ import {
VISUALIZE_FIELD_TRIGGER,
} from '../../../../src/plugins/ui_actions/public';
import { getEditPath, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../common';
-import { PLUGIN_ID_OSS } from '../../../../src/plugins/lens_oss/common/constants';
import { EditorFrameStart } from './types';
import { getLensAliasConfig } from './vis_type_alias';
import { visualizeFieldAction } from './trigger_actions/visualize_field_actions';
@@ -208,8 +207,6 @@ export class LensPlugin {
start(core: CoreStart, startDependencies: LensPluginStartDependencies): LensPublicStart {
const frameStart = this.editorFrameService.start(core, startDependencies);
this.createEditorFrame = frameStart.createInstance;
- // unregisters the OSS alias
- startDependencies.visualizations.unRegisterAlias(PLUGIN_ID_OSS);
// unregisters the Visualize action and registers the lens one
if (startDependencies.uiActions.hasAction(ACTION_VISUALIZE_FIELD)) {
startDependencies.uiActions.unregisterAction(ACTION_VISUALIZE_FIELD);
diff --git a/x-pack/plugins/lens/server/usage/collectors.ts b/x-pack/plugins/lens/server/usage/collectors.ts
index c32fc0371ed8a..71a699aadb865 100644
--- a/x-pack/plugins/lens/server/usage/collectors.ts
+++ b/x-pack/plugins/lens/server/usage/collectors.ts
@@ -16,11 +16,6 @@ export function registerLensUsageCollector(
usageCollection: UsageCollectionSetup,
taskManager: Promise
) {
- let isCollectorReady = false;
- taskManager.then(() => {
- // mark lensUsageCollector as ready to collect when the TaskManager is ready
- isCollectorReady = true;
- });
const lensUsageCollector = usageCollection.makeUsageCollector({
type: 'lens',
async fetch() {
@@ -55,7 +50,10 @@ export function registerLensUsageCollector(
};
}
},
- isReady: () => isCollectorReady,
+ isReady: async () => {
+ await taskManager;
+ return true;
+ },
schema: lensUsageSchema,
});
diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json
index 7ac5a2980d0ba..636d2f44b0217 100644
--- a/x-pack/plugins/lens/tsconfig.json
+++ b/x-pack/plugins/lens/tsconfig.json
@@ -35,7 +35,6 @@
{ "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
{ "path": "../../../src/plugins/kibana_react/tsconfig.json" },
{ "path": "../../../src/plugins/embeddable/tsconfig.json"},
- { "path": "../../../src/plugins/lens_oss/tsconfig.json"},
{ "path": "../../../src/plugins/presentation_util/tsconfig.json"},
]
}
\ No newline at end of file
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index 5f6f5224e32a3..2536601d0e6b1 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -23,5 +23,5 @@
"ui": true,
"server": true,
"extraPublicDirs": ["common/constants"],
- "requiredBundles": ["kibanaReact", "kibanaUtils", "home", "mapsOss", "presentationUtil"]
+ "requiredBundles": ["kibanaReact", "kibanaUtils", "home", "presentationUtil"]
}
diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/view.tsx b/x-pack/plugins/maps/public/connected_components/add_layer_panel/view.tsx
index e2529fff66f3b..78a9f82bb698f 100644
--- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/view.tsx
+++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/view.tsx
@@ -26,7 +26,7 @@ const ADD_LAYER_STEP_LABEL = i18n.translate('xpack.maps.addLayerPanel.addLayer',
});
const SELECT_WIZARD_LABEL = ADD_LAYER_STEP_LABEL;
-interface Props {
+export interface Props {
addPreviewLayers: (layerDescriptors: LayerDescriptor[]) => void;
closeFlyout: () => void;
hasPreviewLayers: boolean;
diff --git a/x-pack/plugins/maps/public/connected_components/layer_panel/join_editor/join_editor.tsx b/x-pack/plugins/maps/public/connected_components/layer_panel/join_editor/join_editor.tsx
index 1bcee961db9e1..d47f130d4ede3 100644
--- a/x-pack/plugins/maps/public/connected_components/layer_panel/join_editor/join_editor.tsx
+++ b/x-pack/plugins/maps/public/connected_components/layer_panel/join_editor/join_editor.tsx
@@ -25,7 +25,7 @@ import { ILayer } from '../../../classes/layers/layer';
import { JoinDescriptor } from '../../../../common/descriptor_types';
import { IField } from '../../../classes/fields/field';
-interface Props {
+export interface Props {
joins: JoinDescriptor[];
layer: ILayer;
layerDisplayName: string;
diff --git a/x-pack/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.tsx b/x-pack/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.tsx
index 33d684b320208..c0462f824cd06 100644
--- a/x-pack/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.tsx
+++ b/x-pack/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.tsx
@@ -21,7 +21,7 @@ import { AlphaSlider } from '../../../components/alpha_slider';
import { ValidatedDualRange } from '../../../../../../../src/plugins/kibana_react/public';
import { ILayer } from '../../../classes/layers/layer';
-interface Props {
+export interface Props {
layer: ILayer;
updateLabel: (layerId: string, label: string) => void;
updateMinZoom: (layerId: string, minZoom: number) => void;
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index 93476f6e14da5..36d07e3870818 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -35,7 +35,7 @@ import 'mapbox-gl/dist/mapbox-gl.css';
const RENDER_COMPLETE_EVENT = 'renderComplete';
-interface Props {
+export interface Props {
addFilters: ((filters: Filter[]) => Promise) | null;
getFilterActions?: () => Promise;
getActionContext?: () => ActionExecutionContext;
diff --git a/x-pack/plugins/maps/public/connected_components/map_settings_panel/map_settings_panel.tsx b/x-pack/plugins/maps/public/connected_components/map_settings_panel/map_settings_panel.tsx
index 726e2c3be7846..9cbbdec5e3d17 100644
--- a/x-pack/plugins/maps/public/connected_components/map_settings_panel/map_settings_panel.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_settings_panel/map_settings_panel.tsx
@@ -23,7 +23,7 @@ import { SpatialFiltersPanel } from './spatial_filters_panel';
import { DisplayPanel } from './display_panel';
import { MapCenter } from '../../../common/descriptor_types';
-interface Props {
+export interface Props {
cancelChanges: () => void;
center: MapCenter;
hasMapSettingsChanges: boolean;
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
index 820453f166a46..21a8abcbaa4e9 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
@@ -49,7 +49,7 @@ import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker';
mapboxgl.workerUrl = mbWorkerUrl;
mapboxgl.setRTLTextPlugin(mbRtlPlugin);
-interface Props {
+export interface Props {
isMapReady: boolean;
settings: MapSettings;
layerList: ILayer[];
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx
index 3f56d8d50b0f0..edf626612cb69 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx
@@ -10,7 +10,7 @@ import { EuiButtonIcon } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { ILayer } from '../../../classes/layers/layer';
-interface Props {
+export interface Props {
layerList: ILayer[];
fitToBounds: () => void;
}
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
index ef320c73bce2f..a0f3aa40e75dd 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
@@ -50,7 +50,7 @@ const DRAW_DISTANCE_LABEL_SHORT = i18n.translate(
}
);
-interface Props {
+export interface Props {
cancelDraw: () => void;
geoFields: GeoFieldWithIndex[];
initiateDraw: (drawState: DrawState) => void;
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
index 4d669dfbe235e..fd0a0d55d2c1b 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
import { ILayer } from '../../../../../../classes/layers/layer';
import { TOCEntryButton } from '../toc_entry_button';
-interface Props {
+export interface Props {
cloneLayer: (layerId: string) => void;
displayName: string;
editLayer: () => void;
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index 67981ab3aede5..bcdc23bddd2eb 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -68,7 +68,7 @@ import {
MapEmbeddableInput,
MapEmbeddableOutput,
} from './types';
-export { MapEmbeddableInput };
+export { MapEmbeddableInput, MapEmbeddableOutput };
export class MapEmbeddable
extends Embeddable
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index dd256126fae62..4173328a41d57 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -34,7 +34,6 @@ import {
VisualizationsStart,
} from '../../../../src/plugins/visualizations/public';
import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
-import { PLUGIN_ID_OSS } from '../../../../src/plugins/maps_oss/common/constants';
import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../src/plugins/ui_actions/public';
import {
createMapsUrlGenerator,
@@ -162,9 +161,6 @@ export class MapsPlugin
setLicensingPluginStart(plugins.licensing);
setStartServices(core, plugins);
- // unregisters the OSS alias
- plugins.visualizations.unRegisterAlias(PLUGIN_ID_OSS);
-
if (core.application.capabilities.maps.show) {
plugins.uiActions.addTriggerAction(VISUALIZE_GEO_FIELD_TRIGGER, visualizeGeoFieldAction);
}
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
index 817fbf3656103..c0a378f38fc13 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
@@ -52,7 +52,7 @@ import {
unsavedChangesWarning,
} from '../saved_map';
-interface Props {
+export interface Props {
savedMap: SavedMap;
// saveCounter used to trigger MapApp render after SaveMap.save
saveCounter: number;
@@ -83,7 +83,7 @@ interface Props {
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
}
-interface State {
+export interface State {
initialized: boolean;
indexPatterns: IndexPattern[];
savedQuery?: SavedQuery;
diff --git a/x-pack/plugins/maps/public/url_generator.ts b/x-pack/plugins/maps/public/url_generator.ts
index be6a7f5fe6fa7..7f4215f4b1275 100644
--- a/x-pack/plugins/maps/public/url_generator.ts
+++ b/x-pack/plugins/maps/public/url_generator.ts
@@ -3,6 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
+
import rison from 'rison-node';
import {
TimeRange,
diff --git a/x-pack/plugins/maps/tsconfig.json b/x-pack/plugins/maps/tsconfig.json
new file mode 100644
index 0000000000000..b70459c690c07
--- /dev/null
+++ b/x-pack/plugins/maps/tsconfig.json
@@ -0,0 +1,25 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "composite": true,
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": [
+ "common/**/*",
+ "public/**/*",
+ "server/**/*",
+ "config.ts",
+ "../../../typings/**/*",
+ ],
+ "references": [
+ { "path": "../../../src/core/tsconfig.json" },
+ { "path": "../../../src/plugins/maps_legacy/tsconfig.json" },
+ { "path": "../features/tsconfig.json" },
+ { "path": "../licensing/tsconfig.json" },
+ { "path": "../maps_file_upload/tsconfig.json" },
+ { "path": "../saved_objects_tagging/tsconfig.json" },
+ ]
+}
diff --git a/x-pack/plugins/maps_file_upload/tsconfig.json b/x-pack/plugins/maps_file_upload/tsconfig.json
new file mode 100644
index 0000000000000..f068d62b71739
--- /dev/null
+++ b/x-pack/plugins/maps_file_upload/tsconfig.json
@@ -0,0 +1,15 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "composite": true,
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": ["common/**/*", "public/**/*", "server/**/*", "mappings.ts"],
+ "references": [
+ { "path": "../../../src/plugins/data/tsconfig.json" },
+ { "path": "../../../src/plugins/usage_collection/tsconfig.json" }
+ ]
+}
diff --git a/x-pack/plugins/maps_legacy_licensing/tsconfig.json b/x-pack/plugins/maps_legacy_licensing/tsconfig.json
new file mode 100644
index 0000000000000..90e8265515a16
--- /dev/null
+++ b/x-pack/plugins/maps_legacy_licensing/tsconfig.json
@@ -0,0 +1,14 @@
+{
+ "extends": "../../../tsconfig.base.json",
+ "compilerOptions": {
+ "composite": true,
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": ["public/**/*"],
+ "references": [
+ { "path": "../licensing/tsconfig.json" },
+ ]
+}
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index 8ec9b8ee976d4..1c47512e0b3de 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -24,7 +24,8 @@
"security",
"spaces",
"management",
- "licenseManagement"
+ "licenseManagement",
+ "maps"
],
"server": true,
"ui": true,
@@ -35,7 +36,8 @@
"dashboard",
"savedObjects",
"home",
- "spaces"
+ "spaces",
+ "maps"
],
"extraPublicDirs": [
"common"
diff --git a/x-pack/plugins/ml/public/application/_index.scss b/x-pack/plugins/ml/public/application/_index.scss
index 7512c180970ad..da1c226a665f6 100644
--- a/x-pack/plugins/ml/public/application/_index.scss
+++ b/x-pack/plugins/ml/public/application/_index.scss
@@ -30,6 +30,7 @@
@import 'components/navigation_menu/index';
@import 'components/rule_editor/index'; // SASSTODO: This file overwrites EUI directly
@import 'components/stats_bar/index';
+ @import 'components/ml_embedded_map/index';
// Hacks are last so they can overwrite anything above if needed
@import 'hacks';
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index d3a055f957c3a..68ee32e24391c 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -77,6 +77,8 @@ const App: FC = ({ coreStart, deps, appMountParams }) => {
security: deps.security,
licenseManagement: deps.licenseManagement,
storage: localStorage,
+ embeddable: deps.embeddable,
+ maps: deps.maps,
...coreStart,
};
@@ -118,6 +120,7 @@ export const renderApp = (
http: coreStart.http,
security: deps.security,
urlGenerators: deps.share.urlGenerators,
+ maps: deps.maps,
});
appMountParams.onAppLeave((actions) => actions.default());
diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/_index.scss b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_index.scss
new file mode 100644
index 0000000000000..6d0d30dae670e
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_index.scss
@@ -0,0 +1 @@
+@import 'ml_embedded_map';
diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss
new file mode 100644
index 0000000000000..495fc40ddb27c
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss
@@ -0,0 +1,8 @@
+.mlEmbeddedMapContent {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex: 1 1 100%;
+ z-index: 1;
+ min-height: 0; // Absolute must for Firefox to scroll contents
+}
diff --git a/x-pack/jest.config.js b/x-pack/plugins/ml/public/application/components/ml_embedded_map/index.ts
similarity index 66%
rename from x-pack/jest.config.js
rename to x-pack/plugins/ml/public/application/components/ml_embedded_map/index.ts
index 8158987213cd2..ce5dfb5171a6d 100644
--- a/x-pack/jest.config.js
+++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/index.ts
@@ -4,8 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-module.exports = {
- preset: '@kbn/test',
- rootDir: '..',
- projects: ['/x-pack/plugins/*/jest.config.js'],
-};
+export { MlEmbeddedMapComponent } from './ml_embedded_map';
diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
new file mode 100644
index 0000000000000..d5fdc9d52a102
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useRef, useState } from 'react';
+
+import { htmlIdGenerator } from '@elastic/eui';
+import { LayerDescriptor } from '../../../../../maps/common/descriptor_types';
+import {
+ MapEmbeddable,
+ MapEmbeddableInput,
+ MapEmbeddableOutput,
+ // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../maps/public/embeddable';
+import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../maps/public';
+import {
+ EmbeddableFactory,
+ ErrorEmbeddable,
+ isErrorEmbeddable,
+ ViewMode,
+} from '../../../../../../../src/plugins/embeddable/public';
+import { useMlKibana } from '../../contexts/kibana';
+
+export function MlEmbeddedMapComponent({
+ layerList,
+ mapEmbeddableInput,
+ renderTooltipContent,
+}: {
+ layerList: LayerDescriptor[];
+ mapEmbeddableInput?: MapEmbeddableInput;
+ renderTooltipContent?: (params: RenderTooltipContentParams) => JSX.Element;
+}) {
+ const [embeddable, setEmbeddable] = useState();
+
+ const embeddableRoot: React.RefObject = useRef(null);
+ const baseLayers = useRef();
+
+ const {
+ services: { embeddable: embeddablePlugin, maps: mapsPlugin },
+ } = useMlKibana();
+
+ const factory:
+ | EmbeddableFactory
+ | undefined = embeddablePlugin
+ ? embeddablePlugin.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE)
+ : undefined;
+
+ // Update the layer list with updated geo points upon refresh
+ useEffect(() => {
+ async function updateIndexPatternSearchLayer() {
+ if (
+ embeddable &&
+ !isErrorEmbeddable(embeddable) &&
+ Array.isArray(layerList) &&
+ Array.isArray(baseLayers.current)
+ ) {
+ embeddable.setLayerList([...baseLayers.current, ...layerList]);
+ }
+ }
+ updateIndexPatternSearchLayer();
+ }, [embeddable, layerList]);
+
+ useEffect(() => {
+ async function setupEmbeddable() {
+ if (!factory) {
+ // eslint-disable-next-line no-console
+ console.error('Map embeddable not found.');
+ return;
+ }
+ const input: MapEmbeddableInput = {
+ id: htmlIdGenerator()(),
+ attributes: { title: '' },
+ filters: [],
+ hidePanelTitles: true,
+ refreshConfig: {
+ value: 0,
+ pause: false,
+ },
+ viewMode: ViewMode.VIEW,
+ isLayerTOCOpen: false,
+ hideFilterActions: true,
+ // Zoom Lat/Lon values are set to make sure map is in center in the panel
+ // It will also omit Greenland/Antarctica etc. NOTE: Can be removed when initialLocation is set
+ mapCenter: {
+ lon: 11,
+ lat: 20,
+ zoom: 1,
+ },
+ // can use mapSettings to center map on anomalies
+ mapSettings: {
+ disableInteractive: false,
+ hideToolbarOverlay: false,
+ hideLayerControl: false,
+ hideViewControl: false,
+ // Doesn't currently work with GEO_JSON. Will uncomment when https://github.com/elastic/kibana/pull/88294 is in
+ // initialLocation: INITIAL_LOCATION.AUTO_FIT_TO_BOUNDS, // this will startup based on data-extent
+ autoFitToDataBounds: true, // this will auto-fit when there are changes to the filter and/or query
+ },
+ };
+
+ const embeddableObject = await factory.create(input);
+
+ if (embeddableObject && !isErrorEmbeddable(embeddableObject)) {
+ const basemapLayerDescriptor = mapsPlugin
+ ? await mapsPlugin.createLayerDescriptors.createBasemapLayerDescriptor()
+ : null;
+
+ if (basemapLayerDescriptor) {
+ baseLayers.current = [basemapLayerDescriptor];
+ await embeddableObject.setLayerList(baseLayers.current);
+ }
+ }
+
+ setEmbeddable(embeddableObject);
+ }
+
+ setupEmbeddable();
+ // we want this effect to execute exactly once after the component mounts
+ }, []);
+
+ useEffect(() => {
+ if (embeddable && !isErrorEmbeddable(embeddable) && mapEmbeddableInput !== undefined) {
+ embeddable.updateInput(mapEmbeddableInput);
+ }
+ }, [embeddable, mapEmbeddableInput]);
+
+ useEffect(() => {
+ if (embeddable && !isErrorEmbeddable(embeddable) && renderTooltipContent !== undefined) {
+ embeddable.setRenderTooltipContent(renderTooltipContent);
+ }
+ }, [embeddable, renderTooltipContent]);
+
+ // We can only render after embeddable has already initialized
+ useEffect(() => {
+ if (embeddableRoot.current && embeddable) {
+ embeddable.render(embeddableRoot.current);
+ }
+ }, [embeddable, embeddableRoot]);
+
+ if (!embeddablePlugin) {
+ // eslint-disable-next-line no-console
+ console.error('Embeddable start plugin not found');
+ return null;
+ }
+ if (!mapsPlugin) {
+ // eslint-disable-next-line no-console
+ console.error('Maps start plugin not found');
+ return null;
+ }
+
+ return (
+
+ );
+}
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 4a7550788db56..a97fd513c9c99 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -15,12 +15,16 @@ import { LicenseManagementUIPluginSetup } from '../../../../../license_managemen
import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
import { MlServicesContext } from '../../app';
import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
+import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public';
+import { MapsStartApi } from '../../../../../maps/public';
interface StartPlugins {
data: DataPublicPluginStart;
security?: SecurityPluginSetup;
licenseManagement?: LicenseManagementUIPluginSetup;
share: SharePluginStart;
+ embeddable: EmbeddableStart;
+ maps?: MapsStartApi;
}
export type StartServices = CoreStart &
StartPlugins & {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx
index 77f31ae9c2322..a8d8eb18776ec 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx
@@ -8,13 +8,13 @@ import React from 'react';
import {
BooleanContent,
DateContent,
- GeoPointContent,
IpContent,
KeywordContent,
OtherContent,
TextContent,
NumberContent,
} from '../../../stats_table/components/field_data_expanded_row';
+import { GeoPointContent } from './geo_point_content/geo_point_content';
import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
import type { FileBasedFieldVisConfig } from '../../../stats_table/types/field_vis_config';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/format_utils.ts b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/format_utils.ts
new file mode 100644
index 0000000000000..8a442e345014d
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/format_utils.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Feature, Point } from 'geojson';
+import { euiPaletteColorBlind } from '@elastic/eui';
+import { DEFAULT_GEO_REGEX } from './geo_point_content';
+import { SOURCE_TYPES } from '../../../../../../../../maps/common/constants';
+
+export const convertWKTGeoToLonLat = (
+ value: string | number
+): { lat: number; lon: number } | undefined => {
+ if (typeof value === 'string') {
+ const trimmedValue = value.trim().replace('POINT (', '').replace(')', '');
+ const regExpSerializer = DEFAULT_GEO_REGEX;
+ const parsed = regExpSerializer.exec(trimmedValue.trim());
+
+ if (parsed?.groups?.lat != null && parsed?.groups?.lon != null) {
+ return {
+ lat: parseFloat(parsed.groups.lat.trim()),
+ lon: parseFloat(parsed.groups.lon.trim()),
+ };
+ }
+ }
+};
+
+export const DEFAULT_POINT_COLOR = euiPaletteColorBlind()[0];
+export const getGeoPointsLayer = (
+ features: Array>,
+ pointColor: string = DEFAULT_POINT_COLOR
+) => {
+ return {
+ id: 'geo_points',
+ label: 'Geo points',
+ sourceDescriptor: {
+ type: SOURCE_TYPES.GEOJSON_FILE,
+ __featureCollection: {
+ features,
+ type: 'FeatureCollection',
+ },
+ },
+ visible: true,
+ style: {
+ type: 'VECTOR',
+ properties: {
+ fillColor: {
+ type: 'STATIC',
+ options: {
+ color: pointColor,
+ },
+ },
+ lineColor: {
+ type: 'STATIC',
+ options: {
+ color: '#fff',
+ },
+ },
+ lineWidth: {
+ type: 'STATIC',
+ options: {
+ size: 2,
+ },
+ },
+ iconSize: {
+ type: 'STATIC',
+ options: {
+ size: 6,
+ },
+ },
+ },
+ },
+ type: 'VECTOR',
+ };
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/geo_point_content.tsx
new file mode 100644
index 0000000000000..a498b786229bb
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/geo_point_content.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useMemo } from 'react';
+
+import { EuiFlexItem } from '@elastic/eui';
+import { Feature, Point } from 'geojson';
+import type { FieldDataRowProps } from '../../../../stats_table/types/field_data_row';
+import { DocumentStatsTable } from '../../../../stats_table/components/field_data_expanded_row/document_stats';
+import { MlEmbeddedMapComponent } from '../../../../../components/ml_embedded_map';
+import { convertWKTGeoToLonLat, getGeoPointsLayer } from './format_utils';
+import { ExpandedRowContent } from '../../../../stats_table/components/field_data_expanded_row/expanded_row_content';
+import { ExamplesList } from '../../../../index_based/components/field_data_row/examples_list';
+
+export const DEFAULT_GEO_REGEX = RegExp('(?.+) (?.+)');
+
+export const GeoPointContent: FC = ({ config }) => {
+ const formattedResults = useMemo(() => {
+ const { stats } = config;
+
+ if (stats === undefined || stats.topValues === undefined) return null;
+ if (Array.isArray(stats.topValues)) {
+ const geoPointsFeatures: Array> = [];
+
+ // reformatting the top values from POINT (-2.359207 51.37837) to (-2.359207, 51.37837)
+ const formattedExamples = [];
+
+ for (let i = 0; i < stats.topValues.length; i++) {
+ const value = stats.topValues[i];
+ const coordinates = convertWKTGeoToLonLat(value.key);
+ if (coordinates) {
+ const formattedGeoPoint = `(${coordinates.lat}, ${coordinates.lon})`;
+ formattedExamples.push(coordinates);
+
+ geoPointsFeatures.push({
+ type: 'Feature',
+ id: `ml-${config.fieldName}-${i}`,
+ geometry: {
+ type: 'Point',
+ coordinates: [coordinates.lat, coordinates.lon],
+ },
+ properties: {
+ value: formattedGeoPoint,
+ count: value.doc_count,
+ },
+ });
+ }
+ }
+
+ if (geoPointsFeatures.length > 0) {
+ return {
+ examples: formattedExamples,
+ layerList: [getGeoPointsLayer(geoPointsFeatures)],
+ };
+ }
+ }
+ }, [config]);
+ return (
+
+
+ {formattedResults && Array.isArray(formattedResults.examples) && (
+
+
+
+ )}
+ {formattedResults && Array.isArray(formattedResults.layerList) && (
+
+
+
+ )}
+
+ );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/index.ts
new file mode 100644
index 0000000000000..d3a50db45ec57
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { GeoPointContent } from './geo_point_content';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/_index.scss
index 957ca0eec24d3..c1191ad270e4c 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/_index.scss
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/_index.scss
@@ -1 +1 @@
-@import 'file_datavisualizer_view'
+@import 'file_datavisualizer_view';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx
index 7018f73ff6c32..6d58efee36f36 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx
@@ -6,23 +6,31 @@
import React from 'react';
+import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
+import { LoadingIndicator } from '../field_data_row/loading_indicator';
+import { NotInDocsContent } from '../field_data_row/content_types';
import { FieldVisConfig } from '../../../stats_table/types';
import {
BooleanContent,
DateContent,
- GeoPointContent,
IpContent,
KeywordContent,
NumberContent,
OtherContent,
TextContent,
} from '../../../stats_table/components/field_data_expanded_row';
+import { CombinedQuery, GeoPointContent } from './geo_point_content';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
-import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
-import { LoadingIndicator } from '../field_data_row/loading_indicator';
-import { NotInDocsContent } from '../field_data_row/content_types';
-
-export const IndexBasedDataVisualizerExpandedRow = ({ item }: { item: FieldVisConfig }) => {
+export const IndexBasedDataVisualizerExpandedRow = ({
+ item,
+ indexPattern,
+ combinedQuery,
+}: {
+ item: FieldVisConfig;
+ indexPattern: IndexPattern | undefined;
+ combinedQuery: CombinedQuery;
+}) => {
const config = item;
const { loading, type, existsInDocs, fieldName } = config;
@@ -42,7 +50,13 @@ export const IndexBasedDataVisualizerExpandedRow = ({ item }: { item: FieldVisCo
return ;
case ML_JOB_FIELD_TYPES.GEO_POINT:
- return ;
+ return (
+
+ );
case ML_JOB_FIELD_TYPES.IP:
return ;
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx
new file mode 100644
index 0000000000000..94db5d1ba686c
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useEffect, useState } from 'react';
+
+import { EuiFlexItem } from '@elastic/eui';
+import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list';
+import { FieldVisConfig } from '../../../stats_table/types';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { MlEmbeddedMapComponent } from '../../../../components/ml_embedded_map';
+import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
+import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common/constants';
+import { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types';
+import { useMlKibana } from '../../../../contexts/kibana';
+import { DocumentStatsTable } from '../../../stats_table/components/field_data_expanded_row/document_stats';
+import { ExpandedRowContent } from '../../../stats_table/components/field_data_expanded_row/expanded_row_content';
+
+export interface CombinedQuery {
+ searchString: string | { [key: string]: any };
+ searchQueryLanguage: string;
+}
+export const GeoPointContent: FC<{
+ config: FieldVisConfig;
+ indexPattern: IndexPattern | undefined;
+ combinedQuery: CombinedQuery;
+}> = ({ config, indexPattern, combinedQuery }) => {
+ const { stats } = config;
+ const [layerList, setLayerList] = useState([]);
+ const {
+ services: { maps: mapsPlugin },
+ } = useMlKibana();
+
+ // Update the layer list with updated geo points upon refresh
+ useEffect(() => {
+ async function updateIndexPatternSearchLayer() {
+ if (
+ indexPattern?.id !== undefined &&
+ config !== undefined &&
+ config.fieldName !== undefined &&
+ config.type === ML_JOB_FIELD_TYPES.GEO_POINT
+ ) {
+ const params = {
+ indexPatternId: indexPattern.id,
+ geoFieldName: config.fieldName,
+ geoFieldType: config.type as ES_GEO_FIELD_TYPE.GEO_POINT,
+ query: {
+ query: combinedQuery.searchString,
+ language: combinedQuery.searchQueryLanguage,
+ },
+ };
+ const searchLayerDescriptor = mapsPlugin
+ ? await mapsPlugin.createLayerDescriptors.createESSearchSourceLayerDescriptor(params)
+ : null;
+ if (searchLayerDescriptor) {
+ setLayerList([...layerList, searchLayerDescriptor]);
+ }
+ }
+ }
+ updateIndexPatternSearchLayer();
+ }, [indexPattern, config.fieldName, combinedQuery]);
+
+ if (stats?.examples === undefined) return null;
+ return (
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx
index 1e8f7586258d5..a59c6e0fe4183 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx
@@ -15,25 +15,29 @@ interface Props {
}
export const ExamplesList: FC = ({ examples }) => {
- if (
- examples === undefined ||
- examples === null ||
- !Array.isArray(examples) ||
- examples.length === 0
- ) {
+ if (examples === undefined || examples === null || !Array.isArray(examples)) {
return null;
}
-
- const examplesContent = examples.map((example, i) => {
- return (
-
);
- });
+ } else {
+ examplesContent = examples.map((example, i) => {
+ return (
+
+ );
+ });
+ }
return (
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx
index bd83aaa1f6149..8ad48a3e60d3a 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx
@@ -19,9 +19,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
import classNames from 'classnames';
import { kibanaFieldFormat } from '../../../../../formatters/kibana_field_format';
import { roundToDecimalPlace } from '../../../../../formatters/round_to_decimal_place';
+import { ExpandedRowFieldHeader } from '../../../../stats_table/components/expanded_row_field_header';
+import { FieldVisStats } from '../../../../stats_table/types';
interface Props {
- stats: any;
+ stats: FieldVisStats | undefined;
fieldFormat?: any;
barColor?: 'primary' | 'secondary' | 'danger' | 'subdued' | 'accent';
compressed?: boolean;
@@ -37,6 +39,7 @@ function getPercentLabel(docCount: number, topValuesSampleSize: number): string
}
export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed }) => {
+ if (stats === undefined) return null;
const {
topValues,
topValuesSampleSize,
@@ -46,51 +49,64 @@ export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed
} = stats;
const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count;
return (
-
- {Array.isArray(topValues) &&
- topValues.map((value: any) => (
-
-
+
+
+
+
+
+ {Array.isArray(topValues) &&
+ topValues.map((value) => (
+
+
+
+
+ {kibanaFieldFormat(value.key, fieldFormat)}
+
+
+
+
+
+
+ {progressBarMax !== undefined && (
+
+
+ {getPercentLabel(value.doc_count, progressBarMax)}
+
+
)}
- >
-
-
- {kibanaFieldFormat(value.key, fieldFormat)}
-
-
-
-
-
-
-
-
- {getPercentLabel(value.doc_count, progressBarMax)}
-
-
-
- ))}
- {isTopValuesSampled === true && (
-
-
-
-
-
-
- )}
-
+
+ ))}
+ {isTopValuesSampled === true && (
+
+
+
+
+
+
+ )}
+ News feed content will be retrieved from this URL ',
}),
@@ -167,6 +170,7 @@ export const initUiSettings = (uiSettings: CoreSetup['uiSettings']) => {
'Array of URL templates to build the list of reputation URLs to be displayed on the IP Details page.',
}
),
+ sensitive: true,
category: [APP_ID],
requiresPageReload: true,
schema: schema.arrayOf(
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e28b41e0ce5e3..d798bc9b42c95 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -3032,10 +3032,6 @@
"kibanaOverview.manageData.sectionTitle": "データを管理",
"kibanaOverview.more.title": "Elasticではさまざまなことが可能です",
"kibanaOverview.news.title": "新機能",
- "lensOss.visTypeAlias.description": "ドラッグアンドドロップエディターでビジュアライゼーションを作成します。いつでもビジュアライゼーションタイプを切り替えることができます。ほとんどのビジュアライゼーションに最適です。",
- "lensOss.visTypeAlias.note": "ほとんどのユーザーに推奨されます。",
- "lensOss.visTypeAlias.promoTooltip.description": "Elastic では Lens を無料でお試しいただけます。詳細情報",
- "lensOss.visTypeAlias.title": "レンズ",
"management.breadcrumb": "スタック管理",
"management.landing.header": "Stack Management {version}へようこそ",
"management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibanaの設定、その他を管理します。",
@@ -3089,9 +3085,6 @@
"maps_legacy.wmsOptions.wmsStylesLabel": "WMSスタイル",
"maps_legacy.wmsOptions.wmsUrlLabel": "WMS URL",
"maps_legacy.wmsOptions.wmsVersionLabel": "WMS バージョン",
- "mapsOss.visTypeAlias.description": "マルチレイヤーマップで地理データをプロットしてスタイル設定できます。",
- "mapsOss.visTypeAlias.promoTooltip.description": "Elastic では Maps を無料でお試しいただけます。詳細情報",
- "mapsOss.visTypeAlias.title": "マップ",
"monaco.painlessLanguage.autocomplete.docKeywordDescription": "doc['field_name'] 構文を使用して、スクリプトからフィールド値にアクセスします",
"monaco.painlessLanguage.autocomplete.emitKeywordDescription": "戻らずに値を発行します。",
"monaco.painlessLanguage.autocomplete.fieldValueDescription": "フィールド「{fieldName}」の値を取得します",
@@ -4692,7 +4685,6 @@
"visualizations.initializeWithoutIndexPatternErrorMessage": "インデックスパターンなしで集約を初期化しようとしています",
"visualizations.newVisWizard.aggBasedGroupDescription": "クラシック Visualize ライブラリを使用して、アグリゲーションに基づいてグラフを作成します。",
"visualizations.newVisWizard.aggBasedGroupTitle": "アグリゲーションに基づく",
- "visualizations.newVisWizard.basicTitle": "基本",
"visualizations.newVisWizard.chooseSourceTitle": "ソースの選択",
"visualizations.newVisWizard.experimentalTitle": "実験的",
"visualizations.newVisWizard.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
@@ -9424,9 +9416,7 @@
"xpack.indexLifecycleMgmt.coldPhase.dataTier.defaultAllocationNotAvailableTitle": "コールドティアに割り当てられているノードがありません",
"xpack.indexLifecycleMgmt.coldPhase.dataTier.description": "頻度が低い読み取り専用アクセス用に最適化されたノードにデータを移動します。安価なハードウェアのコールドフェーズにデータを格納します。",
"xpack.indexLifecycleMgmt.coldPhase.freezeIndexLabel": "インデックスを凍結",
- "xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasDescription": "レプリカの数を設定します。デフォルトでは前のフェーズと同じです。",
"xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasLabel": "レプリカ数（任意）",
- "xpack.indexLifecycleMgmt.coldPhase.replicasTitle": "レプリカ",
"xpack.indexLifecycleMgmt.common.dataTier.title": "データ割り当て",
"xpack.indexLifecycleMgmt.confirmDelete.cancelButton": "キャンセル",
"xpack.indexLifecycleMgmt.confirmDelete.deleteButton": "削除",
@@ -9439,11 +9429,8 @@
"xpack.indexLifecycleMgmt.editPolicy.cloudDataTierCallout.title": "コールドティアを作成",
"xpack.indexLifecycleMgmt.editPolicy.cold.nodeAttributesMissingDescription": "属性に基づく割り当てを使用するには、elasticsearch.yml でカスタムノード属性を定義します。",
"xpack.indexLifecycleMgmt.editPolicy.coldPhase.activateColdPhaseSwitchLabel": "コールドフェーズを有効にする",
- "xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseDescriptionText": "インデックスへのクエリの頻度を減らすことで、大幅に性能が低いハードウェアにシャードを割り当てることができます。クエリが遅いため、複製の数を減らすことができます。",
- "xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseLabel": "コールドフェーズ",
"xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeIndexExplanationText": "インデックスを読み取り専用にし、メモリー消費量を最小化します。",
"xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeText": "凍結",
- "xpack.indexLifecycleMgmt.editPolicy.coldPhase.numberOfReplicas.switchLabel": "レプリカを設定",
"xpack.indexLifecycleMgmt.editPolicy.common.dataTierAllocation.cold.customOption.helpText": "ノード属性に基づいてデータを移動します。",
"xpack.indexLifecycleMgmt.editPolicy.common.dataTierAllocation.cold.customOption.input": "カスタム",
"xpack.indexLifecycleMgmt.editPolicy.common.dataTierAllocation.cold.defaultOption.helpText": "コールドティアのノードにデータを移動します。",
@@ -9460,13 +9447,6 @@
"xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage": "インデックスライフサイクルポリシーを作成します",
"xpack.indexLifecycleMgmt.editPolicy.createSearchableSnapshotLink": "スナップショットリポジドリを作成",
"xpack.indexLifecycleMgmt.editPolicy.createSnapshotRepositoryLink": "新しいスナップショットリポジドリを作成",
- "xpack.indexLifecycleMgmt.editPolicy.creationDaysOptionLabel": "インデックスの作成からの経過日数",
- "xpack.indexLifecycleMgmt.editPolicy.creationHoursOptionLabel": "インデックスの作成からの経過時間数",
- "xpack.indexLifecycleMgmt.editPolicy.creationMicroSecondsOptionLabel": "インデックスの作成からの経過時間（マイクロ秒）",
- "xpack.indexLifecycleMgmt.editPolicy.creationMilliSecondsOptionLabel": "インデックスの作成からの経過時間（ミリ秒）",
- "xpack.indexLifecycleMgmt.editPolicy.creationMinutesOptionLabel": "インデックスの作成からの経過時間（分）",
- "xpack.indexLifecycleMgmt.editPolicy.creationNanoSecondsOptionLabel": "インデックスの作成からの経過時間（ナノ秒）",
- "xpack.indexLifecycleMgmt.editPolicy.creationSecondsOptionLabel": "インデックスの作成からの経過時間（秒）",
"xpack.indexLifecycleMgmt.editPolicy.dataTierAllocation.allocationFieldLabel": "データティアオプション",
"xpack.indexLifecycleMgmt.editPolicy.dataTierAllocation.nodeAllocationFieldLabel": "ノード属性を選択",
"xpack.indexLifecycleMgmt.editPolicy.dataTierColdLabel": "コールド",
@@ -9507,23 +9487,17 @@
"xpack.indexLifecycleMgmt.editPolicy.formErrorsMessage": "このページのエラーを修正してください。",
"xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto": "リクエストを非表示",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.enableRolloverTipContent": "現在のインデックスが定義された条件のいずれかを満たすときに、新しいインデックスにロールオーバーします。",
- "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseDescriptionMessage": "このフェーズは必須です。アクティブにクエリを実行しインデックスに書き込んでいます。 更新を高速化するため、大きくなりすぎたり古くなりすぎたりした際にインデックスをロールオーバーできます。",
- "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseLabel": "ホットフェーズ",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.learnAboutRolloverLinkText": "詳細",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.rolloverDefaultsTipContent": "インデックスが 30 日経過するか、50 GB に達したらロールオーバーします。",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.rolloverDescriptionMessage": "効率的なストレージと高いパフォーマンスのための時系列データの自動ロールアウト。",
"xpack.indexLifecycleMgmt.editPolicy.indexPriorityLabel": "インデックス優先度（任意）",
"xpack.indexLifecycleMgmt.editPolicy.indexPriorityText": "インデックスの優先順位",
- "xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexLifecycleManagementLinkText": "インデックスライフサイクルの詳細をご覧ください。",
"xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexTemplatesLink": "インデックステンプレートの詳細をご覧ください",
"xpack.indexLifecycleMgmt.editPolicy.learnAboutShardAllocationLink": "シャード割り当ての詳細をご覧ください",
- "xpack.indexLifecycleMgmt.editPolicy.learnAboutTimingText": "タイミングの詳細をご覧ください",
"xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesLoadingFailedTitle": "既存のライフサイクルポリシーを読み込めません",
"xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesReloadButton": "再試行",
- "xpack.indexLifecycleMgmt.editPolicy.lifecyclePolicyDescriptionText": "インデックスへのアクティブな書き込みから削除までの、インデックスライフサイクルの 4 つのフェーズを自動化するには、インデックスポリシーを使用します。",
"xpack.indexLifecycleMgmt.editPolicy.loadSnapshotRepositoriesErrorBody": "このフィールドを更新し、既存のスナップショットリポジトリの名前を入力します。",
"xpack.indexLifecycleMgmt.editPolicy.loadSnapshotRepositoriesErrorTitle": "スナップショットリポジトリを読み込めません",
- "xpack.indexLifecycleMgmt.editPolicy.nameLabel": "名前",
"xpack.indexLifecycleMgmt.editPolicy.nodeAllocation.customOption.description": "ノード属性を使用して、シャード割り当てを制御します。{learnMoreLink}。",
"xpack.indexLifecycleMgmt.editPolicy.nodeAllocation.doNotModifyAllocationOption": "割り当て構成を修正しない",
"xpack.indexLifecycleMgmt.editPolicy.nodeAttributesLoadingFailedTitle": "ノードデータを読み込めません",
@@ -9550,13 +9524,6 @@
"xpack.indexLifecycleMgmt.editPolicy.readonlyDescription": "有効にすると、インデックスおよびインデックスメタデータを読み取り専用にします。無効にすると、書き込みとメタデータの変更を許可します。",
"xpack.indexLifecycleMgmt.editPolicy.readonlyTitle": "読み取り専用",
"xpack.indexLifecycleMgmt.editPolicy.reloadSnapshotRepositoriesLabel": "スナップショットリポジドリの再読み込み",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverDaysOptionLabel": "ロールオーバーからの経過日数",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverHoursOptionLabel": "ロールオーバーからの経過時間数",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverMicroSecondsOptionLabel": "ロールオーバーからの経過時間（マイクロ秒）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverMilliSecondsOptionLabel": "ロールオーバーからの経過時間（ミリ秒）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverMinutesOptionLabel": "ロールオーバーからの経過時間数（分）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverNanoSecondsOptionLabel": "ロールオーバーからの経過時間（ナノ秒）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverSecondsOptionLabel": "ロールオーバーからの経過時間（秒）",
"xpack.indexLifecycleMgmt.editPolicy.saveAsNewButton": "新規ポリシーとして保存します",
"xpack.indexLifecycleMgmt.editPolicy.saveAsNewPolicyMessage": "新規ポリシーとして保存します",
"xpack.indexLifecycleMgmt.editPolicy.saveButton": "ポリシーを保存",
@@ -9581,15 +9548,11 @@
"xpack.indexLifecycleMgmt.editPolicy.warm.nodeAttributesMissingDescription": "属性に基づく割り当てを使用するには、elasticsearch.yml でカスタムノード属性を定義します。",
"xpack.indexLifecycleMgmt.editPolicy.warmPhase.activateWarmPhaseSwitchLabel": "ウォームフェーズを有効にする",
"xpack.indexLifecycleMgmt.editPolicy.warmPhase.indexPriorityExplanationText": "ノードの再起動後にインデックスを復元する優先順位を設定します。優先順位の高いインデックスは優先順位の低いインデックスよりも先に復元されます。",
- "xpack.indexLifecycleMgmt.editPolicy.warmPhase.numberOfReplicas.switchLabel": "レプリカを設定",
- "xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseDescriptionMessage": "まだインデックスにクエリを実行中ですが、読み取り専用です。性能の低いハードウェアにシャードを割り当てることができます。検索を高速化するために、シャードの数を減らしセグメントを結合することができます。",
- "xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseLabel": "ウォームフェーズ",
"xpack.indexLifecycleMgmt.featureCatalogueDescription": "ライフサイクルポリシーを定義し、インデックス年齢として自動的に処理を実行します。",
"xpack.indexLifecycleMgmt.featureCatalogueTitle": "インデックスライフサイクルを管理",
"xpack.indexLifecycleMgmt.forcemerge.bestCompressionLabel": "格納されたフィールドを圧縮",
"xpack.indexLifecycleMgmt.forcemerge.enableLabel": "データを強制結合",
"xpack.indexLifecycleMgmt.forceMerge.numberOfSegmentsLabel": "セグメントの数",
- "xpack.indexLifecycleMgmt.hotPhase.advancedSettingsButton": "高度な設定",
"xpack.indexLifecycleMgmt.hotPhase.bytesLabel": "バイト",
"xpack.indexLifecycleMgmt.hotPhase.daysLabel": "日",
"xpack.indexLifecycleMgmt.hotPhase.enableRolloverLabel": "ロールオーバーを有効にする",
@@ -9713,7 +9676,6 @@
"xpack.indexLifecycleMgmt.shrink.indexFieldLabel": "インデックスを縮小",
"xpack.indexLifecycleMgmt.shrink.numberOfPrimaryShardsLabel": "プライマリシャードの数",
"xpack.indexLifecycleMgmt.templateNotFoundMessage": "テンプレート{name}が見つかりません。",
- "xpack.indexLifecycleMgmt.warmPhase.advancedSettingsButton": "高度な設定",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotAvailableBody": "ロールに基づく割り当てを使用するには、1つ以上のノードを、ウォームまたはホットティアに割り当てます。使用可能なノードがない場合、ポリシーは割り当てを完了できません。",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotAvailableTitle": "ウォームティアに割り当てられているノードがありません",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotice.cold": "このポリシーはコールドフェーズのデータを{tier}ティアノードに移動します。",
@@ -9721,10 +9683,7 @@
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotice.warm": "このポリシーはウォームフェーズのデータを{tier}ティアノードに移動します。",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotice.warm.title": "ウォームティアに割り当てられているノードがありません",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.description": "頻度が低い読み取り専用アクセス用に最適化されたノードにデータを移動します。",
- "xpack.indexLifecycleMgmt.warmPhase.moveToWarmPhaseOnRolloverLabel": "ロールオーバー時にウォームフェーズに変更",
- "xpack.indexLifecycleMgmt.warmPhase.numberOfReplicasDescription": "レプリカの数を設定します。デフォルトでは前のフェーズと同じです。",
"xpack.indexLifecycleMgmt.warmPhase.numberOfReplicasLabel": "レプリカ数（任意）",
- "xpack.indexLifecycleMgmt.warmPhase.replicasTitle": "レプリカ",
"xpack.infra.alerting.alertFlyout.groupBy.placeholder": "なし（グループなし）",
"xpack.infra.alerting.alertFlyout.groupByLabel": "グループ分けの条件",
"xpack.infra.alerting.alertsButton": "アラート",
@@ -13114,8 +13073,6 @@
"xpack.ml.featureRegistry.mlFeatureName": "機械学習",
"xpack.ml.fieldDataCard.cardBoolean.valuesLabel": "値",
"xpack.ml.fieldDataCard.cardDate.summaryTableTitle": "まとめ",
- "xpack.ml.fieldDataCard.cardIp.topValuesLabel": "トップの値",
- "xpack.ml.fieldDataCard.cardKeyword.topValuesLabel": "トップの値",
"xpack.ml.fieldDataCard.cardText.fieldMayBePopulatedDescription": "たとえば、ドキュメントマッピングで {copyToParam} パラメーターを使ったり、{includesParam} と {excludesParam} パラメーターを使用してインデックスした後に {sourceParam} フィールドから切り取ったりして入力される場合があります。",
"xpack.ml.fieldDataCard.cardText.fieldNotPresentDescription": "このフィールドはクエリが実行されたドキュメントの {sourceParam} フィールドにありませんでした。",
"xpack.ml.fieldDataCard.cardText.noExamplesForFieldsTitle": "このフィールドの例が取得されませんでした",
@@ -13133,7 +13090,6 @@
"xpack.ml.fieldDataCardExpandedRow.numberContent.medianLabel": "中間",
"xpack.ml.fieldDataCardExpandedRow.numberContent.minLabel": "分",
"xpack.ml.fieldDataCardExpandedRow.numberContent.summaryTableTitle": "まとめ",
- "xpack.ml.fieldDataCardExpandedRow.numberContent.topValuesTitle": "トップの値",
"xpack.ml.fieldTitleBar.documentCountLabel": "ドキュメントカウント",
"xpack.ml.fieldTypeIcon.booleanTypeAriaLabel": "ブールタイプ",
"xpack.ml.fieldTypeIcon.dateTypeAriaLabel": "日付タイプ",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 49fd9ce095f66..c6f2965803813 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -3036,10 +3036,6 @@
"kibanaOverview.manageData.sectionTitle": "管理您的数据",
"kibanaOverview.more.title": "Elastic 让您事半功倍",
"kibanaOverview.news.title": "最新动态",
- "lensOss.visTypeAlias.description": "使用我们支持拖放的编辑器来创建可视化。随时在可视化类型之间切换。绝大多数可视化的最佳选择。",
- "lensOss.visTypeAlias.note": "适合绝大多数用户。",
- "lensOss.visTypeAlias.promoTooltip.description": "免费试用 Elastic 的 Lens。了解详情。",
- "lensOss.visTypeAlias.title": "Lens",
"management.breadcrumb": "Stack Management",
"management.landing.header": "欢迎使用 Stack Management {version}",
"management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
@@ -3093,9 +3089,6 @@
"maps_legacy.wmsOptions.wmsStylesLabel": "WMS 样式",
"maps_legacy.wmsOptions.wmsUrlLabel": "WMS url",
"maps_legacy.wmsOptions.wmsVersionLabel": "WMS 版本",
- "mapsOss.visTypeAlias.description": "在多层地图中绘制地理数据并设置其样式。",
- "mapsOss.visTypeAlias.promoTooltip.description": "免费试用 Elastic 的地图。了解详情。",
- "mapsOss.visTypeAlias.title": "地图",
"monaco.painlessLanguage.autocomplete.docKeywordDescription": "使用 doc['field_name'] 语法，从脚本中访问字段值",
"monaco.painlessLanguage.autocomplete.emitKeywordDescription": "发出值，而不返回值。",
"monaco.painlessLanguage.autocomplete.fieldValueDescription": "检索字段“{fieldName}”的值",
@@ -4697,7 +4690,6 @@
"visualizations.initializeWithoutIndexPatternErrorMessage": "正在尝试在不使用索引模式的情况下初始化聚合",
"visualizations.newVisWizard.aggBasedGroupDescription": "使用我们的经典可视化库，基于聚合创建图表。",
"visualizations.newVisWizard.aggBasedGroupTitle": "基于聚合",
- "visualizations.newVisWizard.basicTitle": "基本级",
"visualizations.newVisWizard.chooseSourceTitle": "选择源",
"visualizations.newVisWizard.experimentalTitle": "实验性",
"visualizations.newVisWizard.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
@@ -9448,9 +9440,7 @@
"xpack.indexLifecycleMgmt.coldPhase.dataTier.defaultAllocationNotAvailableTitle": "没有分配到冷层的节点",
"xpack.indexLifecycleMgmt.coldPhase.dataTier.description": "将数据移到针对不太频繁的只读访问优化的节点。将处于冷阶段的数据存储在成本较低的硬件上。",
"xpack.indexLifecycleMgmt.coldPhase.freezeIndexLabel": "冻结索引",
- "xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasDescription": "设置副本数目。默认情况下仍与上一阶段相同。",
"xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasLabel": "副本分片数（可选）",
- "xpack.indexLifecycleMgmt.coldPhase.replicasTitle": "副本分片",
"xpack.indexLifecycleMgmt.common.dataTier.title": "数据分配",
"xpack.indexLifecycleMgmt.confirmDelete.cancelButton": "取消",
"xpack.indexLifecycleMgmt.confirmDelete.deleteButton": "删除",
@@ -9463,11 +9453,8 @@
"xpack.indexLifecycleMgmt.editPolicy.cloudDataTierCallout.title": "创建冷层",
"xpack.indexLifecycleMgmt.editPolicy.cold.nodeAttributesMissingDescription": "在 elasticsearch.yml 中定义定制节点属性，以使用基于属性的分配。",
"xpack.indexLifecycleMgmt.editPolicy.coldPhase.activateColdPhaseSwitchLabel": "激活冷阶段",
- "xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseDescriptionText": "您查询自己索引的频率较低，因此您可以在效率较低的硬件上分配分片。因为您的查询较为缓慢，所以您可以减少副本分片数目。",
- "xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseLabel": "冷阶段",
"xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeIndexExplanationText": "使索引只读，并最大限度减小其内存占用。",
"xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeText": "冻结",
- "xpack.indexLifecycleMgmt.editPolicy.coldPhase.numberOfReplicas.switchLabel": "设置副本",
"xpack.indexLifecycleMgmt.editPolicy.common.dataTierAllocation.cold.customOption.helpText": "根据节点属性移动数据。",
"xpack.indexLifecycleMgmt.editPolicy.common.dataTierAllocation.cold.customOption.input": "定制",
"xpack.indexLifecycleMgmt.editPolicy.common.dataTierAllocation.cold.defaultOption.helpText": "将数据移到冷层中的节点。",
@@ -9484,13 +9471,6 @@
"xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage": "创建索引生命周期策略",
"xpack.indexLifecycleMgmt.editPolicy.createSearchableSnapshotLink": "创建快照库",
"xpack.indexLifecycleMgmt.editPolicy.createSnapshotRepositoryLink": "创建新的快照库",
- "xpack.indexLifecycleMgmt.editPolicy.creationDaysOptionLabel": "天（自索引创建）",
- "xpack.indexLifecycleMgmt.editPolicy.creationHoursOptionLabel": "小时（自索引创建）",
- "xpack.indexLifecycleMgmt.editPolicy.creationMicroSecondsOptionLabel": "微秒（自索引创建）",
- "xpack.indexLifecycleMgmt.editPolicy.creationMilliSecondsOptionLabel": "毫秒（自索引创建）",
- "xpack.indexLifecycleMgmt.editPolicy.creationMinutesOptionLabel": "分钟（自索引创建）",
- "xpack.indexLifecycleMgmt.editPolicy.creationNanoSecondsOptionLabel": "纳秒（自索引创建）",
- "xpack.indexLifecycleMgmt.editPolicy.creationSecondsOptionLabel": "秒（自索引创建）",
"xpack.indexLifecycleMgmt.editPolicy.dataTierAllocation.allocationFieldLabel": "数据层选项",
"xpack.indexLifecycleMgmt.editPolicy.dataTierAllocation.nodeAllocationFieldLabel": "选择节点属性",
"xpack.indexLifecycleMgmt.editPolicy.dataTierColdLabel": "冷",
@@ -9531,23 +9511,17 @@
"xpack.indexLifecycleMgmt.editPolicy.formErrorsMessage": "请修复此页面上的错误。",
"xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto": "隐藏请求",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.enableRolloverTipContent": "在当前索引满足定义的条件之一时，滚动更新到新索引。",
- "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseDescriptionMessage": "此阶段为必需。您正频繁地查询并写到您的索引。 为了获取更快的更新，在索引变得过大或过旧时，您可以滚动更新索引。",
- "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseLabel": "热阶段",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.learnAboutRolloverLinkText": "了解详情",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.rolloverDefaultsTipContent": "当索引已存在 30 天或达到 50 GB 时滚动更新。",
"xpack.indexLifecycleMgmt.editPolicy.hotPhase.rolloverDescriptionMessage": "自动滚动更新时间序列数据，以实现高效存储和更高性能。",
"xpack.indexLifecycleMgmt.editPolicy.indexPriorityLabel": "索引优先级（可选）",
"xpack.indexLifecycleMgmt.editPolicy.indexPriorityText": "索引优先级",
- "xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexLifecycleManagementLinkText": "了解索引生命周期。",
"xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexTemplatesLink": "了解索引模板",
"xpack.indexLifecycleMgmt.editPolicy.learnAboutShardAllocationLink": "了解分片分配",
- "xpack.indexLifecycleMgmt.editPolicy.learnAboutTimingText": "了解计时",
"xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesLoadingFailedTitle": "无法加载现有生命周期策略",
"xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesReloadButton": "重试",
- "xpack.indexLifecycleMgmt.editPolicy.lifecyclePolicyDescriptionText": "使用索引策略自动化索引生命周期的四个阶段，从频繁地写入到索引到删除索引。",
"xpack.indexLifecycleMgmt.editPolicy.loadSnapshotRepositoriesErrorBody": "刷新此字段并输入现有快照储存库的名称。",
"xpack.indexLifecycleMgmt.editPolicy.loadSnapshotRepositoriesErrorTitle": "无法加载快照存储库",
- "xpack.indexLifecycleMgmt.editPolicy.nameLabel": "名称",
"xpack.indexLifecycleMgmt.editPolicy.nodeAllocation.customOption.description": "使用节点属性控制分片分配。{learnMoreLink}。",
"xpack.indexLifecycleMgmt.editPolicy.nodeAllocation.doNotModifyAllocationOption": "切勿修改分配配置",
"xpack.indexLifecycleMgmt.editPolicy.nodeAttributesLoadingFailedTitle": "无法加载节点数据",
@@ -9574,13 +9548,6 @@
"xpack.indexLifecycleMgmt.editPolicy.readonlyDescription": "启用以使索引及索引元数据只读；禁用以允许写入和元数据更改。",
"xpack.indexLifecycleMgmt.editPolicy.readonlyTitle": "只读",
"xpack.indexLifecycleMgmt.editPolicy.reloadSnapshotRepositoriesLabel": "重新加载快照存储库",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverDaysOptionLabel": "天（自滚动更新）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverHoursOptionLabel": "小时（自滚动更新）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverMicroSecondsOptionLabel": "微秒（自滚动更新）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverMilliSecondsOptionLabel": "毫秒（自滚动更新）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverMinutesOptionLabel": "分钟（自滚动更新）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverNanoSecondsOptionLabel": "纳秒（自滚动更新）",
- "xpack.indexLifecycleMgmt.editPolicy.rolloverSecondsOptionLabel": "秒（自滚动更新）",
"xpack.indexLifecycleMgmt.editPolicy.saveAsNewButton": "另存为新策略",
"xpack.indexLifecycleMgmt.editPolicy.saveAsNewPolicyMessage": "另存为新策略",
"xpack.indexLifecycleMgmt.editPolicy.saveButton": "保存策略",
@@ -9605,15 +9572,11 @@
"xpack.indexLifecycleMgmt.editPolicy.warm.nodeAttributesMissingDescription": "在 elasticsearch.yml 中定义定制节点属性，以使用基于属性的分配。",
"xpack.indexLifecycleMgmt.editPolicy.warmPhase.activateWarmPhaseSwitchLabel": "激活温阶段",
"xpack.indexLifecycleMgmt.editPolicy.warmPhase.indexPriorityExplanationText": "设置在节点重新启动后恢复索引的优先级。较高优先级的索引会在较低优先级的索引之前恢复。",
- "xpack.indexLifecycleMgmt.editPolicy.warmPhase.numberOfReplicas.switchLabel": "设置副本",
- "xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseDescriptionMessage": "您仍在查询自己的索引，但其为只读。您可以将分片分配给效率较低的硬件。为了获取更快的搜索，您可以减少分片数目并强制合并段。",
- "xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseLabel": "温阶段",
"xpack.indexLifecycleMgmt.featureCatalogueDescription": "定义生命周期策略，以随着索引老化自动执行操作。",
"xpack.indexLifecycleMgmt.featureCatalogueTitle": "管理索引生命周期",
"xpack.indexLifecycleMgmt.forcemerge.bestCompressionLabel": "压缩已存储字段",
"xpack.indexLifecycleMgmt.forcemerge.enableLabel": "强制合并数据",
"xpack.indexLifecycleMgmt.forceMerge.numberOfSegmentsLabel": "分段数目",
- "xpack.indexLifecycleMgmt.hotPhase.advancedSettingsButton": "高级设置",
"xpack.indexLifecycleMgmt.hotPhase.bytesLabel": "字节",
"xpack.indexLifecycleMgmt.hotPhase.daysLabel": "天",
"xpack.indexLifecycleMgmt.hotPhase.enableRolloverLabel": "启用滚动更新",
@@ -9739,7 +9702,6 @@
"xpack.indexLifecycleMgmt.shrink.indexFieldLabel": "缩小索引",
"xpack.indexLifecycleMgmt.shrink.numberOfPrimaryShardsLabel": "主分片数目",
"xpack.indexLifecycleMgmt.templateNotFoundMessage": "找不到模板 {name}。",
- "xpack.indexLifecycleMgmt.warmPhase.advancedSettingsButton": "高级设置",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotAvailableBody": "至少将一个节点分配到温层或冷层，以使用基于角色的分配。如果没有可用节点，则策略无法完成分配。",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotAvailableTitle": "没有分配到温层的节点",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotice.cold": "此策略会改为将冷阶段的数据移到{tier}层节点。",
@@ -9747,10 +9709,7 @@
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotice.warm": "此策略会改为将温阶段的数据移到{tier}层节点。",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.defaultAllocationNotice.warm.title": "没有分配到温层的节点",
"xpack.indexLifecycleMgmt.warmPhase.dataTier.description": "将数据移到针对不太频繁的只读访问优化的节点。",
- "xpack.indexLifecycleMgmt.warmPhase.moveToWarmPhaseOnRolloverLabel": "滚动更新时移到温阶段",
- "xpack.indexLifecycleMgmt.warmPhase.numberOfReplicasDescription": "设置副本数目。默认情况下仍与上一阶段相同。",
"xpack.indexLifecycleMgmt.warmPhase.numberOfReplicasLabel": "副本分片数（可选）",
- "xpack.indexLifecycleMgmt.warmPhase.replicasTitle": "副本分片",
"xpack.infra.alerting.alertFlyout.groupBy.placeholder": "无内容（未分组）",
"xpack.infra.alerting.alertFlyout.groupByLabel": "分组依据",
"xpack.infra.alerting.alertsButton": "告警",
@@ -13145,8 +13104,6 @@
"xpack.ml.featureRegistry.mlFeatureName": "Machine Learning",
"xpack.ml.fieldDataCard.cardBoolean.valuesLabel": "值",
"xpack.ml.fieldDataCard.cardDate.summaryTableTitle": "摘要",
- "xpack.ml.fieldDataCard.cardIp.topValuesLabel": "排名最前值",
- "xpack.ml.fieldDataCard.cardKeyword.topValuesLabel": "排名最前值",
"xpack.ml.fieldDataCard.cardText.fieldMayBePopulatedDescription": "例如，可以使用文档映射中的 {copyToParam} 参数进行填充，也可以在索引后通过使用 {includesParam} 和 {excludesParam} 参数从 {sourceParam} 字段中修剪。",
"xpack.ml.fieldDataCard.cardText.fieldNotPresentDescription": "查询的文档的 {sourceParam} 字段中不存在此字段。",
"xpack.ml.fieldDataCard.cardText.noExamplesForFieldsTitle": "没有获取此字段的示例",
@@ -13164,7 +13121,6 @@
"xpack.ml.fieldDataCardExpandedRow.numberContent.medianLabel": "中值",
"xpack.ml.fieldDataCardExpandedRow.numberContent.minLabel": "最小值",
"xpack.ml.fieldDataCardExpandedRow.numberContent.summaryTableTitle": "摘要",
- "xpack.ml.fieldDataCardExpandedRow.numberContent.topValuesTitle": "排名最前值",
"xpack.ml.fieldTitleBar.documentCountLabel": "文档计数",
"xpack.ml.fieldTypeIcon.booleanTypeAriaLabel": "布尔类型",
"xpack.ml.fieldTypeIcon.dateTypeAriaLabel": "日期类型",
diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts
index 2a94b39ca6c66..9625ca89b11d0 100644
--- a/x-pack/plugins/upgrade_assistant/common/types.ts
+++ b/x-pack/plugins/upgrade_assistant/common/types.ts
@@ -5,8 +5,6 @@
*/
import { SavedObject, SavedObjectAttributes } from 'src/core/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../src/core/server/elasticsearch/legacy/api_types';
export enum ReindexStep {
// Enum values are spaced out by 10 to give us room to insert steps in between.
@@ -165,6 +163,23 @@ export interface UpgradeAssistantTelemetrySavedObjectAttributes {
[key: string]: any;
}
+export type MIGRATION_DEPRECATION_LEVEL = 'none' | 'info' | 'warning' | 'critical';
+export interface DeprecationInfo {
+ level: MIGRATION_DEPRECATION_LEVEL;
+ message: string;
+ url: string;
+ details?: string;
+}
+
+export interface IndexSettingsDeprecationInfo {
+ [indexName: string]: DeprecationInfo[];
+}
+export interface DeprecationAPIResponse {
+ cluster_settings: DeprecationInfo[];
+ ml_settings: DeprecationInfo[];
+ node_settings: DeprecationInfo[];
+ index_settings: IndexSettingsDeprecationInfo;
+}
export interface EnrichedDeprecationInfo extends DeprecationInfo {
index?: string;
node?: string;
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx
index 66c802097055b..8637099b77c9b 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx
@@ -6,8 +6,7 @@
import { IconColor } from '@elastic/eui';
import { invert } from 'lodash';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
+import { DeprecationInfo } from '../../../../../common/types';
export const LEVEL_MAP: { [level: string]: number } = {
warning: 0,
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx
index d75a25a95d67f..c75db7e2f96e1 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx
@@ -8,8 +8,7 @@ import React, { FunctionComponent, useState } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiButton, EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
+import { DeprecationInfo } from '../../../../../common/types';
import { GroupByOption, LevelFilterOption, LoadingState } from '../../types';
import { FilterBar } from './filter_bar';
import { GroupByBar } from './group_by_bar';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx
index 6bdb5df036224..727d959f49a71 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx
@@ -9,9 +9,7 @@ import React from 'react';
import { mountWithIntl, shallowWithIntl } from '@kbn/test/jest';
import { EuiBadge, EuiPagination } from '@elastic/eui';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
+import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption, LevelFilterOption } from '../../../types';
import { DeprecationAccordion, filterDeps, GroupedDeprecations } from './grouped';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx
index de1a5a996d75f..20ffbae143672 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx
@@ -18,9 +18,7 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
+import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption, LevelFilterOption } from '../../../types';
import { DeprecationCountSummary } from './count_summary';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx
index 3ce40d0c4fdf0..c866c1e1f6847 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx
@@ -10,8 +10,7 @@ import React, { FunctionComponent } from 'react';
import { EuiBadge, EuiToolTip } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
+import { DeprecationInfo } from '../../../../../../common/types';
import { COLOR_MAP, LEVEL_MAP, REVERSE_LEVEL_MAP } from '../constants';
const LocalizedLevels: { [level: string]: string } = {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx
index 038f05aace4c3..afc443b8c3b7d 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx
@@ -6,9 +6,7 @@
import React, { FunctionComponent } from 'react';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
+import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption } from '../../../types';
import { COLOR_MAP, LEVEL_MAP } from '../constants';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx
index 053ef21d6b309..231b15fc52d72 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx
@@ -6,9 +6,8 @@
import { mount, shallow } from 'enzyme';
import React from 'react';
+import { DeprecationInfo } from '../../../../../common/types';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
import { LevelFilterOption } from '../../types';
import { FilterBar } from './filter_bar';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx
index 6939c547fee57..abcd02d5a5ce4 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx
@@ -10,8 +10,7 @@ import React from 'react';
import { EuiFilterButton, EuiFilterGroup, EuiFlexItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationInfo } from '../../../../../../../../src/core/server/elasticsearch/legacy/api_types';
+import { DeprecationInfo } from '../../../../../common/types';
import { LevelFilterOption } from '../../types';
const LocalizedOptions: { [option: string]: string } = {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
index b0dec299b2b12..dee05c97f11af 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
@@ -12,10 +12,10 @@ import {
describe('getDeprecationLoggingStatus', () => {
it('calls cluster.getSettings', async () => {
- const dataClient = elasticsearchServiceMock.createLegacyScopedClusterClient();
+ const dataClient = elasticsearchServiceMock.createScopedClusterClient();
await getDeprecationLoggingStatus(dataClient);
- expect(dataClient.callAsCurrentUser).toHaveBeenCalledWith('cluster.getSettings', {
- includeDefaults: true,
+ expect(dataClient.asCurrentUser.cluster.getSettings).toHaveBeenCalledWith({
+ include_defaults: true,
});
});
});
@@ -23,9 +23,9 @@ describe('getDeprecationLoggingStatus', () => {
describe('setDeprecationLogging', () => {
describe('isEnabled = true', () => {
it('calls cluster.putSettings with logger.deprecation = WARN', async () => {
- const dataClient = elasticsearchServiceMock.createLegacyScopedClusterClient();
+ const dataClient = elasticsearchServiceMock.createScopedClusterClient();
await setDeprecationLogging(dataClient, true);
- expect(dataClient.callAsCurrentUser).toHaveBeenCalledWith('cluster.putSettings', {
+ expect(dataClient.asCurrentUser.cluster.putSettings).toHaveBeenCalledWith({
body: { transient: { 'logger.deprecation': 'WARN' } },
});
});
@@ -33,9 +33,9 @@ describe('setDeprecationLogging', () => {
describe('isEnabled = false', () => {
it('calls cluster.putSettings with logger.deprecation = ERROR', async () => {
- const dataClient = elasticsearchServiceMock.createLegacyScopedClusterClient();
+ const dataClient = elasticsearchServiceMock.createScopedClusterClient();
await setDeprecationLogging(dataClient, false);
- expect(dataClient.callAsCurrentUser).toHaveBeenCalledWith('cluster.putSettings', {
+ expect(dataClient.asCurrentUser.cluster.putSettings).toHaveBeenCalledWith({
body: { transient: { 'logger.deprecation': 'ERROR' } },
});
});
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
index 348eebb97e384..c545d12ac1b82 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
@@ -4,17 +4,17 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { get } from 'lodash';
-import { ILegacyScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from 'src/core/server';
interface DeprecationLoggingStatus {
isEnabled: boolean;
}
export async function getDeprecationLoggingStatus(
- dataClient: ILegacyScopedClusterClient
+ dataClient: IScopedClusterClient
): Promise {
- const response = await dataClient.callAsCurrentUser('cluster.getSettings', {
- includeDefaults: true,
+ const { body: response } = await dataClient.asCurrentUser.cluster.getSettings({
+ include_defaults: true,
});
return {
@@ -23,10 +23,10 @@ export async function getDeprecationLoggingStatus(
}
export async function setDeprecationLogging(
- dataClient: ILegacyScopedClusterClient,
+ dataClient: IScopedClusterClient,
isEnabled: boolean
): Promise {
- const response = await dataClient.callAsCurrentUser('cluster.putSettings', {
+ const { body: response } = await dataClient.asCurrentUser.cluster.putSettings({
body: {
transient: {
'logger.deprecation': isEnabled ? 'WARN' : 'ERROR',
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
index bce48b152700f..739499e2235b5 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
@@ -4,22 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { LegacyAPICaller } from 'kibana/server';
+import { ElasticsearchClient } from 'kibana/server';
import { getIndexState } from '../../common/get_index_state';
import { ResolveIndexResponseFromES } from '../../common/types';
type StatusCheckResult = Record;
export const esIndicesStateCheck = async (
- callAsUser: LegacyAPICaller,
+ asCurrentUser: ElasticsearchClient,
indices: string[]
): Promise => {
- const response: ResolveIndexResponseFromES = await callAsUser('transport.request', {
- method: 'GET',
- path: `/_resolve/index/*`,
- query: {
- expand_wildcards: 'all',
- },
+ const { body: response } = await asCurrentUser.indices.resolveIndex({
+ name: '*',
+ expand_wildcards: 'all',
});
const result: StatusCheckResult = {};
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts
index 312a7275382b8..6e8a729b4d3bb 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts
@@ -5,95 +5,94 @@
*/
import _ from 'lodash';
+import { RequestEvent } from '@elastic/elasticsearch/lib/Transport';
import { elasticsearchServiceMock } from 'src/core/server/mocks';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationAPIResponse } from '../../../../../src/core/server/elasticsearch/legacy/api_types';
+import { DeprecationAPIResponse } from '../../common/types';
import { getUpgradeAssistantStatus } from './es_migration_apis';
import fakeDeprecations from './__fixtures__/fake_deprecations.json';
const fakeIndexNames = Object.keys(fakeDeprecations.index_settings);
+const asApiResponse = (body: T): RequestEvent =>
+ ({
+ body,
+ } as RequestEvent);
+
describe('getUpgradeAssistantStatus', () => {
const resolvedIndices = {
indices: fakeIndexNames.map((f) => ({ name: f, attributes: ['open'] })),
};
- let deprecationsResponse: DeprecationAPIResponse;
-
- const dataClient = elasticsearchServiceMock.createLegacyScopedClusterClient();
- (dataClient.callAsCurrentUser as jest.Mock).mockImplementation(async (api, { path }) => {
- if (path === '/_migration/deprecations') {
- return deprecationsResponse;
- } else if (path === '/_resolve/index/*') {
- return resolvedIndices;
- } else if (api === 'indices.getMapping') {
- return {};
- } else {
- throw new Error(`Unexpected API call: ${path}`);
- }
- });
+ // @ts-expect-error mock data is too loosely typed
+ const deprecationsResponse: DeprecationAPIResponse = _.cloneDeep(fakeDeprecations);
- beforeEach(() => {
- // @ts-expect-error mock data is too loosely typed
- deprecationsResponse = _.cloneDeep(fakeDeprecations);
- });
+ const esClient = elasticsearchServiceMock.createScopedClusterClient();
+
+ esClient.asCurrentUser.migration.deprecations.mockResolvedValue(
+ asApiResponse(deprecationsResponse)
+ );
+
+ esClient.asCurrentUser.indices.resolveIndex.mockResolvedValue(asApiResponse(resolvedIndices));
it('calls /_migration/deprecations', async () => {
- await getUpgradeAssistantStatus(dataClient, false);
- expect(dataClient.callAsCurrentUser).toHaveBeenCalledWith('transport.request', {
- path: '/_migration/deprecations',
- method: 'GET',
- });
+ await getUpgradeAssistantStatus(esClient, false);
+ expect(esClient.asCurrentUser.migration.deprecations).toHaveBeenCalled();
});
it('returns the correct shape of data', async () => {
- const resp = await getUpgradeAssistantStatus(dataClient, false);
+ const resp = await getUpgradeAssistantStatus(esClient, false);
expect(resp).toMatchSnapshot();
});
it('returns readyForUpgrade === false when critical issues found', async () => {
- deprecationsResponse = {
- cluster_settings: [{ level: 'critical', message: 'Do count me', url: 'https://...' }],
- node_settings: [],
- ml_settings: [],
- index_settings: {},
- };
-
- await expect(getUpgradeAssistantStatus(dataClient, false)).resolves.toHaveProperty(
+ esClient.asCurrentUser.migration.deprecations.mockResolvedValue(
+ asApiResponse({
+ cluster_settings: [{ level: 'critical', message: 'Do count me', url: 'https://...' }],
+ node_settings: [],
+ ml_settings: [],
+ index_settings: {},
+ })
+ );
+
+ await expect(getUpgradeAssistantStatus(esClient, false)).resolves.toHaveProperty(
'readyForUpgrade',
false
);
});
it('returns readyForUpgrade === true when no critical issues found', async () => {
- deprecationsResponse = {
- cluster_settings: [{ level: 'warning', message: 'Do not count me', url: 'https://...' }],
- node_settings: [],
- ml_settings: [],
- index_settings: {},
- };
-
- await expect(getUpgradeAssistantStatus(dataClient, false)).resolves.toHaveProperty(
+ esClient.asCurrentUser.migration.deprecations.mockResolvedValue(
+ asApiResponse({
+ cluster_settings: [{ level: 'warning', message: 'Do not count me', url: 'https://...' }],
+ node_settings: [],
+ ml_settings: [],
+ index_settings: {},
+ })
+ );
+
+ await expect(getUpgradeAssistantStatus(esClient, false)).resolves.toHaveProperty(
'readyForUpgrade',
true
);
});
it('filters out security realm deprecation on Cloud', async () => {
- deprecationsResponse = {
- cluster_settings: [
- {
- level: 'critical',
- message: 'Security realm settings structure changed',
- url: 'https://...',
- },
- ],
- node_settings: [],
- ml_settings: [],
- index_settings: {},
- };
-
- const result = await getUpgradeAssistantStatus(dataClient, true);
+ esClient.asCurrentUser.migration.deprecations.mockResolvedValue(
+ asApiResponse({
+ cluster_settings: [
+ {
+ level: 'critical',
+ message: 'Security realm settings structure changed',
+ url: 'https://...',
+ },
+ ],
+ node_settings: [],
+ ml_settings: [],
+ index_settings: {},
+ })
+ );
+
+ const result = await getUpgradeAssistantStatus(esClient, true);
expect(result).toHaveProperty('readyForUpgrade', true);
expect(result).toHaveProperty('cluster', []);
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts
index 9f55b9d049735..22b9956fc957a 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts
@@ -4,21 +4,22 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ILegacyScopedClusterClient } from 'src/core/server';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationAPIResponse } from '../../../../../src/core/server/elasticsearch/legacy/api_types';
-import { EnrichedDeprecationInfo, UpgradeAssistantStatus } from '../../common/types';
+import { IScopedClusterClient } from 'src/core/server';
+import {
+ DeprecationAPIResponse,
+ EnrichedDeprecationInfo,
+ UpgradeAssistantStatus,
+} from '../../common/types';
import { esIndicesStateCheck } from './es_indices_state_check';
export async function getUpgradeAssistantStatus(
- dataClient: ILegacyScopedClusterClient,
+ dataClient: IScopedClusterClient,
isCloudEnabled: boolean
): Promise {
- const deprecations = await dataClient.callAsCurrentUser('transport.request', {
- path: '/_migration/deprecations',
- method: 'GET',
- });
+ const {
+ body: deprecations,
+ } = await dataClient.asCurrentUser.migration.deprecations();
const cluster = getClusterDeprecations(deprecations, isCloudEnabled);
const indices = getCombinedIndexInfos(deprecations);
@@ -28,10 +29,7 @@ export async function getUpgradeAssistantStatus(
// If we have found deprecation information for index/indices check whether the index is
// open or closed.
if (indexNames.length) {
- const indexStates = await esIndicesStateCheck(
- dataClient.callAsCurrentUser.bind(dataClient),
- indexNames
- );
+ const indexStates = await esIndicesStateCheck(dataClient.asCurrentUser, indexNames);
indices.forEach((indexData) => {
indexData.blockerForReindexing =
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
index 78f159ed98867..2310f993ce27d 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
@@ -5,7 +5,7 @@
*/
import { SemVer } from 'semver';
-import { ILegacyScopedClusterClient, kibanaResponseFactory } from 'src/core/server';
+import { IScopedClusterClient, kibanaResponseFactory } from 'src/core/server';
import { xpackMocks } from '../../../../mocks';
import { CURRENT_VERSION } from '../../common/version';
import {
@@ -17,14 +17,20 @@ import {
describe('getAllNodeVersions', () => {
it('returns a list of unique node versions', async () => {
const adminClient = ({
- callAsInternalUser: jest.fn().mockResolvedValue({
+ asInternalUser: {
nodes: {
- node1: { version: '7.0.0' },
- node2: { version: '7.0.0' },
- node3: { version: '6.0.0' },
+ info: jest.fn().mockResolvedValue({
+ body: {
+ nodes: {
+ node1: { version: '7.0.0' },
+ node2: { version: '7.0.0' },
+ node3: { version: '6.0.0' },
+ },
+ },
+ }),
},
- }),
- } as unknown) as ILegacyScopedClusterClient;
+ },
+ } as unknown) as IScopedClusterClient;
await expect(getAllNodeVersions(adminClient)).resolves.toEqual([
new SemVer('6.0.0'),
@@ -73,12 +79,18 @@ describe('verifyAllMatchKibanaVersion', () => {
describe('EsVersionPrecheck', () => {
it('returns a 403 when callCluster fails with a 403', async () => {
- const fakeCall = jest.fn().mockRejectedValue({ status: 403 });
+ const fakeCall = jest.fn().mockRejectedValue({ statusCode: 403 });
const ctx = xpackMocks.createRequestHandlerContext();
- ctx.core.elasticsearch.legacy.client = {
- callAsCurrentUser: jest.fn(),
- callAsInternalUser: fakeCall,
+ ctx.core.elasticsearch.client = {
+ asInternalUser: {
+ ...ctx.core.elasticsearch.client.asInternalUser,
+ nodes: {
+ ...ctx.core.elasticsearch.client.asInternalUser.nodes,
+ info: fakeCall,
+ },
+ },
+ asCurrentUser: ctx.core.elasticsearch.client.asCurrentUser,
};
const result = await esVersionCheck(ctx, kibanaResponseFactory);
@@ -87,14 +99,22 @@ describe('EsVersionPrecheck', () => {
it('returns a 426 message w/ allNodesUpgraded = false when nodes are not on same version', async () => {
const ctx = xpackMocks.createRequestHandlerContext();
- ctx.core.elasticsearch.legacy.client = {
- callAsCurrentUser: jest.fn(),
- callAsInternalUser: jest.fn().mockResolvedValue({
+ ctx.core.elasticsearch.client = {
+ asInternalUser: {
+ ...ctx.core.elasticsearch.client.asInternalUser,
nodes: {
- node1: { version: CURRENT_VERSION.raw },
- node2: { version: new SemVer(CURRENT_VERSION.raw).inc('major').raw },
+ ...ctx.core.elasticsearch.client.asInternalUser.nodes,
+ info: jest.fn().mockResolvedValue({
+ body: {
+ nodes: {
+ node1: { version: CURRENT_VERSION.raw },
+ node2: { version: new SemVer(CURRENT_VERSION.raw).inc('major').raw },
+ },
+ },
+ }),
},
- }),
+ },
+ asCurrentUser: ctx.core.elasticsearch.client.asCurrentUser,
};
const result = await esVersionCheck(ctx, kibanaResponseFactory);
@@ -104,14 +124,22 @@ describe('EsVersionPrecheck', () => {
it('returns a 426 message w/ allNodesUpgraded = true when nodes are on next version', async () => {
const ctx = xpackMocks.createRequestHandlerContext();
- ctx.core.elasticsearch.legacy.client = {
- callAsCurrentUser: jest.fn(),
- callAsInternalUser: jest.fn().mockResolvedValue({
+ ctx.core.elasticsearch.client = {
+ asInternalUser: {
+ ...ctx.core.elasticsearch.client.asInternalUser,
nodes: {
- node1: { version: new SemVer(CURRENT_VERSION.raw).inc('major').raw },
- node2: { version: new SemVer(CURRENT_VERSION.raw).inc('major').raw },
+ ...ctx.core.elasticsearch.client.asInternalUser.nodes,
+ info: jest.fn().mockResolvedValue({
+ body: {
+ nodes: {
+ node1: { version: new SemVer(CURRENT_VERSION.raw).inc('major').raw },
+ node2: { version: new SemVer(CURRENT_VERSION.raw).inc('major').raw },
+ },
+ },
+ }),
},
- }),
+ },
+ asCurrentUser: ctx.core.elasticsearch.client.asCurrentUser,
};
const result = await esVersionCheck(ctx, kibanaResponseFactory);
@@ -121,14 +149,22 @@ describe('EsVersionPrecheck', () => {
it('returns undefined when nodes are on same version', async () => {
const ctx = xpackMocks.createRequestHandlerContext();
- ctx.core.elasticsearch.legacy.client = {
- callAsCurrentUser: jest.fn(),
- callAsInternalUser: jest.fn().mockResolvedValue({
+ ctx.core.elasticsearch.client = {
+ asInternalUser: {
+ ...ctx.core.elasticsearch.client.asInternalUser,
nodes: {
- node1: { version: CURRENT_VERSION.raw },
- node2: { version: CURRENT_VERSION.raw },
+ ...ctx.core.elasticsearch.client.asInternalUser.nodes,
+ info: jest.fn().mockResolvedValue({
+ body: {
+ nodes: {
+ node1: { version: CURRENT_VERSION.raw },
+ node2: { version: CURRENT_VERSION.raw },
+ },
+ },
+ }),
},
- }),
+ },
+ asCurrentUser: ctx.core.elasticsearch.client.asCurrentUser,
};
await expect(esVersionCheck(ctx, kibanaResponseFactory)).resolves.toBe(undefined);
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
index 2b49d4c286f61..be6c4f5ff0230 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
@@ -7,7 +7,7 @@
import { uniq } from 'lodash';
import { SemVer } from 'semver';
import {
- ILegacyScopedClusterClient,
+ IScopedClusterClient,
KibanaRequest,
KibanaResponseFactory,
RequestHandler,
@@ -15,14 +15,22 @@ import {
} from 'src/core/server';
import { CURRENT_VERSION } from '../../common/version';
+interface Nodes {
+ nodes: {
+ [nodeId: string]: { version: string };
+ };
+}
+
/**
* Returns an array of all the unique Elasticsearch Node Versions in the Elasticsearch cluster.
*/
-export const getAllNodeVersions = async (adminClient: ILegacyScopedClusterClient) => {
+export const getAllNodeVersions = async (adminClient: IScopedClusterClient) => {
// Get the version information for all nodes in the cluster.
- const { nodes } = (await adminClient.callAsInternalUser('nodes.info', {
- filterPath: 'nodes.*.version',
- })) as { nodes: { [nodeId: string]: { version: string } } };
+ const response = await adminClient.asInternalUser.nodes.info({
+ filter_path: 'nodes.*.version',
+ });
+
+ const nodes = response.body.nodes;
const versionStrings = Object.values(nodes).map(({ version }) => version);
@@ -62,13 +70,13 @@ export const esVersionCheck = async (
ctx: RequestHandlerContext,
response: KibanaResponseFactory
) => {
- const { client } = ctx.core.elasticsearch.legacy;
+ const { client } = ctx.core.elasticsearch;
let allNodeVersions: SemVer[];
try {
allNodeVersions = await getAllNodeVersions(client);
} catch (e) {
- if (e.status === 403) {
+ if (e.statusCode === 403) {
return response.forbidden({ body: e.message });
}
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
index 525c3781be749..d059c03bcecb1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
@@ -3,7 +3,11 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { RequestEvent } from '@elastic/elasticsearch/lib/Transport';
+import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { elasticsearchServiceMock } from 'src/core/server/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mocks';
import moment from 'moment';
import {
@@ -18,7 +22,7 @@ import { LOCK_WINDOW, ReindexActions, reindexActionsFactory } from './reindex_ac
describe('ReindexActions', () => {
let client: jest.Mocked;
- let callCluster: jest.Mock;
+ let clusterClient: ScopedClusterClientMock;
let actions: ReindexActions;
const unimplemented = (name: string) => () =>
@@ -38,8 +42,8 @@ describe('ReindexActions', () => {
Promise.resolve({ id, attributes } as ReindexSavedObject)
) as any,
};
- callCluster = jest.fn();
- actions = reindexActionsFactory(client, callCluster);
+ clusterClient = elasticsearchServiceMock.createScopedClusterClient();
+ actions = reindexActionsFactory(client, clusterClient.asCurrentUser);
});
describe('createReindexOp', () => {
@@ -281,13 +285,20 @@ describe('ReindexActions', () => {
});
describe('getFlatSettings', () => {
+ const asApiResponse = (body: T): RequestEvent =>
+ ({
+ body,
+ } as RequestEvent);
+
it('returns flat settings', async () => {
- callCluster.mockResolvedValueOnce({
- myIndex: {
- settings: { 'index.mySetting': '1' },
- mappings: {},
- },
- });
+ clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
+ asApiResponse({
+ myIndex: {
+ settings: { 'index.mySetting': '1' },
+ mappings: {},
+ },
+ })
+ );
await expect(actions.getFlatSettings('myIndex')).resolves.toEqual({
settings: { 'index.mySetting': '1' },
mappings: {},
@@ -295,7 +306,7 @@ describe('ReindexActions', () => {
});
it('returns null if index does not exist', async () => {
- callCluster.mockResolvedValueOnce({});
+ clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(asApiResponse({}));
await expect(actions.getFlatSettings('myIndex')).resolves.toBeNull();
});
});
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
index 6d8afee1ff950..611ab3c92b72b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
@@ -9,7 +9,7 @@ import moment from 'moment';
import {
SavedObjectsFindResponse,
SavedObjectsClientContract,
- LegacyAPICaller,
+ ElasticsearchClient,
} from 'src/core/server';
import {
IndexGroup,
@@ -116,7 +116,7 @@ export interface ReindexActions {
export const reindexActionsFactory = (
client: SavedObjectsClientContract,
- callAsUser: LegacyAPICaller
+ esClient: ElasticsearchClient
): ReindexActions => {
// ----- Internal functions
const isLocked = (reindexOp: ReindexSavedObject) => {
@@ -236,9 +236,12 @@ export const reindexActionsFactory = (
},
async getFlatSettings(indexName: string) {
- const flatSettings = (await callAsUser('transport.request', {
- path: `/${encodeURIComponent(indexName)}?flat_settings=true`,
- })) as { [indexName: string]: FlatSettings };
+ const { body: flatSettings } = await esClient.indices.getSettings<{
+ [indexName: string]: FlatSettings;
+ }>({
+ index: indexName,
+ flat_settings: true,
+ });
if (!flatSettings[indexName]) {
return null;
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
index dea9974791a88..8a7033c1594da 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
@@ -5,8 +5,11 @@
*/
jest.mock('../es_indices_state_check', () => ({ esIndicesStateCheck: jest.fn() }));
import { BehaviorSubject } from 'rxjs';
+import { RequestEvent } from '@elastic/elasticsearch/lib/Transport';
import { Logger } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mocks';
import {
IndexGroup,
@@ -28,9 +31,14 @@ import {
reindexServiceFactory,
} from './reindex_service';
+const asApiResponse = (body: T): RequestEvent =>
+ ({
+ body,
+ } as RequestEvent);
+
describe('reindexService', () => {
let actions: jest.Mocked;
- let callCluster: jest.Mock;
+ let clusterClient: ScopedClusterClientMock;
let log: Logger;
let service: ReindexService;
let licensingPluginSetup: LicensingPluginSetup;
@@ -59,7 +67,7 @@ describe('reindexService', () => {
decrementIndexGroupReindexes: jest.fn(unimplemented('decrementIndexGroupReindexes')),
runWhileIndexGroupLocked: jest.fn(async (group: string, f: any) => f({ attributes: {} })),
};
- callCluster = jest.fn();
+ clusterClient = elasticsearchServiceMock.createScopedClusterClient();
log = loggingSystemMock.create().get();
licensingPluginSetup = licensingMock.createSetup();
licensingPluginSetup.license$ = new BehaviorSubject(
@@ -68,7 +76,12 @@ describe('reindexService', () => {
})
);
- service = reindexServiceFactory(callCluster as any, actions, log, licensingPluginSetup);
+ service = reindexServiceFactory(
+ clusterClient.asCurrentUser,
+ actions,
+ log,
+ licensingPluginSetup
+ );
});
describe('hasRequiredPrivileges', () => {
@@ -83,13 +96,13 @@ describe('reindexService', () => {
});
it('calls security API with basic requirements', async () => {
- callCluster.mockResolvedValueOnce({ has_all_requested: true });
+ clusterClient.asCurrentUser.security.hasPrivileges.mockResolvedValueOnce(
+ asApiResponse({ has_all_requested: true })
+ );
const hasRequired = await service.hasRequiredPrivileges('anIndex');
expect(hasRequired).toBe(true);
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_security/user/_has_privileges',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.security.hasPrivileges).toHaveBeenCalledWith({
body: {
cluster: ['manage'],
index: [
@@ -108,12 +121,12 @@ describe('reindexService', () => {
});
it('includes manage_ml for ML indices', async () => {
- callCluster.mockResolvedValueOnce({ has_all_requested: true });
+ clusterClient.asCurrentUser.security.hasPrivileges.mockResolvedValueOnce(
+ asApiResponse({ has_all_requested: true })
+ );
await service.hasRequiredPrivileges('.ml-anomalies');
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_security/user/_has_privileges',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.security.hasPrivileges).toHaveBeenCalledWith({
body: {
cluster: ['manage', 'manage_ml'],
index: [
@@ -132,15 +145,15 @@ describe('reindexService', () => {
});
it('includes checking for permissions on the baseName which could be an alias', async () => {
- callCluster.mockResolvedValueOnce({ has_all_requested: true });
+ clusterClient.asCurrentUser.security.hasPrivileges.mockResolvedValueOnce(
+ asApiResponse({ has_all_requested: true })
+ );
const hasRequired = await service.hasRequiredPrivileges(
`reindexed-v${PREV_MAJOR_VERSION}-anIndex`
);
expect(hasRequired).toBe(true);
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_security/user/_has_privileges',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.security.hasPrivileges).toHaveBeenCalledWith({
body: {
cluster: ['manage'],
index: [
@@ -163,12 +176,14 @@ describe('reindexService', () => {
});
it('includes manage_watcher for watcher indices', async () => {
- callCluster.mockResolvedValueOnce({ has_all_requested: true });
+ clusterClient.asCurrentUser.security.hasPrivileges.mockResolvedValueOnce(
+ asApiResponse({
+ has_all_requested: true,
+ })
+ );
await service.hasRequiredPrivileges('.watches');
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_security/user/_has_privileges',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.security.hasPrivileges).toHaveBeenCalledWith({
body: {
cluster: ['manage', 'manage_watcher'],
index: [
@@ -212,7 +227,7 @@ describe('reindexService', () => {
describe('createReindexOperation', () => {
it('creates new reindex operation', async () => {
- callCluster.mockResolvedValueOnce(true); // indices.exist
+ clusterClient.asCurrentUser.indices.exists.mockResolvedValueOnce(asApiResponse(true));
actions.findReindexOperations.mockResolvedValueOnce({ total: 0 });
actions.createReindexOp.mockResolvedValueOnce();
@@ -222,13 +237,13 @@ describe('reindexService', () => {
});
it('fails if index does not exist', async () => {
- callCluster.mockResolvedValueOnce(false); // indices.exist
+ clusterClient.asCurrentUser.indices.exists.mockResolvedValueOnce(asApiResponse(false));
await expect(service.createReindexOperation('myIndex')).rejects.toThrow();
expect(actions.createReindexOp).not.toHaveBeenCalled();
});
it('deletes existing operation if it failed', async () => {
- callCluster.mockResolvedValueOnce(true); // indices.exist
+ clusterClient.asCurrentUser.indices.exists.mockResolvedValueOnce(asApiResponse(true));
actions.findReindexOperations.mockResolvedValueOnce({
saved_objects: [{ id: 1, attributes: { status: ReindexStatus.failed } }],
total: 1,
@@ -244,7 +259,7 @@ describe('reindexService', () => {
});
it('deletes existing operation if it was cancelled', async () => {
- callCluster.mockResolvedValueOnce(true); // indices.exist
+ clusterClient.asCurrentUser.indices.exists.mockResolvedValueOnce(asApiResponse(true));
actions.findReindexOperations.mockResolvedValueOnce({
saved_objects: [{ id: 1, attributes: { status: ReindexStatus.cancelled } }],
total: 1,
@@ -260,7 +275,7 @@ describe('reindexService', () => {
});
it('fails if existing operation did not fail', async () => {
- callCluster.mockResolvedValueOnce(true); // indices.exist
+ clusterClient.asCurrentUser.indices.exists.mockResolvedValueOnce(asApiResponse(true));
actions.findReindexOperations.mockResolvedValueOnce({
saved_objects: [{ id: 1, attributes: { status: ReindexStatus.inProgress } }],
total: 1,
@@ -418,10 +433,11 @@ describe('reindexService', () => {
reindexTaskId: '999333',
},
} as any);
- callCluster.mockResolvedValueOnce(true);
+
+ clusterClient.asCurrentUser.tasks.cancel.mockResolvedValueOnce(asApiResponse(true));
await service.cancelReindexing('myIndex');
- expect(callCluster).toHaveBeenCalledWith('tasks.cancel', { taskId: '999333' });
+ expect(clusterClient.asCurrentUser.tasks.cancel).toHaveBeenCalledWith({ task_id: '999333' });
findSpy.mockRestore();
});
@@ -433,7 +449,11 @@ describe('reindexService', () => {
const findSpy = jest.spyOn(service, 'findReindexOperation').mockResolvedValueOnce(reindexOp);
await expect(service.cancelReindexing('myIndex')).rejects.toThrow();
- expect(callCluster).not.toHaveBeenCalledWith('tasks.cancel', { taskId: '999333' });
+ expect(clusterClient.asCurrentUser.tasks.cancel).not.toHaveBeenCalledWith(
+ asApiResponse({
+ taskId: '999333',
+ })
+ );
findSpy.mockRestore();
});
@@ -450,7 +470,11 @@ describe('reindexService', () => {
const findSpy = jest.spyOn(service, 'findReindexOperation').mockResolvedValueOnce(reindexOp);
await expect(service.cancelReindexing('myIndex')).rejects.toThrow();
- expect(callCluster).not.toHaveBeenCalledWith('tasks.cancel', { taskId: '999333' });
+ expect(clusterClient.asCurrentUser.tasks.cancel).not.toHaveBeenCalledWith(
+ asApiResponse({
+ taskId: '999333',
+ })
+ );
findSpy.mockRestore();
});
@@ -525,7 +549,7 @@ describe('reindexService', () => {
);
expect(actions.incrementIndexGroupReindexes).not.toHaveBeenCalled();
expect(actions.runWhileIndexGroupLocked).not.toHaveBeenCalled();
- expect(callCluster).not.toHaveBeenCalled();
+ expect(clusterClient.asCurrentUser.nodes.info).not.toHaveBeenCalled();
});
it('supports an already migrated ML index', async () => {
@@ -533,11 +557,12 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f()
);
- callCluster
- // Mock call to /_nodes for version check
- .mockResolvedValueOnce({ nodes: { nodeX: { version: '6.7.0-alpha' } } })
- // Mock call to /_ml/set_upgrade_mode?enabled=true
- .mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.nodes.info.mockResolvedValueOnce(
+ asApiResponse({ nodes: { nodeX: { version: '6.7.0-alpha' } } })
+ );
+ clusterClient.asCurrentUser.ml.setUpgradeMode.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const mlReindexedOp = {
id: '2',
@@ -550,9 +575,8 @@ describe('reindexService', () => {
);
expect(actions.incrementIndexGroupReindexes).toHaveBeenCalled();
expect(actions.runWhileIndexGroupLocked).toHaveBeenCalled();
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).toHaveBeenCalledWith({
+ enabled: true,
});
});
@@ -561,11 +585,13 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f()
);
- callCluster
- // Mock call to /_nodes for version check
- .mockResolvedValueOnce({ nodes: { nodeX: { version: '6.7.0-alpha' } } })
- // Mock call to /_ml/set_upgrade_mode?enabled=true
- .mockResolvedValueOnce({ acknowledged: true });
+
+ clusterClient.asCurrentUser.nodes.info.mockResolvedValueOnce(
+ asApiResponse({ nodes: { nodeX: { version: '6.7.0-alpha' } } })
+ );
+ clusterClient.asCurrentUser.ml.setUpgradeMode.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(mlReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
@@ -573,9 +599,8 @@ describe('reindexService', () => {
);
expect(actions.incrementIndexGroupReindexes).toHaveBeenCalled();
expect(actions.runWhileIndexGroupLocked).toHaveBeenCalled();
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).toHaveBeenCalledWith({
+ enabled: true,
});
});
@@ -587,9 +612,8 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalledWith({
+ enabled: true,
});
});
@@ -602,9 +626,8 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalledWith({
+ enabled: true,
});
});
@@ -613,11 +636,12 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f()
);
- callCluster
- // Mock call to /_nodes for version check
- .mockResolvedValueOnce({ nodes: { nodeX: { version: '6.7.0' } } })
- // Mock call to /_ml/set_upgrade_mode?enabled=true
- .mockResolvedValueOnce({ acknowledged: false });
+ clusterClient.asCurrentUser.nodes.info.mockResolvedValueOnce(
+ asApiResponse({ nodes: { nodeX: { version: '6.7.0' } } })
+ );
+ clusterClient.asCurrentUser.ml.setUpgradeMode.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(mlReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.created);
@@ -626,9 +650,8 @@ describe('reindexService', () => {
updatedOp.attributes.errorMessage!.includes('Could not stop ML jobs')
).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).toHaveBeenCalledWith({
+ enabled: true,
});
});
@@ -637,9 +660,9 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f()
);
- callCluster
- // Mock call to /_nodes for version check
- .mockResolvedValueOnce({ nodes: { nodeX: { version: '6.6.0' } } });
+ clusterClient.asCurrentUser.nodes.info.mockResolvedValueOnce(
+ asApiResponse({ nodes: { nodeX: { version: '6.6.0' } } })
+ );
const updatedOp = await service.processNextStep(mlReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.created);
@@ -649,9 +672,8 @@ describe('reindexService', () => {
).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
// Should not have called ML endpoint at all
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalledWith({
+ enabled: true,
});
});
});
@@ -669,7 +691,7 @@ describe('reindexService', () => {
);
expect(actions.incrementIndexGroupReindexes).not.toHaveBeenCalled();
expect(actions.runWhileIndexGroupLocked).not.toHaveBeenCalled();
- expect(callCluster).not.toHaveBeenCalled();
+ expect(clusterClient.asCurrentUser.watcher.stop).not.toHaveBeenCalled();
});
it('increments ML reindexes and calls watcher stop endpoint', async () => {
@@ -677,9 +699,9 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (type: string, f: any) =>
f()
);
- callCluster
- // Mock call to /_watcher/_stop
- .mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.watcher.stop.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(watcherReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
@@ -687,10 +709,7 @@ describe('reindexService', () => {
);
expect(actions.incrementIndexGroupReindexes).toHaveBeenCalledWith(IndexGroup.watcher);
expect(actions.runWhileIndexGroupLocked).toHaveBeenCalled();
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_stop',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.stop).toHaveBeenCalled();
});
it('fails if watcher reindexes cannot be incremented', async () => {
@@ -701,9 +720,8 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_stop',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.watcher.stop).not.toHaveBeenCalledWith({
+ enabled: true,
});
});
@@ -716,10 +734,7 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_stop',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.stop).not.toHaveBeenCalled();
});
it('fails if watcher endpoint fails', async () => {
@@ -727,9 +742,9 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (type: string, f: any) =>
f()
);
- callCluster
- // Mock call to /_watcher/_stop
- .mockResolvedValueOnce({ acknowledged: false });
+ clusterClient.asCurrentUser.watcher.stop.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(watcherReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.created);
@@ -738,10 +753,7 @@ describe('reindexService', () => {
updatedOp.attributes.errorMessage!.includes('Could not stop Watcher')
).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_stop',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.stop).toHaveBeenCalled();
});
});
});
@@ -756,17 +768,21 @@ describe('reindexService', () => {
} as ReindexSavedObject;
it('blocks writes and updates lastCompletedStep', async () => {
- callCluster.mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.indices.putSettings.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.readonly);
- expect(callCluster).toHaveBeenCalledWith('indices.putSettings', {
+ expect(clusterClient.asCurrentUser.indices.putSettings).toHaveBeenCalledWith({
index: 'myIndex',
body: { 'index.blocks.write': true },
});
});
it('fails if setting updates are not acknowledged', async () => {
- callCluster.mockResolvedValueOnce({ acknowledged: false });
+ clusterClient.asCurrentUser.indices.putSettings.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStopped
@@ -777,7 +793,7 @@ describe('reindexService', () => {
});
it('fails if setting updates fail', async () => {
- callCluster.mockRejectedValueOnce(new Error('blah!'));
+ clusterClient.asCurrentUser.indices.putSettings.mockRejectedValueOnce(new Error('blah!'));
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStopped
@@ -797,11 +813,12 @@ describe('reindexService', () => {
// The more intricate details of how the settings are chosen are test separately.
it('creates new index with settings and mappings and updates lastCompletedStep', async () => {
actions.getFlatSettings.mockResolvedValueOnce(settingsMappings);
- callCluster.mockResolvedValueOnce({ acknowledged: true }); // indices.create
-
+ clusterClient.asCurrentUser.indices.create.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.newIndexCreated);
- expect(callCluster).toHaveBeenCalledWith('indices.create', {
+ expect(clusterClient.asCurrentUser.indices.create).toHaveBeenCalledWith({
index: 'myIndex-reindex-0',
body: {
// index.blocks.write should be removed from the settings for the new index.
@@ -812,9 +829,13 @@ describe('reindexService', () => {
});
it('fails if create index is not acknowledged', async () => {
- callCluster
- .mockResolvedValueOnce({ myIndex: settingsMappings })
- .mockResolvedValueOnce({ acknowledged: false });
+ clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
+ asApiResponse({ myIndex: settingsMappings })
+ );
+
+ clusterClient.asCurrentUser.indices.create.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.readonly);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -823,10 +844,16 @@ describe('reindexService', () => {
});
it('fails if create index fails', async () => {
- callCluster
- .mockResolvedValueOnce({ myIndex: settingsMappings })
- .mockRejectedValueOnce(new Error(`blah!`))
- .mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.indices.getSettings.mockResolvedValueOnce(
+ asApiResponse({ myIndex: settingsMappings })
+ );
+
+ clusterClient.asCurrentUser.indices.create.mockRejectedValueOnce(new Error(`blah!`));
+
+ clusterClient.asCurrentUser.indices.putSettings.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
+
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.readonly);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -834,7 +861,7 @@ describe('reindexService', () => {
expect(log.error).toHaveBeenCalledWith(expect.any(String));
// Original index should have been set back to allow reads.
- expect(callCluster).toHaveBeenCalledWith('indices.putSettings', {
+ expect(clusterClient.asCurrentUser.indices.putSettings).toHaveBeenCalledWith({
index: 'myIndex',
body: { 'index.blocks.write': false },
});
@@ -858,14 +885,14 @@ describe('reindexService', () => {
});
it('starts reindex, saves taskId, and updates lastCompletedStep', async () => {
- callCluster.mockResolvedValueOnce({ task: 'xyz' }); // reindex
+ clusterClient.asCurrentUser.reindex.mockResolvedValueOnce(asApiResponse({ task: 'xyz' }));
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexStarted);
expect(updatedOp.attributes.reindexTaskId).toEqual('xyz');
expect(updatedOp.attributes.reindexTaskPercComplete).toEqual(0);
- expect(callCluster).toHaveBeenLastCalledWith('reindex', {
+ expect(clusterClient.asCurrentUser.reindex).toHaveBeenLastCalledWith({
refresh: true,
- waitForCompletion: false,
+ wait_for_completion: false,
body: {
source: { index: 'myIndex' },
dest: { index: 'myIndex-reindex-0' },
@@ -874,7 +901,7 @@ describe('reindexService', () => {
});
it('fails if starting reindex fails', async () => {
- callCluster.mockRejectedValueOnce(new Error('blah!')).mockResolvedValueOnce({});
+ clusterClient.asCurrentUser.reindex.mockRejectedValueOnce(new Error('blah!'));
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.newIndexCreated);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -895,10 +922,13 @@ describe('reindexService', () => {
describe('reindex task is not complete', () => {
it('updates reindexTaskPercComplete', async () => {
- callCluster.mockResolvedValueOnce({
- completed: false,
- task: { status: { created: 10, total: 100 } },
- });
+ clusterClient.asCurrentUser.tasks.get.mockResolvedValueOnce(
+ asApiResponse({
+ completed: false,
+ task: { status: { created: 10, total: 100 } },
+ })
+ );
+
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexStarted);
expect(updatedOp.attributes.reindexTaskPercComplete).toEqual(0.1); // 10 / 100 = 0.1
@@ -907,30 +937,47 @@ describe('reindexService', () => {
describe('reindex task is complete', () => {
it('deletes task, updates reindexTaskPercComplete, updates lastCompletedStep', async () => {
- callCluster
- .mockResolvedValueOnce({
+ clusterClient.asCurrentUser.tasks.get.mockResolvedValueOnce(
+ asApiResponse({
completed: true,
task: { status: { created: 100, total: 100 } },
})
- .mockResolvedValueOnce({ count: 100 })
- .mockResolvedValueOnce({ result: 'deleted' });
+ );
+
+ clusterClient.asCurrentUser.count.mockResolvedValueOnce(
+ asApiResponse({
+ count: 100,
+ })
+ );
+
+ clusterClient.asCurrentUser.delete.mockResolvedValueOnce(
+ asApiResponse({
+ result: 'deleted',
+ })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexCompleted);
expect(updatedOp.attributes.reindexTaskPercComplete).toEqual(1);
- expect(callCluster).toHaveBeenCalledWith('delete', {
+ expect(clusterClient.asCurrentUser.delete).toHaveBeenCalledWith({
index: '.tasks',
id: 'xyz',
});
});
it('fails if docs created is less than count in source index', async () => {
- callCluster
- .mockResolvedValueOnce({
+ clusterClient.asCurrentUser.tasks.get.mockResolvedValueOnce(
+ asApiResponse({
completed: true,
task: { status: { created: 95, total: 95 } },
})
- .mockReturnValueOnce({ count: 100 });
+ );
+
+ clusterClient.asCurrentUser.count.mockResolvedValueOnce(
+ asApiResponse({
+ count: 100,
+ })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexStarted);
@@ -941,18 +988,22 @@ describe('reindexService', () => {
});
describe('reindex task is cancelled', () => {
- it('deletes tsk, updates status to cancelled', async () => {
- callCluster
- .mockResolvedValueOnce({
+ it('deletes task, updates status to cancelled', async () => {
+ clusterClient.asCurrentUser.tasks.get.mockResolvedValueOnce(
+ asApiResponse({
completed: true,
task: { status: { created: 100, total: 100, canceled: 'by user request' } },
})
- .mockResolvedValue({ result: 'deleted' });
+ );
+
+ clusterClient.asCurrentUser.delete.mockResolvedValue(
+ asApiResponse({ result: 'deleted' })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexStarted);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.cancelled);
- expect(callCluster).toHaveBeenCalledWith('delete', {
+ expect(clusterClient.asCurrentUser.delete).toHaveBeenLastCalledWith({
index: '.tasks',
id: 'xyz',
});
@@ -971,12 +1022,16 @@ describe('reindexService', () => {
} as ReindexSavedObject;
it('switches aliases, sets as complete, and updates lastCompletedStep', async () => {
- callCluster
- .mockResolvedValueOnce({ myIndex: { aliases: {} } })
- .mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.indices.getAlias.mockResolvedValue(
+ asApiResponse({ myIndex: { aliases: {} } })
+ );
+
+ clusterClient.asCurrentUser.indices.updateAliases.mockResolvedValue(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.aliasCreated);
- expect(callCluster).toHaveBeenCalledWith('indices.updateAliases', {
+ expect(clusterClient.asCurrentUser.indices.updateAliases).toHaveBeenCalledWith({
body: {
actions: [
{ add: { index: 'myIndex-reindex-0', alias: 'myIndex' } },
@@ -987,8 +1042,8 @@ describe('reindexService', () => {
});
it('moves existing aliases over to new index', async () => {
- callCluster
- .mockResolvedValueOnce({
+ clusterClient.asCurrentUser.indices.getAlias.mockResolvedValue(
+ asApiResponse({
myIndex: {
aliases: {
myAlias: {},
@@ -996,10 +1051,15 @@ describe('reindexService', () => {
},
},
})
- .mockResolvedValueOnce({ acknowledged: true });
+ );
+
+ clusterClient.asCurrentUser.indices.updateAliases.mockResolvedValue(
+ asApiResponse({ acknowledged: true })
+ );
+
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.aliasCreated);
- expect(callCluster).toHaveBeenCalledWith('indices.updateAliases', {
+ expect(clusterClient.asCurrentUser.indices.updateAliases).toHaveBeenCalledWith({
body: {
actions: [
{ add: { index: 'myIndex-reindex-0', alias: 'myIndex' } },
@@ -1018,7 +1078,9 @@ describe('reindexService', () => {
});
it('fails if switching aliases is not acknowledged', async () => {
- callCluster.mockResolvedValueOnce({ acknowledged: false });
+ clusterClient.asCurrentUser.indices.updateAliases.mockResolvedValue(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexCompleted);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -1027,7 +1089,7 @@ describe('reindexService', () => {
});
it('fails if switching aliases fails', async () => {
- callCluster.mockRejectedValueOnce(new Error('blah!'));
+ clusterClient.asCurrentUser.indices.updateAliases.mockRejectedValueOnce(new Error('blah!'));
const updatedOp = await service.processNextStep(reindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.reindexCompleted);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -1053,7 +1115,7 @@ describe('reindexService', () => {
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStarted
);
- expect(callCluster).not.toHaveBeenCalled();
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalled();
});
it('decrements ML reindexes and calls ML start endpoint if no remaining ML jobs', async () => {
@@ -1061,17 +1123,17 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f({ attributes: { runningReindexCount: 0 } })
);
- // Mock call to /_ml/set_upgrade_mode?enabled=false
- callCluster.mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.ml.setUpgradeMode.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(mlReindexOp);
expect(actions.decrementIndexGroupReindexes).toHaveBeenCalledWith(IndexGroup.ml);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStarted
);
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=false',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).toHaveBeenCalledWith({
+ enabled: false,
});
});
@@ -1080,16 +1142,16 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f({ attributes: { runningReindexCount: 2 } })
);
- // Mock call to /_ml/set_upgrade_mode?enabled=false
- callCluster.mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.ml.setUpgradeMode.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(mlReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStarted
);
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=false',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalledWith({
+ enabled: false,
});
});
@@ -1102,9 +1164,8 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=false',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalledWith({
+ enabled: false,
});
});
@@ -1118,9 +1179,8 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=false',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).not.toHaveBeenCalledWith({
+ enabled: false,
});
});
@@ -1129,9 +1189,9 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f({ attributes: { runningReindexCount: 0 } })
);
- // Mock call to /_ml/set_upgrade_mode?enabled=true
- callCluster.mockResolvedValueOnce({ acknowledged: false });
-
+ clusterClient.asCurrentUser.ml.setUpgradeMode.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(mlReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.aliasCreated);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -1139,9 +1199,8 @@ describe('reindexService', () => {
updatedOp.attributes.errorMessage!.includes('Could not resume ML jobs')
).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=false',
- method: 'POST',
+ expect(clusterClient.asCurrentUser.ml.setUpgradeMode).toHaveBeenCalledWith({
+ enabled: false,
});
});
});
@@ -1157,7 +1216,7 @@ describe('reindexService', () => {
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStarted
);
- expect(callCluster).not.toHaveBeenCalled();
+ expect(clusterClient.asCurrentUser.watcher.start).not.toHaveBeenCalled();
});
it('decrements watcher reindexes and calls wathcer start endpoint if no remaining watcher reindexes', async () => {
@@ -1165,36 +1224,31 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f({ attributes: { runningReindexCount: 0 } })
);
- // Mock call to /_watcher/_start
- callCluster.mockResolvedValueOnce({ acknowledged: true });
+ clusterClient.asCurrentUser.watcher.start.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(watcherReindexOp);
expect(actions.decrementIndexGroupReindexes).toHaveBeenCalledWith(IndexGroup.watcher);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStarted
);
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_start',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.start).toHaveBeenCalled();
});
- it('does not call wathcer start endpoint if there are remaining wathcer reindexes', async () => {
+ it('does not call watcher start endpoint if there are remaining watcher reindexes', async () => {
actions.decrementIndexGroupReindexes.mockResolvedValue();
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f({ attributes: { runningReindexCount: 2 } })
);
- // Mock call to /_watcher/_start
- callCluster.mockResolvedValueOnce({ acknowledged: true });
-
+ clusterClient.asCurrentUser.watcher.start.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: true })
+ );
const updatedOp = await service.processNextStep(watcherReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(
ReindexStep.indexGroupServicesStarted
);
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_start',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.start).not.toHaveBeenCalledWith();
});
it('fails if watcher reindexes cannot be decremented', async () => {
@@ -1206,10 +1260,7 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_start',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.start).not.toHaveBeenCalledWith();
});
it('fails if watcher doc cannot be locked', async () => {
@@ -1222,10 +1273,7 @@ describe('reindexService', () => {
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
expect(updatedOp.attributes.errorMessage!.includes(`Can't lock!`)).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).not.toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_start',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.start).not.toHaveBeenCalledWith();
});
it('fails if watcher endpoint fails', async () => {
@@ -1233,9 +1281,10 @@ describe('reindexService', () => {
actions.runWhileIndexGroupLocked.mockImplementationOnce(async (group: string, f: any) =>
f({ attributes: { runningReindexCount: 0 } })
);
- // Mock call to /_watcher/_start
- callCluster.mockResolvedValueOnce({ acknowledged: false });
+ clusterClient.asCurrentUser.watcher.start.mockResolvedValueOnce(
+ asApiResponse({ acknowledged: false })
+ );
const updatedOp = await service.processNextStep(watcherReindexOp);
expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.aliasCreated);
expect(updatedOp.attributes.status).toEqual(ReindexStatus.failed);
@@ -1243,10 +1292,7 @@ describe('reindexService', () => {
updatedOp.attributes.errorMessage!.includes('Could not start Watcher')
).toBeTruthy();
expect(log.error).toHaveBeenCalledWith(expect.any(String));
- expect(callCluster).toHaveBeenCalledWith('transport.request', {
- path: '/_watcher/_start',
- method: 'POST',
- });
+ expect(clusterClient.asCurrentUser.watcher.start).toHaveBeenCalled();
});
});
});
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index e784f42867d57..f59dc66f40612 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { LegacyAPICaller, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from 'src/core/server';
import { first } from 'rxjs/operators';
import { LicensingPluginSetup } from '../../../../licensing/server';
@@ -127,7 +127,7 @@ export interface ReindexService {
}
export const reindexServiceFactory = (
- callAsUser: LegacyAPICaller,
+ esClient: ElasticsearchClient,
actions: ReindexActions,
log: Logger,
licensing: LicensingPluginSetup
@@ -144,12 +144,11 @@ export const reindexServiceFactory = (
await actions.runWhileIndexGroupLocked(IndexGroup.ml, async (mlDoc) => {
await validateNodesMinimumVersion(6, 7);
- const res = await callAsUser('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=true',
- method: 'POST',
+ const { body } = await esClient.ml.setUpgradeMode({
+ enabled: true,
});
- if (!res.acknowledged) {
+ if (!body.acknowledged) {
throw new Error(`Could not stop ML jobs`);
}
@@ -164,12 +163,11 @@ export const reindexServiceFactory = (
await actions.decrementIndexGroupReindexes(IndexGroup.ml);
await actions.runWhileIndexGroupLocked(IndexGroup.ml, async (mlDoc) => {
if (mlDoc.attributes.runningReindexCount === 0) {
- const res = await callAsUser('transport.request', {
- path: '/_ml/set_upgrade_mode?enabled=false',
- method: 'POST',
+ const { body } = await esClient.ml.setUpgradeMode({
+ enabled: false,
});
- if (!res.acknowledged) {
+ if (!body.acknowledged) {
throw new Error(`Could not resume ML jobs`);
}
}
@@ -184,12 +182,9 @@ export const reindexServiceFactory = (
const stopWatcher = async () => {
await actions.incrementIndexGroupReindexes(IndexGroup.watcher);
await actions.runWhileIndexGroupLocked(IndexGroup.watcher, async (watcherDoc) => {
- const { acknowledged } = await callAsUser('transport.request', {
- path: '/_watcher/_stop',
- method: 'POST',
- });
+ const { body } = await esClient.watcher.stop();
- if (!acknowledged) {
+ if (!body.acknowledged) {
throw new Error('Could not stop Watcher');
}
@@ -204,12 +199,9 @@ export const reindexServiceFactory = (
await actions.decrementIndexGroupReindexes(IndexGroup.watcher);
await actions.runWhileIndexGroupLocked(IndexGroup.watcher, async (watcherDoc) => {
if (watcherDoc.attributes.runningReindexCount === 0) {
- const { acknowledged } = await callAsUser('transport.request', {
- path: '/_watcher/_start',
- method: 'POST',
- });
+ const { body } = await esClient.watcher.start();
- if (!acknowledged) {
+ if (!body.acknowledged) {
throw new Error('Could not start Watcher');
}
}
@@ -221,14 +213,16 @@ export const reindexServiceFactory = (
const cleanupChanges = async (reindexOp: ReindexSavedObject) => {
// Cancel reindex task if it was started but not completed
if (reindexOp.attributes.lastCompletedStep === ReindexStep.reindexStarted) {
- await callAsUser('tasks.cancel', {
- taskId: reindexOp.attributes.reindexTaskId,
- }).catch((e) => undefined); // Ignore any exceptions trying to cancel (it may have already completed).
+ await esClient.tasks
+ .cancel({
+ task_id: reindexOp.attributes.reindexTaskId ?? undefined,
+ })
+ .catch((e) => undefined); // Ignore any exceptions trying to cancel (it may have already completed).
}
// Set index back to writable if we ever got past this point.
if (reindexOp.attributes.lastCompletedStep >= ReindexStep.readonly) {
- await callAsUser('indices.putSettings', {
+ await esClient.indices.putSettings({
index: reindexOp.attributes.indexName,
body: { 'index.blocks.write': false },
});
@@ -238,7 +232,9 @@ export const reindexServiceFactory = (
reindexOp.attributes.lastCompletedStep >= ReindexStep.newIndexCreated &&
reindexOp.attributes.lastCompletedStep < ReindexStep.aliasCreated
) {
- await callAsUser('indices.delete', { index: reindexOp.attributes.newIndexName });
+ await esClient.indices.delete({
+ index: reindexOp.attributes.newIndexName,
+ });
}
// Resume consumers if we ever got past this point.
@@ -252,10 +248,7 @@ export const reindexServiceFactory = (
// ------ Functions used to process the state machine
const validateNodesMinimumVersion = async (minMajor: number, minMinor: number) => {
- const nodesResponse = await callAsUser('transport.request', {
- path: '/_nodes',
- method: 'GET',
- });
+ const { body: nodesResponse } = await esClient.nodes.info();
const outDatedNodes = Object.values(nodesResponse.nodes).filter((node: any) => {
const matches = node.version.match(VERSION_REGEX);
@@ -293,7 +286,7 @@ export const reindexServiceFactory = (
*/
const setReadonly = async (reindexOp: ReindexSavedObject) => {
const { indexName } = reindexOp.attributes;
- const putReadonly = await callAsUser('indices.putSettings', {
+ const { body: putReadonly } = await esClient.indices.putSettings({
index: indexName,
body: { 'index.blocks.write': true },
});
@@ -319,7 +312,7 @@ export const reindexServiceFactory = (
const { settings, mappings } = transformFlatSettings(flatSettings);
- const createIndex = await callAsUser('indices.create', {
+ const { body: createIndex } = await esClient.indices.create({
index: newIndexName,
body: {
settings,
@@ -345,25 +338,25 @@ export const reindexServiceFactory = (
// Where possible, derive reindex options at the last moment before reindexing
// to prevent them from becoming stale as they wait in the queue.
- const indicesState = await esIndicesStateCheck(callAsUser, [indexName]);
+ const indicesState = await esIndicesStateCheck(esClient, [indexName]);
const shouldOpenAndClose = indicesState[indexName] === 'closed';
if (shouldOpenAndClose) {
log.debug(`Detected closed index ${indexName}, opening...`);
- await callAsUser('indices.open', { index: indexName });
+ await esClient.indices.open({ index: indexName });
}
- const startReindex = (await callAsUser('reindex', {
+ const { body: startReindexResponse } = await esClient.reindex({
refresh: true,
- waitForCompletion: false,
+ wait_for_completion: false,
body: {
source: { index: indexName },
dest: { index: reindexOp.attributes.newIndexName },
},
- })) as any;
+ });
return actions.updateReindexOp(reindexOp, {
lastCompletedStep: ReindexStep.reindexStarted,
- reindexTaskId: startReindex.task,
+ reindexTaskId: startReindexResponse.task,
reindexTaskPercComplete: 0,
reindexOptions: {
...(reindexOptions ?? {}),
@@ -379,12 +372,12 @@ export const reindexServiceFactory = (
* @param reindexOp
*/
const updateReindexStatus = async (reindexOp: ReindexSavedObject) => {
- const taskId = reindexOp.attributes.reindexTaskId;
+ const taskId = reindexOp.attributes.reindexTaskId!;
// Check reindexing task progress
- const taskResponse = await callAsUser('tasks.get', {
- taskId,
- waitForCompletion: false,
+ const { body: taskResponse } = await esClient.tasks.get({
+ task_id: taskId,
+ wait_for_completion: false,
});
if (!taskResponse.completed) {
@@ -403,7 +396,7 @@ export const reindexServiceFactory = (
reindexOp = await cleanupChanges(reindexOp);
} else {
// Check that it reindexed all documents
- const { count } = await callAsUser('count', { index: reindexOp.attributes.indexName });
+ const { body: count } = await esClient.count({ index: reindexOp.attributes.indexName });
if (taskResponse.task.status.created < count) {
// Include the entire task result in the error message. This should be guaranteed
@@ -419,7 +412,7 @@ export const reindexServiceFactory = (
}
// Delete the task from ES .tasks index
- const deleteTaskResp = await callAsUser('delete', {
+ const { body: deleteTaskResp } = await esClient.delete({
index: '.tasks',
id: taskId,
});
@@ -438,22 +431,22 @@ export const reindexServiceFactory = (
const switchAlias = async (reindexOp: ReindexSavedObject) => {
const { indexName, newIndexName, reindexOptions } = reindexOp.attributes;
- const existingAliases = (
- await callAsUser('indices.getAlias', {
- index: indexName,
- })
- )[indexName].aliases;
+ const { body: response } = await esClient.indices.getAlias({
+ index: indexName,
+ });
+
+ const existingAliases = response[indexName].aliases;
- const extraAlises = Object.keys(existingAliases).map((aliasName) => ({
+ const extraAliases = Object.keys(existingAliases).map((aliasName) => ({
add: { index: newIndexName, alias: aliasName, ...existingAliases[aliasName] },
}));
- const aliasResponse = await callAsUser('indices.updateAliases', {
+ const { body: aliasResponse } = await esClient.indices.updateAliases({
body: {
actions: [
{ add: { index: newIndexName, alias: indexName } },
{ remove_index: { index: indexName } },
- ...extraAlises,
+ ...extraAliases,
],
},
});
@@ -463,7 +456,7 @@ export const reindexServiceFactory = (
}
if (reindexOptions?.openAndClose === true) {
- await callAsUser('indices.close', { index: indexName });
+ await esClient.indices.close({ index: indexName });
}
return actions.updateReindexOp(reindexOp, {
@@ -540,9 +533,7 @@ export const reindexServiceFactory = (
body.cluster = [...body.cluster, 'manage_watcher'];
}
- const resp = await callAsUser('transport.request', {
- path: '/_security/user/_has_privileges',
- method: 'POST',
+ const { body: resp } = await esClient.security.hasPrivileges({
body,
});
@@ -567,7 +558,7 @@ export const reindexServiceFactory = (
},
async createReindexOperation(indexName: string, opts?: { enqueue: boolean }) {
- const indexExists = await callAsUser('indices.exists', { index: indexName });
+ const { body: indexExists } = await esClient.indices.exists({ index: indexName });
if (!indexExists) {
throw error.indexNotFound(`Index ${indexName} does not exist in this cluster.`);
}
@@ -752,8 +743,8 @@ export const reindexServiceFactory = (
);
}
- const resp = await callAsUser('tasks.cancel', {
- taskId: reindexOp.attributes.reindexTaskId,
+ const { body: resp } = await esClient.tasks.cancel({
+ task_id: reindexOp.attributes.reindexTaskId!,
});
if (resp.node_failures && resp.node_failures.length > 0) {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
index 756ce17b60199..1a30f98296c3a 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
@@ -3,12 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import {
- ILegacyClusterClient,
- Logger,
- SavedObjectsClientContract,
- FakeRequest,
-} from 'src/core/server';
+import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from 'src/core/server';
import moment from 'moment';
import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
import { Credential, CredentialStore } from './credential_store';
@@ -53,7 +48,7 @@ export class ReindexWorker {
constructor(
private client: SavedObjectsClientContract,
private credentialStore: CredentialStore,
- private clusterClient: ILegacyClusterClient,
+ private clusterClient: IClusterClient,
log: Logger,
private licensing: LicensingPluginSetup
) {
@@ -62,7 +57,7 @@ export class ReindexWorker {
throw new Error(`More than one ReindexWorker cannot be created.`);
}
- const callAsInternalUser = this.clusterClient.callAsInternalUser.bind(this.clusterClient);
+ const callAsInternalUser = this.clusterClient.asInternalUser;
this.reindexService = reindexServiceFactory(
callAsInternalUser,
@@ -151,7 +146,7 @@ export class ReindexWorker {
private getCredentialScopedReindexService = (credential: Credential) => {
const fakeRequest: FakeRequest = { headers: credential };
const scopedClusterClient = this.clusterClient.asScoped(fakeRequest);
- const callAsCurrentUser = scopedClusterClient.callAsCurrentUser.bind(scopedClusterClient);
+ const callAsCurrentUser = scopedClusterClient.asCurrentUser;
const actions = reindexActionsFactory(this.client, callAsCurrentUser);
return reindexServiceFactory(callAsCurrentUser, actions, this.log, this.licensing);
};
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
index e14056439ca6b..9b5223d07bfbf 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
@@ -5,7 +5,7 @@
*/
import { elasticsearchServiceMock } from 'src/core/server/mocks';
import { registerUpgradeAssistantUsageCollector } from './usage_collector';
-import { ILegacyClusterClient } from 'src/core/server';
+import { IClusterClient } from 'src/core/server';
/**
* Since these route callbacks are so thin, these serve simply as integration tests
@@ -18,15 +18,17 @@ describe('Upgrade Assistant Usage Collector', () => {
let dependencies: any;
let callClusterStub: any;
let usageCollection: any;
- let clusterClient: ILegacyClusterClient;
+ let clusterClient: IClusterClient;
beforeEach(() => {
- clusterClient = elasticsearchServiceMock.createLegacyClusterClient();
- (clusterClient.callAsInternalUser as jest.Mock).mockResolvedValue({
- persistent: {},
- transient: {
- logger: {
- deprecation: 'WARN',
+ clusterClient = elasticsearchServiceMock.createClusterClient();
+ (clusterClient.asInternalUser.cluster.getSettings as jest.Mock).mockResolvedValue({
+ body: {
+ persistent: {},
+ transient: {
+ logger: {
+ deprecation: 'WARN',
+ },
},
},
});
@@ -59,7 +61,7 @@ describe('Upgrade Assistant Usage Collector', () => {
}),
},
elasticsearch: {
- legacy: { client: clusterClient },
+ client: clusterClient,
},
};
});
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
index 276e639678fd8..1eafefb4238c2 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
@@ -6,7 +6,7 @@
import { get } from 'lodash';
import {
- LegacyAPICaller,
+ ElasticsearchClient,
ElasticsearchServiceStart,
ISavedObjectsRepository,
SavedObjectsServiceStart,
@@ -38,12 +38,10 @@ async function getSavedObjectAttributesFromRepo(
}
}
-async function getDeprecationLoggingStatusValue(
- callAsCurrentUser: LegacyAPICaller
-): Promise {
+async function getDeprecationLoggingStatusValue(esClient: ElasticsearchClient): Promise {
try {
- const loggerDeprecationCallResult = await callAsCurrentUser('cluster.getSettings', {
- includeDefaults: true,
+ const { body: loggerDeprecationCallResult } = await esClient.cluster.getSettings({
+ include_defaults: true,
});
return isDeprecationLoggingEnabled(loggerDeprecationCallResult);
@@ -53,7 +51,7 @@ async function getDeprecationLoggingStatusValue(
}
export async function fetchUpgradeAssistantMetrics(
- { legacy: { client: esClient } }: ElasticsearchServiceStart,
+ { client: esClient }: ElasticsearchServiceStart,
savedObjects: SavedObjectsServiceStart
): Promise {
const savedObjectsRepository = savedObjects.createInternalRepository();
@@ -62,8 +60,9 @@ export async function fetchUpgradeAssistantMetrics(
UPGRADE_ASSISTANT_TYPE,
UPGRADE_ASSISTANT_DOC_ID
);
- const callAsInternalUser = esClient.callAsInternalUser.bind(esClient);
- const deprecationLoggingStatusValue = await getDeprecationLoggingStatusValue(callAsInternalUser);
+ const deprecationLoggingStatusValue = await getDeprecationLoggingStatusValue(
+ esClient.asInternalUser
+ );
const getTelemetrySavedObject = (
upgradeAssistantTelemetrySavedObjectAttrs: UpgradeAssistantTelemetrySavedObjectAttributes | null
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
index 2df770c3ce45c..43fe8af18c392 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
@@ -12,9 +12,7 @@ import {
export const routeHandlerContextMock = ({
core: {
elasticsearch: {
- legacy: {
- client: elasticsearchServiceMock.createLegacyScopedClusterClient(),
- },
+ client: elasticsearchServiceMock.createScopedClusterClient(),
},
savedObjects: { client: savedObjectsClientMock.create() },
},
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.test.ts
index 16f8001f8e1de..630ee9157dc90 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.test.ts
@@ -80,7 +80,7 @@ describe('cluster checkup API', () => {
it('returns an 403 error if it throws forbidden', async () => {
const e: any = new Error(`you can't go here!`);
- e.status = 403;
+ e.statusCode = 403;
MigrationApis.getUpgradeAssistantStatus.mockRejectedValue(e);
const resp = await routeDependencies.router.getHandler({
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts b/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts
index ff673adaf1642..6eb0378b21baa 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/cluster_checkup.ts
@@ -23,9 +23,7 @@ export function registerClusterCheckupRoutes({ cloud, router, licensing, log }:
{
core: {
savedObjects: { client: savedObjectsClient },
- elasticsearch: {
- legacy: { client },
- },
+ elasticsearch: { client },
},
},
request,
@@ -34,10 +32,10 @@ export function registerClusterCheckupRoutes({ cloud, router, licensing, log }:
try {
const status = await getUpgradeAssistantStatus(client, isCloudEnabled);
- const callAsCurrentUser = client.callAsCurrentUser.bind(client);
- const reindexActions = reindexActionsFactory(savedObjectsClient, callAsCurrentUser);
+ const asCurrentUser = client.asCurrentUser;
+ const reindexActions = reindexActionsFactory(savedObjectsClient, asCurrentUser);
const reindexService = reindexServiceFactory(
- callAsCurrentUser,
+ asCurrentUser,
reindexActions,
log,
licensing
@@ -52,7 +50,7 @@ export function registerClusterCheckupRoutes({ cloud, router, licensing, log }:
body: status,
});
} catch (e) {
- if (e.status === 403) {
+ if (e.statusCode === 403) {
return response.forbidden(e.message);
}
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
index b8021eeef75e6..f76a86704e2c4 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
@@ -37,9 +37,9 @@ describe('deprecation logging API', () => {
describe('GET /api/upgrade_assistant/deprecation_logging', () => {
it('returns isEnabled', async () => {
- (routeHandlerContextMock.core.elasticsearch.legacy.client
- .callAsCurrentUser as jest.Mock).mockResolvedValue({
- default: { logger: { deprecation: 'WARN' } },
+ (routeHandlerContextMock.core.elasticsearch.client.asCurrentUser.cluster
+ .getSettings as jest.Mock).mockResolvedValue({
+ body: { default: { logger: { deprecation: 'WARN' } } },
});
const resp = await routeDependencies.router.getHandler({
method: 'get',
@@ -51,8 +51,8 @@ describe('deprecation logging API', () => {
});
it('returns an error if it throws', async () => {
- (routeHandlerContextMock.core.elasticsearch.legacy.client
- .callAsCurrentUser as jest.Mock).mockRejectedValue(new Error(`scary error!`));
+ (routeHandlerContextMock.core.elasticsearch.client.asCurrentUser.cluster
+ .getSettings as jest.Mock).mockRejectedValue(new Error(`scary error!`));
const resp = await routeDependencies.router.getHandler({
method: 'get',
pathPattern: '/api/upgrade_assistant/deprecation_logging',
@@ -64,21 +64,21 @@ describe('deprecation logging API', () => {
describe('PUT /api/upgrade_assistant/deprecation_logging', () => {
it('returns isEnabled', async () => {
- (routeHandlerContextMock.core.elasticsearch.legacy.client
- .callAsCurrentUser as jest.Mock).mockResolvedValue({
- default: { logger: { deprecation: 'ERROR' } },
+ (routeHandlerContextMock.core.elasticsearch.client.asCurrentUser.cluster
+ .putSettings as jest.Mock).mockResolvedValue({
+ body: { default: { logger: { deprecation: 'ERROR' } } },
});
const resp = await routeDependencies.router.getHandler({
- method: 'get',
+ method: 'put',
pathPattern: '/api/upgrade_assistant/deprecation_logging',
- })(routeHandlerContextMock, createRequestMock(), kibanaResponseFactory);
+ })(routeHandlerContextMock, { body: { isEnabled: true } }, kibanaResponseFactory);
expect(resp.payload).toEqual({ isEnabled: false });
});
it('returns an error if it throws', async () => {
- (routeHandlerContextMock.core.elasticsearch.legacy.client
- .callAsCurrentUser as jest.Mock).mockRejectedValue(new Error(`scary error!`));
+ (routeHandlerContextMock.core.elasticsearch.client.asCurrentUser.cluster
+ .putSettings as jest.Mock).mockRejectedValue(new Error(`scary error!`));
const resp = await routeDependencies.router.getHandler({
method: 'put',
pathPattern: '/api/upgrade_assistant/deprecation_logging',
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts
index 38f244a4e1154..4bdb1364b071a 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.ts
@@ -23,9 +23,7 @@ export function registerDeprecationLoggingRoutes({ router }: RouteDependencies)
async (
{
core: {
- elasticsearch: {
- legacy: { client },
- },
+ elasticsearch: { client },
},
},
request,
@@ -54,9 +52,7 @@ export function registerDeprecationLoggingRoutes({ router }: RouteDependencies)
async (
{
core: {
- elasticsearch: {
- legacy: { client },
- },
+ elasticsearch: { client },
},
},
request,
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
index fffde339c59e5..e33398fdcc93b 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { i18n } from '@kbn/i18n';
-import { ILegacyScopedClusterClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import { IScopedClusterClient, Logger, SavedObjectsClientContract } from 'kibana/server';
import { LicensingPluginSetup } from '../../../../licensing/server';
@@ -17,7 +17,7 @@ import { error } from '../../lib/reindexing/error';
interface ReindexHandlerArgs {
savedObjects: SavedObjectsClientContract;
- dataClient: ILegacyScopedClusterClient;
+ dataClient: IScopedClusterClient;
indexName: string;
log: Logger;
licensing: LicensingPluginSetup;
@@ -38,7 +38,7 @@ export const reindexHandler = async ({
savedObjects,
reindexOptions,
}: ReindexHandlerArgs): Promise => {
- const callAsCurrentUser = dataClient.callAsCurrentUser.bind(dataClient);
+ const callAsCurrentUser = dataClient.asCurrentUser;
const reindexActions = reindexActionsFactory(savedObjects, callAsCurrentUser);
const reindexService = reindexServiceFactory(callAsCurrentUser, reindexActions, log, licensing);
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
index c745def5e8936..52157f39743e8 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
@@ -51,7 +51,7 @@ export function createReindexWorker({
savedObjects,
licensing,
}: CreateReindexWorker) {
- const esClient = elasticsearchService.legacy.client;
+ const esClient = elasticsearchService.client;
return new ReindexWorker(savedObjects, credentialStore, esClient, logger, licensing);
}
@@ -100,9 +100,7 @@ export function registerReindexIndicesRoutes(
{
core: {
savedObjects: { client: savedObjectsClient },
- elasticsearch: {
- legacy: { client: esClient },
- },
+ elasticsearch: { client: esClient },
},
},
request,
@@ -142,9 +140,7 @@ export function registerReindexIndicesRoutes(
async (
{
core: {
- elasticsearch: {
- legacy: { client: esClient },
- },
+ elasticsearch: { client: esClient },
savedObjects,
},
},
@@ -152,7 +148,7 @@ export function registerReindexIndicesRoutes(
response
) => {
const { client } = savedObjects;
- const callAsCurrentUser = esClient.callAsCurrentUser.bind(esClient);
+ const callAsCurrentUser = esClient.asCurrentUser;
const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
try {
const inProgressOps = await reindexActions.findAllByStatus(ReindexStatus.inProgress);
@@ -184,9 +180,7 @@ export function registerReindexIndicesRoutes(
{
core: {
savedObjects: { client: savedObjectsClient },
- elasticsearch: {
- legacy: { client: esClient },
- },
+ elasticsearch: { client: esClient },
},
},
request,
@@ -245,9 +239,7 @@ export function registerReindexIndicesRoutes(
{
core: {
savedObjects,
- elasticsearch: {
- legacy: { client: esClient },
- },
+ elasticsearch: { client: esClient },
},
},
request,
@@ -255,14 +247,9 @@ export function registerReindexIndicesRoutes(
) => {
const { client } = savedObjects;
const { indexName } = request.params;
- const callAsCurrentUser = esClient.callAsCurrentUser.bind(esClient);
- const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
- const reindexService = reindexServiceFactory(
- callAsCurrentUser,
- reindexActions,
- log,
- licensing
- );
+ const asCurrentUser = esClient.asCurrentUser;
+ const reindexActions = reindexActionsFactory(client, asCurrentUser);
+ const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing);
try {
const hasRequiredPrivileges = await reindexService.hasRequiredPrivileges(indexName);
@@ -303,9 +290,7 @@ export function registerReindexIndicesRoutes(
{
core: {
savedObjects,
- elasticsearch: {
- legacy: { client: esClient },
- },
+ elasticsearch: { client: esClient },
},
},
request,
@@ -313,7 +298,7 @@ export function registerReindexIndicesRoutes(
) => {
const { indexName } = request.params;
const { client } = savedObjects;
- const callAsCurrentUser = esClient.callAsCurrentUser.bind(esClient);
+ const callAsCurrentUser = esClient.asCurrentUser;
const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
const reindexService = reindexServiceFactory(
callAsCurrentUser,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_network_events.test.ts b/x-pack/plugins/uptime/server/lib/requests/get_network_events.test.ts
index 2d590e80ca42d..e1c62f3469518 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_network_events.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_network_events.test.ts
@@ -5,9 +5,19 @@
*/
import { getUptimeESMockClient } from './helper';
-import { getNetworkEvents } from './get_network_events';
+import { getNetworkEvents, secondsToMillis } from './get_network_events';
describe('getNetworkEvents', () => {
+ describe('secondsToMillis conversion', () => {
+ it('returns -1 for -1 value', () => {
+ expect(secondsToMillis(-1)).toBe(-1);
+ });
+
+ it('returns a value of seconds as milliseconds', () => {
+ expect(secondsToMillis(10)).toBe(10_000);
+ });
+ });
+
let mockHits: any;
beforeEach(() => {
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts b/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
index ec1fffd62350d..6b1bca8f2d7b7 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
@@ -12,6 +12,10 @@ interface GetNetworkEventsParams {
stepIndex: string;
}
+export const secondsToMillis = (seconds: number) =>
+ // -1 is a special case where a value was unavailable
+ seconds === -1 ? -1 : seconds * 1000;
+
export const getNetworkEvents: UMElasticsearchQueryFn<
GetNetworkEventsParams,
{ events: NetworkEvent[]; total: number }
@@ -35,17 +39,15 @@ export const getNetworkEvents: UMElasticsearchQueryFn<
const { body: result } = await uptimeEsClient.search({ body: params });
- const microToMillis = (micro: number): number => (micro === -1 ? -1 : micro * 1000);
-
return {
total: result.hits.total.value,
events: result.hits.hits.map((event: any) => {
- const requestSentTime = microToMillis(event._source.synthetics.payload.request_sent_time);
- const loadEndTime = microToMillis(event._source.synthetics.payload.load_end_time);
+ const requestSentTime = secondsToMillis(event._source.synthetics.payload.request_sent_time);
+ const loadEndTime = secondsToMillis(event._source.synthetics.payload.load_end_time);
const requestStartTime =
event._source.synthetics.payload.response &&
event._source.synthetics.payload.response.timing
- ? microToMillis(event._source.synthetics.payload.response.timing.request_time)
+ ? secondsToMillis(event._source.synthetics.payload.response.timing.request_time)
: undefined;
return {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_entries.ts b/x-pack/test/api_integration/apis/metrics_ui/log_entries.ts
index 2d148f4c2c0f7..79d5e68344432 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_entries.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_entries.ts
@@ -13,10 +13,13 @@ import {
LOG_ENTRIES_PATH,
logEntriesRequestRT,
logEntriesResponseRT,
+} from '../../../../plugins/infra/common/http_api';
+
+import {
LogTimestampColumn,
LogFieldColumn,
LogMessageColumn,
-} from '../../../../plugins/infra/common/http_api';
+} from '../../../../plugins/infra/common/log_entry';
import { FtrProviderContext } from '../../ftr_provider_context';
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
index 23b0a96ecd401..b9cbc58bbd6f7 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
@@ -93,5 +93,30 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.metrics.length).to.equal(2);
});
});
+
+ it('should return multiple values for hostSystemOverview metric', () => {
+ const data = fetchNodeDetails({
+ sourceId: 'default',
+ metrics: ['hostSystemOverview'],
+ timerange: {
+ to: max,
+ from: min,
+ interval: '>=1m',
+ },
+ nodeId: 'demo-stack-mysql-01',
+ nodeType: 'host' as InfraNodeType,
+ });
+ return data.then((resp) => {
+ if (!resp) {
+ return;
+ }
+
+ const hostSystemOverviewMetric = resp.metrics.find(
+ (metric) => metric.id === 'hostSystemOverview'
+ );
+
+ expect(hostSystemOverviewMetric?.series.length).to.be.greaterThan(1);
+ });
+ });
});
}
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts
index daeb71ef12382..bdfbff61bc5db 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
import { reindexOperationWithLargeErrorMessage } from './reindex_operation_with_large_error_message';
export default function ({ getService }: FtrProviderContext) {
- const es = getService('legacyEs');
+ const es = getService('es');
describe('Reindex operation saved object', function () {
const dotKibanaIndex = '.kibana';
diff --git a/x-pack/test/apm_api_integration/basic/config.ts b/x-pack/test/apm_api_integration/basic/config.ts
index 03b8b21bf3232..f3e6ec29f3df2 100644
--- a/x-pack/test/apm_api_integration/basic/config.ts
+++ b/x-pack/test/apm_api_integration/basic/config.ts
@@ -4,10 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { createTestConfig } from '../common/config';
+import { configs } from '../configs';
-export default createTestConfig({
- license: 'basic',
- name: 'X-Pack APM API integration tests (basic)',
- testFiles: [require.resolve('./tests')],
-});
+export default configs.basic;
diff --git a/x-pack/test/apm_api_integration/basic/tests/alerts/chart_preview.ts b/x-pack/test/apm_api_integration/basic/tests/alerts/chart_preview.ts
deleted file mode 100644
index 46c0dbeb8940f..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/alerts/chart_preview.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { format } from 'url';
-import archives from '../../../common/fixtures/es_archiver/archives_metadata';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function ApiTest({ getService }: FtrProviderContext) {
- const esArchiver = getService('esArchiver');
- const supertest = getService('supertest');
- const archiveName = 'apm_8.0.0';
- const { end } = archives[archiveName];
- const start = new Date(Date.parse(end) - 600000).toISOString();
-
- describe('Alerting chart previews', () => {
- describe('GET /api/apm/alerts/chart_preview/transaction_error_rate', () => {
- const url = format({
- pathname: '/api/apm/alerts/chart_preview/transaction_error_rate',
- query: {
- start,
- end,
- transactionType: 'request',
- serviceName: 'opbeans-java',
- },
- });
-
- describe('when data is not loaded', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(url);
-
- expect(response.status).to.be(200);
- expect(response.body).to.eql([]);
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- it('returns the correct data', async () => {
- const response = await supertest.get(url);
-
- expect(response.status).to.be(200);
- expect(
- response.body.some((item: { x: number; y: number | null }) => item.x && item.y)
- ).to.equal(true);
- });
- });
- });
-
- describe('GET /api/apm/alerts/chart_preview/transaction_error_count', () => {
- const url = format({
- pathname: '/api/apm/alerts/chart_preview/transaction_error_count',
- query: {
- start,
- end,
- serviceName: 'opbeans-java',
- },
- });
-
- describe('when data is not loaded', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(url);
-
- expect(response.status).to.be(200);
- expect(response.body).to.eql([]);
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- it('returns the correct data', async () => {
- const response = await supertest.get(url);
-
- expect(response.status).to.be(200);
- expect(
- response.body.some((item: { x: number; y: number | null }) => item.x && item.y)
- ).to.equal(true);
- });
- });
- });
-
- describe('GET /api/apm/alerts/chart_preview/transaction_duration', () => {
- const url = format({
- pathname: '/api/apm/alerts/chart_preview/transaction_duration',
- query: {
- start,
- end,
- serviceName: 'opbeans-java',
- transactionType: 'request',
- },
- });
-
- describe('when data is not loaded', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(url);
-
- expect(response.status).to.be(200);
- expect(response.body).to.eql([]);
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- it('returns the correct data', async () => {
- const response = await supertest.get(url);
-
- expect(response.status).to.be(200);
- expect(
- response.body.some((item: { x: number; y: number | null }) => item.x && item.y)
- ).to.equal(true);
- });
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/index.ts b/x-pack/test/apm_api_integration/basic/tests/index.ts
deleted file mode 100644
index 4e66c6e6f76c3..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/index.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-
-export default function apmApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
- describe('APM specs (basic)', function () {
- this.tags('ciGroup1');
-
- loadTestFile(require.resolve('./feature_controls'));
-
- describe('Alerts', function () {
- loadTestFile(require.resolve('./alerts/chart_preview'));
- });
-
- describe('Service Maps', function () {
- loadTestFile(require.resolve('./service_maps/service_maps'));
- });
-
- describe('Services', function () {
- loadTestFile(require.resolve('./services/agent_name'));
- loadTestFile(require.resolve('./services/annotations'));
- loadTestFile(require.resolve('./services/throughput'));
- loadTestFile(require.resolve('./services/top_services'));
- loadTestFile(require.resolve('./services/transaction_types'));
- loadTestFile(require.resolve('./services/service_details'));
- loadTestFile(require.resolve('./services/service_icons'));
- });
-
- describe('Service overview', function () {
- loadTestFile(require.resolve('./service_overview/error_groups'));
- loadTestFile(require.resolve('./service_overview/dependencies'));
- loadTestFile(require.resolve('./service_overview/instances'));
- });
-
- describe('Settings', function () {
- loadTestFile(require.resolve('./settings/custom_link'));
- loadTestFile(require.resolve('./settings/agent_configuration'));
-
- describe('Anomaly detection', function () {
- loadTestFile(require.resolve('./settings/anomaly_detection/no_access_user'));
- loadTestFile(require.resolve('./settings/anomaly_detection/read_user'));
- loadTestFile(require.resolve('./settings/anomaly_detection/write_user'));
- });
- });
-
- describe('Traces', function () {
- loadTestFile(require.resolve('./traces/top_traces'));
- });
-
- describe('Transactions', function () {
- loadTestFile(require.resolve('./transactions/top_transaction_groups'));
- loadTestFile(require.resolve('./transactions/latency'));
- loadTestFile(require.resolve('./transactions/throughput'));
- loadTestFile(require.resolve('./transactions/error_rate'));
- loadTestFile(require.resolve('./transactions/breakdown'));
- loadTestFile(require.resolve('./transactions/distribution'));
- loadTestFile(require.resolve('./transactions/transactions_groups_overview'));
- });
-
- describe('Observability overview', function () {
- loadTestFile(require.resolve('./observability_overview/has_data'));
- loadTestFile(require.resolve('./observability_overview/observability_overview'));
- });
-
- describe('Metrics', function () {
- loadTestFile(require.resolve('./metrics_charts/metrics_charts'));
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/metrics_charts/metrics_charts.ts b/x-pack/test/apm_api_integration/basic/tests/metrics_charts/metrics_charts.ts
deleted file mode 100644
index d52aa2727d651..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/metrics_charts/metrics_charts.ts
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import expect from '@kbn/expect';
-import { first } from 'lodash';
-import { MetricsChartsByAgentAPIResponse } from '../../../../../plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent';
-import { GenericMetricsChart } from '../../../../../plugins/apm/server/lib/metrics/transform_metrics_chart';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-interface ChartResponse {
- body: MetricsChartsByAgentAPIResponse;
- status: number;
-}
-
-export default function ApiTest({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load('metrics_8.0.0'));
- after(() => esArchiver.unload('metrics_8.0.0'));
-
- describe('for opbeans-node', () => {
- const start = encodeURIComponent('2020-09-08T14:50:00.000Z');
- const end = encodeURIComponent('2020-09-08T14:55:00.000Z');
- const uiFilters = encodeURIComponent(JSON.stringify({}));
- const agentName = 'nodejs';
-
- describe('returns metrics data', () => {
- let chartsResponse: ChartResponse;
- before(async () => {
- chartsResponse = await supertest.get(
- `/api/apm/services/opbeans-node/metrics/charts?start=${start}&end=${end}&uiFilters=${uiFilters}&agentName=${agentName}`
- );
- });
- it('contains CPU usage and System memory usage chart data', async () => {
- expect(chartsResponse.status).to.be(200);
- expectSnapshot(chartsResponse.body.charts.map((chart) => chart.title)).toMatchInline(`
- Array [
- "CPU usage",
- "System memory usage",
- ]
- `);
- });
-
- describe('CPU usage', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(({ key }) => key === 'cpu_usage_chart');
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "System max",
- "System average",
- "Process max",
- "Process average",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0.714,
- 0.3877,
- 0.75,
- 0.2543,
- ]
- `);
- });
- });
-
- describe("System memory usage (using 'system.memory' fields to calculate the memory usage)", () => {
- let systemMemoryUsageChart: GenericMetricsChart | undefined;
- before(() => {
- systemMemoryUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'memory_usage_chart'
- );
- });
-
- it('has correct series', () => {
- expect(systemMemoryUsageChart).to.not.empty();
- expectSnapshot(systemMemoryUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "Max",
- "Average",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(systemMemoryUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0.722093920925555,
- 0.718173546796348,
- ]
- `);
- });
- });
- });
- });
-
- describe('for opbeans-java', () => {
- const uiFilters = encodeURIComponent(JSON.stringify({}));
- const agentName = 'java';
-
- describe('returns metrics data', () => {
- const start = encodeURIComponent('2020-09-08T14:55:30.000Z');
- const end = encodeURIComponent('2020-09-08T15:00:00.000Z');
-
- let chartsResponse: ChartResponse;
- before(async () => {
- chartsResponse = await supertest.get(
- `/api/apm/services/opbeans-java/metrics/charts?start=${start}&end=${end}&uiFilters=${uiFilters}&agentName=${agentName}`
- );
- });
-
- it('has correct chart data', async () => {
- expect(chartsResponse.status).to.be(200);
- expectSnapshot(chartsResponse.body.charts.map((chart) => chart.title)).toMatchInline(`
- Array [
- "CPU usage",
- "System memory usage",
- "Heap Memory",
- "Non-Heap Memory",
- "Thread Count",
- "Garbage collection per minute",
- "Garbage collection time spent per minute",
- ]
- `);
- });
-
- describe('CPU usage', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(({ key }) => key === 'cpu_usage_chart');
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "System max",
- "System average",
- "Process max",
- "Process average",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0.203,
- 0.178777777777778,
- 0.01,
- 0.009,
- ]
- `);
- });
-
- it('has the correct rate', async () => {
- const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
- expectSnapshot(yValues).toMatchInline(`
- Array [
- 0.193,
- 0.193,
- 0.009,
- 0.009,
- ]
- `);
- });
- });
-
- describe("System memory usage (using 'system.process.cgroup' fields to calculate the memory usage)", () => {
- let systemMemoryUsageChart: GenericMetricsChart | undefined;
- before(() => {
- systemMemoryUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'memory_usage_chart'
- );
- });
-
- it('has correct series', () => {
- expect(systemMemoryUsageChart).to.not.empty();
- expectSnapshot(systemMemoryUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "Max",
- "Average",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(systemMemoryUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0.707924703557837,
- 0.705395980841182,
- ]
- `);
- });
-
- it('has the correct rate', async () => {
- const yValues = systemMemoryUsageChart?.series.map((serie) => first(serie.data)?.y);
- expectSnapshot(yValues).toMatchInline(`
- Array [
- 0.707924703557837,
- 0.707924703557837,
- ]
- `);
- });
- });
-
- describe('Heap Memory', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'heap_memory_area_chart'
- );
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "Avg. used",
- "Avg. committed",
- "Avg. limit",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 222501617.777778,
- 374341632,
- 1560281088,
- ]
- `);
- });
-
- it('has the correct rate', async () => {
- const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
- expectSnapshot(yValues).toMatchInline(`
- Array [
- 211472896,
- 374341632,
- 1560281088,
- ]
- `);
- });
- });
-
- describe('Non-Heap Memory', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'non_heap_memory_area_chart'
- );
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "Avg. used",
- "Avg. committed",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 138573397.333333,
- 147677639.111111,
- ]
- `);
- });
-
- it('has the correct rate', async () => {
- const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
- expectSnapshot(yValues).toMatchInline(`
- Array [
- 138162752,
- 147386368,
- ]
- `);
- });
- });
-
- describe('Thread Count', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'thread_count_line_chart'
- );
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "Avg. count",
- "Max count",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 44.4444444444444,
- 45,
- ]
- `);
- });
-
- it('has the correct rate', async () => {
- const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
- expectSnapshot(yValues).toMatchInline(`
- Array [
- 44,
- 44,
- ]
- `);
- });
- });
-
- describe('Garbage collection per minute', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'gc_rate_line_chart'
- );
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "G1 Old Generation",
- "G1 Young Generation",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0,
- 15,
- ]
- `);
- });
- });
-
- describe('Garbage collection time spent per minute', () => {
- let cpuUsageChart: GenericMetricsChart | undefined;
- before(() => {
- cpuUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'gc_time_line_chart'
- );
- });
-
- it('has correct series', () => {
- expect(cpuUsageChart).to.not.empty();
- expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "G1 Old Generation",
- "G1 Young Generation",
- ]
- `);
- });
-
- it('has correct series overall values', () => {
- expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0,
- 187.5,
- ]
- `);
- });
- });
- });
-
- // 9223372036854771712 = memory limit for a c-group when no memory limit is specified
- it('calculates system memory usage using system total field when cgroup limit is equal to 9223372036854771712', async () => {
- const start = encodeURIComponent('2020-09-08T15:00:30.000Z');
- const end = encodeURIComponent('2020-09-08T15:05:00.000Z');
-
- const chartsResponse: ChartResponse = await supertest.get(
- `/api/apm/services/opbeans-java/metrics/charts?start=${start}&end=${end}&uiFilters=${uiFilters}&agentName=${agentName}`
- );
-
- const systemMemoryUsageChart = chartsResponse.body.charts.find(
- ({ key }) => key === 'memory_usage_chart'
- );
-
- expect(systemMemoryUsageChart).to.not.empty();
- expectSnapshot(systemMemoryUsageChart?.series.map(({ title }) => title)).toMatchInline(`
- Array [
- "Max",
- "Average",
- ]
- `);
- expectSnapshot(systemMemoryUsageChart?.series.map(({ overallValue }) => overallValue))
- .toMatchInline(`
- Array [
- 0.114523896426499,
- 0.114002376090415,
- ]
- `);
-
- const yValues = systemMemoryUsageChart?.series.map((serie) => first(serie.data)?.y);
- expectSnapshot(yValues).toMatchInline(`
- Array [
- 0.11383724014064,
- 0.11383724014064,
- ]
- `);
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/service_maps/service_maps.ts b/x-pack/test/apm_api_integration/basic/tests/service_maps/service_maps.ts
deleted file mode 100644
index f44b1561f2a5a..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/service_maps/service_maps.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function serviceMapsApiTests({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
-
- const archiveName = 'apm_8.0.0';
- const metadata = archives_metadata[archiveName];
-
- // url parameters
- const start = encodeURIComponent(metadata.start);
- const end = encodeURIComponent(metadata.end);
-
- describe('Service Maps', () => {
- it('is only be available to users with Platinum license (or higher)', async () => {
- const response = await supertest.get(`/api/apm/service-map?start=${start}&end=${end}`);
-
- expect(response.status).to.be(403);
-
- expectSnapshot(response.body.message).toMatchInline(
- `"In order to access Service Maps, you must be subscribed to an Elastic Platinum license. With it, you'll have the ability to visualize your entire application stack along with your APM data."`
- );
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/services/annotations.ts b/x-pack/test/apm_api_integration/basic/tests/services/annotations.ts
deleted file mode 100644
index 3136dcef2e985..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/services/annotations.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { JsonObject } from 'src/plugins/kibana_utils/common';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function annotationApiTests({ getService }: FtrProviderContext) {
- const supertestWrite = getService('supertestAsApmAnnotationsWriteUser');
-
- function request({ method, url, data }: { method: string; url: string; data?: JsonObject }) {
- switch (method.toLowerCase()) {
- case 'post':
- return supertestWrite.post(url).send(data).set('kbn-xsrf', 'foo');
-
- default:
- throw new Error(`Unsupported method ${method}`);
- }
- }
-
- describe('APM annotations with a basic license', () => {
- describe('when creating an annotation', () => {
- it('fails with a 403 forbidden', async () => {
- const response = await request({
- url: '/api/apm/services/opbeans-java/annotation',
- method: 'POST',
- data: {
- '@timestamp': new Date().toISOString(),
- message: 'New deployment',
- tags: ['foo'],
- service: {
- version: '1.1',
- environment: 'production',
- },
- },
- });
-
- expect(response.status).to.be(403);
- expect(response.body.message).to.be(
- 'Annotations require at least a gold license or a trial license.'
- );
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/services/throughput.ts b/x-pack/test/apm_api_integration/basic/tests/services/throughput.ts
deleted file mode 100644
index 07a1442d751b4..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/services/throughput.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import expect from '@kbn/expect';
-import qs from 'querystring';
-import { first, last } from 'lodash';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function ApiTest({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
-
- const archiveName = 'apm_8.0.0';
- const metadata = archives_metadata[archiveName];
-
- describe('Throughput', () => {
- describe('when data is not loaded', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-java/throughput?${qs.stringify({
- start: metadata.start,
- end: metadata.end,
- uiFilters: encodeURIComponent('{}'),
- transactionType: 'request',
- })}`
- );
- expect(response.status).to.be(200);
- expect(response.body.throughput.length).to.be(0);
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- describe('returns the service throughput', () => {
- let throughputResponse: {
- throughput: Array<{ x: number; y: number | null }>;
- };
- before(async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-java/throughput?${qs.stringify({
- start: metadata.start,
- end: metadata.end,
- uiFilters: encodeURIComponent('{}'),
- transactionType: 'request',
- })}`
- );
- throughputResponse = response.body;
- });
-
- it('returns some data', () => {
- expect(throughputResponse.throughput.length).to.be.greaterThan(0);
-
- const nonNullDataPoints = throughputResponse.throughput.filter(({ y }) => y !== null);
-
- expect(nonNullDataPoints.length).to.be.greaterThan(0);
- });
-
- it('has the correct start date', () => {
- expectSnapshot(
- new Date(first(throughputResponse.throughput)?.x ?? NaN).toISOString()
- ).toMatchInline(`"2020-12-08T13:57:30.000Z"`);
- });
-
- it('has the correct end date', () => {
- expectSnapshot(
- new Date(last(throughputResponse.throughput)?.x ?? NaN).toISOString()
- ).toMatchInline(`"2020-12-08T14:27:30.000Z"`);
- });
-
- it('has the correct number of buckets', () => {
- expectSnapshot(throughputResponse.throughput.length).toMatchInline(`61`);
- });
-
- it('has the correct throughput', () => {
- expectSnapshot(throughputResponse.throughput).toMatch();
- });
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/services/top_services.ts b/x-pack/test/apm_api_integration/basic/tests/services/top_services.ts
deleted file mode 100644
index 98bfe84cf56ee..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/services/top_services.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { isEmpty, pick, sortBy } from 'lodash';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/createCallApmApi';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-
-export default function ApiTest({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
-
- const archiveName = 'apm_8.0.0';
-
- const range = archives_metadata[archiveName];
-
- // url parameters
- const start = encodeURIComponent(range.start);
- const end = encodeURIComponent(range.end);
-
- const uiFilters = encodeURIComponent(JSON.stringify({}));
-
- describe('APM Services Overview', () => {
- describe('when data is not loaded ', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(
- `/api/apm/services?start=${start}&end=${end}&uiFilters=${uiFilters}`
- );
-
- expect(response.status).to.be(200);
- expect(response.body.hasHistoricalData).to.be(false);
- expect(response.body.hasLegacyData).to.be(false);
- expect(response.body.items.length).to.be(0);
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- describe('and fetching a list of services', () => {
- let response: {
- status: number;
- body: APIReturnType<'GET /api/apm/services'>;
- };
-
- let sortedItems: typeof response.body.items;
-
- before(async () => {
- response = await supertest.get(
- `/api/apm/services?start=${start}&end=${end}&uiFilters=${uiFilters}`
- );
- sortedItems = sortBy(response.body.items, 'serviceName');
- });
-
- it('the response is successful', () => {
- expect(response.status).to.eql(200);
- });
-
- it('returns hasHistoricalData: true', () => {
- expect(response.body.hasHistoricalData).to.be(true);
- });
-
- it('returns hasLegacyData: false', () => {
- expect(response.body.hasLegacyData).to.be(false);
- });
-
- it('returns the correct service names', () => {
- expectSnapshot(sortedItems.map((item) => item.serviceName)).toMatchInline(`
- Array [
- "kibana",
- "kibana-frontend",
- "opbeans-dotnet",
- "opbeans-go",
- "opbeans-java",
- "opbeans-node",
- "opbeans-python",
- "opbeans-ruby",
- "opbeans-rum",
- ]
- `);
- });
-
- it('returns the correct metrics averages', () => {
- expectSnapshot(
- sortedItems.map((item) =>
- pick(
- item,
- 'transactionErrorRate.value',
- 'avgResponseTime.value',
- 'transactionsPerMinute.value'
- )
- )
- ).toMatchInline(`
- Array [
- Object {
- "avgResponseTime": Object {
- "value": 420419.34550767,
- },
- "transactionErrorRate": Object {
- "value": 0,
- },
- "transactionsPerMinute": Object {
- "value": 45.6333333333333,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 2382833.33333333,
- },
- "transactionErrorRate": Object {
- "value": null,
- },
- "transactionsPerMinute": Object {
- "value": 0.2,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 631521.83908046,
- },
- "transactionErrorRate": Object {
- "value": 0.0229885057471264,
- },
- "transactionsPerMinute": Object {
- "value": 2.9,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 27946.1484375,
- },
- "transactionErrorRate": Object {
- "value": 0.015625,
- },
- "transactionsPerMinute": Object {
- "value": 4.26666666666667,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 237339.813333333,
- },
- "transactionErrorRate": Object {
- "value": 0.16,
- },
- "transactionsPerMinute": Object {
- "value": 2.5,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 24920.1052631579,
- },
- "transactionErrorRate": Object {
- "value": 0.0210526315789474,
- },
- "transactionsPerMinute": Object {
- "value": 3.16666666666667,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 29542.6607142857,
- },
- "transactionErrorRate": Object {
- "value": 0.0357142857142857,
- },
- "transactionsPerMinute": Object {
- "value": 1.86666666666667,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 70518.9328358209,
- },
- "transactionErrorRate": Object {
- "value": 0.0373134328358209,
- },
- "transactionsPerMinute": Object {
- "value": 4.46666666666667,
- },
- },
- Object {
- "avgResponseTime": Object {
- "value": 2319812.5,
- },
- "transactionErrorRate": Object {
- "value": null,
- },
- "transactionsPerMinute": Object {
- "value": 0.533333333333333,
- },
- },
- ]
- `);
- });
-
- it('returns environments', () => {
- expectSnapshot(sortedItems.map((item) => item.environments ?? [])).toMatchInline(`
- Array [
- Array [
- "production",
- ],
- Array [
- "production",
- ],
- Array [
- "production",
- ],
- Array [
- "testing",
- ],
- Array [
- "production",
- ],
- Array [
- "testing",
- ],
- Array [],
- Array [],
- Array [
- "testing",
- ],
- ]
- `);
- });
-
- it(`RUM services don't report any transaction error rates`, () => {
- // RUM transactions don't have event.outcome set,
- // so they should not have an error rate
-
- const rumServices = sortedItems.filter((item) => item.agentName === 'rum-js');
-
- expect(rumServices.length).to.be.greaterThan(0);
-
- expect(rumServices.every((item) => isEmpty(item.transactionErrorRate?.value)));
- });
-
- it('non-RUM services all report transaction error rates', () => {
- const nonRumServices = sortedItems.filter((item) => item.agentName !== 'rum-js');
-
- expect(
- nonRumServices.every((item) => {
- return (
- typeof item.transactionErrorRate?.value === 'number' &&
- item.transactionErrorRate.timeseries.length > 0
- );
- })
- ).to.be(true);
- });
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/settings/agent_configuration.ts b/x-pack/test/apm_api_integration/basic/tests/settings/agent_configuration.ts
deleted file mode 100644
index 1817c7c4511fa..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/settings/agent_configuration.ts
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { omit, orderBy } from 'lodash';
-import { AgentConfigurationIntake } from '../../../../../plugins/apm/common/agent_configuration/configuration_types';
-import { AgentConfigSearchParams } from '../../../../../plugins/apm/server/routes/settings/agent_configuration';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function agentConfigurationTests({ getService }: FtrProviderContext) {
- const supertestRead = getService('supertestAsApmReadUser');
- const supertestWrite = getService('supertestAsApmWriteUser');
- const log = getService('log');
- const esArchiver = getService('esArchiver');
-
- const archiveName = 'apm_8.0.0';
-
- function getServices() {
- return supertestRead
- .get(`/api/apm/settings/agent-configuration/services`)
- .set('kbn-xsrf', 'foo');
- }
-
- function getEnvironments(serviceName: string) {
- return supertestRead
- .get(`/api/apm/settings/agent-configuration/environments?serviceName=${serviceName}`)
- .set('kbn-xsrf', 'foo');
- }
-
- function getAgentName(serviceName: string) {
- return supertestRead
- .get(`/api/apm/settings/agent-configuration/agent_name?serviceName=${serviceName}`)
- .set('kbn-xsrf', 'foo');
- }
-
- function searchConfigurations(configuration: AgentConfigSearchParams) {
- return supertestRead
- .post(`/api/apm/settings/agent-configuration/search`)
- .send(configuration)
- .set('kbn-xsrf', 'foo');
- }
-
- function getAllConfigurations() {
- return supertestRead.get(`/api/apm/settings/agent-configuration`).set('kbn-xsrf', 'foo');
- }
-
- async function createConfiguration(config: AgentConfigurationIntake, { user = 'write' } = {}) {
- log.debug('creating configuration', config.service);
- const supertestClient = user === 'read' ? supertestRead : supertestWrite;
-
- const res = await supertestClient
- .put(`/api/apm/settings/agent-configuration`)
- .send(config)
- .set('kbn-xsrf', 'foo');
-
- throwOnError(res);
-
- return res;
- }
-
- async function updateConfiguration(config: AgentConfigurationIntake, { user = 'write' } = {}) {
- log.debug('updating configuration', config.service);
- const supertestClient = user === 'read' ? supertestRead : supertestWrite;
-
- const res = await supertestClient
- .put(`/api/apm/settings/agent-configuration?overwrite=true`)
- .send(config)
- .set('kbn-xsrf', 'foo');
-
- throwOnError(res);
-
- return res;
- }
-
- async function deleteConfiguration(
- { service }: AgentConfigurationIntake,
- { user = 'write' } = {}
- ) {
- log.debug('deleting configuration', service);
- const supertestClient = user === 'read' ? supertestRead : supertestWrite;
-
- const res = await supertestClient
- .delete(`/api/apm/settings/agent-configuration`)
- .send({ service })
- .set('kbn-xsrf', 'foo');
-
- throwOnError(res);
-
- return res;
- }
-
- function throwOnError(res: any) {
- const { statusCode, req, body } = res;
- if (statusCode !== 200) {
- const e = new Error(`
- Endpoint: ${req.method} ${req.path}
- Service: ${JSON.stringify(res.request._data.service)}
- Status code: ${statusCode}
- Response: ${body.message}`);
-
- // @ts-ignore
- e.res = res;
-
- throw e;
- }
- }
-
- describe('agent configuration', () => {
- describe('when no data is loaded', () => {
- it('handles the empty state for services', async () => {
- const { body } = await getServices();
- expect(body).to.eql(['ALL_OPTION_VALUE']);
- });
-
- it('handles the empty state for environments', async () => {
- const { body } = await getEnvironments('myservice');
- expect(body).to.eql([{ name: 'ALL_OPTION_VALUE', alreadyConfigured: false }]);
- });
-
- it('handles the empty state for agent names', async () => {
- const { body } = await getAgentName('myservice');
- expect(body).to.eql({});
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- it('returns all services', async () => {
- const { body } = await getServices();
- expectSnapshot(body).toMatchInline(`
- Array [
- "ALL_OPTION_VALUE",
- "kibana",
- "kibana-frontend",
- "opbeans-dotnet",
- "opbeans-go",
- "opbeans-java",
- "opbeans-node",
- "opbeans-python",
- "opbeans-ruby",
- "opbeans-rum",
- ]
- `);
- });
-
- it('returns the environments, all unconfigured', async () => {
- const { body } = await getEnvironments('opbeans-node');
-
- expect(body.map((item: { name: string }) => item.name)).to.contain('ALL_OPTION_VALUE');
-
- expect(
- body.every((item: { alreadyConfigured: boolean }) => item.alreadyConfigured === false)
- ).to.be(true);
-
- expectSnapshot(body).toMatchInline(`
- Array [
- Object {
- "alreadyConfigured": false,
- "name": "ALL_OPTION_VALUE",
- },
- Object {
- "alreadyConfigured": false,
- "name": "testing",
- },
- ]
- `);
- });
-
- it('returns the agent names', async () => {
- const { body } = await getAgentName('opbeans-node');
- expect(body).to.eql({ agentName: 'nodejs' });
- });
- });
-
- describe('as a read-only user', () => {
- const newConfig = { service: {}, settings: { transaction_sample_rate: '0.55' } };
- it('throws when attempting to create config', async () => {
- try {
- await createConfiguration(newConfig, { user: 'read' });
-
- // ensure that `createConfiguration` throws
- expect(true).to.be(false);
- } catch (e) {
- expect(e.res.statusCode).to.be(403);
- }
- });
-
- describe('when a configuration already exists', () => {
- before(async () => createConfiguration(newConfig));
- after(async () => deleteConfiguration(newConfig));
-
- it('throws when attempting to update config', async () => {
- try {
- await updateConfiguration(newConfig, { user: 'read' });
-
- // ensure that `updateConfiguration` throws
- expect(true).to.be(false);
- } catch (e) {
- expect(e.res.statusCode).to.be(403);
- }
- });
-
- it('throws when attempting to delete config', async () => {
- try {
- await deleteConfiguration(newConfig, { user: 'read' });
-
- // ensure that `deleteConfiguration` throws
- expect(true).to.be(false);
- } catch (e) {
- expect(e.res.statusCode).to.be(403);
- }
- });
- });
- });
-
- describe('when creating one configuration', () => {
- const newConfig = {
- service: {},
- settings: { transaction_sample_rate: '0.55' },
- };
-
- const searchParams = {
- service: { name: 'myservice', environment: 'development' },
- etag: '7312bdcc34999629a3d39df24ed9b2a7553c0c39',
- };
-
- it('can create and delete config', async () => {
- // assert that config does not exist
- const res1 = await searchConfigurations(searchParams);
- expect(res1.status).to.equal(404);
-
- // assert that config was created
- await createConfiguration(newConfig);
- const res2 = await searchConfigurations(searchParams);
- expect(res2.status).to.equal(200);
-
- // assert that config was deleted
- await deleteConfiguration(newConfig);
- const res3 = await searchConfigurations(searchParams);
- expect(res3.status).to.equal(404);
- });
-
- describe('when a configuration exists', () => {
- before(async () => createConfiguration(newConfig));
- after(async () => deleteConfiguration(newConfig));
-
- it('can find the config', async () => {
- const { status, body } = await searchConfigurations(searchParams);
- expect(status).to.equal(200);
- expect(body._source.service).to.eql({});
- expect(body._source.settings).to.eql({ transaction_sample_rate: '0.55' });
- });
-
- it('can list the config', async () => {
- const { status, body } = await getAllConfigurations();
- expect(status).to.equal(200);
- expect(omitTimestamp(body)).to.eql([
- {
- service: {},
- settings: { transaction_sample_rate: '0.55' },
- applied_by_agent: false,
- etag: 'eb88a8997666cc4b33745ef355a1bbd7c4782f2d',
- },
- ]);
- });
-
- it('can update the config', async () => {
- await updateConfiguration({ service: {}, settings: { transaction_sample_rate: '0.85' } });
- const { status, body } = await searchConfigurations(searchParams);
- expect(status).to.equal(200);
- expect(body._source.service).to.eql({});
- expect(body._source.settings).to.eql({ transaction_sample_rate: '0.85' });
- });
- });
- });
-
- describe('when creating multiple configurations', () => {
- const configs = [
- {
- service: {},
- settings: { transaction_sample_rate: '0.1' },
- },
- {
- service: { name: 'my_service' },
- settings: { transaction_sample_rate: '0.2' },
- },
- {
- service: { name: 'my_service', environment: 'development' },
- settings: { transaction_sample_rate: '0.3' },
- },
- {
- service: { environment: 'production' },
- settings: { transaction_sample_rate: '0.4' },
- },
- {
- service: { environment: 'development' },
- settings: { transaction_sample_rate: '0.5' },
- },
- ];
-
- before(async () => {
- await Promise.all(configs.map((config) => createConfiguration(config)));
- });
-
- after(async () => {
- await Promise.all(configs.map((config) => deleteConfiguration(config)));
- });
-
- const agentsRequests = [
- {
- service: { name: 'non_existing_service', environment: 'non_existing_env' },
- expectedSettings: { transaction_sample_rate: '0.1' },
- },
- {
- service: { name: 'my_service', environment: 'non_existing_env' },
- expectedSettings: { transaction_sample_rate: '0.2' },
- },
- {
- service: { name: 'my_service', environment: 'production' },
- expectedSettings: { transaction_sample_rate: '0.2' },
- },
- {
- service: { name: 'my_service', environment: 'development' },
- expectedSettings: { transaction_sample_rate: '0.3' },
- },
- {
- service: { name: 'non_existing_service', environment: 'production' },
- expectedSettings: { transaction_sample_rate: '0.4' },
- },
- {
- service: { name: 'non_existing_service', environment: 'development' },
- expectedSettings: { transaction_sample_rate: '0.5' },
- },
- ];
-
- it('can list all configs', async () => {
- const { status, body } = await getAllConfigurations();
- expect(status).to.equal(200);
- expect(orderBy(omitTimestamp(body), ['settings.transaction_sample_rate'])).to.eql([
- {
- service: {},
- settings: { transaction_sample_rate: '0.1' },
- applied_by_agent: false,
- etag: '0758cb18817de60cca29e07480d472694239c4c3',
- },
- {
- service: { name: 'my_service' },
- settings: { transaction_sample_rate: '0.2' },
- applied_by_agent: false,
- etag: 'e04737637056fdf1763bf0ef0d3fcb86e89ae5fc',
- },
- {
- service: { name: 'my_service', environment: 'development' },
- settings: { transaction_sample_rate: '0.3' },
- applied_by_agent: false,
- etag: 'af4dac62621b6762e6281481d1f7523af1124120',
- },
- {
- service: { environment: 'production' },
- settings: { transaction_sample_rate: '0.4' },
- applied_by_agent: false,
- etag: '8d1bf8e6b778b60af351117e2cf53fb1ee570068',
- },
- {
- service: { environment: 'development' },
- settings: { transaction_sample_rate: '0.5' },
- applied_by_agent: false,
- etag: '4ce40da57e3c71daca704121c784b911ec05ae81',
- },
- ]);
- });
-
- for (const agentRequest of agentsRequests) {
- it(`${agentRequest.service.name} / ${agentRequest.service.environment}`, async () => {
- const { status, body } = await searchConfigurations({
- service: agentRequest.service,
- etag: 'abc',
- });
-
- expect(status).to.equal(200);
- expect(body._source.settings).to.eql(agentRequest.expectedSettings);
- });
- }
- });
-
- describe('when an agent retrieves a configuration', () => {
- const config = {
- service: { name: 'myservice', environment: 'development' },
- settings: { transaction_sample_rate: '0.9' },
- };
- const configProduction = {
- service: { name: 'myservice', environment: 'production' },
- settings: { transaction_sample_rate: '0.9' },
- };
- let etag: string;
-
- before(async () => {
- log.debug('creating agent configuration');
- await createConfiguration(config);
- await createConfiguration(configProduction);
- });
-
- after(async () => {
- await deleteConfiguration(config);
- await deleteConfiguration(configProduction);
- });
-
- it(`should have 'applied_by_agent=false' before supplying etag`, async () => {
- const res1 = await searchConfigurations({
- service: { name: 'myservice', environment: 'development' },
- });
-
- etag = res1.body._source.etag;
-
- const res2 = await searchConfigurations({
- service: { name: 'myservice', environment: 'development' },
- etag,
- });
-
- expect(res1.body._source.applied_by_agent).to.be(false);
- expect(res2.body._source.applied_by_agent).to.be(false);
- });
-
- it(`should have 'applied_by_agent=true' after supplying etag`, async () => {
- await searchConfigurations({
- service: { name: 'myservice', environment: 'development' },
- etag,
- });
-
- async function hasBeenAppliedByAgent() {
- const { body } = await searchConfigurations({
- service: { name: 'myservice', environment: 'development' },
- });
-
- return body._source.applied_by_agent;
- }
-
- // wait until `applied_by_agent` has been updated in elasticsearch
- expect(await waitFor(hasBeenAppliedByAgent)).to.be(true);
- });
- it(`should have 'applied_by_agent=false' before marking as applied`, async () => {
- const res1 = await searchConfigurations({
- service: { name: 'myservice', environment: 'production' },
- });
-
- expect(res1.body._source.applied_by_agent).to.be(false);
- });
- it(`should have 'applied_by_agent=true' when 'mark_as_applied_by_agent' attribute is true`, async () => {
- await searchConfigurations({
- service: { name: 'myservice', environment: 'production' },
- mark_as_applied_by_agent: true,
- });
-
- async function hasBeenAppliedByAgent() {
- const { body } = await searchConfigurations({
- service: { name: 'myservice', environment: 'production' },
- });
-
- return body._source.applied_by_agent;
- }
-
- // wait until `applied_by_agent` has been updated in elasticsearch
- expect(await waitFor(hasBeenAppliedByAgent)).to.be(true);
- });
- });
- });
-}
-
-async function waitFor(cb: () => Promise, retries = 50): Promise {
- if (retries === 0) {
- throw new Error(`Maximum number of retries reached`);
- }
-
- const res = await cb();
- if (!res) {
- await new Promise((resolve) => setTimeout(resolve, 100));
- return waitFor(cb, retries - 1);
- }
- return res;
-}
-
-function omitTimestamp(configs: AgentConfigurationIntake[]) {
- return configs.map((config: AgentConfigurationIntake) => omit(config, '@timestamp'));
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/no_access_user.ts b/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/no_access_user.ts
deleted file mode 100644
index 5630bd195b6cd..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/no_access_user.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-export default function apiTest({ getService }: FtrProviderContext) {
- const noAccessUser = getService('supertestAsNoAccessUser');
-
- function getAnomalyDetectionJobs() {
- return noAccessUser.get(`/api/apm/settings/anomaly-detection/jobs`).set('kbn-xsrf', 'foo');
- }
-
- function createAnomalyDetectionJobs(environments: string[]) {
- return noAccessUser
- .post(`/api/apm/settings/anomaly-detection/jobs`)
- .send({ environments })
- .set('kbn-xsrf', 'foo');
- }
-
- describe('when user does not have read access to ML', () => {
- describe('when calling the endpoint for listing jobs', () => {
- it('returns an error because the user does not have access', async () => {
- const { body } = await getAnomalyDetectionJobs();
-
- expect(body.statusCode).to.be(403);
- expect(body.error).to.be('Forbidden');
- });
- });
-
- describe('when calling create endpoint', () => {
- it('returns an error because the user does not have access', async () => {
- const { body } = await createAnomalyDetectionJobs(['production', 'staging']);
-
- expect(body.statusCode).to.be(403);
- expect(body.error).to.be('Forbidden');
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/read_user.ts b/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/read_user.ts
deleted file mode 100644
index 30e097e791eaa..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/read_user.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-export default function apiTest({ getService }: FtrProviderContext) {
- const apmReadUser = getService('supertestAsApmReadUser');
-
- function getAnomalyDetectionJobs() {
- return apmReadUser.get(`/api/apm/settings/anomaly-detection/jobs`).set('kbn-xsrf', 'foo');
- }
-
- function createAnomalyDetectionJobs(environments: string[]) {
- return apmReadUser
- .post(`/api/apm/settings/anomaly-detection/jobs`)
- .send({ environments })
- .set('kbn-xsrf', 'foo');
- }
-
- describe('when user has read access to ML', () => {
- describe('when calling the endpoint for listing jobs', () => {
- it('returns an error because the user is on basic license', async () => {
- const { body } = await getAnomalyDetectionJobs();
-
- expect(body.statusCode).to.be(403);
- expect(body.error).to.be('Forbidden');
-
- expectSnapshot(body.message).toMatchInline(
- `"To use anomaly detection, you must be subscribed to an Elastic Platinum license. With it, you'll be able to monitor your services with the aid of machine learning."`
- );
- });
- });
-
- describe('when calling create endpoint', () => {
- it('returns an error because the user does not have access', async () => {
- const { body } = await createAnomalyDetectionJobs(['production', 'staging']);
- expect(body.statusCode).to.be(403);
- expect(body.error).to.be('Forbidden');
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/write_user.ts b/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/write_user.ts
deleted file mode 100644
index 15659229a1917..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/settings/anomaly_detection/write_user.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-export default function apiTest({ getService }: FtrProviderContext) {
- const apmWriteUser = getService('supertestAsApmWriteUser');
-
- function getAnomalyDetectionJobs() {
- return apmWriteUser.get(`/api/apm/settings/anomaly-detection/jobs`).set('kbn-xsrf', 'foo');
- }
-
- function createAnomalyDetectionJobs(environments: string[]) {
- return apmWriteUser
- .post(`/api/apm/settings/anomaly-detection/jobs`)
- .send({ environments })
- .set('kbn-xsrf', 'foo');
- }
-
- describe('when user has write access to ML', () => {
- describe('when calling the endpoint for listing jobs', () => {
- it('returns an error because the user is on basic license', async () => {
- const { body } = await getAnomalyDetectionJobs();
-
- expect(body.statusCode).to.be(403);
- expect(body.error).to.be('Forbidden');
- expectSnapshot(body.message).toMatchInline(
- `"To use anomaly detection, you must be subscribed to an Elastic Platinum license. With it, you'll be able to monitor your services with the aid of machine learning."`
- );
- });
- });
-
- describe('when calling create endpoint', () => {
- it('returns an error because the user is on basic license', async () => {
- const { body } = await createAnomalyDetectionJobs(['production', 'staging']);
-
- expect(body.statusCode).to.be(403);
- expect(body.error).to.be('Forbidden');
-
- expectSnapshot(body.message).toMatchInline(
- `"To use anomaly detection, you must be subscribed to an Elastic Platinum license. With it, you'll be able to monitor your services with the aid of machine learning."`
- );
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/settings/custom_link.ts b/x-pack/test/apm_api_integration/basic/tests/settings/custom_link.ts
deleted file mode 100644
index 8ac5566fc2c49..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/settings/custom_link.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import expect from '@kbn/expect';
-import { CustomLink } from '../../../../../plugins/apm/common/custom_link/custom_link_types';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function customLinksTests({ getService }: FtrProviderContext) {
- const supertestWrite = getService('supertestAsApmWriteUser');
-
- describe('custom links', () => {
- it('is only be available to users with Gold license (or higher)', async () => {
- const customLink = {
- url: 'https://elastic.co',
- label: 'with filters',
- filters: [
- { key: 'service.name', value: 'baz' },
- { key: 'transaction.type', value: 'qux' },
- ],
- } as CustomLink;
- const response = await supertestWrite
- .post(`/api/apm/settings/custom_links`)
- .send(customLink)
- .set('kbn-xsrf', 'foo');
-
- expect(response.status).to.be(403);
-
- expectSnapshot(response.body.message).toMatchInline(
- `"To create custom links, you must be subscribed to an Elastic Gold license or above. With it, you'll have the ability to create custom links to improve your workflow when analyzing your services."`
- );
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/transactions/breakdown.ts b/x-pack/test/apm_api_integration/basic/tests/transactions/breakdown.ts
deleted file mode 100644
index 947defca05d94..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/transactions/breakdown.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import expect from '@kbn/expect';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-export default function ApiTest({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
-
- const archiveName = 'apm_8.0.0';
- const metadata = archives_metadata[archiveName];
-
- const start = encodeURIComponent(metadata.start);
- const end = encodeURIComponent(metadata.end);
- const transactionType = 'request';
- const transactionName = 'GET /api';
- const uiFilters = encodeURIComponent(JSON.stringify({}));
-
- describe('Breakdown', () => {
- describe('when data is not loaded', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transaction/charts/breakdown?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=${transactionType}`
- );
- expect(response.status).to.be(200);
- expect(response.body).to.eql({ timeseries: [] });
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- it('returns the transaction breakdown for a service', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transaction/charts/breakdown?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=${transactionType}`
- );
-
- expect(response.status).to.be(200);
- expectSnapshot(response.body).toMatch();
- });
- it('returns the transaction breakdown for a transaction group', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transaction/charts/breakdown?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=${transactionType}&transactionName=${transactionName}`
- );
-
- expect(response.status).to.be(200);
-
- const { timeseries } = response.body;
-
- const numberOfSeries = timeseries.length;
-
- expectSnapshot(numberOfSeries).toMatchInline(`1`);
-
- const { title, color, type, data, hideLegend, legendValue } = timeseries[0];
-
- const nonNullDataPoints = data.filter((y: number | null) => y !== null);
-
- expectSnapshot(nonNullDataPoints.length).toMatchInline(`61`);
-
- expectSnapshot(
- data.slice(0, 5).map(({ x, y }: { x: number; y: number | null }) => {
- return {
- x: new Date(x ?? NaN).toISOString(),
- y,
- };
- })
- ).toMatchInline(`
- Array [
- Object {
- "x": "2020-12-08T13:57:30.000Z",
- "y": null,
- },
- Object {
- "x": "2020-12-08T13:58:00.000Z",
- "y": null,
- },
- Object {
- "x": "2020-12-08T13:58:30.000Z",
- "y": 1,
- },
- Object {
- "x": "2020-12-08T13:59:00.000Z",
- "y": 1,
- },
- Object {
- "x": "2020-12-08T13:59:30.000Z",
- "y": null,
- },
- ]
- `);
-
- expectSnapshot(title).toMatchInline(`"app"`);
- expectSnapshot(color).toMatchInline(`"#54b399"`);
- expectSnapshot(type).toMatchInline(`"areaStacked"`);
- expectSnapshot(hideLegend).toMatchInline(`false`);
- expectSnapshot(legendValue).toMatchInline(`"100%"`);
-
- expectSnapshot(data).toMatch();
- });
- it('returns the transaction breakdown sorted by name', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transaction/charts/breakdown?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=${transactionType}`
- );
-
- expect(response.status).to.be(200);
- expectSnapshot(response.body.timeseries.map((serie: { title: string }) => serie.title))
- .toMatchInline(`
- Array [
- "app",
- "http",
- "postgresql",
- "redis",
- ]
- `);
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/basic/tests/transactions/latency.ts b/x-pack/test/apm_api_integration/basic/tests/transactions/latency.ts
deleted file mode 100644
index 3088f4fd481d7..0000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/transactions/latency.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import expect from '@kbn/expect';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-import { PromiseReturnType } from '../../../../../plugins/observability/typings/common';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-export default function ApiTest({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
-
- const archiveName = 'apm_8.0.0';
- const metadata = archives_metadata[archiveName];
-
- // url parameters
- const start = encodeURIComponent(metadata.start);
- const end = encodeURIComponent(metadata.end);
- const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'testing' }));
-
- describe('Latency', () => {
- describe('when data is not loaded ', () => {
- it('returns 400 when latencyAggregationType is not informed', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transactions/charts/latency?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=request`
- );
-
- expect(response.status).to.be(400);
- });
-
- it('returns 400 when transactionType is not informed', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transactions/charts/latency?start=${start}&end=${end}&uiFilters=${uiFilters}&latencyAggregationType=avg`
- );
-
- expect(response.status).to.be(400);
- });
-
- it('handles the empty state', async () => {
- const response = await supertest.get(
- `/api/apm/services/opbeans-node/transactions/charts/latency?start=${start}&end=${end}&uiFilters=${uiFilters}&latencyAggregationType=avg&transactionType=request`
- );
-
- expect(response.status).to.be(200);
-
- expect(response.body.overallAvgDuration).to.be(null);
- expect(response.body.latencyTimeseries.length).to.be(0);
- });
- });
-
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
- let response: PromiseReturnType;
-
- describe('average latency type', () => {
- before(async () => {
- response = await supertest.get(
- `/api/apm/services/opbeans-node/transactions/charts/latency?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=request&latencyAggregationType=avg`
- );
- });
-
- it('returns average duration and timeseries', async () => {
- expect(response.status).to.be(200);
- expect(response.body.overallAvgDuration).not.to.be(null);
- expect(response.body.latencyTimeseries.length).to.be.eql(61);
- });
- });
-
- describe('95th percentile latency type', () => {
- before(async () => {
- response = await supertest.get(
- `/api/apm/services/opbeans-node/transactions/charts/latency?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=request&latencyAggregationType=p95`
- );
- });
-
- it('returns average duration and timeseries', async () => {
- expect(response.status).to.be(200);
- expect(response.body.overallAvgDuration).not.to.be(null);
- expect(response.body.latencyTimeseries.length).to.be.eql(61);
- });
- });
-
- describe('99th percentile latency type', () => {
- before(async () => {
- response = await supertest.get(
- `/api/apm/services/opbeans-node/transactions/charts/latency?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=request&latencyAggregationType=p99`
- );
- });
-
- it('returns average duration and timeseries', async () => {
- expect(response.status).to.be(200);
- expect(response.body.overallAvgDuration).not.to.be(null);
- expect(response.body.latencyTimeseries.length).to.be.eql(61);
- });
- });
- });
- });
-}
diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
index f94bd6bd3be6f..08333de15ec6d 100644
--- a/x-pack/test/apm_api_integration/common/config.ts
+++ b/x-pack/test/apm_api_integration/common/config.ts
@@ -11,11 +11,12 @@ import path from 'path';
import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
import { PromiseReturnType } from '../../../plugins/observability/typings/common';
import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
+import { APMFtrConfigName } from '../configs';
+import { registry } from './registry';
-interface Settings {
+interface Config {
+ name: APMFtrConfigName;
license: 'basic' | 'trial';
- testFiles: string[];
- name: string;
}
const supertestAsApmUser = (kibanaServer: UrlObject, apmUser: ApmUser) => async (
@@ -34,8 +35,8 @@ const supertestAsApmUser = (kibanaServer: UrlObject, apmUser: ApmUser) => async
return supertestAsPromised(url);
};
-export function createTestConfig(settings: Settings) {
- const { testFiles, license, name } = settings;
+export function createTestConfig(config: Config) {
+ const { license, name } = config;
return async ({ readConfigFile }: FtrConfigProviderContext) => {
const xPackAPITestsConfig = await readConfigFile(
@@ -47,8 +48,10 @@ export function createTestConfig(settings: Settings) {
const supertestAsApmReadUser = supertestAsApmUser(servers.kibana, ApmUser.apmReadUser);
+ registry.init(config.name);
+
return {
- testFiles,
+ testFiles: [require.resolve('../tests')],
servers,
esArchiver: {
directory: path.resolve(__dirname, './fixtures/es_archiver'),
@@ -69,7 +72,7 @@ export function createTestConfig(settings: Settings) {
),
},
junit: {
- reportName: name,
+ reportName: `APM API Integration tests (${name})`,
},
esTestCluster: {
...xPackAPITestsConfig.get('esTestCluster'),
diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts
new file mode 100644
index 0000000000000..8c918eae5a5a8
--- /dev/null
+++ b/x-pack/test/apm_api_integration/common/registry.ts
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { castArray, groupBy } from 'lodash';
+import callsites from 'callsites';
+import { maybe } from '../../../plugins/apm/common/utils/maybe';
+import { joinByKey } from '../../../plugins/apm/common/utils/join_by_key';
+import { APMFtrConfigName } from '../configs';
+import { FtrProviderContext } from './ftr_provider_context';
+
+type ArchiveName =
+ | 'apm_8.0.0'
+ | '8.0.0'
+ | 'metrics_8.0.0'
+ | 'ml_8.0.0'
+ | 'observability_overview'
+ | 'rum_8.0.0'
+ | 'rum_test_data';
+
+interface RunCondition {
+ config: APMFtrConfigName;
+ archives: ArchiveName[];
+}
+
+const callbacks: Array<
+ RunCondition & {
+ runs: Array<{
+ cb: () => void;
+ }>;
+ }
+> = [];
+
+let configName: APMFtrConfigName | undefined;
+
+let running: boolean = false;
+
+export const registry = {
+ init: (config: APMFtrConfigName) => {
+ configName = config;
+ callbacks.length = 0;
+ running = false;
+ },
+ when: (
+ title: string,
+ conditions: RunCondition | RunCondition[],
+ callback: (condition: RunCondition) => void
+ ) => {
+ const allConditions = castArray(conditions);
+
+ if (!allConditions.length) {
+ throw new Error('At least one condition should be defined');
+ }
+
+ if (running) {
+ throw new Error("Can't add tests when running");
+ }
+
+ const frame = maybe(callsites()[1]);
+
+ const file = frame?.getFileName();
+
+ if (!file) {
+ throw new Error('Could not infer file for suite');
+ }
+
+ allConditions.forEach((matchedCondition) => {
+ callbacks.push({
+ ...matchedCondition,
+ runs: [
+ {
+ cb: () => {
+ const suite = describe(title, () => {
+ callback(matchedCondition);
+ });
+
+ suite.file = file;
+ suite.eachTest((test) => {
+ test.file = file;
+ });
+ },
+ },
+ ],
+ });
+ });
+ },
+ run: (context: FtrProviderContext) => {
+ if (!configName) {
+ throw new Error(`registry was not init() before running`);
+ }
+ running = true;
+ const esArchiver = context.getService('esArchiver');
+ const logger = context.getService('log');
+ const logWithTimer = () => {
+ const start = process.hrtime();
+
+ return (message: string) => {
+ const diff = process.hrtime(start);
+ const time = `${Math.round(diff[0] * 1000 + diff[1] / 1e6)}ms`;
+ logger.info(`(${time}) ${message}`);
+ };
+ };
+
+ const groups = joinByKey(callbacks, ['config', 'archives'], (a, b) => ({
+ ...a,
+ ...b,
+ runs: a.runs.concat(b.runs),
+ }));
+
+ callbacks.length = 0;
+
+ const byConfig = groupBy(groups, 'config');
+
+ Object.keys(byConfig).forEach((config) => {
+ const groupsForConfig = byConfig[config];
+ // register suites for other configs, but skip them so tests are marked as such
+ // and their snapshots are not marked as obsolete
+ (config === configName ? describe : describe.skip)(config, () => {
+ groupsForConfig.forEach((group) => {
+ const { runs, ...condition } = group;
+
+ const runBefore = async () => {
+ const log = logWithTimer();
+ for (const archiveName of condition.archives) {
+ log(`Loading ${archiveName}`);
+ await esArchiver.load(archiveName);
+ }
+ if (condition.archives.length) {
+ log('Loaded all archives');
+ }
+ };
+
+ const runAfter = async () => {
+ const log = logWithTimer();
+ for (const archiveName of condition.archives) {
+ log(`Unloading ${archiveName}`);
+ await esArchiver.unload(archiveName);
+ }
+ if (condition.archives.length) {
+ log('Unloaded all archives');
+ }
+ };
+
+ describe(condition.archives.join(',') || 'no data', () => {
+ before(runBefore);
+
+ runs.forEach((run) => {
+ run.cb();
+ });
+
+ after(runAfter);
+ });
+ });
+ });
+ });
+
+ running = false;
+ },
+};
diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts
new file mode 100644
index 0000000000000..4bda5419c8729
--- /dev/null
+++ b/x-pack/test/apm_api_integration/configs/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { mapValues } from 'lodash';
+import { createTestConfig } from '../common/config';
+
+const apmFtrConfigs = {
+ basic: {
+ license: 'basic' as const,
+ },
+ trial: {
+ license: 'trial' as const,
+ },
+};
+
+export type APMFtrConfigName = keyof typeof apmFtrConfigs;
+
+export const configs = mapValues(apmFtrConfigs, (value, key) => {
+ return createTestConfig({
+ name: key as APMFtrConfigName,
+ ...value,
+ });
+});
diff --git a/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts b/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts
new file mode 100644
index 0000000000000..2b14e3b8a4a75
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { format } from 'url';
+import archives from '../../common/fixtures/es_archiver/archives_metadata';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+ const archiveName = 'apm_8.0.0';
+ const { end } = archives[archiveName];
+ const start = new Date(Date.parse(end) - 600000).toISOString();
+
+ const apis = [
+ {
+ pathname: '/api/apm/alerts/chart_preview/transaction_error_rate',
+ params: { transactionType: 'request' },
+ },
+ { pathname: '/api/apm/alerts/chart_preview/transaction_error_count', params: {} },
+ {
+ pathname: '/api/apm/alerts/chart_preview/transaction_duration',
+ params: { transactionType: 'request' },
+ },
+ ];
+
+ apis.forEach((api) => {
+ const url = format({
+ pathname: api.pathname,
+ query: {
+ start,
+ end,
+ serviceName: 'opbeans-java',
+ ...api.params,
+ },
+ });
+
+ registry.when(
+ `GET ${api.pathname} without data loaded`,
+ { config: 'basic', archives: [] },
+ () => {
+ it('handles the empty state', async () => {
+ const response = await supertest.get(url);
+
+ expect(response.status).to.be(200);
+ expect(response.body).to.eql([]);
+ });
+ }
+ );
+
+ registry.when(
+ `GET ${api.pathname} with data loaded`,
+ { config: 'basic', archives: [archiveName] },
+ () => {
+ it('returns the correct data', async () => {
+ const response = await supertest.get(url);
+
+ expect(response.status).to.be(200);
+ expect(
+ response.body.some((item: { x: number; y: number | null }) => item.x && item.y)
+ ).to.equal(true);
+ });
+ }
+ );
+ });
+}
diff --git a/x-pack/test/apm_api_integration/tests/correlations/slow_transactions.ts b/x-pack/test/apm_api_integration/tests/correlations/slow_transactions.ts
new file mode 100644
index 0000000000000..2439943a664ea
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/correlations/slow_transactions.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { format } from 'url';
+import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi';
+import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+ const archiveName = 'apm_8.0.0';
+ const range = archives_metadata[archiveName];
+
+ const url = format({
+ pathname: `/api/apm/correlations/slow_transactions`,
+ query: {
+ start: range.start,
+ end: range.end,
+ durationPercentile: 95,
+ fieldNames:
+ 'user.username,user.id,host.ip,user_agent.name,kubernetes.pod.uuid,url.domain,container.id,service.node.name',
+ },
+ });
+
+ registry.when('without data', { config: 'trial', archives: [] }, () => {
+ it('handles the empty state', async () => {
+ const response = await supertest.get(url);
+
+ expect(response.status).to.be(200);
+ expect(response.body.response).to.be(undefined);
+ });
+ });
+
+ registry.when('with data and default args', { config: 'trial', archives: ['apm_8.0.0'] }, () => {
+ type ResponseBody = APIReturnType<'GET /api/apm/correlations/slow_transactions'>;
+ let response: {
+ status: number;
+ body: NonNullable;
+ };
+
+ before(async () => {
+ response = await supertest.get(url);
+ });
+
+ it('returns successfully', () => {
+ expect(response.status).to.eql(200);
+ });
+
+ it('returns significant terms', () => {
+ const sorted = response.body?.significantTerms?.sort();
+ expectSnapshot(sorted?.map((term) => term.fieldName)).toMatchInline(`
+ Array [
+ "user_agent.name",
+ "url.domain",
+ "host.ip",
+ "service.node.name",
+ "container.id",
+ "url.domain",
+ "user_agent.name",
+ ]
+ `);
+ });
+
+ it('returns a distribution per term', () => {
+ expectSnapshot(response.body?.significantTerms?.map((term) => term.distribution.length))
+ .toMatchInline(`
+ Array [
+ 11,
+ 11,
+ 11,
+ 11,
+ 11,
+ 11,
+ 11,
+ ]
+ `);
+ });
+
+ it('returns overall distribution', () => {
+ expectSnapshot(response.body?.overall?.distribution.length).toMatchInline(`11`);
+ });
+ });
+}
diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/__snapshots__/page_load_dist.snap b/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.snap
similarity index 95%
rename from x-pack/test/apm_api_integration/trial/tests/csm/__snapshots__/page_load_dist.snap
rename to x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.snap
index c8681866169a5..e21069ba2f0a6 100644
--- a/x-pack/test/apm_api_integration/trial/tests/csm/__snapshots__/page_load_dist.snap
+++ b/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`APM specs (trial) CSM UX page load dist when there is data returns page load distribution 1`] = `
+exports[`APM API tests trial 8.0.0,rum_8.0.0 UX page load dist with data returns page load distribution 1`] = `
Object {
"maxDuration": 54.46,
"minDuration": 0,
@@ -456,7 +456,7 @@ Object {
}
`;
-exports[`APM specs (trial) CSM UX page load dist when there is data returns page load distribution with breakdown 1`] = `
+exports[`APM API tests trial 8.0.0,rum_8.0.0 UX page load dist with data returns page load distribution with breakdown 1`] = `
Array [
Object {
"data": Array [
@@ -819,6 +819,6 @@ Array [
]
`;
-exports[`APM specs (trial) CSM UX page load dist when there is no data returns empty list 1`] = `Object {}`;
+exports[`APM API tests trial no data UX page load dist without data returns empty list 1`] = `Object {}`;
-exports[`APM specs (trial) CSM UX page load dist when there is no data returns empty list with breakdowns 1`] = `Object {}`;
+exports[`APM API tests trial no data UX page load dist without data returns empty list with breakdowns 1`] = `Object {}`;
diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/__snapshots__/page_views.snap b/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.snap
similarity index 90%
rename from x-pack/test/apm_api_integration/trial/tests/csm/__snapshots__/page_views.snap
rename to x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.snap
index 76e5180ba2141..01d0d7fb6139c 100644
--- a/x-pack/test/apm_api_integration/trial/tests/csm/__snapshots__/page_views.snap
+++ b/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`APM specs (trial) CSM CSM page views when there is data returns page views 1`] = `
+exports[`APM API tests trial 8.0.0,rum_8.0.0 CSM page views with data returns page views 1`] = `
Object {
"items": Array [
Object {
@@ -128,7 +128,7 @@ Object {
}
`;
-exports[`APM specs (trial) CSM CSM page views when there is data returns page views with breakdown 1`] = `
+exports[`APM API tests trial 8.0.0,rum_8.0.0 CSM page views with data returns page views with breakdown 1`] = `
Object {
"items": Array [
Object {
@@ -265,14 +265,14 @@ Object {
}
`;
-exports[`APM specs (trial) CSM CSM page views when there is no data returns empty list 1`] = `
+exports[`APM API tests trial no data CSM page views without data returns empty list 1`] = `
Object {
"items": Array [],
"topItems": Array [],
}
`;
-exports[`APM specs (trial) CSM CSM page views when there is no data returns empty list with breakdowns 1`] = `
+exports[`APM API tests trial no data CSM page views without data returns empty list with breakdowns 1`] = `
Object {
"items": Array [],
"topItems": Array [],
diff --git a/x-pack/test/apm_api_integration/tests/csm/csm_services.ts b/x-pack/test/apm_api_integration/tests/csm/csm_services.ts
new file mode 100644
index 0000000000000..6460c0832a947
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/csm/csm_services.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+export default function rumServicesApiTests({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+
+ registry.when('CSM Services without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/services?start=2020-06-28T10%3A24%3A46.055Z&end=2020-07-29T10%3A24%3A46.055Z&uiFilters=%7B%22agentName%22%3A%5B%22js-base%22%2C%22rum-js%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+ expect(response.body).to.eql([]);
+ });
+ });
+
+ registry.when(
+ 'CSM services with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
+ it('returns rum services list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/services?start=2020-06-28T10%3A24%3A46.055Z&end=2020-07-29T10%3A24%3A46.055Z&uiFilters=%7B%22agentName%22%3A%5B%22js-base%22%2C%22rum-js%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatchInline(`Array []`);
+ });
+ }
+ );
+}
diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/has_rum_data.ts b/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts
similarity index 53%
rename from x-pack/test/apm_api_integration/trial/tests/csm/has_rum_data.ts
rename to x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts
index f2033e03f5821..66f99dd29df5a 100644
--- a/x-pack/test/apm_api_integration/trial/tests/csm/has_rum_data.ts
+++ b/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts
@@ -5,38 +5,31 @@
*/
import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function rumHasDataApiTests({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
- describe('CSM has rum data api', () => {
- describe('when there is no data', () => {
- it('returns empty list', async () => {
- const response = await supertest.get(
- '/api/apm/observability_overview/has_rum_data?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters='
- );
+ registry.when('has_rum_data without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/observability_overview/has_rum_data?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters='
+ );
- expect(response.status).to.be(200);
- expectSnapshot(response.body).toMatchInline(`
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatchInline(`
Object {
"hasData": false,
}
`);
- });
});
+ });
- describe('when there is data', () => {
- before(async () => {
- await esArchiver.load('8.0.0');
- await esArchiver.load('rum_8.0.0');
- });
- after(async () => {
- await esArchiver.unload('8.0.0');
- await esArchiver.unload('rum_8.0.0');
- });
-
+ registry.when(
+ 'has RUM data with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
it('returns that it has data and service name with most traffice', async () => {
const response = await supertest.get(
'/api/apm/observability_overview/has_rum_data?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters='
@@ -51,6 +44,6 @@ export default function rumHasDataApiTests({ getService }: FtrProviderContext) {
}
`);
});
- });
- });
+ }
+ );
}
diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/js_errors.ts b/x-pack/test/apm_api_integration/tests/csm/js_errors.ts
similarity index 72%
rename from x-pack/test/apm_api_integration/trial/tests/csm/js_errors.ts
rename to x-pack/test/apm_api_integration/tests/csm/js_errors.ts
index 6abb701f98a1c..dcadc8424ef7e 100644
--- a/x-pack/test/apm_api_integration/trial/tests/csm/js_errors.ts
+++ b/x-pack/test/apm_api_integration/tests/csm/js_errors.ts
@@ -5,40 +5,33 @@
*/
import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function rumJsErrorsApiTests({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
- describe('CSM js errors', () => {
- describe('when there is no data', () => {
- it('returns no js errors', async () => {
- const response = await supertest.get(
- '/api/apm/rum-client/js-errors?pageSize=5&pageIndex=0&start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D'
- );
+ registry.when('CSM JS errors with data', { config: 'trial', archives: [] }, () => {
+ it('returns no js errors', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/js-errors?pageSize=5&pageIndex=0&start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D'
+ );
- expect(response.status).to.be(200);
- expectSnapshot(response.body).toMatchInline(`
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatchInline(`
Object {
"totalErrorGroups": 0,
"totalErrorPages": 0,
"totalErrors": 0,
}
`);
- });
});
+ });
- describe('when there is data', () => {
- before(async () => {
- await esArchiver.load('8.0.0');
- await esArchiver.load('rum_test_data');
- });
- after(async () => {
- await esArchiver.unload('8.0.0');
- await esArchiver.unload('rum_test_data');
- });
-
+ registry.when(
+ 'CSM JS errors without data',
+ { config: 'trial', archives: ['8.0.0', 'rum_test_data'] },
+ () => {
it('returns js errors', async () => {
const response = await supertest.get(
'/api/apm/rum-client/js-errors?start=2021-01-18T12%3A20%3A17.202Z&end=2021-01-18T12%3A25%3A17.203Z&uiFilters=%7B%22environment%22%3A%22ENVIRONMENT_ALL%22%2C%22serviceName%22%3A%5B%22elastic-co-frontend%22%5D%7D&pageSize=5&pageIndex=0'
@@ -81,6 +74,6 @@ export default function rumJsErrorsApiTests({ getService }: FtrProviderContext)
}
`);
});
- });
- });
+ }
+ );
}
diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts b/x-pack/test/apm_api_integration/tests/csm/long_task_metrics.ts
similarity index 50%
rename from x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts
rename to x-pack/test/apm_api_integration/tests/csm/long_task_metrics.ts
index 6db5de24baa99..0da0889c11775 100644
--- a/x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts
+++ b/x-pack/test/apm_api_integration/tests/csm/long_task_metrics.ts
@@ -5,38 +5,31 @@
*/
import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function rumServicesApiTests({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
- describe('CSM long task metrics', () => {
- describe('when there is no data', () => {
- it('returns empty list', async () => {
- const response = await supertest.get(
- '/api/apm/rum-client/long-task-metrics?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D'
- );
-
- expect(response.status).to.be(200);
- expect(response.body).to.eql({
- longestLongTask: 0,
- noOfLongTasks: 0,
- sumOfLongTasks: 0,
- });
+ registry.when('CSM long task metrics without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/long-task-metrics?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+ expect(response.body).to.eql({
+ longestLongTask: 0,
+ noOfLongTasks: 0,
+ sumOfLongTasks: 0,
});
});
+ });
- describe('when there is data', () => {
- before(async () => {
- await esArchiver.load('8.0.0');
- await esArchiver.load('rum_8.0.0');
- });
- after(async () => {
- await esArchiver.unload('8.0.0');
- await esArchiver.unload('rum_8.0.0');
- });
-
+ registry.when(
+ 'CSM long task metrics with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
it('returns web core vitals values', async () => {
const response = await supertest.get(
'/api/apm/rum-client/long-task-metrics?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D'
@@ -52,6 +45,6 @@ export default function rumServicesApiTests({ getService }: FtrProviderContext)
}
`);
});
- });
- });
+ }
+ );
}
diff --git a/x-pack/test/apm_api_integration/tests/csm/page_load_dist.ts b/x-pack/test/apm_api_integration/tests/csm/page_load_dist.ts
new file mode 100644
index 0000000000000..28fa9cb87f516
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/csm/page_load_dist.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+export default function rumServicesApiTests({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+
+ registry.when('UX page load dist without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-load-distribution?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatch();
+ });
+
+ it('returns empty list with breakdowns', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-load-distribution/breakdown?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D&breakdown=Browser'
+ );
+
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatch();
+ });
+ });
+
+ registry.when(
+ 'UX page load dist with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
+ it('returns page load distribution', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-load-distribution?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatch();
+ });
+ it('returns page load distribution with breakdown', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-load-distribution/breakdown?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D&breakdown=Browser'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatch();
+ });
+ }
+ );
+}
diff --git a/x-pack/test/apm_api_integration/tests/csm/page_views.ts b/x-pack/test/apm_api_integration/tests/csm/page_views.ts
new file mode 100644
index 0000000000000..43f9d278f694a
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/csm/page_views.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+export default function rumServicesApiTests({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+
+ registry.when('CSM page views without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-view-trends?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatch();
+ });
+
+ it('returns empty list with breakdowns', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-view-trends?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D&breakdowns=%7B%22name%22%3A%22Browser%22%2C%22fieldName%22%3A%22user_agent.name%22%2C%22type%22%3A%22category%22%7D'
+ );
+
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatch();
+ });
+ });
+
+ registry.when(
+ 'CSM page views with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
+ it('returns page views', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-view-trends?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatch();
+ });
+ it('returns page views with breakdown', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/page-view-trends?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D&breakdowns=%7B%22name%22%3A%22Browser%22%2C%22fieldName%22%3A%22user_agent.name%22%2C%22type%22%3A%22category%22%7D'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatch();
+ });
+ }
+ );
+}
diff --git a/x-pack/test/apm_api_integration/tests/csm/url_search.ts b/x-pack/test/apm_api_integration/tests/csm/url_search.ts
new file mode 100644
index 0000000000000..906f1783cb90e
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/csm/url_search.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+export default function rumServicesApiTests({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+
+ registry.when('CSM url search api without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/url-search?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D&percentile=50'
+ );
+
+ expect(response.status).to.be(200);
+ expectSnapshot(response.body).toMatchInline(`
+ Object {
+ "items": Array [],
+ "total": 0,
+ }
+ `);
+ });
+ });
+
+ registry.when(
+ 'CSM url search api with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
+ it('returns top urls when no query', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/url-search?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D&percentile=50'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatchInline(`
+ Object {
+ "items": Array [
+ Object {
+ "count": 5,
+ "pld": 4924000,
+ "url": "http://localhost:5601/nfw/app/csm?rangeFrom=now-15m&rangeTo=now&serviceName=kibana-frontend-8_0_0",
+ },
+ Object {
+ "count": 1,
+ "pld": 2760000,
+ "url": "http://localhost:5601/nfw/app/home",
+ },
+ ],
+ "total": 2,
+ }
+ `);
+ });
+
+ it('returns specific results against query', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/url-search?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D&urlQuery=csm&percentile=50'
+ );
+
+ expect(response.status).to.be(200);
+
+ expectSnapshot(response.body).toMatchInline(`
+ Object {
+ "items": Array [
+ Object {
+ "count": 5,
+ "pld": 4924000,
+ "url": "http://localhost:5601/nfw/app/csm?rangeFrom=now-15m&rangeTo=now&serviceName=kibana-frontend-8_0_0",
+ },
+ ],
+ "total": 1,
+ }
+ `);
+ });
+ }
+ );
+}
diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/web_core_vitals.ts b/x-pack/test/apm_api_integration/tests/csm/web_core_vitals.ts
similarity index 55%
rename from x-pack/test/apm_api_integration/trial/tests/csm/web_core_vitals.ts
rename to x-pack/test/apm_api_integration/tests/csm/web_core_vitals.ts
index 50c261d2d37ad..3574ef065eef7 100644
--- a/x-pack/test/apm_api_integration/trial/tests/csm/web_core_vitals.ts
+++ b/x-pack/test/apm_api_integration/tests/csm/web_core_vitals.ts
@@ -5,41 +5,34 @@
*/
import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function rumServicesApiTests({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
- describe('CSM web core vitals', () => {
- describe('when there is no data', () => {
- it('returns empty list', async () => {
- const response = await supertest.get(
- '/api/apm/rum-client/web-core-vitals?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D&percentile=50'
- );
+ registry.when('CSM web core vitals without data', { config: 'trial', archives: [] }, () => {
+ it('returns empty list', async () => {
+ const response = await supertest.get(
+ '/api/apm/rum-client/web-core-vitals?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-14T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22elastic-co-rum-test%22%5D%7D&percentile=50'
+ );
- expect(response.status).to.be(200);
- expect(response.body).to.eql({
- coreVitalPages: 0,
- cls: null,
- tbt: 0,
- lcpRanks: [100, 0, 0],
- fidRanks: [100, 0, 0],
- clsRanks: [100, 0, 0],
- });
+ expect(response.status).to.be(200);
+ expect(response.body).to.eql({
+ coreVitalPages: 0,
+ cls: null,
+ tbt: 0,
+ lcpRanks: [100, 0, 0],
+ fidRanks: [100, 0, 0],
+ clsRanks: [100, 0, 0],
});
});
+ });
- describe('when there is data', () => {
- before(async () => {
- await esArchiver.load('8.0.0');
- await esArchiver.load('rum_8.0.0');
- });
- after(async () => {
- await esArchiver.unload('8.0.0');
- await esArchiver.unload('rum_8.0.0');
- });
-
+ registry.when(
+ 'CSM web core vitals with data',
+ { config: 'trial', archives: ['8.0.0', 'rum_8.0.0'] },
+ () => {
it('returns web core vitals values', async () => {
const response = await supertest.get(
'/api/apm/rum-client/web-core-vitals?start=2020-09-07T20%3A35%3A54.654Z&end=2020-09-16T20%3A35%3A54.654Z&uiFilters=%7B%22serviceName%22%3A%5B%22kibana-frontend-8_0_0%22%5D%7D&percentile=50'
@@ -73,6 +66,6 @@ export default function rumServicesApiTests({ getService }: FtrProviderContext)
}
`);
});
- });
- });
+ }
+ );
}
diff --git a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts b/x-pack/test/apm_api_integration/tests/feature_controls.ts
similarity index 98%
rename from x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
rename to x-pack/test/apm_api_integration/tests/feature_controls.ts
index 35025fcbfd107..7a65d8114c73f 100644
--- a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
+++ b/x-pack/test/apm_api_integration/tests/feature_controls.ts
@@ -5,7 +5,8 @@
*/
import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { FtrProviderContext } from '../common/ftr_provider_context';
+import { registry } from '../common/registry';
export default function featureControlsTests({ getService }: FtrProviderContext) {
const supertest = getService('supertestAsApmWriteUser');
@@ -270,7 +271,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
}
}
- describe('apm feature controls', () => {
+ registry.when('apm feature controls', { config: 'basic', archives: [] }, () => {
const config = {
service: { name: 'test-service' },
settings: { transaction_sample_rate: '0.5' },
diff --git a/x-pack/test/apm_api_integration/tests/index.ts b/x-pack/test/apm_api_integration/tests/index.ts
new file mode 100644
index 0000000000000..eef82c714b2d0
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/index.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../common/ftr_provider_context';
+import { registry } from '../common/registry';
+
+export default function apmApiIntegrationTests(providerContext: FtrProviderContext) {
+ const { loadTestFile } = providerContext;
+
+ describe('APM API tests', function () {
+ this.tags('ciGroup1');
+ loadTestFile(require.resolve('./alerts/chart_preview'));
+
+ loadTestFile(require.resolve('./correlations/slow_transactions'));
+
+ loadTestFile(require.resolve('./csm/csm_services'));
+ loadTestFile(require.resolve('./csm/has_rum_data'));
+ loadTestFile(require.resolve('./csm/js_errors'));
+ loadTestFile(require.resolve('./csm/long_task_metrics'));
+ loadTestFile(require.resolve('./csm/page_load_dist'));
+ loadTestFile(require.resolve('./csm/page_views'));
+ loadTestFile(require.resolve('./csm/url_search'));
+ loadTestFile(require.resolve('./csm/web_core_vitals'));
+
+ loadTestFile(require.resolve('./metrics_charts/metrics_charts'));
+
+ loadTestFile(require.resolve('./observability_overview/has_data'));
+ loadTestFile(require.resolve('./observability_overview/observability_overview'));
+
+ loadTestFile(require.resolve('./service_maps/service_maps'));
+
+ loadTestFile(require.resolve('./service_overview/dependencies'));
+ loadTestFile(require.resolve('./service_overview/error_groups'));
+ loadTestFile(require.resolve('./service_overview/instances'));
+
+ loadTestFile(require.resolve('./services/agent_name'));
+ loadTestFile(require.resolve('./services/annotations'));
+ loadTestFile(require.resolve('./services/service_details'));
+ loadTestFile(require.resolve('./services/service_icons'));
+ loadTestFile(require.resolve('./services/throughput'));
+ loadTestFile(require.resolve('./services/top_services'));
+ loadTestFile(require.resolve('./services/transaction_types'));
+
+ loadTestFile(require.resolve('./settings/anomaly_detection/basic'));
+ loadTestFile(require.resolve('./settings/anomaly_detection/no_access_user'));
+ loadTestFile(require.resolve('./settings/anomaly_detection/read_user'));
+ loadTestFile(require.resolve('./settings/anomaly_detection/write_user'));
+
+ loadTestFile(require.resolve('./settings/agent_configuration'));
+
+ loadTestFile(require.resolve('./settings/custom_link'));
+
+ loadTestFile(require.resolve('./traces/top_traces'));
+
+ loadTestFile(require.resolve('./transactions/breakdown'));
+ loadTestFile(require.resolve('./transactions/distribution'));
+ loadTestFile(require.resolve('./transactions/error_rate'));
+ loadTestFile(require.resolve('./transactions/latency'));
+ loadTestFile(require.resolve('./transactions/throughput'));
+ loadTestFile(require.resolve('./transactions/top_transaction_groups'));
+ loadTestFile(require.resolve('./transactions/transactions_groups_overview'));
+
+ loadTestFile(require.resolve('./feature_controls'));
+
+ registry.run(providerContext);
+ });
+}
diff --git a/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.ts b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.ts
new file mode 100644
index 0000000000000..dda46f00d7c72
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.ts
@@ -0,0 +1,446 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { first } from 'lodash';
+import { MetricsChartsByAgentAPIResponse } from '../../../../plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent';
+import { GenericMetricsChart } from '../../../../plugins/apm/server/lib/metrics/transform_metrics_chart';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+interface ChartResponse {
+ body: MetricsChartsByAgentAPIResponse;
+ status: number;
+}
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+
+ registry.when(
+ 'Metrics charts when data is loaded',
+ { config: 'basic', archives: ['metrics_8.0.0'] },
+ () => {
+ describe('for opbeans-node', () => {
+ const start = encodeURIComponent('2020-09-08T14:50:00.000Z');
+ const end = encodeURIComponent('2020-09-08T14:55:00.000Z');
+ const uiFilters = encodeURIComponent(JSON.stringify({}));
+ const agentName = 'nodejs';
+
+ describe('returns metrics data', () => {
+ let chartsResponse: ChartResponse;
+ before(async () => {
+ chartsResponse = await supertest.get(
+ `/api/apm/services/opbeans-node/metrics/charts?start=${start}&end=${end}&uiFilters=${uiFilters}&agentName=${agentName}`
+ );
+ });
+ it('contains CPU usage and System memory usage chart data', async () => {
+ expect(chartsResponse.status).to.be(200);
+ expectSnapshot(chartsResponse.body.charts.map((chart) => chart.title)).toMatchInline(`
+ Array [
+ "CPU usage",
+ "System memory usage",
+ ]
+ `);
+ });
+
+ describe('CPU usage', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'cpu_usage_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "System max",
+ "System average",
+ "Process max",
+ "Process average",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0.714,
+ 0.3877,
+ 0.75,
+ 0.2543,
+ ]
+ `);
+ });
+ });
+
+ describe("System memory usage (using 'system.memory' fields to calculate the memory usage)", () => {
+ let systemMemoryUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ systemMemoryUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'memory_usage_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(systemMemoryUsageChart).to.not.empty();
+ expectSnapshot(systemMemoryUsageChart?.series.map(({ title }) => title))
+ .toMatchInline(`
+ Array [
+ "Max",
+ "Average",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(systemMemoryUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0.722093920925555,
+ 0.718173546796348,
+ ]
+ `);
+ });
+ });
+ });
+ });
+
+ describe('for opbeans-java', () => {
+ const uiFilters = encodeURIComponent(JSON.stringify({}));
+ const agentName = 'java';
+
+ describe('returns metrics data', () => {
+ const start = encodeURIComponent('2020-09-08T14:55:30.000Z');
+ const end = encodeURIComponent('2020-09-08T15:00:00.000Z');
+
+ let chartsResponse: ChartResponse;
+ before(async () => {
+ chartsResponse = await supertest.get(
+ `/api/apm/services/opbeans-java/metrics/charts?start=${start}&end=${end}&uiFilters=${uiFilters}&agentName=${agentName}`
+ );
+ });
+
+ it('has correct chart data', async () => {
+ expect(chartsResponse.status).to.be(200);
+ expectSnapshot(chartsResponse.body.charts.map((chart) => chart.title)).toMatchInline(`
+ Array [
+ "CPU usage",
+ "System memory usage",
+ "Heap Memory",
+ "Non-Heap Memory",
+ "Thread Count",
+ "Garbage collection per minute",
+ "Garbage collection time spent per minute",
+ ]
+ `);
+ });
+
+ describe('CPU usage', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'cpu_usage_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "System max",
+ "System average",
+ "Process max",
+ "Process average",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0.203,
+ 0.178777777777778,
+ 0.01,
+ 0.009,
+ ]
+ `);
+ });
+
+ it('has the correct rate', async () => {
+ const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
+ expectSnapshot(yValues).toMatchInline(`
+ Array [
+ 0.193,
+ 0.193,
+ 0.009,
+ 0.009,
+ ]
+ `);
+ });
+ });
+
+ describe("System memory usage (using 'system.process.cgroup' fields to calculate the memory usage)", () => {
+ let systemMemoryUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ systemMemoryUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'memory_usage_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(systemMemoryUsageChart).to.not.empty();
+ expectSnapshot(systemMemoryUsageChart?.series.map(({ title }) => title))
+ .toMatchInline(`
+ Array [
+ "Max",
+ "Average",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(systemMemoryUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0.707924703557837,
+ 0.705395980841182,
+ ]
+ `);
+ });
+
+ it('has the correct rate', async () => {
+ const yValues = systemMemoryUsageChart?.series.map((serie) => first(serie.data)?.y);
+ expectSnapshot(yValues).toMatchInline(`
+ Array [
+ 0.707924703557837,
+ 0.707924703557837,
+ ]
+ `);
+ });
+ });
+
+ describe('Heap Memory', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'heap_memory_area_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "Avg. used",
+ "Avg. committed",
+ "Avg. limit",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 222501617.777778,
+ 374341632,
+ 1560281088,
+ ]
+ `);
+ });
+
+ it('has the correct rate', async () => {
+ const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
+ expectSnapshot(yValues).toMatchInline(`
+ Array [
+ 211472896,
+ 374341632,
+ 1560281088,
+ ]
+ `);
+ });
+ });
+
+ describe('Non-Heap Memory', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'non_heap_memory_area_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "Avg. used",
+ "Avg. committed",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 138573397.333333,
+ 147677639.111111,
+ ]
+ `);
+ });
+
+ it('has the correct rate', async () => {
+ const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
+ expectSnapshot(yValues).toMatchInline(`
+ Array [
+ 138162752,
+ 147386368,
+ ]
+ `);
+ });
+ });
+
+ describe('Thread Count', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'thread_count_line_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "Avg. count",
+ "Max count",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 44.4444444444444,
+ 45,
+ ]
+ `);
+ });
+
+ it('has the correct rate', async () => {
+ const yValues = cpuUsageChart?.series.map((serie) => first(serie.data)?.y);
+ expectSnapshot(yValues).toMatchInline(`
+ Array [
+ 44,
+ 44,
+ ]
+ `);
+ });
+ });
+
+ describe('Garbage collection per minute', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'gc_rate_line_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "G1 Old Generation",
+ "G1 Young Generation",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0,
+ 15,
+ ]
+ `);
+ });
+ });
+
+ describe('Garbage collection time spent per minute', () => {
+ let cpuUsageChart: GenericMetricsChart | undefined;
+ before(() => {
+ cpuUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'gc_time_line_chart'
+ );
+ });
+
+ it('has correct series', () => {
+ expect(cpuUsageChart).to.not.empty();
+ expectSnapshot(cpuUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "G1 Old Generation",
+ "G1 Young Generation",
+ ]
+ `);
+ });
+
+ it('has correct series overall values', () => {
+ expectSnapshot(cpuUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0,
+ 187.5,
+ ]
+ `);
+ });
+ });
+ });
+
+ // 9223372036854771712 = memory limit for a c-group when no memory limit is specified
+ it('calculates system memory usage using system total field when cgroup limit is equal to 9223372036854771712', async () => {
+ const start = encodeURIComponent('2020-09-08T15:00:30.000Z');
+ const end = encodeURIComponent('2020-09-08T15:05:00.000Z');
+
+ const chartsResponse: ChartResponse = await supertest.get(
+ `/api/apm/services/opbeans-java/metrics/charts?start=${start}&end=${end}&uiFilters=${uiFilters}&agentName=${agentName}`
+ );
+
+ const systemMemoryUsageChart = chartsResponse.body.charts.find(
+ ({ key }) => key === 'memory_usage_chart'
+ );
+
+ expect(systemMemoryUsageChart).to.not.empty();
+ expectSnapshot(systemMemoryUsageChart?.series.map(({ title }) => title)).toMatchInline(`
+ Array [
+ "Max",
+ "Average",
+ ]
+ `);
+ expectSnapshot(systemMemoryUsageChart?.series.map(({ overallValue }) => overallValue))
+ .toMatchInline(`
+ Array [
+ 0.114523896426499,
+ 0.114002376090415,
+ ]
+ `);
+
+ const yValues = systemMemoryUsageChart?.series.map((serie) => first(serie.data)?.y);
+ expectSnapshot(yValues).toMatchInline(`
+ Array [
+ 0.11383724014064,
+ 0.11383724014064,
+ ]
+ `);
+ });
+ });
+ }
+ );
+}
diff --git a/x-pack/test/apm_api_integration/basic/tests/observability_overview/has_data.ts b/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts
similarity index 67%
rename from x-pack/test/apm_api_integration/basic/tests/observability_overview/has_data.ts
rename to x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts
index 6d0d2d3042625..9c88f75c6adbd 100644
--- a/x-pack/test/apm_api_integration/basic/tests/observability_overview/has_data.ts
+++ b/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts
@@ -4,40 +4,45 @@
* you may not use this file except in compliance with the Elastic License.
*/
import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function ApiTest({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
- const archiveName = 'apm_8.0.0';
-
- describe('Has data', () => {
- describe('when data is not loaded', () => {
+ registry.when(
+ 'Observability overview when data is not loaded',
+ { config: 'basic', archives: [] },
+ () => {
it('returns false when there is no data', async () => {
const response = await supertest.get('/api/apm/observability_overview/has_data');
expect(response.status).to.be(200);
expect(response.body).to.eql(false);
});
- });
- describe('when only onboarding data is loaded', () => {
- before(() => esArchiver.load('observability_overview'));
- after(() => esArchiver.unload('observability_overview'));
+ }
+ );
+
+ registry.when(
+ 'Observability overview when only onboarding data is loaded',
+ { config: 'basic', archives: ['observability_overview'] },
+ () => {
it('returns false when there is only onboarding data', async () => {
const response = await supertest.get('/api/apm/observability_overview/has_data');
expect(response.status).to.be(200);
expect(response.body).to.eql(false);
});
- });
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
+ }
+ );
+ registry.when(
+ 'Observability overview when APM data is loaded',
+ { config: 'basic', archives: ['apm_8.0.0'] },
+ () => {
it('returns true when there is at least one document on transaction, error or metrics indices', async () => {
const response = await supertest.get('/api/apm/observability_overview/has_data');
expect(response.status).to.be(200);
expect(response.body).to.eql(true);
});
- });
- });
+ }
+ );
}
diff --git a/x-pack/test/apm_api_integration/basic/tests/observability_overview/observability_overview.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
similarity index 69%
rename from x-pack/test/apm_api_integration/basic/tests/observability_overview/observability_overview.ts
rename to x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
index f7c459029c7f5..7c9d8fa8b0f91 100644
--- a/x-pack/test/apm_api_integration/basic/tests/observability_overview/observability_overview.ts
+++ b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
@@ -4,12 +4,12 @@
* you may not use this file except in compliance with the Elastic License.
*/
import expect from '@kbn/expect';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function ApiTest({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
- const esArchiver = getService('esArchiver');
const archiveName = 'apm_8.0.0';
const metadata = archives_metadata[archiveName];
@@ -19,22 +19,28 @@ export default function ApiTest({ getService }: FtrProviderContext) {
const end = encodeURIComponent(metadata.end);
const bucketSize = '60s';
- describe('Observability overview', () => {
- describe('when data is not loaded', () => {
- it('handles the empty state', async () => {
- const response = await supertest.get(
- `/api/apm/observability_overview?start=${start}&end=${end}&bucketSize=${bucketSize}`
- );
- expect(response.status).to.be(200);
+ registry.when(
+ 'Observability overview when data is not loaded',
+ { config: 'basic', archives: [] },
+ () => {
+ describe('when data is not loaded', () => {
+ it('handles the empty state', async () => {
+ const response = await supertest.get(
+ `/api/apm/observability_overview?start=${start}&end=${end}&bucketSize=${bucketSize}`
+ );
+ expect(response.status).to.be(200);
- expect(response.body.serviceCount).to.be(0);
- expect(response.body.transactionCoordinates.length).to.be(0);
+ expect(response.body.serviceCount).to.be(0);
+ expect(response.body.transactionCoordinates.length).to.be(0);
+ });
});
- });
- describe('when data is loaded', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
+ }
+ );
+ registry.when(
+ 'Observability overview when data is loaded',
+ { config: 'basic', archives: [archiveName] },
+ () => {
it('returns the service count and transaction coordinates', async () => {
const response = await supertest.get(
`/api/apm/observability_overview?start=${start}&end=${end}&bucketSize=${bucketSize}`
@@ -80,6 +86,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
]
`);
});
- });
- });
+ }
+ );
}
diff --git a/x-pack/test/apm_api_integration/trial/tests/service_maps/__snapshots__/service_maps.snap b/x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap
similarity index 99%
rename from x-pack/test/apm_api_integration/trial/tests/service_maps/__snapshots__/service_maps.snap
rename to x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap
index 7639822eaa6f9..69bc039b67ed2 100644
--- a/x-pack/test/apm_api_integration/trial/tests/service_maps/__snapshots__/service_maps.snap
+++ b/x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`APM specs (trial) Service Maps Service Maps with a trial license /api/apm/service-map when there is data returns service map elements filtering by environment not defined 1`] = `
+exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map returns service map elements filtering by environment not defined 1`] = `
Object {
"elements": Array [
Object {
@@ -514,7 +514,7 @@ Object {
}
`;
-exports[`APM specs (trial) Service Maps Service Maps with a trial license /api/apm/service-map when there is data returns the correct data 3`] = `
+exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map returns the correct data 3`] = `
Array [
Object {
"data": Object {
@@ -1741,7 +1741,7 @@ Array [
]
`;
-exports[`APM specs (trial) Service Maps Service Maps with a trial license when there is data with anomalies with the default apm user returns the correct anomaly stats 3`] = `
+exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map with ML data with the default apm user returns the correct anomaly stats 3`] = `
Object {
"elements": Array [
Object {
diff --git a/x-pack/test/apm_api_integration/trial/tests/service_maps/service_maps.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
similarity index 58%
rename from x-pack/test/apm_api_integration/trial/tests/service_maps/service_maps.ts
rename to x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
index 02acd34ad5666..a15f0442c7cde 100644
--- a/x-pack/test/apm_api_integration/trial/tests/service_maps/service_maps.ts
+++ b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
@@ -7,57 +7,85 @@
import querystring from 'querystring';
import expect from '@kbn/expect';
import { isEmpty, uniq } from 'lodash';
-import archives_metadata from '../../../common/fixtures/es_archiver/archives_metadata';
-import { PromiseReturnType } from '../../../../../plugins/observability/typings/common';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
+import { PromiseReturnType } from '../../../../plugins/observability/typings/common';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
export default function serviceMapsApiTests({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
const supertestAsApmReadUserWithoutMlAccess = getService('supertestAsApmReadUserWithoutMlAccess');
- const esArchiver = getService('esArchiver');
-
const archiveName = 'apm_8.0.0';
const metadata = archives_metadata[archiveName];
const start = encodeURIComponent(metadata.start);
const end = encodeURIComponent(metadata.end);
- describe('Service Maps with a trial license', () => {
+ registry.when('Service map with a basic license', { config: 'basic', archives: [] }, () => {
+ it('is only be available to users with Platinum license (or higher)', async () => {
+ const response = await supertest.get(`/api/apm/service-map?start=${start}&end=${end}`);
+
+ expect(response.status).to.be(403);
+
+ expectSnapshot(response.body.message).toMatchInline(
+ `"In order to access Service Maps, you must be subscribed to an Elastic Platinum license. With it, you'll have the ability to visualize your entire application stack along with your APM data."`
+ );
+ });
+ });
+
+ registry.when('Service map without data', { config: 'trial', archives: [] }, () => {
describe('/api/apm/service-map', () => {
- describe('when there is no data', () => {
- it('returns empty list', async () => {
- const response = await supertest.get(`/api/apm/service-map?start=${start}&end=${end}`);
+ it('returns an empty list', async () => {
+ const response = await supertest.get(`/api/apm/service-map?start=${start}&end=${end}`);
- expect(response.status).to.be(200);
- expect(response.body.elements.length).to.be(0);
- });
+ expect(response.status).to.be(200);
+ expect(response.body.elements.length).to.be(0);
});
+ });
- describe('when there is data', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
+ describe('/api/apm/service-map/service/{serviceName}', () => {
+ it('returns an object with nulls', async () => {
+ const q = querystring.stringify({
+ start: metadata.start,
+ end: metadata.end,
+ uiFilters: encodeURIComponent('{}'),
+ });
+ const response = await supertest.get(`/api/apm/service-map/service/opbeans-node?${q}`);
- let response: PromiseReturnType;
+ expect(response.status).to.be(200);
- before(async () => {
- response = await supertest.get(`/api/apm/service-map?start=${start}&end=${end}`);
- });
+ expect(response.body.avgCpuUsage).to.be(null);
+ expect(response.body.avgErrorRate).to.be(null);
+ expect(response.body.avgMemoryUsage).to.be(null);
+ expect(response.body.transactionStats.avgRequestsPerMinute).to.be(null);
+ expect(response.body.transactionStats.avgTransactionDuration).to.be(null);
+ });
+ });
+ });
- it('returns service map elements', () => {
- expect(response.status).to.be(200);
- expect(response.body.elements.length).to.be.greaterThan(0);
- });
+ registry.when('Service Map with data', { config: 'trial', archives: ['apm_8.0.0'] }, () => {
+ describe('/api/apm/service-map', () => {
+ let response: PromiseReturnType;
+
+ before(async () => {
+ response = await supertest.get(`/api/apm/service-map?start=${start}&end=${end}`);
+ });
+
+ it('returns service map elements', () => {
+ expect(response.status).to.be(200);
+ expect(response.body.elements.length).to.be.greaterThan(0);
+ });
- it('returns the correct data', () => {
- const elements: Array<{ data: Record }> = response.body.elements;
+ it('returns the correct data', () => {
+ const elements: Array<{ data: Record }> = response.body.elements;
- const serviceNames = uniq(
- elements
- .filter((element) => element.data['service.name'] !== undefined)
- .map((element) => element.data['service.name'])
- ).sort();
+ const serviceNames = uniq(
+ elements
+ .filter((element) => element.data['service.name'] !== undefined)
+ .map((element) => element.data['service.name'])
+ ).sort();
- expectSnapshot(serviceNames).toMatchInline(`
+ expectSnapshot(serviceNames).toMatchInline(`
Array [
"kibana",
"kibana-frontend",
@@ -71,13 +99,13 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
]
`);
- const externalDestinations = uniq(
- elements
- .filter((element) => element.data.target?.startsWith('>'))
- .map((element) => element.data.target)
- ).sort();
+ const externalDestinations = uniq(
+ elements
+ .filter((element) => element.data.target?.startsWith('>'))
+ .map((element) => element.data.target)
+ ).sort();
- expectSnapshot(externalDestinations).toMatchInline(`
+ expectSnapshot(externalDestinations).toMatchInline(`
Array [
">elasticsearch",
">feeds.elastic.co:443",
@@ -86,51 +114,26 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
]
`);
- expectSnapshot(elements).toMatch();
- });
-
- it('returns service map elements filtering by environment not defined', async () => {
- const ENVIRONMENT_NOT_DEFINED = 'ENVIRONMENT_NOT_DEFINED';
- const { body, status } = await supertest.get(
- `/api/apm/service-map?start=${start}&end=${end}&environment=${ENVIRONMENT_NOT_DEFINED}`
- );
- expect(status).to.be(200);
- const environments = new Set();
- body.elements.forEach((element: { data: Record }) => {
- environments.add(element.data['service.environment']);
- });
-
- expect(environments.has(ENVIRONMENT_NOT_DEFINED)).to.eql(true);
- expectSnapshot(body).toMatch();
- });
+ expectSnapshot(elements).toMatch();
});
- });
-
- describe('/api/apm/service-map/service/{serviceName}', () => {
- describe('when there is no data', () => {
- it('returns an object with nulls', async () => {
- const q = querystring.stringify({
- start: metadata.start,
- end: metadata.end,
- uiFilters: encodeURIComponent('{}'),
- });
- const response = await supertest.get(`/api/apm/service-map/service/opbeans-node?${q}`);
- expect(response.status).to.be(200);
-
- expect(response.body.avgCpuUsage).to.be(null);
- expect(response.body.avgErrorRate).to.be(null);
- expect(response.body.avgMemoryUsage).to.be(null);
- expect(response.body.transactionStats.avgRequestsPerMinute).to.be(null);
- expect(response.body.transactionStats.avgTransactionDuration).to.be(null);
+ it('returns service map elements filtering by environment not defined', async () => {
+ const ENVIRONMENT_NOT_DEFINED = 'ENVIRONMENT_NOT_DEFINED';
+ const { body, status } = await supertest.get(
+ `/api/apm/service-map?start=${start}&end=${end}&environment=${ENVIRONMENT_NOT_DEFINED}`
+ );
+ expect(status).to.be(200);
+ const environments = new Set();
+ body.elements.forEach((element: { data: Record }) => {
+ environments.add(element.data['service.environment']);
});
+
+ expect(environments.has(ENVIRONMENT_NOT_DEFINED)).to.eql(true);
+ expectSnapshot(body).toMatch();
});
});
- describe('when there is data with anomalies', () => {
- before(() => esArchiver.load(archiveName));
- after(() => esArchiver.unload(archiveName));
-
+ describe('/api/apm/service-map with ML data', () => {
describe('with the default apm user', () => {
let response: PromiseReturnType |