= ({
// can't use `EuiConfirmModal` here as the confirm modal body is wrapped
// inside a `` element, causing UI glitches with the table.
return (
-
-
-
-
-
-
-
-
-
-
-
-
- (
-
-
-
- ),
- },
- {
- field: 'id',
- name: i18n.translate(
- 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName',
- { defaultMessage: 'Id' }
- ),
- },
- {
- field: 'meta.title',
- name: i18n.translate(
- 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName',
- { defaultMessage: 'Title' }
- ),
- },
- ]}
- pagination={true}
- sorting={false}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ (
+
+
+
+ ),
+ },
+ {
+ field: 'id',
+ name: i18n.translate(
+ 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName',
+ { defaultMessage: 'Id' }
+ ),
+ },
+ {
+ field: 'meta.title',
+ name: i18n.translate(
+ 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName',
+ { defaultMessage: 'Title' }
+ ),
+ },
+ ]}
+ pagination={true}
+ sorting={false}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
};
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/export_modal.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/export_modal.tsx
index 693fe00ffedccb..0699f77f575219 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/export_modal.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/export_modal.tsx
@@ -8,7 +8,6 @@
import React, { FC } from 'react';
import {
- EuiOverlayMask,
EuiModal,
EuiModalHeader,
EuiModalHeaderTitle,
@@ -47,80 +46,78 @@ export const ExportModal: FC = ({
onIncludeReferenceChange,
}) => {
return (
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
- }
- labelType="legend"
- >
- {
- onSelectedOptionsChange({
- ...selectedOptions,
- ...{
- [optionId]: !selectedOptions[optionId],
- },
- });
- }}
+ id="savedObjectsManagement.objectsTable.exportObjectsConfirmModalDescription"
+ defaultMessage="Select which types to export"
/>
-
-
-
- }
- checked={includeReferences}
- onChange={() => onIncludeReferenceChange(!includeReferences)}
+ }
+ labelType="legend"
+ >
+ {
+ onSelectedOptionsChange({
+ ...selectedOptions,
+ ...{
+ [optionId]: !selectedOptions[optionId],
+ },
+ });
+ }}
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ }
+ checked={includeReferences}
+ onChange={() => onIncludeReferenceChange(!includeReferences)}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
};
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
index 66753e81ccd3ff..cfe0b2be1d3c05 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
@@ -7,13 +7,7 @@
*/
import React, { useState, Fragment, ReactNode } from 'react';
-import {
- EuiOverlayMask,
- EuiConfirmModal,
- EUI_MODAL_CONFIRM_BUTTON,
- EuiText,
- EuiSuperSelect,
-} from '@elastic/eui';
+import { EuiConfirmModal, EUI_MODAL_CONFIRM_BUTTON, EuiText, EuiSuperSelect } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import moment from 'moment';
import { FailedImportConflict } from '../../../lib/resolve_import_errors';
@@ -98,29 +92,27 @@ export const OverwriteModal = ({ conflict, onFinish }: OverwriteModalProps) => {
}
);
return (
-
- onFinish(false)}
- onConfirm={() => onFinish(true, destinationId)}
- defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
- maxWidth="500px"
- >
- {bodyText}
- {selectControl}
-
-
+ onFinish(false)}
+ onConfirm={() => onFinish(true, destinationId)}
+ defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
+ maxWidth="500px"
+ >
+ {bodyText}
+ {selectControl}
+
);
};
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index c129fd006ae156..566d10182b5444 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -4384,9 +4384,6 @@
},
"apm:enableServiceOverview": {
"type": "boolean"
- },
- "apm:enableCorrelations": {
- "type": "boolean"
}
}
},
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
index 35592d83cf822a..566c9428901502 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
@@ -77,5 +77,5 @@ export async function getKibana(
kibanaRequest: KibanaRequest | undefined // intentionally `| undefined` to enforce providing the parameter
): Promise {
const usage = await usageCollection.bulkFetch(asInternalUser, soClient, kibanaRequest);
- return usageCollection.toObject(usage);
+ return usageCollection.toObject(usage);
}
diff --git a/src/plugins/usage_collection/public/mocks.tsx b/src/plugins/usage_collection/public/mocks.tsx
index ff8740ea48f7b9..72cefaf0264907 100644
--- a/src/plugins/usage_collection/public/mocks.tsx
+++ b/src/plugins/usage_collection/public/mocks.tsx
@@ -36,9 +36,6 @@ const createSetupContract = (): Setup => {
allowTrackUserAgent: jest.fn(),
reportUiCounter: jest.fn(),
METRIC_TYPE,
- __LEGACY: {
- appChanged: jest.fn(),
- },
};
return setupContract;
diff --git a/src/plugins/usage_collection/public/plugin.tsx b/src/plugins/usage_collection/public/plugin.tsx
index ac566c6a0d0445..6d1eb751d907a6 100644
--- a/src/plugins/usage_collection/public/plugin.tsx
+++ b/src/plugins/usage_collection/public/plugin.tsx
@@ -7,17 +7,17 @@
*/
import { Reporter, METRIC_TYPE, ApplicationUsageTracker } from '@kbn/analytics';
-import { Subject, merge, Subscription } from 'rxjs';
+import type { Subscription } from 'rxjs';
import React from 'react';
-import { Storage } from '../../kibana_utils/public';
-import { createReporter, trackApplicationUsageChange } from './services';
-import {
+import type {
PluginInitializerContext,
Plugin,
CoreSetup,
CoreStart,
HttpSetup,
-} from '../../../core/public';
+} from 'src/core/public';
+import { Storage } from '../../kibana_utils/public';
+import { createReporter, trackApplicationUsageChange } from './services';
import { ApplicationUsageContext } from './components/track_application_view';
export interface PublicConfigType {
@@ -39,15 +39,6 @@ export interface UsageCollectionSetup {
applicationUsageTracker: IApplicationUsageTracker;
reportUiCounter: Reporter['reportUiCounter'];
METRIC_TYPE: typeof METRIC_TYPE;
- __LEGACY: {
- /**
- * Legacy handler so we can report the actual app being used inside "kibana#/{appId}".
- * To be removed when we get rid of the legacy world
- *
- * @deprecated
- */
- appChanged: (appId: string) => void;
- };
}
export interface UsageCollectionStart {
@@ -65,7 +56,6 @@ export function isUnauthenticated(http: HttpSetup) {
}
export class UsageCollectionPlugin implements Plugin {
- private readonly legacyAppId$ = new Subject();
private applicationUsageTracker?: ApplicationUsageTracker;
private trackUserAgent: boolean = true;
private subscriptions: Subscription[] = [];
@@ -103,9 +93,6 @@ export class UsageCollectionPlugin implements Plugin this.legacyAppId$.next(appId),
- },
};
}
@@ -118,7 +105,7 @@ export class UsageCollectionPlugin implements Plugin(statsData: Array<{ type: string; result: T }> = []) => {
- return statsData.reduce((accumulatedStats, { type, result }) => {
- return {
- ...accumulatedStats,
- [type]: result,
- };
- }, {} as Result);
- };
-
- // rename fields to use api conventions
- public toApiFieldNames = (apiData: any): any => {
- const getValueOrRecurse = (value: any) => {
- if (value == null || typeof value !== 'object') {
- return value;
- } else {
- return this.toApiFieldNames(value); // recurse
- }
- };
+ /**
+ * Convert an array of fetched stats results into key/object
+ * @param statsData Array of fetched stats results
+ */
+ public toObject, T = unknown>(
+ statsData: Array<{ type: string; result: T }> = []
+ ): Result {
+ return Object.fromEntries(statsData.map(({ type, result }) => [type, result])) as Result;
+ }
+ /**
+ * Rename fields to use API conventions
+ * @param apiData Data to be normalized
+ */
+ public toApiFieldNames(
+ apiData: Record | unknown[]
+ ): Record | unknown[] {
// handle array and return early, or return a reduced object
-
if (Array.isArray(apiData)) {
- return apiData.map(getValueOrRecurse);
+ return apiData.map((value) => this.getValueOrRecurse(value));
}
- return Object.keys(apiData).reduce((accum, field) => {
- const value = apiData[field];
- let newName = field;
- newName = snakeCase(newName);
- newName = newName.replace(/^(1|5|15)_m/, '$1m'); // os.load.15m, os.load.5m, os.load.1m
- newName = newName.replace('_in_bytes', '_bytes');
- newName = newName.replace('_in_millis', '_ms');
+ return Object.fromEntries(
+ Object.entries(apiData).map(([field, value]) => {
+ let newName = field;
+ newName = snakeCase(newName);
+ newName = newName.replace(/^(1|5|15)_m/, '$1m'); // os.load.15m, os.load.5m, os.load.1m
+ newName = newName.replace('_in_bytes', '_bytes');
+ newName = newName.replace('_in_millis', '_ms');
- return {
- ...accum,
- [newName]: getValueOrRecurse(value),
- };
- }, {});
- };
+ return [newName, this.getValueOrRecurse(value)];
+ })
+ );
+ }
+
+ private getValueOrRecurse(value: unknown) {
+ if (Array.isArray(value) || (typeof value === 'object' && value !== null)) {
+ return this.toApiFieldNames(value as Record | unknown[]); // recurse
+ }
+ return value;
+ }
private makeCollectorSetFromArray = (collectors: AnyCollector[]) => {
return new CollectorSet({
diff --git a/src/plugins/vis_type_timelion/server/routes/run.ts b/src/plugins/vis_type_timelion/server/routes/run.ts
index bae25d6f918e37..b3ab3c61c15d89 100644
--- a/src/plugins/vis_type_timelion/server/routes/run.ts
+++ b/src/plugins/vis_type_timelion/server/routes/run.ts
@@ -77,46 +77,32 @@ export function runRoute(
},
},
router.handleLegacyErrors(async (context, request, response) => {
- try {
- const [, { data }] = await core.getStartServices();
- const uiSettings = await context.core.uiSettings.client.getAll();
- const indexPatternsService = await data.indexPatterns.indexPatternsServiceFactory(
- context.core.savedObjects.client,
- context.core.elasticsearch.client.asCurrentUser
- );
+ const [, { data }] = await core.getStartServices();
+ const uiSettings = await context.core.uiSettings.client.getAll();
+ const indexPatternsService = await data.indexPatterns.indexPatternsServiceFactory(
+ context.core.savedObjects.client,
+ context.core.elasticsearch.client.asCurrentUser
+ );
- const tlConfig = getTlConfig({
- context,
- request,
- settings: _.defaults(uiSettings, timelionDefaults), // Just in case they delete some setting.
- getFunction,
- getIndexPatternsService: () => indexPatternsService,
- getStartServices: core.getStartServices,
- allowedGraphiteUrls: configManager.getGraphiteUrls(),
- esShardTimeout: configManager.getEsShardTimeout(),
- });
- const chainRunner = chainRunnerFn(tlConfig);
- const sheet = await Bluebird.all(chainRunner.processRequest(request.body));
+ const tlConfig = getTlConfig({
+ context,
+ request,
+ settings: _.defaults(uiSettings, timelionDefaults), // Just in case they delete some setting.
+ getFunction,
+ getIndexPatternsService: () => indexPatternsService,
+ getStartServices: core.getStartServices,
+ allowedGraphiteUrls: configManager.getGraphiteUrls(),
+ esShardTimeout: configManager.getEsShardTimeout(),
+ });
+ const chainRunner = chainRunnerFn(tlConfig);
+ const sheet = await Bluebird.all(chainRunner.processRequest(request.body));
- return response.ok({
- body: {
- sheet,
- stats: chainRunner.getStats(),
- },
- });
- } catch (err) {
- logger.error(`${err.toString()}: ${err.stack}`);
- // TODO Maybe we should just replace everywhere we throw with Boom? Probably.
- if (err.isBoom) {
- throw err;
- } else {
- return response.internalError({
- body: {
- message: err.toString(),
- },
- });
- }
- }
+ return response.ok({
+ body: {
+ sheet,
+ stats: chainRunner.getStats(),
+ },
+ });
})
);
}
diff --git a/src/plugins/vis_type_timeseries/common/metric_types.ts b/src/plugins/vis_type_timeseries/common/metric_types.ts
index 52b31b67743715..17352f0f9da258 100644
--- a/src/plugins/vis_type_timeseries/common/metric_types.ts
+++ b/src/plugins/vis_type_timeseries/common/metric_types.ts
@@ -20,6 +20,8 @@ export enum METRIC_TYPES {
VALUE_COUNT = 'value_count',
AVERAGE = 'avg',
SUM = 'sum',
+ MIN = 'min',
+ MAX = 'max',
}
// We should probably use BUCKET_TYPES from data plugin in future.
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.test.tsx b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.test.tsx
index d82a16f1186219..579205ae048444 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.test.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.test.tsx
@@ -87,6 +87,14 @@ describe('TSVB AggSelect', () => {
"label": "Count",
"value": "count",
},
+ Object {
+ "label": "Max",
+ "value": "max",
+ },
+ Object {
+ "label": "Min",
+ "value": "min",
+ },
Object {
"label": "Sum",
"value": "sum",
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.tsx b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.tsx
index 0b8fad4d780f64..00d088025bf253 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_select.tsx
@@ -225,7 +225,7 @@ const FILTER_RATIO_AGGS = [
'value_count',
];
-const HISTOGRAM_AGGS = ['avg', 'count', 'sum', 'value_count'];
+const HISTOGRAM_AGGS = ['avg', 'count', 'sum', 'min', 'max', 'value_count'];
const allAggOptions = [...metricAggs, ...pipelineAggs, ...siblingAggs, ...specialAggs];
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js
index dd85e2490d70a7..5648a8d3e7133a 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js
@@ -51,26 +51,13 @@ describe('TSVB Filter Ratio', () => {
field: 'histogram_value',
};
const wrapper = setup(metric);
- expect(wrapper.find(EuiComboBox).at(1).props().options).toMatchInlineSnapshot(`
- Array [
- Object {
- "label": "Average",
- "value": "avg",
- },
- Object {
- "label": "Count",
- "value": "count",
- },
- Object {
- "label": "Sum",
- "value": "sum",
- },
- Object {
- "label": "Value Count",
- "value": "value_count",
- },
- ]
- `);
+ expect(
+ wrapper
+ .find(EuiComboBox)
+ .at(1)
+ .props()
+ .options.map(({ value }) => value)
+ ).toEqual(['avg', 'count', 'max', 'min', 'sum', 'value_count']);
});
const shouldNotHaveHistogramField = (agg) => {
it(`should not have histogram fields for ${agg}`, () => {
@@ -80,23 +67,19 @@ describe('TSVB Filter Ratio', () => {
field: '',
};
const wrapper = setup(metric);
- expect(wrapper.find(EuiComboBox).at(2).props().options).toMatchInlineSnapshot(`
- Array [
- Object {
- "label": "number",
- "options": Array [
- Object {
- "label": "system.cpu.user.pct",
- "value": "system.cpu.user.pct",
- },
- ],
- },
- ]
- `);
+ expect(wrapper.find(EuiComboBox).at(2).props().options).toEqual([
+ {
+ label: 'number',
+ options: [
+ {
+ label: 'system.cpu.user.pct',
+ value: 'system.cpu.user.pct',
+ },
+ ],
+ },
+ ]);
});
};
- shouldNotHaveHistogramField('max');
- shouldNotHaveHistogramField('min');
shouldNotHaveHistogramField('positive_rate');
it(`should not have histogram fields for cardinality`, () => {
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js
index 5a5f37db2b7b5e..c536856327f283 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js
@@ -65,6 +65,8 @@ describe('Histogram Types', () => {
};
shouldHaveHistogramSupport('avg');
shouldHaveHistogramSupport('sum');
+ shouldHaveHistogramSupport('min');
+ shouldHaveHistogramSupport('max');
shouldHaveHistogramSupport('value_count');
shouldHaveHistogramSupport('percentile');
shouldHaveHistogramSupport('percentile_rank');
@@ -81,8 +83,6 @@ describe('Histogram Types', () => {
);
};
shouldNotHaveHistogramSupport('cardinality');
- shouldNotHaveHistogramSupport('max');
- shouldNotHaveHistogramSupport('min');
shouldNotHaveHistogramSupport('variance');
shouldNotHaveHistogramSupport('sum_of_squares');
shouldNotHaveHistogramSupport('std_deviation');
diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js b/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
index ba3b330ed8eef2..61226e4e8dcbe5 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
@@ -17,6 +17,8 @@ export function getSupportedFieldsByMetricType(type) {
return Object.values(KBN_FIELD_TYPES);
case METRIC_TYPES.AVERAGE:
case METRIC_TYPES.SUM:
+ case METRIC_TYPES.MIN:
+ case METRIC_TYPES.MAX:
return [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.HISTOGRAM];
default:
return [KBN_FIELD_TYPES.NUMBER];
diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js b/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
index 10258effbb8836..c009146abb7bd1 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
@@ -26,11 +26,11 @@ describe('getSupportedFieldsByMetricType', () => {
shouldSupportAllFieldTypes('value_count');
shouldHaveHistogramAndNumbers('avg');
shouldHaveHistogramAndNumbers('sum');
+ shouldHaveHistogramAndNumbers('min');
+ shouldHaveHistogramAndNumbers('max');
shouldHaveOnlyNumbers('positive_rate');
shouldHaveOnlyNumbers('std_deviation');
- shouldHaveOnlyNumbers('max');
- shouldHaveOnlyNumbers('min');
it(`should return everything but histogram for cardinality`, () => {
expect(getSupportedFieldsByMetricType('cardinality')).not.toContain('histogram');
diff --git a/src/plugins/vis_type_timeseries/server/routes/vis.ts b/src/plugins/vis_type_timeseries/server/routes/vis.ts
index 7c314228dad246..15890011d75bb9 100644
--- a/src/plugins/vis_type_timeseries/server/routes/vis.ts
+++ b/src/plugins/vis_type_timeseries/server/routes/vis.ts
@@ -42,18 +42,12 @@ export const visDataRoutes = (router: VisTypeTimeseriesRouter, framework: Framew
);
}
- try {
- const results = await getVisData(
- requestContext,
- request as KibanaRequest<{}, {}, GetVisDataOptions>,
- framework
- );
- return response.ok({ body: results });
- } catch (error) {
- return response.internalError({
- body: error.message,
- });
- }
+ const results = await getVisData(
+ requestContext,
+ request as KibanaRequest<{}, {}, GetVisDataOptions>,
+ framework
+ );
+ return response.ok({ body: results });
}
);
};
diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/handler.js
index 1f1d971a445462..f3201f60007f06 100644
--- a/src/plugins/vis_type_vislib/public/vislib/lib/handler.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/handler.js
@@ -9,6 +9,7 @@
import d3 from 'd3';
import _ from 'lodash';
import MarkdownIt from 'markdown-it';
+import moment from 'moment';
import { dispatchRenderComplete } from '../../../../kibana_utils/public';
@@ -26,6 +27,10 @@ const markdownIt = new MarkdownIt({
linkify: true,
});
+const convertToTimestamp = (date) => {
+ return parseInt(moment(date).format('x'));
+};
+
/**
* Handles building all the components of the visualization
*
@@ -80,11 +85,13 @@ export class Handler {
case 'brush':
const xRaw = _.get(eventPayload.data, 'series[0].values[0].xRaw');
if (!xRaw) return; // not sure if this is possible?
+ const [start, end] = eventPayload.range;
+ const range = [convertToTimestamp(start), convertToTimestamp(end)];
return self.vis.emit(eventType, {
name: 'brush',
data: {
table: xRaw.table,
- range: eventPayload.range,
+ range,
column: xRaw.column,
},
});
diff --git a/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx b/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx
index 0c1ab262755a73..c9ed82fcf58e55 100644
--- a/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx
+++ b/src/plugins/vis_type_xy/public/components/detailed_tooltip.tsx
@@ -27,9 +27,6 @@ interface TooltipData {
value: string;
}
-// TODO: replace when exported from elastic/charts
-const DEFAULT_SINGLE_PANEL_SM_VALUE = '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__';
-
export const getTooltipData = (
aspects: Aspects,
header: TooltipValue | null,
@@ -81,7 +78,7 @@ export const getTooltipData = (
if (
aspects.splitColumn &&
valueSeries.smHorizontalAccessorValue !== undefined &&
- valueSeries.smHorizontalAccessorValue !== DEFAULT_SINGLE_PANEL_SM_VALUE
+ valueSeries.smHorizontalAccessorValue !== undefined
) {
data.push({
label: aspects.splitColumn.title,
@@ -92,7 +89,7 @@ export const getTooltipData = (
if (
aspects.splitRow &&
valueSeries.smVerticalAccessorValue !== undefined &&
- valueSeries.smVerticalAccessorValue !== DEFAULT_SINGLE_PANEL_SM_VALUE
+ valueSeries.smVerticalAccessorValue !== undefined
) {
data.push({
label: aspects.splitRow.title,
diff --git a/src/plugins/vis_type_xy/public/utils/get_legend_actions.tsx b/src/plugins/vis_type_xy/public/utils/get_legend_actions.tsx
index 9f557806cf1427..5c28ca77da0c4a 100644
--- a/src/plugins/vis_type_xy/public/utils/get_legend_actions.tsx
+++ b/src/plugins/vis_type_xy/public/utils/get_legend_actions.tsx
@@ -20,7 +20,7 @@ export const getLegendActions = (
onFilter: (data: ClickTriggerEvent, negate?: any) => void,
getSeriesName: (series: XYChartSeriesIdentifier) => SeriesName
): LegendAction => {
- return ({ series: xySeries }) => {
+ return ({ series: [xySeries] }) => {
const [popoverOpen, setPopoverOpen] = useState(false);
const [isfilterable, setIsfilterable] = useState(false);
const series = xySeries as XYChartSeriesIdentifier;
diff --git a/src/plugins/vis_type_xy/public/utils/use_color_picker.tsx b/src/plugins/vis_type_xy/public/utils/use_color_picker.tsx
index 80e7e12adf799d..5028bc379c375d 100644
--- a/src/plugins/vis_type_xy/public/utils/use_color_picker.tsx
+++ b/src/plugins/vis_type_xy/public/utils/use_color_picker.tsx
@@ -36,7 +36,7 @@ export const useColorPicker = (
getSeriesName: (series: XYChartSeriesIdentifier) => SeriesName
): LegendColorPicker =>
useMemo(
- () => ({ anchor, color, onClose, onChange, seriesIdentifier }) => {
+ () => ({ anchor, color, onClose, onChange, seriesIdentifiers: [seriesIdentifier] }) => {
const seriesName = getSeriesName(seriesIdentifier as XYChartSeriesIdentifier);
const handlChange = (newColor: string | null, event: BaseSyntheticEvent) => {
if (!seriesName) {
diff --git a/src/plugins/vis_type_xy/public/vis_component.tsx b/src/plugins/vis_type_xy/public/vis_component.tsx
index c7ba5021196ff7..ab398101bac9d6 100644
--- a/src/plugins/vis_type_xy/public/vis_component.tsx
+++ b/src/plugins/vis_type_xy/public/vis_component.tsx
@@ -157,17 +157,12 @@ const VisComponent = (props: VisComponentProps) => {
(
visData: Datatable,
xAccessor: Accessor | AccessorFn,
- splitSeriesAccessors: Array,
- splitChartAccessor?: Accessor | AccessorFn
+ splitSeriesAccessors: Array
) => {
const splitSeriesAccessorFnMap = getSplitSeriesAccessorFnMap(splitSeriesAccessors);
return (series: XYChartSeriesIdentifier): ClickTriggerEvent | null => {
if (xAccessor !== null) {
- return getFilterFromSeriesFn(visData)(
- series,
- splitSeriesAccessorFnMap,
- splitChartAccessor
- );
+ return getFilterFromSeriesFn(visData)(series, splitSeriesAccessorFnMap);
}
return null;
@@ -373,12 +368,7 @@ const VisComponent = (props: VisComponentProps) => {
config.aspects.series && (config.aspects.series?.length ?? 0) > 0
? getLegendActions(
canFilter,
- getFilterEventData(
- visData,
- xAccessor,
- splitSeriesAccessors,
- splitChartColumnAccessor ?? splitChartRowAccessor
- ),
+ getFilterEventData(visData, xAccessor, splitSeriesAccessors),
handleFilterAction,
getSeriesName
)
diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
index ff352003609a99..d36b734f75be2e 100644
--- a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
+++ b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
@@ -8,7 +8,7 @@
import React from 'react';
-import { EuiModal, EuiOverlayMask } from '@elastic/eui';
+import { EuiModal } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
@@ -121,7 +121,7 @@ class NewVisModal extends React.Component
);
- return {selectionModal};
+ return selectionModal;
}
private onCloseModal = () => {
diff --git a/test/common/fixtures/plugins/newsfeed/server/plugin.ts b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
index 732bc6c4732436..49ffa464efac92 100644
--- a/test/common/fixtures/plugins/newsfeed/server/plugin.ts
+++ b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
@@ -34,7 +34,7 @@ export class NewsFeedSimulatorPlugin implements Plugin {
options: { authRequired: false },
},
(context, req, res) => {
- return res.internalError({ body: new Error('Internal server error') });
+ throw new Error('Internal server error');
}
);
}
diff --git a/test/functional/apps/discover/_shared_links.ts b/test/functional/apps/discover/_shared_links.ts
index 076a53a618c46a..2893102367b04b 100644
--- a/test/functional/apps/discover/_shared_links.ts
+++ b/test/functional/apps/discover/_shared_links.ts
@@ -77,7 +77,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'/app/discover?_t=1453775307251#' +
'/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time' +
":(from:'2015-09-19T06:31:44.000Z',to:'2015-09" +
- "-23T18:31:44.000Z'))&_a=(columns:!(_source),filters:!(),index:'logstash-" +
+ "-23T18:31:44.000Z'))&_a=(columns:!(),filters:!(),index:'logstash-" +
"*',interval:auto,query:(language:kuery,query:'')" +
",sort:!(!('@timestamp',desc)))";
const actualUrl = await PageObjects.share.getSharedUrl();
diff --git a/test/functional/apps/home/_navigation.ts b/test/functional/apps/home/_navigation.ts
index 3a59f45cef8fa8..401f33b789c859 100644
--- a/test/functional/apps/home/_navigation.ts
+++ b/test/functional/apps/home/_navigation.ts
@@ -15,8 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const appsMenu = getService('appsMenu');
const esArchiver = getService('esArchiver');
- // Failing: See https://github.com/elastic/kibana/issues/88826
- describe.skip('Kibana browser back navigation should work', function describeIndexTests() {
+ describe('Kibana browser back navigation should work', function describeIndexTests() {
before(async () => {
await esArchiver.loadIfNeeded('discover');
await esArchiver.loadIfNeeded('logstash_functional');
diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js
index 61b143e9874714..16c427e9bbe20b 100644
--- a/test/functional/apps/management/_handle_version_conflict.js
+++ b/test/functional/apps/management/_handle_version_conflict.js
@@ -18,6 +18,7 @@
import expect from '@kbn/expect';
export default function ({ getService, getPageObjects }) {
+ const testSubjects = getService('testSubjects');
const esArchiver = getService('esArchiver');
const browser = getService('browser');
const es = getService('legacyEs');
@@ -65,6 +66,11 @@ export default function ({ getService, getPageObjects }) {
log.debug('Starting openControlsByName (' + fieldName + ')');
await PageObjects.settings.openControlsByName(fieldName);
log.debug('controls are open');
+ await (
+ await (await testSubjects.find('formatRow')).findAllByCssSelector(
+ '[data-test-subj="toggle"]'
+ )
+ )[0].click();
await PageObjects.settings.setFieldFormat('url');
const response = await es.update({
index: '.kibana',
diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts
index e2a056359b48e2..a3daaf86294939 100644
--- a/test/functional/apps/management/_import_objects.ts
+++ b/test/functional/apps/management/_import_objects.ts
@@ -23,8 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const log = getService('log');
- // FLAKY: https://github.com/elastic/kibana/issues/89478
- describe.skip('import objects', function describeIndexTests() {
+ describe('import objects', function describeIndexTests() {
describe('.ndjson file', () => {
beforeEach(async function () {
await esArchiver.load('management');
diff --git a/test/functional/apps/management/_index_pattern_filter.js b/test/functional/apps/management/_index_pattern_filter.js
index eeb0b224d5f0ca..261ba29410a09d 100644
--- a/test/functional/apps/management/_index_pattern_filter.js
+++ b/test/functional/apps/management/_index_pattern_filter.js
@@ -35,23 +35,23 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.settings.clickKibanaIndexPatterns();
await PageObjects.settings.clickIndexPatternLogstash();
await PageObjects.settings.getFieldTypes();
- await PageObjects.settings.setFieldTypeFilter('string');
+ await PageObjects.settings.setFieldTypeFilter('keyword');
await retry.try(async function () {
const fieldTypes = await PageObjects.settings.getFieldTypes();
expect(fieldTypes.length).to.be.above(0);
for (const fieldType of fieldTypes) {
- expect(fieldType).to.be('string');
+ expect(fieldType).to.be('keyword');
}
});
- await PageObjects.settings.setFieldTypeFilter('number');
+ await PageObjects.settings.setFieldTypeFilter('long');
await retry.try(async function () {
const fieldTypes = await PageObjects.settings.getFieldTypes();
expect(fieldTypes.length).to.be.above(0);
for (const fieldType of fieldTypes) {
- expect(fieldType).to.be('number');
+ expect(fieldType).to.be('long');
}
});
});
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index 231617d7084e96..0618dd79e272ec 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -10,6 +10,7 @@ import expect from '@kbn/expect';
export default function ({ getService, getPageObjects }) {
const kibanaServer = getService('kibanaServer');
+ const testSubjects = getService('testSubjects');
const log = getService('log');
const PageObjects = getPageObjects(['settings', 'common']);
@@ -27,11 +28,12 @@ export default function ({ getService, getPageObjects }) {
log.debug('Starting openControlsByName (' + fieldName + ')');
await PageObjects.settings.openControlsByName(fieldName);
log.debug('increasePopularity');
+ await testSubjects.click('toggleAdvancedSetting');
await PageObjects.settings.increasePopularity();
});
afterEach(async () => {
- await PageObjects.settings.controlChangeCancel();
+ await testSubjects.click('closeFlyoutButton');
await PageObjects.settings.removeIndexPattern();
// Cancel saving the popularity change (we didn't make a change in this case, just checking the value)
});
@@ -44,12 +46,12 @@ export default function ({ getService, getPageObjects }) {
it('should be reset on cancel', async function () {
// Cancel saving the popularity change
- await PageObjects.settings.controlChangeCancel();
+ await testSubjects.click('closeFlyoutButton');
await PageObjects.settings.openControlsByName(fieldName);
// check that it is 0 (previous increase was cancelled
const popularity = await PageObjects.settings.getPopularity();
log.debug('popularity = ' + popularity);
- expect(popularity).to.be('');
+ expect(popularity).to.be('0');
});
it('can be saved', async function () {
diff --git a/test/functional/apps/management/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js
index 90af0636bcd486..cedf5ee355b36a 100644
--- a/test/functional/apps/management/_index_pattern_results_sort.js
+++ b/test/functional/apps/management/_index_pattern_results_sort.js
@@ -17,6 +17,12 @@ export default function ({ getService, getPageObjects }) {
before(async function () {
// delete .kibana index and then wait for Kibana to re-create it
await kibanaServer.uiSettings.replace({});
+ await PageObjects.settings.navigateTo();
+ await PageObjects.settings.createIndexPattern();
+ });
+
+ after(async function () {
+ return await PageObjects.settings.removeIndexPattern();
});
const columns = [
@@ -31,8 +37,8 @@ export default function ({ getService, getPageObjects }) {
},
{
heading: 'Type',
- first: '_source',
- last: 'string',
+ first: '',
+ last: 'text',
selector: async function () {
const tableRow = await PageObjects.settings.getTableRow(0, 1);
return await tableRow.getVisibleText();
@@ -42,16 +48,11 @@ export default function ({ getService, getPageObjects }) {
columns.forEach(function (col) {
describe('sort by heading - ' + col.heading, function indexPatternCreation() {
- before(async function () {
- await PageObjects.settings.createIndexPattern();
- });
-
- after(async function () {
- return await PageObjects.settings.removeIndexPattern();
- });
-
it('should sort ascending', async function () {
- await PageObjects.settings.sortBy(col.heading);
+ console.log('col.heading', col.heading);
+ if (col.heading !== 'Name') {
+ await PageObjects.settings.sortBy(col.heading);
+ }
const rowText = await col.selector();
expect(rowText).to.be(col.first);
});
@@ -65,15 +66,6 @@ export default function ({ getService, getPageObjects }) {
});
describe('field list pagination', function () {
const EXPECTED_FIELD_COUNT = 86;
-
- before(async function () {
- await PageObjects.settings.createIndexPattern();
- });
-
- after(async function () {
- return await PageObjects.settings.removeIndexPattern();
- });
-
it('makelogs data should have expected number of fields', async function () {
await retry.try(async function () {
const TabCount = await PageObjects.settings.getFieldsTabCount();
diff --git a/test/functional/apps/saved_objects_management/edit_saved_object.ts b/test/functional/apps/saved_objects_management/edit_saved_object.ts
index 81569c5bfc498a..89889088bd73ba 100644
--- a/test/functional/apps/saved_objects_management/edit_saved_object.ts
+++ b/test/functional/apps/saved_objects_management/edit_saved_object.ts
@@ -55,8 +55,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
await button.click();
};
- // Flaky: https://github.com/elastic/kibana/issues/68400
- describe.skip('saved objects edition page', () => {
+ describe('saved objects edition page', () => {
beforeEach(async () => {
await esArchiver.load('saved_objects_management/edit_saved_object');
});
diff --git a/test/functional/apps/visualize/_tag_cloud.ts b/test/functional/apps/visualize/_tag_cloud.ts
index e619a35fb3d0b7..c7d864e5cfb233 100644
--- a/test/functional/apps/visualize/_tag_cloud.ts
+++ b/test/functional/apps/visualize/_tag_cloud.ts
@@ -11,6 +11,7 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const testSubjects = getService('testSubjects');
const filterBar = getService('filterBar');
const log = getService('log');
const inspector = getService('inspector');
@@ -145,6 +146,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.settings.clickIndexPatternLogstash();
await PageObjects.settings.filterField(termsField);
await PageObjects.settings.openControlsByName(termsField);
+ await (
+ await (await testSubjects.find('formatRow')).findAllByCssSelector(
+ '[data-test-subj="toggle"]'
+ )
+ )[0].click();
await PageObjects.settings.setFieldFormat('bytes');
await PageObjects.settings.controlChangeSave();
await PageObjects.common.navigateToApp('visualize');
diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts
index 9c571f0f0ef86b..465deed4d9039b 100644
--- a/test/functional/page_objects/dashboard_page.ts
+++ b/test/functional/page_objects/dashboard_page.ts
@@ -425,8 +425,9 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
await this.setStoreTimeWithDashboard(saveOptions.storeTimeWithDashboard);
}
- if (saveOptions.saveAsNew !== undefined) {
- await this.setSaveAsNewCheckBox(saveOptions.saveAsNew);
+ const saveAsNewCheckboxExists = await testSubjects.exists('saveAsNewCheckbox');
+ if (saveAsNewCheckboxExists) {
+ await this.setSaveAsNewCheckBox(Boolean(saveOptions.saveAsNew));
}
if (saveOptions.tags) {
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index f59db345f39ff9..09a05732b791bb 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -249,7 +249,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
await find.clickByCssSelector(
`table.euiTable tbody tr.euiTableRow:nth-child(${tableFields.indexOf(name) + 1})
- td:last-child button`
+ td:nth-last-child(2) button`
);
}
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index f731ffade6efc7..5bf99b4bf1136b 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -37,14 +37,21 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
};
const writeCoverage = (coverageJson: string) => {
- if (!Fs.existsSync(coverageDir)) {
- Fs.mkdirSync(coverageDir, { recursive: true });
+ // on CI we make hard link clone and run tests from kibana${process.env.CI_GROUP} root path
+ const re = new RegExp(`kibana${process.env.CI_GROUP}`, 'g');
+ const dir = process.env.CI ? coverageDir.replace(re, 'kibana') : coverageDir;
+
+ if (!Fs.existsSync(dir)) {
+ Fs.mkdirSync(dir, { recursive: true });
}
+
const id = coverageCounter++;
const timestamp = Date.now();
- const path = resolve(coverageDir, `${id}.${timestamp}.coverage.json`);
+ const path = resolve(dir, `${id}.${timestamp}.coverage.json`);
log.info('writing coverage to', path);
- Fs.writeFileSync(path, JSON.stringify(JSON.parse(coverageJson), null, 2));
+
+ const jsonString = process.env.CI ? coverageJson.replace(re, 'kibana') : coverageJson;
+ Fs.writeFileSync(path, JSON.stringify(JSON.parse(jsonString), null, 2));
};
const browserConfig: BrowserConfig = {
diff --git a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
index 47644256b05e7c..ae7abdaebba101 100644
--- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
@@ -18,7 +18,7 @@ export class CorePluginBPlugin implements Plugin {
public setup(core: CoreSetup, deps: {}) {
const router = core.http.createRouter();
router.get({ path: '/core_plugin_b', validate: false }, async (context, req, res) => {
- if (!context.pluginA) return res.internalError({ body: 'pluginA is disabled' });
+ if (!context.pluginA) throw new Error('pluginA is disabled');
const response = await context.pluginA.ping();
return res.ok({ body: `Pong via plugin A: ${response}` });
});
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index 4faf645975c778..58dcc9f52c0893 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -29,14 +29,6 @@ else
echo " -> running tests from the clone folder"
node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP" --exclude-tag "skipCoverage" || true;
- if [[ -d target/kibana-coverage/functional ]]; then
- echo " -> replacing kibana${CI_GROUP} with kibana in json files"
- sed -i "s|kibana${CI_GROUP}|kibana|g" target/kibana-coverage/functional/*.json
- echo " -> copying coverage to the original folder"
- mkdir -p ../kibana/target/kibana-coverage/functional
- mv target/kibana-coverage/functional/* ../kibana/target/kibana-coverage/functional/
- fi
-
echo " -> moving junit output, silently fail in case of no report"
mkdir -p ../kibana/target/junit
mv target/junit/* ../kibana/target/junit/ || echo "copying junit failed"
diff --git a/test/scripts/jenkins_storybook.sh b/test/scripts/jenkins_storybook.sh
new file mode 100755
index 00000000000000..8ebfc1035fe1f1
--- /dev/null
+++ b/test/scripts/jenkins_storybook.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+cd "$XPACK_DIR/plugins/canvas"
+node scripts/storybook --dll
+
+cd "$KIBANA_DIR"
+
+# yarn storybook --site apm # TODO re-enable after being fixed
+yarn storybook --site canvas
+yarn storybook --site ci_composite
+yarn storybook --site url_template_editor
+yarn storybook --site codeeditor
+yarn storybook --site dashboard
+yarn storybook --site dashboard_enhanced
+yarn storybook --site data_enhanced
+yarn storybook --site embeddable
+yarn storybook --site infra
+yarn storybook --site security_solution
+yarn storybook --site ui_actions_enhanced
+yarn storybook --site observability
+yarn storybook --site presentation
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
index a483f8378b8b41..3300ed2d0884f9 100755
--- a/test/scripts/jenkins_unit.sh
+++ b/test/scripts/jenkins_unit.sh
@@ -28,7 +28,7 @@ if [[ -z "$CODE_COVERAGE" ]] ; then
./test/scripts/checks/test_hardening.sh
else
echo " -> Running jest tests with coverage"
- node scripts/jest --ci --verbose --maxWorkers=6 --coverage || true;
+ node scripts/jest --ci --verbose --maxWorkers=8 --coverage || true;
echo " -> Running jest integration tests with coverage"
node scripts/jest_integration --ci --verbose --coverage || true;
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 648605135b3595..0198a5d0ac5fac 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -25,14 +25,6 @@ else
echo " -> running tests from the clone folder"
node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP" --exclude-tag "skipCoverage" || true;
- if [[ -d ../target/kibana-coverage/functional ]]; then
- echo " -> replacing kibana${CI_GROUP} with kibana in json files"
- sed -i "s|kibana${CI_GROUP}|kibana|g" ../target/kibana-coverage/functional/*.json
- echo " -> copying coverage to the original folder"
- mkdir -p ../../kibana/target/kibana-coverage/functional
- mv ../target/kibana-coverage/functional/* ../../kibana/target/kibana-coverage/functional/
- fi
-
echo " -> moving junit output, silently fail in case of no report"
mkdir -p ../../kibana/target/junit
mv ../target/junit/* ../../kibana/target/junit/ || echo "copying junit failed"
diff --git a/tsconfig.json b/tsconfig.json
index 48feac3efe4752..f6ce6b92b7e02f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -63,5 +63,6 @@
{ "path": "./src/plugins/visualizations/tsconfig.json" },
{ "path": "./src/plugins/visualize/tsconfig.json" },
{ "path": "./src/plugins/index_pattern_management/tsconfig.json" },
+ { "path": "./src/plugins/index_pattern_field_editor/tsconfig.json" },
]
}
diff --git a/tsconfig.refs.json b/tsconfig.refs.json
index 7806cf93756e57..428460e0bfeb51 100644
--- a/tsconfig.refs.json
+++ b/tsconfig.refs.json
@@ -67,6 +67,7 @@
{ "path": "./x-pack/plugins/data_enhanced/tsconfig.json" },
{ "path": "./x-pack/plugins/dashboard_mode/tsconfig.json" },
{ "path": "./x-pack/plugins/discover_enhanced/tsconfig.json" },
+ { "path": "./x-pack/plugins/drilldowns/url_drilldown/tsconfig.json" },
{ "path": "./x-pack/plugins/embeddable_enhanced/tsconfig.json" },
{ "path": "./x-pack/plugins/encrypted_saved_objects/tsconfig.json" },
{ "path": "./x-pack/plugins/enterprise_search/tsconfig.json" },
@@ -84,6 +85,7 @@
{ "path": "./x-pack/plugins/lens/tsconfig.json" },
{ "path": "./x-pack/plugins/license_management/tsconfig.json" },
{ "path": "./x-pack/plugins/licensing/tsconfig.json" },
+ { "path": "./x-pack/plugins/logstash/tsconfig.json" },
{ "path": "./x-pack/plugins/maps_legacy_licensing/tsconfig.json" },
{ "path": "./x-pack/plugins/maps/tsconfig.json" },
{ "path": "./x-pack/plugins/ml/tsconfig.json" },
@@ -112,6 +114,7 @@
{ "path": "./x-pack/plugins/remote_clusters/tsconfig.json" },
{ "path": "./x-pack/plugins/cross_cluster_replication/tsconfig.json" },
{ "path": "./x-pack/plugins/index_lifecycle_management/tsconfig.json" },
- { "path": "./x-pack/plugins/uptime/tsconfig.json" }
+ { "path": "./x-pack/plugins/uptime/tsconfig.json" },
+ { "path": "./x-pack/plugins/xpack_legacy/tsconfig.json" },
]
}
diff --git a/vars/githubCommitStatus.groovy b/vars/githubCommitStatus.groovy
index 248d226169a61e..175dbe0c90542f 100644
--- a/vars/githubCommitStatus.groovy
+++ b/vars/githubCommitStatus.groovy
@@ -41,13 +41,15 @@ def trackBuild(commit, context, Closure closure) {
}
// state: error|failure|pending|success
-def create(sha, state, description, context) {
+def create(sha, state, description, context, targetUrl = null) {
+ targetUrl = targetUrl ?: env.BUILD_URL
+
withGithubCredentials {
return githubApi.post("repos/elastic/kibana/statuses/${sha}", [
state: state,
description: description,
context: context,
- target_url: env.BUILD_URL
+ target_url: targetUrl.toString()
])
}
}
diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
index eead00c082ba75..a2a3a81f253a02 100644
--- a/vars/githubPr.groovy
+++ b/vars/githubPr.groovy
@@ -169,12 +169,18 @@ def getNextCommentMessage(previousCommentInfo = [:], isFinal = false) {
? getBuildStatusIncludingMetrics()
: buildUtils.getBuildStatus()
+ def storybooksUrl = buildState.get('storybooksUrl')
+ def storybooksMessage = storybooksUrl ? "* [Storybooks Preview](${storybooksUrl})" : "* Storybooks not built"
+
if (!isFinal) {
+ storybooksMessage = storybooksUrl ? storybooksMessage : "* Storybooks not built yet"
+
def failuresPart = status != 'SUCCESS' ? ', with failures' : ''
messages << """
## :hourglass_flowing_sand: Build in-progress${failuresPart}
* [continuous-integration/kibana-ci/pull-request](${env.BUILD_URL})
* Commit: ${getCommitHash()}
+ ${storybooksMessage}
* This comment will update when the build is complete
"""
} else if (status == 'SUCCESS') {
@@ -182,6 +188,7 @@ def getNextCommentMessage(previousCommentInfo = [:], isFinal = false) {
## :green_heart: Build Succeeded
* [continuous-integration/kibana-ci/pull-request](${env.BUILD_URL})
* Commit: ${getCommitHash()}
+ ${storybooksMessage}
${getDocsChangesLink()}
"""
} else if(status == 'UNSTABLE') {
@@ -189,6 +196,7 @@ def getNextCommentMessage(previousCommentInfo = [:], isFinal = false) {
## :yellow_heart: Build succeeded, but was flaky
* [continuous-integration/kibana-ci/pull-request](${env.BUILD_URL})
* Commit: ${getCommitHash()}
+ ${storybooksMessage}
${getDocsChangesLink()}
""".stripIndent()
@@ -204,6 +212,7 @@ def getNextCommentMessage(previousCommentInfo = [:], isFinal = false) {
## :broken_heart: Build Failed
* [continuous-integration/kibana-ci/pull-request](${env.BUILD_URL})
* Commit: ${getCommitHash()}
+ ${storybooksMessage}
* [Pipeline Steps](${env.BUILD_URL}flowGraphTable) (look for red circles / failed steps)
* [Interpreting CI Failures](https://www.elastic.co/guide/en/kibana/current/interpreting-ci-failures.html)
${getDocsChangesLink()}
@@ -235,6 +244,13 @@ def getNextCommentMessage(previousCommentInfo = [:], isFinal = false) {
messages << "To update your PR or re-run it, just comment with:\n`@elasticmachine merge upstream`"
+ catchErrors {
+ def assignees = getAssignees()
+ if (assignees) {
+ messages << "cc " + assignees.collect { "@${it}"}.join(" ")
+ }
+ }
+
info.builds << [
status: status,
url: env.BUILD_URL,
@@ -329,3 +345,19 @@ def shouldCheckCiMetricSuccess() {
return true
}
+
+def getPR() {
+ withGithubCredentials {
+ def path = "repos/elastic/kibana/pulls/${env.ghprbPullId}"
+ return githubApi.get(path)
+ }
+}
+
+def getAssignees() {
+ def pr = getPR()
+ if (!pr) {
+ return []
+ }
+
+ return pr.assignees.collect { it.login }
+}
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 7adf755bfc5834..466a04d9b6b39f 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -425,12 +425,13 @@ def buildXpackPlugins() {
runbld('./test/scripts/jenkins_xpack_build_plugins.sh', 'Build X-Pack Plugins')
}
-def withTasks(Map params = [worker: [:]], Closure closure) {
+def withTasks(Map params = [:], Closure closure) {
catchErrors {
- def config = [name: 'ci-worker', size: 'xxl', ramDisk: true] + (params.worker ?: [:])
+ def config = [setupWork: {}, worker: [:], parallel: 24] + params
+ def workerConfig = [name: 'ci-worker', size: 'xxl', ramDisk: true] + config.worker
- workers.ci(config) {
- withCiTaskQueue(parallel: 24) {
+ workers.ci(workerConfig) {
+ withCiTaskQueue([parallel: config.parallel]) {
parallel([
docker: {
retry(2) {
@@ -443,6 +444,8 @@ def withTasks(Map params = [worker: [:]], Closure closure) {
xpackPlugins: { buildXpackPlugins() },
])
+ config.setupWork()
+
catchErrors {
closure()
}
@@ -460,6 +463,7 @@ def allCiTasks() {
tasks.test()
tasks.functionalOss()
tasks.functionalXpack()
+ tasks.storybooksCi()
}
},
jest: {
diff --git a/vars/storybooks.groovy b/vars/storybooks.groovy
new file mode 100644
index 00000000000000..f3c4a97a7d4364
--- /dev/null
+++ b/vars/storybooks.groovy
@@ -0,0 +1,83 @@
+def getStorybooksBucket() {
+ return "ci-artifacts.kibana.dev/storybooks"
+}
+
+def getDestinationDir() {
+ return env.ghprbPullId ? "pr-${env.ghprbPullId}" : buildState.get('checkoutInfo').branch.replace("/", "__")
+}
+
+def getUrl() {
+ return "https://${getStorybooksBucket()}/${getDestinationDir()}"
+}
+
+def getUrlLatest() {
+ return "${getUrl()}/latest"
+}
+
+def getUrlForCommit() {
+ return "${getUrl()}/${buildState.get('checkoutInfo').commit}"
+}
+
+def upload() {
+ dir("built_assets/storybook") {
+ sh "mv ci_composite composite"
+
+ def storybooks = sh(
+ script: 'ls -1d */',
+ returnStdout: true
+ ).trim()
+ .split('\n')
+ .collect { it.replace('/', '') }
+ .findAll { it != 'composite' }
+
+ def listHtml = storybooks.collect { """${it}""" }.join("\n")
+
+ def html = """
+
+
+ Storybooks
+ Composite Storybook
+ All
+
+
+
+ """
+
+ writeFile(file: 'index.html', text: html)
+
+ withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
+ kibanaPipeline.bash("""
+ gsutil -q -m cp -r -z js,css,html,json,map,txt,svg '*' 'gs://${getStorybooksBucket()}/${getDestinationDir()}/${buildState.get('checkoutInfo').commit}/'
+ gsutil -h "Cache-Control:no-cache, max-age=0, no-transform" cp -z html 'index.html' 'gs://${getStorybooksBucket()}/${getDestinationDir()}/latest/'
+ """, "Upload Storybooks to GCS")
+ }
+
+ buildState.set('storybooksUrl', getUrlForCommit())
+ }
+}
+
+def build() {
+ withEnv(["STORYBOOK_BASE_URL=${getUrlForCommit()}"]) {
+ kibanaPipeline.bash('test/scripts/jenkins_storybook.sh', 'Build Storybooks')
+ }
+}
+
+def buildAndUpload() {
+ def sha = buildState.get('checkoutInfo').commit
+ def context = 'Build and Publish Storybooks'
+
+ githubCommitStatus.create(sha, 'pending', 'Building Storybooks', context)
+
+ try {
+ build()
+ upload()
+ githubCommitStatus.create(sha, 'success', 'Storybooks built', context, getUrlForCommit())
+ } catch(ex) {
+ githubCommitStatus.create(sha, 'error', 'Building Storybooks failed', context)
+ throw ex
+ }
+}
+
+return this
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index 7c40966ff5e04c..846eed85fb0762 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -124,4 +124,10 @@ def functionalXpack(Map params = [:]) {
}
}
+def storybooksCi() {
+ task {
+ storybooks.buildAndUpload()
+ }
+}
+
return this
diff --git a/x-pack/plugins/alerts/README.md b/x-pack/plugins/alerts/README.md
index 2191b23eec11ee..aab848d4555d2d 100644
--- a/x-pack/plugins/alerts/README.md
+++ b/x-pack/plugins/alerts/README.md
@@ -20,26 +20,13 @@ Table of Contents
- [Example](#example)
- [Role Based Access-Control](#role-based-access-control)
- [Alert Navigation](#alert-navigation)
- - [RESTful API](#restful-api)
- - [`POST /api/alerts/alert`: Create alert](#post-apialert-create-alert)
- - [`DELETE /api/alerts/alert/{id}`: Delete alert](#delete-apialertid-delete-alert)
- - [`GET /api/alerts/_find`: Find alerts](#get-apialertfind-find-alerts)
- - [`GET /api/alerts/alert/{id}`: Get alert](#get-apialertid-get-alert)
+ - [Experimental RESTful API](#restful-api)
- [`GET /api/alerts/alert/{id}/state`: Get alert state](#get-apialertidstate-get-alert-state)
- [`GET /api/alerts/alert/{id}/_instance_summary`: Get alert instance summary](#get-apialertidstate-get-alert-instance-summary)
- - [`GET /api/alerts/list_alert_types`: List alert types](#get-apialerttypes-list-alert-types)
- - [`PUT /api/alerts/alert/{id}`: Update alert](#put-apialertid-update-alert)
- - [`POST /api/alerts/alert/{id}/_enable`: Enable an alert](#post-apialertidenable-enable-an-alert)
- - [`POST /api/alerts/alert/{id}/_disable`: Disable an alert](#post-apialertiddisable-disable-an-alert)
- - [`POST /api/alerts/alert/{id}/_mute_all`: Mute all alert instances](#post-apialertidmuteall-mute-all-alert-instances)
- - [`POST /api/alerts/alert/{alert_id}/alert_instance/{alert_instance_id}/_mute`: Mute alert instance](#post-apialertalertidalertinstancealertinstanceidmute-mute-alert-instance)
- - [`POST /api/alerts/alert/{id}/_unmute_all`: Unmute all alert instances](#post-apialertidunmuteall-unmute-all-alert-instances)
- - [`POST /api/alerts/alert/{alertId}/alert_instance/{alertInstanceId}/_unmute`: Unmute an alert instance](#post-apialertalertidalertinstancealertinstanceidunmute-unmute-an-alert-instance)
- [`POST /api/alerts/alert/{id}/_update_api_key`: Update alert API key](#post-apialertidupdateapikey-update-alert-api-key)
- - [Schedule Formats](#schedule-formats)
- [Alert instance factory](#alert-instance-factory)
- [Templating actions](#templating-actions)
- - [Examples](#examples)
+ - [Examples](#examples)
## Terminology
@@ -61,7 +48,7 @@ A Kibana alert detects a condition and executes one or more actions when that co
1. Develop and register an alert type (see alert types -> example).
2. Configure feature level privileges using RBAC
-3. Create an alert using the RESTful API (see alerts -> create).
+3. Create an alert using the RESTful API [Documentation](https://www.elastic.co/guide/en/kibana/master/alerts-api-update.html) (see alerts -> create).
## Limitations
@@ -96,6 +83,7 @@ The following table describes the properties of the `options` object.
|validate.params|When developing an alert type, you can choose to accept a series of parameters. You may also have the parameters validated before they are passed to the `executor` function or created as an alert saved object. In order to do this, provide a `@kbn/config-schema` schema that we will use to validate the `params` attribute.|@kbn/config-schema|
|executor|This is where the code of the alert type lives. This is a function to be called when executing an alert on an interval basis. For full details, see executor section below.|Function|
|producer|The id of the application producing this alert type.|string|
+|minimumLicenseRequired|The value of a minimum license. Most of the alerts are licensed as "basic".|string|
### Executor
@@ -142,13 +130,13 @@ This example receives server and threshold as parameters. It will read the CPU u
```typescript
import { schema } from '@kbn/config-schema';
+import { AlertType, AlertExecutorOptions } from '../../../alerts/server';
import {
- Alert,
- AlertTypeParams,
- AlertTypeState,
- AlertInstanceState,
- AlertInstanceContext
-} from 'x-pack/plugins/alerts/common';
+ AlertTypeParams,
+ AlertTypeState,
+ AlertInstanceState,
+ AlertInstanceContext,
+} from '../../../alerts/common';
...
interface MyAlertTypeParams extends AlertTypeParams {
server: string;
@@ -156,7 +144,7 @@ interface MyAlertTypeParams extends AlertTypeParams {
}
interface MyAlertTypeState extends AlertTypeState {
- lastChecked: number;
+ lastChecked: Date;
}
interface MyAlertTypeInstanceState extends AlertInstanceState {
@@ -257,83 +245,6 @@ const myAlertType: AlertType<
server.newPlatform.setup.plugins.alerts.registerType(myAlertType);
```
-This example only receives threshold as a parameter. It will read the CPU usage of all the servers and schedule individual actions if the reading for a server is greater than the threshold. This is a better implementation than above as only one query is performed for all the servers instead of one query per server.
-
-```typescript
-server.newPlatform.setup.plugins.alerts.registerType({
- id: 'my-alert-type',
- name: 'My alert type',
- validate: {
- params: schema.object({
- threshold: schema.number({ min: 0, max: 1 }),
- }),
- },
- actionGroups: [
- {
- id: 'default',
- name: 'Default',
- },
- ],
- defaultActionGroupId: 'default',
- minimumLicenseRequired: 'basic',
- actionVariables: {
- context: [
- { name: 'server', description: 'the server' },
- { name: 'hasCpuUsageIncreased', description: 'boolean indicating if the cpu usage has increased' },
- ],
- state: [
- { name: 'cpuUsage', description: 'CPU usage' },
- ],
- },
- async executor({
- alertId,
- startedAt,
- previousStartedAt,
- services,
- params,
- state,
- }: AlertExecutorOptions) {
- const { threshold } = params; // Let's assume params is { threshold: 0.8 }
-
- // Call a function to get the CPU readings on all the servers. The result will be
- // an array of { server, cpuUsage }.
- const cpuUsageByServer = await getCpuUsageByServer();
-
- for (const { server, cpuUsage: currentCpuUsage } of cpuUsageByServer) {
- // Only execute if CPU usage is greater than threshold
- if (currentCpuUsage > threshold) {
- // The first argument is a unique identifier the alert instance is about. In this scenario
- // the provided server will be used. Also, this id will be used to make `getState()` return
- // previous state, if any, on matching identifiers.
- const alertInstance = services.alertInstanceFactory(server);
-
- // State from last execution. This will exist if an alert instance was created and executed
- // in the previous execution
- const { cpuUsage: previousCpuUsage } = alertInstance.getState();
-
- // Replace state entirely with new values
- alertInstance.replaceState({
- cpuUsage: currentCpuUsage,
- });
-
- // 'default' refers to the id of a group of actions to be scheduled for execution, see 'actions' in create alert section
- alertInstance.scheduleActions('default', {
- server,
- hasCpuUsageIncreased: currentCpuUsage > previousCpuUsage,
- });
- }
- }
-
- // Single object containing state that isn't specific to a server, this will become available
- // within the `state` function parameter at the next execution
- return {
- lastChecked: new Date(),
- };
- },
- producer: 'alerting',
-});
-```
-
## Role Based Access-Control
Once you have registered your AlertType, you need to grant your users privileges to use it.
When registering a feature in Kibana you can specify multiple types of privileges which are granted to users when they're assigned certain roles.
@@ -387,29 +298,37 @@ It's important to note that any role can be granted a mix of `all` and `read` pr
```typescript
features.registerKibanaFeature({
- id: 'my-application-id',
- name: 'My Application',
- app: [],
- privileges: {
- all: {
- alerting: {
- all: [
- 'my-application-id.my-alert-type',
- 'my-application-id.my-restricted-alert-type'
- ],
- },
- },
- read: {
- alerting: {
- all: [
- 'my-application-id.my-alert-type'
- ]
- read: [
- 'my-application-id.my-restricted-alert-type'
- ],
- },
- },
- },
+ id: 'my-application-id',
+ name: 'My Application',
+ app: [],
+ privileges: {
+ all: {
+ app: ['my-application-id', 'kibana'],
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: [],
+ api: [],
+ },
+ read: {
+ app: ['lens', 'kibana'],
+ alerting: {
+ all: [
+ 'my-application-id.my-alert-type'
+ ],
+ read: [
+ 'my-application-id.my-restricted-alert-type'
+ ],
+ },
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: [],
+ api: [],
+ },
+ },
});
```
@@ -494,46 +413,10 @@ The only case in which this handler will not be used to evaluate the navigation
You can use the `registerNavigation` api to specify as many AlertType specific handlers as you like, but you can only use it once per AlertType as we wouldn't know which handler to use if you specified two for the same AlertType. For the same reason, you can only use `registerDefaultNavigation` once per plugin, as it covers all cases for your specific plugin.
-## RESTful API
-
-Using an alert type requires you to create an alert that will contain parameters and actions for a given alert type. See below for CRUD operations using the API.
+## Experimental RESTful API
-### `POST /api/alerts/alert`: Create alert
-
-Payload:
-
-|Property|Description|Type|
-|---|---|---|
-|enabled|Indicate if you want the alert to start executing on an interval basis after it has been created.|boolean|
-|name|A name to reference and search in the future.|string|
-|tags|A list of keywords to reference and search in the future.|string[]|
-|alertTypeId|The id value of the alert type you want to call when the alert is scheduled to execute.|string|
-|schedule|The schedule specifying when this alert should be run, using one of the available schedule formats specified under _Schedule Formats_ below|object|
-|throttle|A Duration specifying how often this alert should fire the same actions. This will prevent the alert from sending out the same notification over and over. For example, if an alert with a `schedule` of 1 minute stays in a triggered state for 90 minutes, setting a `throttle` of `10m` or `1h` will prevent it from sending 90 notifications over this period.|string|
-|params|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object|
-|actions|Array of the following:
- `group` (string): We support grouping actions in the scenario of escalations or different types of alert instances. If you don't need this, feel free to use `default` as a value.
- `id` (string): The id of the action saved object to execute.
- `params` (object): The map to the `params` the action type will receive. In order to help apply context to strings, we handle them as mustache templates and pass in a default set of context. (see templating actions).|array|
-
-### `DELETE /api/alerts/alert/{id}`: Delete alert
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to delete.|string|
-
-### `GET /api/alerts/_find`: Find alerts
-
-Params:
-
-See the saved objects API documentation for find. All the properties are the same except you cannot pass in `type`.
-
-### `GET /api/alerts/alert/{id}`: Get alert
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to get.|string|
+Using of the alert type requires you to create an alert that will contain parameters and actions for a given alert type. API description for CRUD operations is a part of the [user documentation](https://www.elastic.co/guide/en/kibana/master/alerts-api-update.html).
+API listed below is experimental and could be changed or removed in the future.
### `GET /api/alerts/alert/{id}/state`: Get alert state
@@ -560,93 +443,12 @@ Query:
|---|---|---|
|dateStart|The date to start looking for alert events in the event log. Either an ISO date string, or a duration string indicating time since now.|string|
-### `GET /api/alerts/list_alert_types`: List alert types
-
-No parameters.
-
-### `PUT /api/alerts/alert/{id}`: Update alert
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to update.|string|
-
-Payload:
-
-|Property|Description|Type|
-|---|---|---|
-|schedule|The schedule specifying when this alert should be run, using one of the available schedule formats specified under _Schedule Formats_ below|object|
-|throttle|A Duration specifying how often this alert should fire the same actions. This will prevent the alert from sending out the same notification over and over. For example, if an alert with a `schedule` of 1 minute stays in a triggered state for 90 minutes, setting a `throttle` of `10m` or `1h` will prevent it from sending 90 notifications over this period.|string|
-|name|A name to reference and search in the future.|string|
-|tags|A list of keywords to reference and search in the future.|string[]|
-|params|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object|
-|actions|Array of the following:
- `group` (string): We support grouping actions in the scenario of escalations or different types of alert instances. If you don't need this, feel free to use `default` as a value.
- `id` (string): The id of the action saved object to execute.
- `params` (object): There map to the `params` the action type will receive. In order to help apply context to strings, we handle them as mustache templates and pass in a default set of context. (see templating actions).|array|
-
-### `POST /api/alerts/alert/{id}/_enable`: Enable an alert
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to enable.|string|
-
-### `POST /api/alerts/alert/{id}/_disable`: Disable an alert
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to disable.|string|
-
-### `POST /api/alerts/alert/{id}/_mute_all`: Mute all alert instances
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to mute all alert instances for.|string|
-
-### `POST /api/alerts/alert/{alert_id}/alert_instance/{alert_instance_id}/_mute`: Mute alert instance
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|alertId|The id of the alert you're trying to mute an instance for.|string|
-|alertInstanceId|The instance id of the alert instance you're trying to mute.|string|
-
-### `POST /api/alerts/alert/{id}/_unmute_all`: Unmute all alert instances
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|id|The id of the alert you're trying to unmute all alert instances for.|string|
-
-### `POST /api/alerts/alert/{alertId}/alert_instance/{alertInstanceId}/_unmute`: Unmute an alert instance
-
-Params:
-
-|Property|Description|Type|
-|---|---|---|
-|alertId|The id of the alert you're trying to unmute an instance for.|string|
-|alertInstanceId|The instance id of the alert instance you're trying to unmute.|string|
-
### `POST /api/alerts/alert/{id}/_update_api_key`: Update alert API key
|Property|Description|Type|
|---|---|---|
|id|The id of the alert you're trying to update the API key for. System will use user in request context to generate an API key for.|string|
-## Schedule Formats
-A schedule is structured such that the key specifies the format you wish to use and its value specifies the schedule.
-
-We currently support the _Interval format_ which specifies the interval in seconds, minutes, hours or days at which the alert should execute.
-Example: `{ interval: "10s" }`, `{ interval: "5m" }`, `{ interval: "1h" }`, `{ interval: "1d" }`.
-
-There are plans to support multiple other schedule formats in the near future.
-
## Alert instance factory
**alertInstanceFactory(id)**
@@ -694,7 +496,7 @@ When an alert instance executes, the first argument is the `group` of actions to
The templating engine is [mustache]. General definition for the [mustache variable] is a double-brace {{}}. All variables are HTML-escaped by default and if there is a requirement to render unescaped HTML, it should be applied the triple mustache: `{{{name}}}`. Also, can be used `&` to unescape a variable.
-## Examples
+### Examples
The following code would be within an alert type. As you can see `cpuUsage ` will replace the state of the alert instance and `server` is the context for the alert instance to execute. The difference between the two is `cpuUsage ` will be accessible at the next execution.
diff --git a/x-pack/plugins/alerts/server/plugin.ts b/x-pack/plugins/alerts/server/plugin.ts
index 8dba4453d56827..5a0745d3f00b7d 100644
--- a/x-pack/plugins/alerts/server/plugin.ts
+++ b/x-pack/plugins/alerts/server/plugin.ts
@@ -161,6 +161,7 @@ export class AlertingPlugin {
private eventLogService?: IEventLogService;
private eventLogger?: IEventLogger;
private readonly kibanaIndexConfig: Observable<{ kibana: { index: string } }>;
+ private kibanaBaseUrl: string | undefined;
constructor(initializerContext: PluginInitializerContext) {
this.config = initializerContext.config.create().pipe(first()).toPromise();
@@ -176,6 +177,7 @@ export class AlertingPlugin {
core: CoreSetup,
plugins: AlertingPluginsSetup
): PluginSetupContract {
+ this.kibanaBaseUrl = core.http.basePath.publicBaseUrl;
this.licenseState = new LicenseState(plugins.licensing.license$);
this.security = plugins.security;
@@ -371,6 +373,7 @@ export class AlertingPlugin {
eventLogger: this.eventLogger!,
internalSavedObjectsRepository: core.savedObjects.createInternalRepository(['alert']),
alertTypeRegistry: this.alertTypeRegistry!,
+ kibanaBaseUrl: this.kibanaBaseUrl,
});
this.eventLogService!.registerSavedObjectProvider('alert', (request) => {
diff --git a/x-pack/plugins/alerts/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerts/server/task_runner/create_execution_handler.test.ts
index 4de53a38958f48..120ab6de296dd8 100644
--- a/x-pack/plugins/alerts/server/task_runner/create_execution_handler.test.ts
+++ b/x-pack/plugins/alerts/server/task_runner/create_execution_handler.test.ts
@@ -72,6 +72,7 @@ const createExecutionHandlerParams: jest.Mocked<
alertName: 'name-of-alert',
tags: ['tag-A', 'tag-B'],
apiKey: 'MTIzOmFiYw==',
+ kibanaBaseUrl: 'http://localhost:5601',
alertType,
logger: loggingSystemMock.create().get(),
eventLogger: mockEventLogger,
diff --git a/x-pack/plugins/alerts/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerts/server/task_runner/create_execution_handler.ts
index ad024d7ddd8841..9999ea6a4d3d7c 100644
--- a/x-pack/plugins/alerts/server/task_runner/create_execution_handler.ts
+++ b/x-pack/plugins/alerts/server/task_runner/create_execution_handler.ts
@@ -39,6 +39,7 @@ export interface CreateExecutionHandlerOptions<
actions: AlertAction[];
spaceId: string;
apiKey: RawAlert['apiKey'];
+ kibanaBaseUrl: string | undefined;
alertType: NormalizedAlertType<
Params,
State,
@@ -82,6 +83,7 @@ export function createExecutionHandler<
spaceId,
apiKey,
alertType,
+ kibanaBaseUrl,
eventLogger,
request,
alertParams,
@@ -126,6 +128,7 @@ export function createExecutionHandler<
context,
actionParams: action.params,
state,
+ kibanaBaseUrl,
alertParams,
}),
};
diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts
index 08b288f293bd77..bb5e0e5830159d 100644
--- a/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts
@@ -97,6 +97,7 @@ describe('Task Runner', () => {
eventLogger: eventLoggerMock.create(),
internalSavedObjectsRepository: savedObjectsRepositoryMock.create(),
alertTypeRegistry,
+ kibanaBaseUrl: 'https://localhost:5601',
};
const mockedAlertTypeSavedObject: Alert = {
diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
index 7e96cf03e06106..744be164519995 100644
--- a/x-pack/plugins/alerts/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
@@ -160,6 +160,7 @@ export class TaskRunner<
tags: string[] | undefined,
spaceId: string,
apiKey: RawAlert['apiKey'],
+ kibanaBaseUrl: string | undefined,
actions: Alert['actions'],
alertParams: Params
) {
@@ -180,6 +181,7 @@ export class TaskRunner<
actions,
spaceId,
alertType: this.alertType,
+ kibanaBaseUrl,
eventLogger: this.context.eventLogger,
request: this.getFakeKibanaRequest(spaceId, apiKey),
alertParams,
@@ -388,6 +390,7 @@ export class TaskRunner<
alert.tags,
spaceId,
apiKey,
+ this.context.kibanaBaseUrl,
alert.actions,
alert.params
);
diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts
index 175de7384ed467..343dffa0d5e709 100644
--- a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts
@@ -77,6 +77,7 @@ describe('Task Runner Factory', () => {
eventLogger: eventLoggerMock.create(),
internalSavedObjectsRepository: savedObjectsRepositoryMock.create(),
alertTypeRegistry: alertTypeRegistryMock.create(),
+ kibanaBaseUrl: 'https://localhost:5601',
};
beforeEach(() => {
diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts
index 6d8a3aec92636d..a023776134e9cf 100644
--- a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts
+++ b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts
@@ -40,6 +40,7 @@ export interface TaskRunnerContext {
basePathService: IBasePath;
internalSavedObjectsRepository: ISavedObjectsRepository;
alertTypeRegistry: AlertTypeRegistry;
+ kibanaBaseUrl: string | undefined;
}
export class TaskRunnerFactory {
diff --git a/x-pack/plugins/alerts/server/task_runner/transform_action_params.ts b/x-pack/plugins/alerts/server/task_runner/transform_action_params.ts
index 7e95fee15e700b..4ce30c46cd9f7e 100644
--- a/x-pack/plugins/alerts/server/task_runner/transform_action_params.ts
+++ b/x-pack/plugins/alerts/server/task_runner/transform_action_params.ts
@@ -27,6 +27,7 @@ interface TransformActionParamsOptions {
actionParams: AlertActionParams;
alertParams: AlertTypeParams;
state: AlertInstanceState;
+ kibanaBaseUrl?: string;
context: AlertInstanceContext;
}
@@ -44,6 +45,7 @@ export function transformActionParams({
context,
actionParams,
state,
+ kibanaBaseUrl,
alertParams,
}: TransformActionParamsOptions): AlertActionParams {
// when the list of variables we pass in here changes,
@@ -61,6 +63,7 @@ export function transformActionParams({
context,
date: new Date().toISOString(),
state,
+ kibanaBaseUrl,
params: alertParams,
};
return actionsPlugin.renderActionParameterTemplates(actionTypeId, actionParams, variables);
diff --git a/x-pack/plugins/apm/common/ui_settings_keys.ts b/x-pack/plugins/apm/common/ui_settings_keys.ts
index 83d358068905e1..427c30605e71b8 100644
--- a/x-pack/plugins/apm/common/ui_settings_keys.ts
+++ b/x-pack/plugins/apm/common/ui_settings_keys.ts
@@ -5,5 +5,4 @@
* 2.0.
*/
-export const enableCorrelations = 'apm:enableCorrelations';
export const enableServiceOverview = 'apm:enableServiceOverview';
diff --git a/x-pack/plugins/apm/common/utils/queries.test.ts b/x-pack/plugins/apm/common/utils/queries.test.ts
new file mode 100644
index 00000000000000..546c8627def69c
--- /dev/null
+++ b/x-pack/plugins/apm/common/utils/queries.test.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SERVICE_ENVIRONMENT } from '../elasticsearch_fieldnames';
+import { ENVIRONMENT_NOT_DEFINED } from '../environment_filter_values';
+import { environmentQuery } from './queries';
+
+describe('environmentQuery', () => {
+ describe('when environment is undefined', () => {
+ it('returns an empty query', () => {
+ expect(environmentQuery()).toEqual([]);
+ });
+ });
+
+ it('creates a query for a service environment', () => {
+ expect(environmentQuery('test')).toEqual([
+ {
+ term: { [SERVICE_ENVIRONMENT]: 'test' },
+ },
+ ]);
+ });
+
+ it('creates a query for missing service environments', () => {
+ expect(environmentQuery(ENVIRONMENT_NOT_DEFINED.value)[0]).toHaveProperty(
+ ['bool', 'must_not', 'exists', 'field'],
+ SERVICE_ENVIRONMENT
+ );
+ });
+});
diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts b/x-pack/plugins/apm/common/utils/queries.ts
similarity index 52%
rename from x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
rename to x-pack/plugins/apm/common/utils/queries.ts
index 3dea3344085c92..dbbbf324b964a9 100644
--- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
+++ b/x-pack/plugins/apm/common/utils/queries.ts
@@ -5,19 +5,41 @@
* 2.0.
*/
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../typings/elasticsearch';
import {
ENVIRONMENT_NOT_DEFINED,
ENVIRONMENT_ALL,
-} from '../../../../common/environment_filter_values';
-import { SERVICE_ENVIRONMENT } from '../../../../common/elasticsearch_fieldnames';
+} from '../environment_filter_values';
+import { SERVICE_ENVIRONMENT } from '../elasticsearch_fieldnames';
-export function getEnvironmentUiFilterES(environment?: string): ESFilter[] {
+type QueryContainer = ESFilter;
+
+export function environmentQuery(environment?: string): QueryContainer[] {
if (!environment || environment === ENVIRONMENT_ALL.value) {
return [];
}
+
if (environment === ENVIRONMENT_NOT_DEFINED.value) {
return [{ bool: { must_not: { exists: { field: SERVICE_ENVIRONMENT } } } }];
}
+
return [{ term: { [SERVICE_ENVIRONMENT]: environment } }];
}
+
+export function rangeQuery(
+ start: number,
+ end: number,
+ field = '@timestamp'
+): QueryContainer[] {
+ return [
+ {
+ range: {
+ [field]: {
+ gte: start,
+ lte: end,
+ format: 'epoch_millis',
+ },
+ },
+ },
+ ];
+}
diff --git a/x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx b/x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx
index 0c1eacb6e800ca..3cb31aa10c4feb 100644
--- a/x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx
+++ b/x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx
@@ -30,8 +30,9 @@ export type AnomalyDetectionApiResponse = APIReturnType<'GET /api/apm/settings/a
const DEFAULT_DATA = { jobs: [], hasLegacyJobs: false };
export function AnomalyDetectionSetupLink() {
- const { uiFilters } = useUrlParams();
- const environment = uiFilters.environment;
+ const {
+ urlParams: { environment },
+ } = useUrlParams();
const { core } = useApmPluginContext();
const canGetJobs = !!core.application.capabilities.ml?.canGetJobs;
const license = useLicenseContext();
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
index 0d44c08355c107..d069d4a11b4942 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
@@ -25,7 +25,7 @@ export default {
core: {
http: {
get: (endpoint: string) => {
- if (endpoint === '/api/apm/ui_filters/environments') {
+ if (endpoint === '/api/apm/environments') {
return Promise.resolve(['production']);
} else {
return Promise.resolve({
diff --git a/x-pack/plugins/apm/public/components/app/Correlations/index.tsx b/x-pack/plugins/apm/public/components/app/Correlations/index.tsx
deleted file mode 100644
index c5b2f265fac8c8..00000000000000
--- a/x-pack/plugins/apm/public/components/app/Correlations/index.tsx
+++ /dev/null
@@ -1,108 +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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState } from 'react';
-import {
- EuiButtonEmpty,
- EuiFlyout,
- EuiFlyoutBody,
- EuiFlyoutHeader,
- EuiTitle,
- EuiPortal,
- EuiCode,
- EuiLink,
- EuiCallOut,
- EuiButton,
-} from '@elastic/eui';
-import { useHistory } from 'react-router-dom';
-import { EuiSpacer } from '@elastic/eui';
-import { isActivePlatinumLicense } from '../../../../common/license_check';
-import { enableCorrelations } from '../../../../common/ui_settings_keys';
-import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
-import { LatencyCorrelations } from './LatencyCorrelations';
-import { ErrorCorrelations } from './ErrorCorrelations';
-import { useUrlParams } from '../../../context/url_params_context/use_url_params';
-import { createHref } from '../../shared/Links/url_helpers';
-import { useLicenseContext } from '../../../context/license/use_license_context';
-
-export function Correlations() {
- const { uiSettings } = useApmPluginContext().core;
- const { urlParams } = useUrlParams();
- const license = useLicenseContext();
- const history = useHistory();
- const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
- if (
- !uiSettings.get(enableCorrelations) ||
- !isActivePlatinumLicense(license)
- ) {
- return null;
- }
-
- return (
- <>
- {
- setIsFlyoutVisible(true);
- }}
- >
- View correlations
-
-
-
-
- {isFlyoutVisible && (
-
- setIsFlyoutVisible(false)}
- >
-
-
- Correlations
-
-
-
- {urlParams.kuery ? (
- <>
-
- Filtering by
- {urlParams.kuery}
-
- Clear
-
-
-
-
- ) : null}
-
-
-
- Correlations is an experimental feature and in active
- development. Bugs and surprises are to be expected but let us
- know your feedback so we can improve it.
-
-
-
-
-
-
-
-
-
-
- )}
-
- );
-}
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
index 3edf21eae7279f..4cd2db43621a8f 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
@@ -68,7 +68,7 @@ type ErrorGroupDetailsProps = RouteComponentProps<{
export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
const { serviceName, groupId } = match.params;
const { urlParams, uiFilters } = useUrlParams();
- const { start, end } = urlParams;
+ const { environment, start, end } = urlParams;
const { data: errorGroupData } = useFetcher(
(callApmApi) => {
@@ -81,6 +81,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
groupId,
},
query: {
+ environment,
start,
end,
uiFilters: JSON.stringify(uiFilters),
@@ -89,7 +90,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
});
}
},
- [serviceName, start, end, groupId, uiFilters]
+ [environment, serviceName, start, end, groupId, uiFilters]
);
const { errorDistributionData } = useErrorGroupDistributionFetcher({
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/Metrics.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/Metrics.tsx
new file mode 100644
index 00000000000000..3a9100a0712aab
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/Metrics.tsx
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as React from 'react';
+import numeral from '@elastic/numeral';
+import styled from 'styled-components';
+import { useContext, useEffect } from 'react';
+import {
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiStat,
+ EuiToolTip,
+ EuiIconTip,
+} from '@elastic/eui';
+import { useFetcher } from '../../../../hooks/use_fetcher';
+import { I18LABELS } from '../translations';
+import { useUxQuery } from '../hooks/useUxQuery';
+import { formatToSec } from '../UXMetrics/KeyUXMetrics';
+import { CsmSharedContext } from '../CsmSharedContext';
+
+const ClFlexGroup = styled(EuiFlexGroup)`
+ flex-direction: row;
+ @media only screen and (max-width: 768px) {
+ flex-direction: row;
+ justify-content: space-between;
+ }
+`;
+
+function formatTitle(unit: string, value?: number) {
+ if (typeof value === 'undefined') return I18LABELS.dataMissing;
+ return formatToSec(value, unit);
+}
+
+function PageViewsTotalTitle({ pageViews }: { pageViews?: number }) {
+ if (typeof pageViews === 'undefined') {
+ return <>{I18LABELS.dataMissing};
+ }
+ return pageViews < 10000 ? (
+ <>{numeral(pageViews).format('0,0')}
+ ) : (
+
+ <>{numeral(pageViews).format('0 a')}
+
+ );
+}
+
+export function Metrics() {
+ const uxQuery = useUxQuery();
+
+ const { data, status } = useFetcher(
+ (callApmApi) => {
+ if (uxQuery) {
+ return callApmApi({
+ endpoint: 'GET /api/apm/rum/client-metrics',
+ params: {
+ query: {
+ ...uxQuery,
+ },
+ },
+ });
+ }
+ return Promise.resolve(null);
+ },
+ [uxQuery]
+ );
+
+ const { setSharedData } = useContext(CsmSharedContext);
+
+ useEffect(() => {
+ setSharedData({ totalPageViews: data?.pageViews?.value ?? 0 });
+ }, [data, setSharedData]);
+
+ const STAT_STYLE = { minWidth: '150px', maxWidth: '250px' };
+
+ return (
+
+
+
+ {I18LABELS.totalPageLoad}
+
+
+ }
+ isLoading={status !== 'success'}
+ />
+
+
+
+ {I18LABELS.backEnd}
+
+
+ }
+ isLoading={status !== 'success'}
+ />
+
+
+
+ {I18LABELS.frontEnd}
+
+
+ }
+ isLoading={status !== 'success'}
+ />
+
+
+ }
+ description={I18LABELS.pageViews}
+ isLoading={status !== 'success'}
+ />
+
+
+ );
+}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
index 1d6ce21d198c4a..add6ac1b08b281 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
@@ -6,134 +6,36 @@
*/
import * as React from 'react';
-import numeral from '@elastic/numeral';
-import styled from 'styled-components';
-import { useContext, useEffect } from 'react';
import {
EuiFlexGroup,
EuiFlexItem,
- EuiStat,
- EuiToolTip,
- EuiIconTip,
+ EuiPanel,
+ EuiTitle,
+ EuiSpacer,
} from '@elastic/eui';
-import { useFetcher } from '../../../../hooks/use_fetcher';
import { I18LABELS } from '../translations';
-import { useUxQuery } from '../hooks/useUxQuery';
-import { formatToSec } from '../UXMetrics/KeyUXMetrics';
-import { CsmSharedContext } from '../CsmSharedContext';
-
-const ClFlexGroup = styled(EuiFlexGroup)`
- flex-direction: row;
- @media only screen and (max-width: 768px) {
- flex-direction: row;
- justify-content: space-between;
- }
-`;
-
-function formatTitle(unit: string, value?: number) {
- if (typeof value === 'undefined') return I18LABELS.dataMissing;
- return formatToSec(value, unit);
-}
-
-function PageViewsTotalTitle({ pageViews }: { pageViews?: number }) {
- if (typeof pageViews === 'undefined') {
- return <>{I18LABELS.dataMissing};
- }
- return pageViews < 10000 ? (
- <>{numeral(pageViews).format('0,0')}
- ) : (
-
- <>{numeral(pageViews).format('0 a')}
-
- );
-}
+import { getPercentileLabel } from '../UXMetrics/translations';
+import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
+import { Metrics } from './Metrics';
export function ClientMetrics() {
- const uxQuery = useUxQuery();
-
- const { data, status } = useFetcher(
- (callApmApi) => {
- if (uxQuery) {
- return callApmApi({
- endpoint: 'GET /api/apm/rum/client-metrics',
- params: {
- query: {
- ...uxQuery,
- },
- },
- });
- }
- return Promise.resolve(null);
- },
- [uxQuery]
- );
-
- const { setSharedData } = useContext(CsmSharedContext);
-
- useEffect(() => {
- setSharedData({ totalPageViews: data?.pageViews?.value ?? 0 });
- }, [data, setSharedData]);
-
- const STAT_STYLE = { width: '240px' };
+ const {
+ urlParams: { percentile },
+ } = useUrlParams();
return (
-
-
-
- {I18LABELS.totalPageLoad}
-
-
- }
- isLoading={status !== 'success'}
- />
-
-
-
- {I18LABELS.backEnd}
-
-
- }
- isLoading={status !== 'success'}
- />
-
-
-
- {I18LABELS.frontEnd}
-
-
- }
- isLoading={status !== 'success'}
- />
-
-
- }
- description={I18LABELS.pageViews}
- isLoading={status !== 'success'}
- />
-
-
+
+
+
+
+
+ {I18LABELS.pageLoad} ({getPercentileLabel(percentile!)})
+
+
+
+
+
+
+
);
}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx
index 4afecb7623f73e..5b0b475e86e038 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx
@@ -11,12 +11,14 @@ import {
EuiSpacer,
EuiHorizontalRule,
EuiButtonEmpty,
+ EuiAccordion,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
import { Filter } from './Filter';
import { useLocalUIFilters } from '../hooks/useLocalUIFilters';
import { LocalUIFilterName } from '../../../../../common/ui_filter';
+import { useBreakPoints } from '../../../../hooks/use_break_points';
interface Props {
filterNames: LocalUIFilterName[];
@@ -45,16 +47,20 @@ function LocalUIFilters({
const hasValues = filters.some((filter) => filter.value.length > 0);
- return (
+ const { isSmall } = useBreakPoints();
+
+ const title = (
+
+
+ {i18n.translate('xpack.apm.localFiltersTitle', {
+ defaultMessage: 'Filters',
+ })}
+
+
+ );
+
+ const content = (
<>
-
-
- {i18n.translate('xpack.apm.localFiltersTitle', {
- defaultMessage: 'Filters',
- })}
-
-
-
{children}
{filters.map((filter) => {
return (
@@ -90,6 +96,18 @@ function LocalUIFilters({
) : null}
);
+
+ return isSmall ? (
+
+ {content}
+
+ ) : (
+ <>
+ {title}
+
+ {content}
+
+ );
}
export { LocalUIFilters };
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
index 7d34328d2653dd..e3e2a979c48d35 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
@@ -13,6 +13,7 @@ import { useFetcher } from '../../../../hooks/use_fetcher';
import { RUM_AGENT_NAMES } from '../../../../../common/agent_name';
import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
import { UserPercentile } from '../UserPercentile';
+import { useBreakPoints } from '../../../../hooks/use_break_points';
export function MainFilters() {
const {
@@ -37,6 +38,11 @@ export function MainFilters() {
[start, end]
);
+ const { isSmall } = useBreakPoints();
+
+ // on mobile we want it to take full width
+ const envStyle = isSmall ? {} : { maxWidth: 200 };
+
return (
<>
@@ -45,7 +51,7 @@ export function MainFilters() {
serviceNames={data ?? []}
/>
-
+
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
index 50d91ca73c249d..a182de8540f584 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
@@ -5,46 +5,22 @@
* 2.0.
*/
-import {
- EuiFlexGroup,
- EuiFlexItem,
- EuiTitle,
- EuiSpacer,
- EuiPanel,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import React from 'react';
-import { ClientMetrics } from './ClientMetrics';
-import { I18LABELS } from './translations';
import { UXMetrics } from './UXMetrics';
import { ImpactfulMetrics } from './ImpactfulMetrics';
import { PageLoadAndViews } from './Panels/PageLoadAndViews';
import { VisitorBreakdownsPanel } from './Panels/VisitorBreakdowns';
import { useBreakPoints } from '../../../hooks/use_break_points';
-import { getPercentileLabel } from './UXMetrics/translations';
-import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { ClientMetrics } from './ClientMetrics';
export function RumDashboard() {
- const {
- urlParams: { percentile },
- } = useUrlParams();
const { isSmall } = useBreakPoints();
return (
-
-
-
-
-
- {I18LABELS.pageLoad} ({getPercentileLabel(percentile!)})
-
-
-
-
-
-
-
+
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
index 6e3ed54ed2e780..a0b3781a30b209 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
@@ -20,24 +20,15 @@ export const UX_LABEL = i18n.translate('xpack.apm.ux.title', {
export function RumHome() {
return (
-
+
{UX_LABEL}
+
-
-
-
-
-
-
+
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/URLSearch/SelectableUrlList.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/URLSearch/SelectableUrlList.tsx
index d3a34a1df25f7a..965449b78f3e08 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/URLSearch/SelectableUrlList.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/URLSearch/SelectableUrlList.tsx
@@ -206,6 +206,7 @@ export function SelectableUrlList({
panelRef={setPopoverRef}
button={search}
closePopover={closePopover}
+ style={{ minWidth: 200 }}
>
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/UXMetrics/KeyUXMetrics.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/UXMetrics/KeyUXMetrics.tsx
index f2e761128e5cea..b8766e8b5ce67d 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/UXMetrics/KeyUXMetrics.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/UXMetrics/KeyUXMetrics.tsx
@@ -36,7 +36,7 @@ export function formatToSec(
}
return (valueInMs / 1000).toFixed(2) + ' s';
}
-const STAT_STYLE = { width: '240px' };
+const STAT_STYLE = { width: '200px' };
interface Props {
data?: UXMetrics | null;
@@ -71,7 +71,7 @@ export function KeyUXMetrics({ data, loading }: Props) {
// Note: FCP value is in ms unit
return (
-
+
-
+
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts
index 3f366300792aca..c40f6ba2b88509 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts
@@ -10,11 +10,11 @@ import { useHistory } from 'react-router-dom';
import { LocalUIFilterName } from '../../../../../common/ui_filter';
import { pickKeys } from '../../../../../common/utils/pick_keys';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LocalUIFiltersAPIResponse } from '../../../../../server/lib/ui_filters/local_ui_filters';
+import { LocalUIFiltersAPIResponse } from '../../../../../server/lib/rum_client/ui_filters/local_ui_filters';
import {
localUIFilters,
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../server/lib/ui_filters/local_ui_filters/config';
+} from '../../../../../server/lib/rum_client/ui_filters/local_ui_filters/config';
import {
fromQuery,
toQuery,
@@ -72,7 +72,7 @@ export function useLocalUIFilters({
(callApmApi) => {
if (shouldFetch && urlParams.start && urlParams.end) {
return callApmApi({
- endpoint: `GET /api/apm/ui_filters/local_filters/rumOverview`,
+ endpoint: 'GET /api/apm/rum/local_filters',
params: {
query: {
uiFilters: JSON.stringify(uiFilters),
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx
index 6554f48ea3c2b3..081a3dbc907c5a 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/ConfirmDeleteModal.tsx
@@ -6,7 +6,7 @@
*/
import React, { useState } from 'react';
-import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
+import { EuiConfirmModal } from '@elastic/eui';
import { NotificationsStart } from 'kibana/public';
import { i18n } from '@kbn/i18n';
import { getOptionLabel } from '../../../../../../common/agent_configuration/all_option';
@@ -29,41 +29,39 @@ export function ConfirmDeleteModal({ config, onCancel, onConfirm }: Props) {
const { toasts } = useApmPluginContext().core.notifications;
return (
-
- {
+ setIsDeleting(true);
+ await deleteConfig(config, toasts);
+ setIsDeleting(false);
+ onConfirm();
+ }}
+ cancelButtonText={i18n.translate(
+ 'xpack.apm.agentConfig.deleteModal.cancel',
+ { defaultMessage: `Cancel` }
+ )}
+ confirmButtonText={i18n.translate(
+ 'xpack.apm.agentConfig.deleteModal.confirm',
+ { defaultMessage: `Delete` }
+ )}
+ confirmButtonDisabled={isDeleting}
+ buttonColor="danger"
+ defaultFocusedButton="confirm"
+ >
+
+ {i18n.translate('xpack.apm.agentConfig.deleteModal.text', {
+ defaultMessage: `You are about to delete the configuration for service "{serviceName}" and environment "{environment}".`,
+ values: {
+ serviceName: getOptionLabel(config.service.name),
+ environment: getOptionLabel(config.service.environment),
+ },
})}
- onCancel={onCancel}
- onConfirm={async () => {
- setIsDeleting(true);
- await deleteConfig(config, toasts);
- setIsDeleting(false);
- onConfirm();
- }}
- cancelButtonText={i18n.translate(
- 'xpack.apm.agentConfig.deleteModal.cancel',
- { defaultMessage: `Cancel` }
- )}
- confirmButtonText={i18n.translate(
- 'xpack.apm.agentConfig.deleteModal.confirm',
- { defaultMessage: `Delete` }
- )}
- confirmButtonDisabled={isDeleting}
- buttonColor="danger"
- defaultFocusedButton="confirm"
- >
-
- {i18n.translate('xpack.apm.agentConfig.deleteModal.text', {
- defaultMessage: `You are about to delete the configuration for service "{serviceName}" and environment "{environment}".`,
- values: {
- serviceName: getOptionLabel(config.service.name),
- environment: getOptionLabel(config.service.environment),
- },
- })}
-
-
-
+
+
);
}
diff --git a/x-pack/plugins/apm/public/components/app/Correlations/SignificantTermsTable.tsx b/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
similarity index 51%
rename from x-pack/plugins/apm/public/components/app/Correlations/SignificantTermsTable.tsx
rename to x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
index f7580cc65c543f..c75c1fb6d96a6b 100644
--- a/x-pack/plugins/apm/public/components/app/Correlations/SignificantTermsTable.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
@@ -5,16 +5,23 @@
* 2.0.
*/
-import React from 'react';
-import { EuiIcon, EuiLink } from '@elastic/eui';
+import React, { useCallback } from 'react';
+import { debounce } from 'lodash';
+import {
+ EuiIcon,
+ EuiLink,
+ EuiBasicTable,
+ EuiBasicTableColumn,
+ EuiToolTip,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
import { useHistory } from 'react-router-dom';
-import { EuiBasicTable } from '@elastic/eui';
-import { EuiBasicTableColumn } from '@elastic/eui';
-import { EuiCode } from '@elastic/eui';
import { asInteger, asPercent } from '../../../../common/utils/formatters';
import { APIReturnType } from '../../../services/rest/createCallApmApi';
import { FETCH_STATUS } from '../../../hooks/use_fetcher';
import { createHref, push } from '../../shared/Links/url_helpers';
+import { ImpactBar } from '../../shared/ImpactBar';
+import { useUiTracker } from '../../../../../observability/public';
type CorrelationsApiResponse =
| APIReturnType<'GET /api/apm/correlations/failed_transactions'>
@@ -27,49 +34,83 @@ type SignificantTerm = NonNullable<
interface Props {
significantTerms?: T[];
status: FETCH_STATUS;
- cardinalityColumnName: string;
+ percentageColumnName: string;
setSelectedSignificantTerm: (term: T | null) => void;
+ onFilter: () => void;
}
-export function SignificantTermsTable({
+export function CorrelationsTable({
significantTerms,
status,
- cardinalityColumnName,
+ percentageColumnName,
setSelectedSignificantTerm,
+ onFilter,
}: Props) {
+ const trackApmEvent = useUiTracker({ app: 'apm' });
+ const trackSelectSignificantTerm = useCallback(
+ () =>
+ debounce(
+ () => trackApmEvent({ metric: 'select_significant_term' }),
+ 1000
+ ),
+ [trackApmEvent]
+ );
const history = useHistory();
const columns: Array