diff --git a/src/plugins/data/public/ui/filter_bar/filter_options.tsx b/src/plugins/data/public/ui/filter_bar/filter_options.tsx
index 3fb7f198d546..b97e0e33f240 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_options.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_options.tsx
@@ -167,6 +167,7 @@ class FilterOptionsUI extends Component
{
anchorPosition="rightUp"
panelPaddingSize="none"
withTitle
+ repositionOnScroll
>
setIsPopoverOpen(false)}
withTitle
+ repositionOnScroll
>
{i18n.translate('data.noDataPopover.content', {
defaultMessage:
- "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts",
+ "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts.",
})}
@@ -66,11 +66,13 @@ export function NoDataPopover({
step={1}
stepsTotal={1}
isStepOpen={noDataPopoverVisible}
- subtitle={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Tip' })}
- title=""
+ subtitle={i18n.translate('data.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
+ title={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Empty dataset' })}
footerAction={
{
storage.set(NO_DATA_POPOVER_STORAGE_KEY, true);
diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx
index 6108de028018..8582f4a12fa3 100644
--- a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx
+++ b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx
@@ -33,7 +33,7 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import React, { useEffect, useState, Fragment, useRef } from 'react';
+import React, { useCallback, useEffect, useState, Fragment, useRef } from 'react';
import { sortBy } from 'lodash';
import { SavedQuery, SavedQueryService } from '../..';
import { SavedQueryListItem } from './saved_query_list_item';
@@ -88,9 +88,51 @@ export function SavedQueryManagementComponent({
}
}, [isOpen, activePage, savedQueryService]);
- const goToPage = (pageNumber: number) => {
- setActivePage(pageNumber);
- };
+ const handleTogglePopover = useCallback(() => setIsOpen((currentState) => !currentState), [
+ setIsOpen,
+ ]);
+
+ const handleClosePopover = useCallback(() => setIsOpen(false), []);
+
+ const handleSave = useCallback(() => {
+ handleClosePopover();
+ onSave();
+ }, [handleClosePopover, onSave]);
+
+ const handleSaveAsNew = useCallback(() => {
+ handleClosePopover();
+ onSaveAsNew();
+ }, [handleClosePopover, onSaveAsNew]);
+
+ const handleSelect = useCallback(
+ (savedQueryToSelect) => {
+ handleClosePopover();
+ onLoad(savedQueryToSelect);
+ },
+ [handleClosePopover, onLoad]
+ );
+
+ const handleDelete = useCallback(
+ (savedQueryToDelete: SavedQuery) => {
+ const onDeleteSavedQuery = async (savedQuery: SavedQuery) => {
+ cancelPendingListingRequest.current();
+ setSavedQueries(
+ savedQueries.filter((currentSavedQuery) => currentSavedQuery.id !== savedQuery.id)
+ );
+
+ if (loadedSavedQuery && loadedSavedQuery.id === savedQuery.id) {
+ onClearSavedQuery();
+ }
+
+ await savedQueryService.deleteSavedQuery(savedQuery.id);
+ setActivePage(0);
+ };
+
+ onDeleteSavedQuery(savedQueryToDelete);
+ handleClosePopover();
+ },
+ [handleClosePopover, loadedSavedQuery, onClearSavedQuery, savedQueries, savedQueryService]
+ );
const savedQueryDescriptionText = i18n.translate(
'data.search.searchBar.savedQueryDescriptionText',
@@ -113,25 +155,13 @@ export function SavedQueryManagementComponent({
}
);
- const onDeleteSavedQuery = async (savedQuery: SavedQuery) => {
- cancelPendingListingRequest.current();
- setSavedQueries(
- savedQueries.filter((currentSavedQuery) => currentSavedQuery.id !== savedQuery.id)
- );
-
- if (loadedSavedQuery && loadedSavedQuery.id === savedQuery.id) {
- onClearSavedQuery();
- }
-
- await savedQueryService.deleteSavedQuery(savedQuery.id);
- setActivePage(0);
+ const goToPage = (pageNumber: number) => {
+ setActivePage(pageNumber);
};
const savedQueryPopoverButton = (
{
- setIsOpen(!isOpen);
- }}
+ onClick={handleTogglePopover}
aria-label={i18n.translate('data.search.searchBar.savedQueryPopoverButtonText', {
defaultMessage: 'See saved queries',
})}
@@ -159,11 +189,8 @@ export function SavedQueryManagementComponent({
key={savedQuery.id}
savedQuery={savedQuery}
isSelected={!!loadedSavedQuery && loadedSavedQuery.id === savedQuery.id}
- onSelect={(savedQueryToSelect) => {
- onLoad(savedQueryToSelect);
- setIsOpen(false);
- }}
- onDelete={(savedQueryToDelete) => onDeleteSavedQuery(savedQueryToDelete)}
+ onSelect={handleSelect}
+ onDelete={handleDelete}
showWriteOperations={!!showSaveQuery}
/>
));
@@ -175,13 +202,12 @@ export function SavedQueryManagementComponent({
id="savedQueryPopover"
button={savedQueryPopoverButton}
isOpen={isOpen}
- closePopover={() => {
- setIsOpen(false);
- }}
+ closePopover={handleClosePopover}
anchorPosition="downLeft"
panelPaddingSize="none"
buffer={-8}
ownFocus
+ repositionOnScroll
>
onSave()}
+ onClick={handleSave}
aria-label={i18n.translate(
'data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel',
{
@@ -255,7 +281,7 @@ export function SavedQueryManagementComponent({
onSaveAsNew()}
+ onClick={handleSaveAsNew}
aria-label={i18n.translate(
'data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel',
{
@@ -279,7 +305,7 @@ export function SavedQueryManagementComponent({
onSave()}
+ onClick={handleSave}
aria-label={i18n.translate(
'data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel',
{ defaultMessage: 'Save a new saved query' }
@@ -298,7 +324,7 @@ export function SavedQueryManagementComponent({
onClearSavedQuery()}
+ onClick={onClearSavedQuery}
aria-label={i18n.translate(
'data.search.searchBar.savedQueryPopoverClearButtonAriaLabel',
{ defaultMessage: 'Clear current saved query' }
diff --git a/src/plugins/data/public/ui/search_bar/create_search_bar.tsx b/src/plugins/data/public/ui/search_bar/create_search_bar.tsx
index a0df7604f23a..f8b7e4f48091 100644
--- a/src/plugins/data/public/ui/search_bar/create_search_bar.tsx
+++ b/src/plugins/data/public/ui/search_bar/create_search_bar.tsx
@@ -17,6 +17,7 @@
* under the License.
*/
+import _ from 'lodash';
import React, { useState, useEffect, useRef } from 'react';
import { CoreStart } from 'src/core/public';
import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
index 502364cdcba3..b4b86b73a5f4 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { defaults, indexBy, sortBy } from 'lodash';
+import { defaults, keyBy, sortBy } from 'lodash';
import { LegacyAPICaller } from 'kibana/server';
import { callFieldCapsApi } from '../es_api';
@@ -44,7 +44,7 @@ export async function getFieldCapabilities(
metaFields: string[] = []
) {
const esFieldCaps: FieldCapsResponse = await callFieldCapsApi(callCluster, indices);
- const fieldsFromFieldCapsByName = indexBy(readFieldCapsResponse(esFieldCaps), 'name');
+ const fieldsFromFieldCapsByName = keyBy(readFieldCapsResponse(esFieldCaps), 'name');
const allFieldsUnsorted = Object.keys(fieldsFromFieldCapsByName)
.filter((name) => !name.startsWith('_'))
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
index a01d34dbe9df..2e408d7569be 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
@@ -46,7 +46,7 @@ export async function resolveTimePattern(callCluster: LegacyAPICaller, timePatte
[]
)
.sortBy((indexName: string) => indexName)
- .uniq(true)
+ .sortedUniq()
.map((indexName) => {
const parsed = moment(indexName, timePattern, true);
if (!parsed.isValid()) {
@@ -65,7 +65,7 @@ export async function resolveTimePattern(callCluster: LegacyAPICaller, timePatte
isMatch: indexName === parsed.format(timePattern),
};
})
- .sortByOrder(['valid', 'order'], ['desc', 'desc'])
+ .orderBy(['valid', 'order'], ['desc', 'desc'])
.value();
return {
diff --git a/src/plugins/data/server/saved_objects/index.ts b/src/plugins/data/server/saved_objects/index.ts
index 432620014117..102183fc1c5e 100644
--- a/src/plugins/data/server/saved_objects/index.ts
+++ b/src/plugins/data/server/saved_objects/index.ts
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-export { searchSavedObjectType } from './search';
export { querySavedObjectType } from './query';
export { indexPatternSavedObjectType } from './index_patterns';
export { kqlTelemetry } from './kql_telementry';
diff --git a/src/plugins/data/server/saved_objects/index_pattern_migrations.ts b/src/plugins/data/server/saved_objects/index_pattern_migrations.ts
index 37819a13b651..768041a376ad 100644
--- a/src/plugins/data/server/saved_objects/index_pattern_migrations.ts
+++ b/src/plugins/data/server/saved_objects/index_pattern_migrations.ts
@@ -55,6 +55,6 @@ const migrateSubTypeAndParentFieldProperties: SavedObjectMigrationFn =
};
export const indexPatternSavedObjectTypeMigrations = {
- '6.5.0': flow(migrateAttributeTypeAndAttributeTypeMeta),
- '7.6.0': flow(migrateSubTypeAndParentFieldProperties),
+ '6.5.0': flow(migrateAttributeTypeAndAttributeTypeMeta),
+ '7.6.0': flow(migrateSubTypeAndParentFieldProperties),
};
diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts
index 902cf2988f42..44d2813f6e3e 100644
--- a/src/plugins/data/server/saved_objects/index_patterns.ts
+++ b/src/plugins/data/server/saved_objects/index_patterns.ts
@@ -54,5 +54,5 @@ export const indexPatternSavedObjectType: SavedObjectsType = {
typeMeta: { type: 'keyword' },
},
},
- migrations: indexPatternSavedObjectTypeMigrations,
+ migrations: indexPatternSavedObjectTypeMigrations as any,
};
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index df809b425eb9..34ed8c6c6f40 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -27,7 +27,6 @@ import {
} from './types';
import { registerSearchRoute } from './routes';
import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './es_search';
-import { searchSavedObjectType } from '../saved_objects';
import { DataPluginStart } from '../plugin';
export class SearchService implements Plugin {
@@ -36,8 +35,6 @@ export class SearchService implements Plugin {
constructor(private initializerContext: PluginInitializerContext) {}
public setup(core: CoreSetup): ISearchSetup {
- core.savedObjects.registerType(searchSavedObjectType);
-
this.registerSearchStrategy(
ES_SEARCH_STRATEGY,
esSearchStrategyProvider(this.initializerContext.config.legacy.globalConfig$)
diff --git a/src/plugins/discover/public/application/angular/context/query/actions.js b/src/plugins/discover/public/application/angular/context/query/actions.js
index 0e057e0a715c..32fc2873d7f2 100644
--- a/src/plugins/discover/public/application/angular/context/query/actions.js
+++ b/src/plugins/discover/public/application/angular/context/query/actions.js
@@ -70,7 +70,7 @@ export function QueryActionsProvider(Promise) {
setLoadingStatus(state)('anchor');
return Promise.try(() =>
- fetchAnchor(indexPatternId, anchorId, [_.zipObject([sort]), { [tieBreakerField]: sort[1] }])
+ fetchAnchor(indexPatternId, anchorId, [_.fromPairs([sort]), { [tieBreakerField]: sort[1] }])
).then(
(anchorDocument) => {
setLoadedStatus(state)('anchor');
diff --git a/src/plugins/discover/public/application/angular/directives/histogram.tsx b/src/plugins/discover/public/application/angular/directives/histogram.tsx
index 9afe5e48bc5b..4c39c8bb2554 100644
--- a/src/plugins/discover/public/application/angular/directives/histogram.tsx
+++ b/src/plugins/discover/public/application/angular/directives/histogram.tsx
@@ -40,12 +40,13 @@ import {
ElementClickListener,
XYChartElementEvent,
BrushEndListener,
+ Theme,
} from '@elastic/charts';
import { i18n } from '@kbn/i18n';
import { IUiSettingsClient } from 'kibana/public';
import { EuiChartThemeType } from '@elastic/eui/dist/eui_charts_theme';
-import { Subscription } from 'rxjs';
+import { Subscription, combineLatest } from 'rxjs';
import { getServices } from '../../../kibana_services';
import { Chart as IChart } from '../helpers/point_series';
@@ -56,6 +57,7 @@ export interface DiscoverHistogramProps {
interface DiscoverHistogramState {
chartsTheme: EuiChartThemeType['theme'];
+ chartsBaseTheme: Theme;
}
function findIntervalFromDuration(
@@ -126,18 +128,21 @@ export class DiscoverHistogram extends Component this.setState({ chartsTheme })
+ this.subscription = combineLatest(
+ getServices().theme.chartsTheme$,
+ getServices().theme.chartsBaseTheme$
+ ).subscribe(([chartsTheme, chartsBaseTheme]) =>
+ this.setState({ chartsTheme, chartsBaseTheme })
);
}
componentWillUnmount() {
if (this.subscription) {
this.subscription.unsubscribe();
- this.subscription = undefined;
}
}
@@ -204,7 +209,7 @@ export class DiscoverHistogram extends Component
{
public setup(core: CoreSetup) {
core.capabilities.registerProvider(capabilitiesProvider);
core.uiSettings.register(uiSettings);
+ core.savedObjects.registerType(searchSavedObjectType);
return {};
}
diff --git a/typings/lodash.topath/index.d.ts b/src/plugins/discover/server/saved_objects/index.ts
similarity index 87%
rename from typings/lodash.topath/index.d.ts
rename to src/plugins/discover/server/saved_objects/index.ts
index 3630a13f72c2..efe785364ccb 100644
--- a/typings/lodash.topath/index.d.ts
+++ b/src/plugins/discover/server/saved_objects/index.ts
@@ -17,7 +17,4 @@
* under the License.
*/
-declare module 'lodash/internal/toPath' {
- function toPath(value: string | string[]): string[];
- export = toPath;
-}
+export { searchSavedObjectType } from './search';
diff --git a/src/plugins/data/server/saved_objects/search.ts b/src/plugins/discover/server/saved_objects/search.ts
similarity index 84%
rename from src/plugins/data/server/saved_objects/search.ts
rename to src/plugins/discover/server/saved_objects/search.ts
index 437c83f67bf5..2348d89c4f4d 100644
--- a/src/plugins/data/server/saved_objects/search.ts
+++ b/src/plugins/discover/server/saved_objects/search.ts
@@ -18,7 +18,7 @@
*/
import { SavedObjectsType } from 'kibana/server';
-import { searchSavedObjectTypeMigrations } from './search_migrations';
+import { searchMigrations } from './search_migrations';
export const searchSavedObjectType: SavedObjectsType = {
name: 'search',
@@ -43,18 +43,18 @@ export const searchSavedObjectType: SavedObjectsType = {
},
mappings: {
properties: {
- columns: { type: 'keyword' },
+ columns: { type: 'keyword', index: false },
description: { type: 'text' },
- hits: { type: 'integer' },
+ hits: { type: 'integer', index: false },
kibanaSavedObjectMeta: {
properties: {
- searchSourceJSON: { type: 'text' },
+ searchSourceJSON: { type: 'text', index: false },
},
},
- sort: { type: 'keyword' },
+ sort: { type: 'keyword', index: false },
title: { type: 'text' },
version: { type: 'integer' },
},
},
- migrations: searchSavedObjectTypeMigrations,
+ migrations: searchMigrations as any,
};
diff --git a/src/plugins/data/server/saved_objects/search_migrations.test.ts b/src/plugins/discover/server/saved_objects/search_migrations.test.ts
similarity index 96%
rename from src/plugins/data/server/saved_objects/search_migrations.test.ts
rename to src/plugins/discover/server/saved_objects/search_migrations.test.ts
index 69db08a68925..babd25c03dbb 100644
--- a/src/plugins/data/server/saved_objects/search_migrations.test.ts
+++ b/src/plugins/discover/server/saved_objects/search_migrations.test.ts
@@ -18,13 +18,13 @@
*/
import { SavedObjectMigrationContext } from 'kibana/server';
-import { searchSavedObjectTypeMigrations } from './search_migrations';
+import { searchMigrations } from './search_migrations';
const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;
describe('migration search', () => {
describe('6.7.2', () => {
- const migrationFn = searchSavedObjectTypeMigrations['6.7.2'];
+ const migrationFn = searchMigrations['6.7.2'];
it('should migrate obsolete match_all query', () => {
const migratedDoc = migrationFn(
@@ -56,7 +56,7 @@ describe('migration search', () => {
});
describe('7.0.0', () => {
- const migrationFn = searchSavedObjectTypeMigrations['7.0.0'];
+ const migrationFn = searchMigrations['7.0.0'];
test('skips errors when searchSourceJSON is null', () => {
const doc = {
@@ -278,7 +278,7 @@ Object {
});
describe('7.4.0', function () {
- const migrationFn = searchSavedObjectTypeMigrations['7.4.0'];
+ const migrationFn = searchMigrations['7.4.0'];
test('transforms one dimensional sort arrays into two dimensional arrays', () => {
const doc = {
diff --git a/src/plugins/data/server/saved_objects/search_migrations.ts b/src/plugins/discover/server/saved_objects/search_migrations.ts
similarity index 89%
rename from src/plugins/data/server/saved_objects/search_migrations.ts
rename to src/plugins/discover/server/saved_objects/search_migrations.ts
index 2e37cd1255ce..0302159c43c5 100644
--- a/src/plugins/data/server/saved_objects/search_migrations.ts
+++ b/src/plugins/discover/server/saved_objects/search_migrations.ts
@@ -19,10 +19,10 @@
import { flow, get } from 'lodash';
import { SavedObjectMigrationFn } from 'kibana/server';
-import { DEFAULT_QUERY_LANGUAGE } from '../../common';
+import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
const migrateMatchAllQuery: SavedObjectMigrationFn = (doc) => {
- const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
+ const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
if (searchSourceJSON) {
let searchSource: any;
@@ -121,8 +121,8 @@ const migrateSearchSortToNestedArray: SavedObjectMigrationFn = (doc) =
};
};
-export const searchSavedObjectTypeMigrations = {
- '6.7.2': flow>(migrateMatchAllQuery),
- '7.0.0': flow>(setNewReferences),
- '7.4.0': flow>(migrateSearchSortToNestedArray),
+export const searchMigrations = {
+ '6.7.2': flow(migrateMatchAllQuery),
+ '7.0.0': flow(setNewReferences),
+ '7.4.0': flow(migrateSearchSortToNestedArray),
};
diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js
index 18e9ffcb27c5..cde2a253d763 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js
@@ -19,7 +19,7 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
-import { padLeft } from 'lodash';
+import { padStart } from 'lodash';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
@@ -55,12 +55,12 @@ function makeSequence(min, max) {
const MINUTE_OPTIONS = makeSequence(0, 59).map((value) => ({
value: value.toString(),
- text: padLeft(value, 2, '0'),
+ text: padStart(value, 2, '0'),
}));
const HOUR_OPTIONS = makeSequence(0, 23).map((value) => ({
value: value.toString(),
- text: padLeft(value, 2, '0'),
+ text: padStart(value, 2, '0'),
}));
const DAY_OPTIONS = makeSequence(1, 7).map((value) => ({
diff --git a/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx b/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx
index 5667220881df..39b91a2e20b5 100644
--- a/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx
+++ b/src/plugins/es_ui_shared/public/forms/form_wizard/form_wizard_context.tsx
@@ -23,7 +23,7 @@ import { WithMultiContent, useMultiContentContext, HookProps } from '../multi_co
export interface Props {
onSave: (data: T) => void | Promise;
- children: JSX.Element | JSX.Element[];
+ children: JSX.Element | Array;
isEditing?: boolean;
defaultActiveStep?: number;
defaultValue?: HookProps['defaultValue'];
diff --git a/src/plugins/es_ui_shared/public/forms/multi_content/multi_content_context.tsx b/src/plugins/es_ui_shared/public/forms/multi_content/multi_content_context.tsx
index 5fbe3d2bbbdd..210b0cedccd0 100644
--- a/src/plugins/es_ui_shared/public/forms/multi_content/multi_content_context.tsx
+++ b/src/plugins/es_ui_shared/public/forms/multi_content/multi_content_context.tsx
@@ -54,7 +54,7 @@ export function useMultiContentContext(contentId: keyof T) {
+export function useContent(contentId: K) {
const { updateContentAt, saveSnapshotAndRemoveContent, getData } = useMultiContentContext();
const updateContent = useCallback(
@@ -71,8 +71,11 @@ export function useContent(contentId:
};
}, [contentId, saveSnapshotAndRemoveContent]);
+ const data = getData();
+ const defaultValue = data[contentId];
+
return {
- defaultValue: getData()[contentId]!,
+ defaultValue,
updateContent,
getData,
};
diff --git a/src/plugins/es_ui_shared/public/forms/multi_content/use_multi_content.ts b/src/plugins/es_ui_shared/public/forms/multi_content/use_multi_content.ts
index 0a2c7bb65195..adc68a39a4a5 100644
--- a/src/plugins/es_ui_shared/public/forms/multi_content/use_multi_content.ts
+++ b/src/plugins/es_ui_shared/public/forms/multi_content/use_multi_content.ts
@@ -150,6 +150,10 @@ export function useMultiContent({
* Validate the multi-content active content(s) in the DOM
*/
const validate = useCallback(async () => {
+ if (Object.keys(contents.current).length === 0) {
+ return Boolean(validation.isValid);
+ }
+
const updatedValidation = {} as { [key in keyof T]?: boolean | undefined };
for (const [id, _content] of Object.entries(contents.current)) {
diff --git a/src/plugins/es_ui_shared/public/index.ts b/src/plugins/es_ui_shared/public/index.ts
index 28baa3d8372f..67c1ee3c7d67 100644
--- a/src/plugins/es_ui_shared/public/index.ts
+++ b/src/plugins/es_ui_shared/public/index.ts
@@ -22,6 +22,7 @@
* In the future, each top level folder should be exported like that to avoid naming collision
*/
import * as Forms from './forms';
+import * as Monaco from './monaco';
export { JsonEditor, OnJsonEditorUpdateHandler } from './components/json_editor';
@@ -53,10 +54,6 @@ export {
expandLiteralStrings,
} from './console_lang';
-import * as Monaco from './monaco';
-
-export { Monaco };
-
export {
AuthorizationContext,
AuthorizationProvider,
@@ -69,7 +66,7 @@ export {
useAuthorizationContext,
} from './authorization';
-export { Forms };
+export { Monaco, Forms };
/** dummy plugin, we just want esUiShared to have its own bundle */
export function plugin() {
diff --git a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_json.ts b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_json.ts
index dc8321aa0700..019a0e8053d0 100644
--- a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_json.ts
+++ b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_json.ts
@@ -21,12 +21,13 @@ import { ValidationFunc } from '../../hook_form_lib';
import { isJSON } from '../../../validators/string';
import { ERROR_CODE } from './types';
-export const isJsonField = (message: string) => (
- ...args: Parameters
-): ReturnType> => {
+export const isJsonField = (
+ message: string,
+ { allowEmptyString = false }: { allowEmptyString?: boolean } = {}
+) => (...args: Parameters): ReturnType> => {
const [{ value }] = args;
- if (typeof value !== 'string') {
+ if (typeof value !== 'string' || (allowEmptyString && value.trim() === '')) {
return;
}
diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts
index 2e83d16dd778..4e73d27c1c4a 100644
--- a/src/plugins/expressions/common/execution/execution.test.ts
+++ b/src/plugins/expressions/common/execution/execution.test.ts
@@ -475,17 +475,6 @@ describe('Execution', () => {
}
});
- test('sets duration to 10 milliseconds when function executes 10 milliseconds', async () => {
- const execution = createExecution('sleep 10', {}, true);
- execution.start(-1);
- await execution.result;
-
- const node = execution.state.get().ast.chain[0];
- expect(typeof node.debug?.duration).toBe('number');
- expect(node.debug?.duration).toBeLessThan(50);
- expect(node.debug?.duration).toBeGreaterThanOrEqual(5);
- });
-
test('adds .debug field in expression AST on each executed function', async () => {
const execution = createExecution('add val=1 | add val=2 | add val=3', {}, true);
execution.start(-1);
diff --git a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts b/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
index b8be273d7bbd..2b7d1b8ed9d7 100644
--- a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { uniq } from 'lodash';
+import { uniqBy } from 'lodash';
import { i18n } from '@kbn/i18n';
import { ExpressionFunctionDefinition } from '../../expression_functions';
import { KibanaContext } from '../../expression_types';
@@ -40,7 +40,7 @@ const getParsedValue = (data: any, defaultValue: any) =>
typeof data === 'string' && data.length ? JSON.parse(data) || defaultValue : defaultValue;
const mergeQueries = (first: Query | Query[] = [], second: Query | Query[]) =>
- uniq(
+ uniqBy(
[...(Array.isArray(first) ? first : [first]), ...(Array.isArray(second) ? second : [second])],
(n: any) => JSON.stringify(n.query)
);
diff --git a/src/plugins/expressions/common/expression_types/specs/datatable.ts b/src/plugins/expressions/common/expression_types/specs/datatable.ts
index c113765f8e7e..5cd53df663e1 100644
--- a/src/plugins/expressions/common/expression_types/specs/datatable.ts
+++ b/src/plugins/expressions/common/expression_types/specs/datatable.ts
@@ -20,7 +20,7 @@
import { map, pick, zipObject } from 'lodash';
import { ExpressionTypeDefinition } from '../types';
-import { PointSeries } from './pointseries';
+import { PointSeries, PointSeriesColumn } from './pointseries';
import { ExpressionValueRender } from './render';
const name = 'datatable';
@@ -109,8 +109,8 @@ export const datatable: ExpressionTypeDefinition ({
type: name,
rows: value.rows,
- columns: map(value.columns, (val, colName) => {
- return { name: colName!, type: val.type };
+ columns: map(value.columns, (val: PointSeriesColumn, colName) => {
+ return { name: colName, type: val.type };
}),
}),
},
diff --git a/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts b/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts
index 7f2f3c37c587..e226f3b124ee 100644
--- a/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts
+++ b/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts
@@ -19,7 +19,7 @@
import { map } from 'lodash';
import { SerializedFieldFormat } from '../../types/common';
-import { Datatable, PointSeries } from '.';
+import { Datatable, PointSeries, PointSeriesColumn } from '.';
const name = 'kibana_datatable';
@@ -62,7 +62,7 @@ export const kibanaDatatable = {
};
},
pointseries: (context: PointSeries) => {
- const columns = map(context.columns, (column, n) => {
+ const columns = map(context.columns, (column: PointSeriesColumn, n) => {
return { id: n, name: n, ...column };
});
return {
diff --git a/src/plugins/expressions/public/loader.ts b/src/plugins/expressions/public/loader.ts
index 9428d7db1d9d..f957f10a9aeb 100644
--- a/src/plugins/expressions/public/loader.ts
+++ b/src/plugins/expressions/public/loader.ts
@@ -19,6 +19,7 @@
import { BehaviorSubject, Observable, Subject } from 'rxjs';
import { filter, map } from 'rxjs/operators';
+import { defaults } from 'lodash';
import { Adapters } from '../../inspector/public';
import { IExpressionLoaderParams } from './types';
import { ExpressionAstExpression } from '../common';
@@ -168,7 +169,7 @@ export class ExpressionLoader {
}
if (params.searchContext) {
- this.params.searchContext = _.defaults(
+ this.params.searchContext = defaults(
{},
params.searchContext,
this.params.searchContext || {}
diff --git a/src/plugins/home/public/assets/googlecloud_metrics/screenshot.png b/src/plugins/home/public/assets/googlecloud_metrics/screenshot.png
new file mode 100644
index 000000000000..d4d90d27ad30
Binary files /dev/null and b/src/plugins/home/public/assets/googlecloud_metrics/screenshot.png differ
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
index 332524014764..210d56369666 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
@@ -82,7 +82,7 @@ export interface TutorialSchema {
name: string;
isBeta?: boolean;
shortDescription: string;
- euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/icon;
+ euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/display/icons;
longDescription: string;
completionTimeMinutes?: number;
previewImagePath?: string;
diff --git a/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts b/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts
new file mode 100644
index 000000000000..504ede04c12d
--- /dev/null
+++ b/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts
@@ -0,0 +1,77 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { TutorialsCategory } from '../../services/tutorials';
+import {
+ onPremInstructions,
+ cloudInstructions,
+ onPremCloudInstructions,
+} from '../instructions/metricbeat_instructions';
+import {
+ TutorialContext,
+ TutorialSchema,
+} from '../../services/tutorials/lib/tutorials_registry_types';
+
+export function googlecloudMetricsSpecProvider(context: TutorialContext): TutorialSchema {
+ const moduleName = 'googlecloud';
+ return {
+ id: 'googlecloudMetrics',
+ name: i18n.translate('home.tutorials.googlecloudMetrics.nameTitle', {
+ defaultMessage: 'Google Cloud metrics',
+ }),
+ category: TutorialsCategory.METRICS,
+ shortDescription: i18n.translate('home.tutorials.googlecloudMetrics.shortDescription', {
+ defaultMessage:
+ 'Fetch monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API.',
+ }),
+ longDescription: i18n.translate('home.tutorials.googlecloudMetrics.longDescription', {
+ defaultMessage:
+ 'The `googlecloud` Metricbeat module fetches monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API. \
+[Learn more]({learnMoreLink}).',
+ values: {
+ learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-googlecloud.html',
+ },
+ }),
+ euiIconType: 'logoGCP',
+ isBeta: false,
+ artifacts: {
+ dashboards: [
+ {
+ id: 'f40ee870-5e4a-11ea-a4f6-717338406083',
+ linkLabel: i18n.translate(
+ 'home.tutorials.googlecloudMetrics.artifacts.dashboards.linkLabel',
+ {
+ defaultMessage: 'Google Cloud metrics dashboard',
+ }
+ ),
+ isOverview: true,
+ },
+ ],
+ exportedFields: {
+ documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-googlecloud.html',
+ },
+ },
+ completionTimeMinutes: 10,
+ previewImagePath: '/plugins/home/assets/googlecloud_metrics/screenshot.png',
+ onPrem: onPremInstructions(moduleName, context),
+ elasticCloud: cloudInstructions(moduleName),
+ onPremElasticCloud: onPremCloudInstructions(moduleName),
+ };
+}
diff --git a/src/plugins/home/server/tutorials/register.ts b/src/plugins/home/server/tutorials/register.ts
index d13cce1c2278..c48423edb2a0 100644
--- a/src/plugins/home/server/tutorials/register.ts
+++ b/src/plugins/home/server/tutorials/register.ts
@@ -91,6 +91,7 @@ import { openmetricsMetricsSpecProvider } from './openmetrics_metrics';
import { oracleMetricsSpecProvider } from './oracle_metrics';
import { iisMetricsSpecProvider } from './iis_metrics';
import { azureLogsSpecProvider } from './azure_logs';
+import { googlecloudMetricsSpecProvider } from './googlecloud_metrics';
export const builtInTutorials = [
systemLogsSpecProvider,
@@ -168,4 +169,5 @@ export const builtInTutorials = [
oracleMetricsSpecProvider,
iisMetricsSpecProvider,
azureLogsSpecProvider,
+ googlecloudMetricsSpecProvider,
];
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts
index 52cd5b0c3f5b..5ab9c695caaa 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { Dictionary, countBy, defaults, unique } from 'lodash';
+import { Dictionary, countBy, defaults, uniq } from 'lodash';
import { i18n } from '@kbn/i18n';
import { IndexPattern, IndexPatternField } from '../../../../../../plugins/data/public';
import { IndexPatternManagementStart } from '../../../../../../plugins/index_pattern_management/public';
@@ -145,7 +145,7 @@ export function convertToEuiSelectOption(options: string[], type: string) {
]
: [];
return euiOptions.concat(
- unique(options).map((option) => {
+ uniq(options).map((option) => {
return {
value: option,
text: option,
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
index 4eff5112c0c0..03ed6c5520de 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
@@ -86,11 +86,11 @@ export class PhraseFilterManager extends FilterManager {
private getValueFromFilter(kbnFilter: PhraseFilter): any {
// bool filter - multiple phrase filters
if (_.has(kbnFilter, 'query.bool.should')) {
- return _.get(kbnFilter, 'query.bool.should')
- .map((kbnQueryFilter) => {
+ return _.get(kbnFilter, 'query.bool.should')
+ .map((kbnQueryFilter: PhraseFilter) => {
return this.getValueFromFilter(kbnQueryFilter);
})
- .filter((value) => {
+ .filter((value: any) => {
if (value) {
return true;
}
diff --git a/src/plugins/inspector/common/adapters/request/request_adapter.ts b/src/plugins/inspector/common/adapters/request/request_adapter.ts
index 70af6b5b51d1..af10d1b77b16 100644
--- a/src/plugins/inspector/common/adapters/request/request_adapter.ts
+++ b/src/plugins/inspector/common/adapters/request/request_adapter.ts
@@ -18,7 +18,6 @@
*/
import { EventEmitter } from 'events';
-import _ from 'lodash';
import uuid from 'uuid/v4';
import { RequestResponder } from './request_responder';
import { Request, RequestParams, RequestStatus } from './types';
diff --git a/src/plugins/inspector/public/views/data/lib/export_csv.ts b/src/plugins/inspector/public/views/data/lib/export_csv.ts
index c0e0153c6053..5a970cc6cff3 100644
--- a/src/plugins/inspector/public/views/data/lib/export_csv.ts
+++ b/src/plugins/inspector/public/views/data/lib/export_csv.ts
@@ -29,7 +29,7 @@ const allDoubleQuoteRE = /"/g;
function escape(val: string, quoteValues: boolean) {
if (isObject(val)) {
- val = val.valueOf();
+ val = (val as any).valueOf();
}
val = String(val);
diff --git a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
index 87fdf0730c88..2fa1debf51b5 100644
--- a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
+++ b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
@@ -20,7 +20,7 @@
import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { debounce, indexBy, sortBy, uniq } from 'lodash';
+import { debounce, keyBy, sortBy, uniq } from 'lodash';
import {
EuiTitle,
EuiInMemoryTable,
@@ -178,7 +178,7 @@ class TableListView extends React.Component itemsById[id]));
} catch (error) {
this.props.toastNotifications.addDanger({
diff --git a/src/plugins/kibana_usage_collection/README.md b/src/plugins/kibana_usage_collection/README.md
index 1aade472c232..6ef4f19c1570 100644
--- a/src/plugins/kibana_usage_collection/README.md
+++ b/src/plugins/kibana_usage_collection/README.md
@@ -2,7 +2,7 @@
This plugin registers the basic usage collectors from Kibana:
-- Application Usage
+- [Application Usage](./server/collectors/application_usage/README.md)
- UI Metrics
- Ops stats
- Number of Saved Objects per type
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/README.md b/src/plugins/kibana_usage_collection/server/collectors/application_usage/README.md
new file mode 100644
index 000000000000..1ffd01fc6fde
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/README.md
@@ -0,0 +1,37 @@
+# Application Usage
+
+This collector reports the number of general clicks and minutes on screen for each registered application in Kibana.
+
+The final payload matches the following contract:
+
+```JSON
+{
+ "application_usage": {
+ "application_ID": {
+ "clicks_7_days": 10,
+ "clicks_30_days": 100,
+ "clicks_90_days": 300,
+ "clicks_total": 600,
+ "minutes_on_screen_7_days": 10.40,
+ "minutes_on_screen_30_days": 20.0,
+ "minutes_on_screen_90_days": 110.1,
+ "minutes_on_screen_total": 112.5
+ }
+ }
+}
+```
+
+Where `application_ID` matches the `id` registered when calling the method `core.application.register`.
+This collection occurs by default for every application registered via the mentioned method and there is no need to do anything else to enable it or _opt-in_ for your plugin.
+
+**Note to maintainers in the Kibana repo:** At the moment of writing, the `usageCollector.schema` is not updated automatically ([#70622](https://github.com/elastic/kibana/issues/70622)) so, if you are adding a new app to Kibana, you'll need to give the Kibana Telemetry team a heads up to update the mappings in the Telemetry Cluster accordingly.
+
+## Developer notes
+
+In order to keep the count of the events, this collector uses 2 Saved Objects:
+
+1. `application_usage_transactional`: It stores each individually reported event (up to 90 days old). Grouped by `timestamp` and `appId`.
+2. `application_usage_totals`: It stores the sum of all the events older than 90 days old per `appId`.
+
+Both of them use the shared fields `appId: 'keyword'`, `numberOfClicks: 'long'` and `minutesOnScreen: 'float'`. `application_usage_transactional` also stores `timestamp: { type: 'date' }`.
+but they are currently not added in the mappings because we don't use them for search purposes, and we need to be thoughtful with the number of mapped fields in the SavedObjects index ([#43673](https://github.com/elastic/kibana/issues/43673)).
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
index 8d6a2d110efe..551c6e230972 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
@@ -35,13 +35,10 @@ export function registerMappings(registerType: SavedObjectsServiceSetup['registe
hidden: false,
namespaceType: 'agnostic',
mappings: {
+ // Not indexing any of its contents because we use them "as-is" and don't search by these fields
+ // for more info, see the README.md for application_usage
dynamic: false,
- properties: {
- // Disabled the mapping of these fields since they are not searched and we need to reduce the amount of indexed fields (#43673)
- // appId: { type: 'keyword' },
- // numberOfClicks: { type: 'long' },
- // minutesOnScreen: { type: 'float' },
- },
+ properties: {},
},
});
@@ -53,10 +50,6 @@ export function registerMappings(registerType: SavedObjectsServiceSetup['registe
dynamic: false,
properties: {
timestamp: { type: 'date' },
- // Disabled the mapping of these fields since they are not searched and we need to reduce the amount of indexed fields (#43673)
- // appId: { type: 'keyword' },
- // numberOfClicks: { type: 'long' },
- // minutesOnScreen: { type: 'float' },
},
},
});
diff --git a/src/plugins/kibana_utils/common/url/encode_uri_query.ts b/src/plugins/kibana_utils/common/url/encode_uri_query.ts
index fb60f0ceff10..fe8cf12d0d6f 100644
--- a/src/plugins/kibana_utils/common/url/encode_uri_query.ts
+++ b/src/plugins/kibana_utils/common/url/encode_uri_query.ts
@@ -45,7 +45,7 @@ export const encodeQuery = (
query: ParsedQuery,
encodeFunction: (val: string, pctEncodeSpaces?: boolean) => string = encodeUriQuery
) =>
- transform(query, (result, value, key) => {
+ transform(query, (result: any, value, key) => {
if (key) {
const singleValue = Array.isArray(value) ? value.join(',') : value;
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
index 3a05ce59f5d1..1c5642f9b75b 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
-import { capitalize, isFunction } from 'lodash';
+import { upperFirst, isFunction } from 'lodash';
import React, { MouseEvent } from 'react';
import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
@@ -50,11 +50,11 @@ export function TopNavMenuItem(props: TopNavMenuData) {
const btn = props.emphasize ? (
- {capitalize(props.label || props.id!)}
+ {upperFirst(props.label || props.id!)}
) : (
- {capitalize(props.label || props.id!)}
+ {upperFirst(props.label || props.id!)}
);
diff --git a/src/plugins/saved_objects_management/public/lib/create_field_list.ts b/src/plugins/saved_objects_management/public/lib/create_field_list.ts
index 5f424751dd58..dcfb44d8a522 100644
--- a/src/plugins/saved_objects_management/public/lib/create_field_list.ts
+++ b/src/plugins/saved_objects_management/public/lib/create_field_list.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { forOwn, indexBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash';
+import { forOwn, keyBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash';
import { SimpleSavedObject } from '../../../../core/public';
import { castEsToKbnFieldTypeName } from '../../../data/public';
import { ObjectField } from '../management_section/types';
@@ -93,9 +93,9 @@ const addFieldsFromClass = function (
Class: { mapping: Record; searchSource: any },
fields: ObjectField[]
) {
- const fieldMap = indexBy(fields, 'name');
+ const fieldMap = keyBy(fields, 'name');
- _.forOwn(Class.mapping, (esType, name) => {
+ forOwn(Class.mapping, (esType, name) => {
if (!name || fieldMap[name]) {
return;
}
diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
index 75692777f08b..dbbea4012aba 100644
--- a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
@@ -78,7 +78,7 @@ const SavedObjectsTablePage = ({
}}
canGoInApp={(savedObject) => {
const { inAppUrl } = savedObject.meta;
- return inAppUrl ? get(capabilities, inAppUrl.uiCapabilitiesPath) : false;
+ return inAppUrl ? Boolean(get(capabilities, inAppUrl.uiCapabilitiesPath)) : false;
}}
/>
);
diff --git a/src/plugins/tile_map/public/index.scss b/src/plugins/tile_map/public/index.scss
index 4ce500b2da4d..f4b86b0c3119 100644
--- a/src/plugins/tile_map/public/index.scss
+++ b/src/plugins/tile_map/public/index.scss
@@ -1,5 +1,3 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
// Prefix all styles with "tlm" to avoid conflicts.
// Examples
// tlmChart
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
index 39abddb3de85..ef2f937c8547 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -87,7 +87,7 @@ function getAggParamsToRender({
// should be refactored in the future to provide a more general way
// for visualization to override some agg config settings
if (agg.type.name === 'top_hits' && param.name === 'field') {
- const allowStrings = _.get(schema, `aggSettings[${agg.type.name}].allowStrings`, false);
+ const allowStrings = get(schema, `aggSettings[${agg.type.name}].allowStrings`, false);
if (!allowStrings) {
availableFields = availableFields.filter((field) => field.type === 'number');
}
diff --git a/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx
index a0bc0d78a288..37e95f2419b4 100644
--- a/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx
@@ -18,7 +18,7 @@
*/
import React, { useState, useEffect, Fragment, useCallback } from 'react';
-import { isEmpty, isEqual, mapValues, omit, pick } from 'lodash';
+import { isEmpty, isEqual, mapValues, omitBy, pick } from 'lodash';
import {
EuiButtonIcon,
EuiFlexGroup,
@@ -173,7 +173,7 @@ function InputList({ config, list, onChange, setValidity }: InputListProps) {
const model: InputObject = mapValues(pick(models[index], modelNames), 'model');
// we need to skip empty values since they are not stored in saved object
- return !isEqual(item, omit(model, isEmpty));
+ return !isEqual(item, omitBy(model, isEmpty));
})
) {
setModels(
diff --git a/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts b/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts
index 6eaef3050029..a3998cbd5954 100644
--- a/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts
@@ -105,7 +105,7 @@ function validateValueUnique(
}
function getNextModel(list: NumberRowModel[], range: NumberListRange): NumberRowModel {
- const lastValue = last(list).value;
+ const lastValue = (last(list) as NumberRowModel).value;
let next = Number(lastValue) ? Number(lastValue) + 1 : 1;
if (next >= range.max) {
diff --git a/src/plugins/vis_default_editor/public/components/controls/filters.tsx b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
index 9a9933b5e1e8..04d0df27927f 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filters.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
@@ -43,7 +43,9 @@ function FiltersParamEditor({ agg, value = [], setValue }: AggParamEditorProps {
// set parsed values into model after initialization
- setValue(filters.map((filter) => omit({ ...filter, input: filter.input }, 'id')));
+ setValue(
+ filters.map((filter) => omit({ ...filter, input: filter.input }, 'id') as FilterValue)
+ );
});
useEffect(() => {
@@ -58,7 +60,7 @@ function FiltersParamEditor({ agg, value = [], setValue }: AggParamEditorProps {
// do not set internal id parameter into saved object
- setValue(updatedFilters.map((filter) => omit(filter, 'id')));
+ setValue(updatedFilters.map((filter) => omit(filter, 'id') as FilterValue));
setFilters(updatedFilters);
};
diff --git a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
index 0d21eb04c12b..f6354027ab01 100644
--- a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
@@ -56,7 +56,7 @@ function NumberIntervalParamEditor({
setValidity,
setValue,
}: AggParamEditorProps) {
- const base: number = get(editorConfig, 'interval.base');
+ const base: number = get(editorConfig, 'interval.base') as number;
const min = base || 0;
const isValid = value !== undefined && value >= min;
diff --git a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
index 4af41f67bc52..dd9e432fa512 100644
--- a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
@@ -107,7 +107,7 @@ function TimeIntervalParamEditor({
setTouched,
setValidity,
}: AggParamEditorProps) {
- const timeBase: string = get(editorConfig, 'interval.timeBase');
+ const timeBase: string = get(editorConfig, 'interval.timeBase') as string;
const options = timeBase
? []
: ((aggParam as any).options || []).reduce(
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
index 26567d05e042..b2c7bcafa15a 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
@@ -74,7 +74,8 @@ function DefaultEditorDataTab({
),
[metricAggs]
);
- const lastParentPipelineAggTitle = lastParentPipelineAgg && lastParentPipelineAgg.type.title;
+ const lastParentPipelineAggTitle =
+ lastParentPipelineAgg && (lastParentPipelineAgg as IAggConfig).type.title;
const addSchema: AddSchema = useCallback((schema) => dispatch(addNewAgg(schema)), [dispatch]);
@@ -116,7 +117,7 @@ function DefaultEditorDataTab({
setValidity,
setTouched,
removeAgg: onAggRemove,
- };
+ } as any;
return (
<>
diff --git a/src/plugins/vis_default_editor/public/schemas.ts b/src/plugins/vis_default_editor/public/schemas.ts
index 54520b85cb5e..d95a6252331b 100644
--- a/src/plugins/vis_default_editor/public/schemas.ts
+++ b/src/plugins/vis_default_editor/public/schemas.ts
@@ -58,6 +58,7 @@ export class Schemas implements ISchemas {
>
) {
_(schemas || [])
+ .chain()
.map((schema) => {
if (!schema.name) throw new Error('all schema must have a unique name');
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
index 5e8a46374818..438582676261 100644
--- a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
+++ b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
@@ -28,6 +28,7 @@ import { getHeatmapColors } from '../../../charts/public';
import { VisParams, MetricVisMetric } from '../types';
import { getFormatService } from '../services';
import { SchemaConfig, ExprVis } from '../../../visualizations/public';
+import { Range } from '../../../expressions/public';
export interface MetricVisComponentProps {
visParams: VisParams;
@@ -41,7 +42,7 @@ export class MetricVisComponent extends Component {
const config = this.props.visParams.metric;
const isPercentageMode = config.percentageMode;
const colorsRange = config.colorsRange;
- const max = last(colorsRange).to;
+ const max = (last(colorsRange) as Range).to;
const labels: string[] = [];
colorsRange.forEach((range: any) => {
@@ -111,7 +112,7 @@ export class MetricVisComponent extends Component {
const dimensions = this.props.visParams.dimensions;
const isPercentageMode = config.percentageMode;
const min = config.colorsRange[0].from;
- const max = last(config.colorsRange).to;
+ const max = (last(config.colorsRange) as Range).to;
const colors = this.getColors();
const labels = this.getLabels();
const metrics: MetricVisMetric[] = [];
diff --git a/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts b/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
index db29d9112be8..860b4e9f2dbd 100644
--- a/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { cloneDeep, defaults, merge, compact } from 'lodash';
+import { cloneDeep, defaults, mergeWith, compact } from 'lodash';
import moment, { Moment } from 'moment-timezone';
import { TimefilterContract } from 'src/plugins/data/public';
@@ -91,7 +91,7 @@ function buildSeriesData(chart: Series[], options: jquery.flot.plotOptions) {
}
if (series._global) {
- merge(options, series._global, (objVal, srcVal) => {
+ mergeWith(options, series._global, (objVal, srcVal) => {
// This is kind of gross, it means that you can't replace a global value with a null
// best you can do is an empty string. Deal with it.
if (objVal == null) {
diff --git a/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts b/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
index c02f43818af9..7be18a4774d9 100644
--- a/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
+++ b/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
@@ -27,6 +27,7 @@ import {
import { getTimelionRequestHandler } from './helpers/timelion_request_handler';
import { TIMELION_VIS_NAME } from './timelion_vis_type';
import { TimelionVisDependencies } from './plugin';
+import { Filter, Query, TimeRange } from '../../data/common';
type Input = KibanaContext | null;
type Output = Promise>;
@@ -71,9 +72,9 @@ export const getTimelionVisualizationConfig = (
const visParams = { expression: args.expression, interval: args.interval };
const response = await timelionRequestHandler({
- timeRange: get(input, 'timeRange'),
- query: get(input, 'query'),
- filters: get(input, 'filters'),
+ timeRange: get(input, 'timeRange') as TimeRange,
+ query: get(input, 'query') as Query,
+ filters: get(input, 'filters') as Filter[],
visParams,
forceFetch: true,
});
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/average.js b/src/plugins/vis_type_timelion/server/fit_functions/average.js
index 06db7bd0e932..09518a328648 100644
--- a/src/plugins/vis_type_timelion/server/fit_functions/average.js
+++ b/src/plugins/vis_type_timelion/server/fit_functions/average.js
@@ -27,7 +27,7 @@ export default function average(dataTuples, targetTuples) {
// Phase 1: Downsample
// We necessarily won't well match the dataSource here as we don't know how much data
// they had when creating their own average
- const resultTimes = _.pluck(targetTuples, 0);
+ const resultTimes = _.map(targetTuples, 0);
const dataTuplesQueue = _.clone(dataTuples);
const resultValues = _.map(targetTuples, function (bucket) {
const time = bucket[0];
diff --git a/src/plugins/vis_type_timelion/server/handlers/chain_runner.js b/src/plugins/vis_type_timelion/server/handlers/chain_runner.js
index 59adea30730c..2ee8deb4dd04 100644
--- a/src/plugins/vis_type_timelion/server/handlers/chain_runner.js
+++ b/src/plugins/vis_type_timelion/server/handlers/chain_runner.js
@@ -132,7 +132,7 @@ export default function chainRunner(tlConfig) {
});
});
return Bluebird.all(seriesList).then(function (args) {
- const list = _.chain(args).pluck('list').flatten().value();
+ const list = _.chain(args).map('list').flatten().value();
const seriesList = _.merge.apply(this, _.flatten([{}, args]));
seriesList.list = list;
return seriesList;
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js b/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js
index 9b4fdddc2186..11004d2784d3 100644
--- a/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js
+++ b/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js
@@ -28,7 +28,7 @@ export default function validateArgFn(functionDef) {
const multi = argDef.multi;
const isCorrectType = (function () {
// If argument is not allow to be specified multiple times, we're dealing with a plain value for type
- if (!multi) return _.contains(required, type);
+ if (!multi) return _.includes(required, type);
// If it is, we'll get an array for type
return _.difference(type, required).length === 0;
})();
diff --git a/src/plugins/vis_type_timelion/server/lib/as_sorted.js b/src/plugins/vis_type_timelion/server/lib/as_sorted.js
index 536145a6b8dc..6a2b7c0f5a9f 100644
--- a/src/plugins/vis_type_timelion/server/lib/as_sorted.js
+++ b/src/plugins/vis_type_timelion/server/lib/as_sorted.js
@@ -22,5 +22,5 @@ import unzipPairs from './unzip_pairs.js';
export default function asSorted(timeValObject, fn) {
const data = unzipPairs(timeValObject);
- return _.zipObject(fn(data));
+ return _.fromPairs(fn(data));
}
diff --git a/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js b/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js
index 83466e263cf2..3d53fc8d5bd0 100644
--- a/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js
+++ b/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js
@@ -25,7 +25,7 @@ export default class TimelionFunction {
constructor(name, config) {
this.name = name;
this.args = config.args || [];
- this.argsByName = _.indexBy(this.args, 'name');
+ this.argsByName = _.keyBy(this.args, 'name');
this.help = config.help || '';
this.aliases = config.aliases || [];
this.extended = config.extended || false;
diff --git a/src/plugins/vis_type_timelion/server/lib/load_functions.js b/src/plugins/vis_type_timelion/server/lib/load_functions.js
index d6cb63b7c427..699342cff6a7 100644
--- a/src/plugins/vis_type_timelion/server/lib/load_functions.js
+++ b/src/plugins/vis_type_timelion/server/lib/load_functions.js
@@ -47,7 +47,7 @@ export default function (directory) {
})
.value();
- const functions = _.zipObject(files.concat(directories));
+ const functions = _.fromPairs(files.concat(directories));
_.each(functions, function (func) {
_.assign(functions, processFunctionDefinition(func));
diff --git a/src/plugins/vis_type_timelion/server/lib/reduce.js b/src/plugins/vis_type_timelion/server/lib/reduce.js
index cc13b75fde12..1a5d78676fc7 100644
--- a/src/plugins/vis_type_timelion/server/lib/reduce.js
+++ b/src/plugins/vis_type_timelion/server/lib/reduce.js
@@ -42,7 +42,7 @@ async function pairwiseReduce(left, right, fn) {
if (allSeriesContainKey(left, 'split') && allSeriesContainKey(right, 'split')) {
pairwiseField = 'split';
}
- const indexedList = _.indexBy(right.list, pairwiseField);
+ const indexedList = _.keyBy(right.list, pairwiseField);
// ensure seriesLists contain same pairwise labels
left.list.forEach((leftSeries) => {
diff --git a/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js b/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js
index 7a34b5ec98ff..412049c89ef2 100644
--- a/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js
+++ b/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js
@@ -21,7 +21,7 @@ import _ from 'lodash';
export default function unzipPairs(timeValObject) {
const paired = _.chain(timeValObject)
- .pairs()
+ .toPairs()
.map(function (point) {
return [parseInt(point[0], 10), point[1]];
})
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js
index 409372da2472..fbae9c5afffe 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js
@@ -20,7 +20,7 @@
import _ from 'lodash';
export function timeBucketsToPairs(buckets) {
- const timestamps = _.pluck(buckets, 'key');
+ const timestamps = _.map(buckets, 'key');
const series = {};
_.each(buckets, function (bucket) {
_.forOwn(bucket, function (val, key) {
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
index bc0e368fbdab..e407636c4156 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
@@ -50,7 +50,7 @@ export default function buildRequest(config, tlConfig, scriptedFields, timeout)
.map(function (q) {
return [q, { query_string: { query: q } }];
})
- .zipObject()
+ .fromPairs()
.value(),
},
aggs: {},
diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js
index 108eb0c72f19..fdaa4dcd8c09 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js
@@ -81,7 +81,7 @@ export default new Chainable('movingaverage', {
}
_position = _position || defaultPosition;
- if (!_.contains(validPositions, _position)) {
+ if (!_.includes(validPositions, _position)) {
throw new Error(
i18n.translate(
'timelion.serverSideErrors.movingaverageFunction.notValidPositionErrorMessage',
diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingstd.js b/src/plugins/vis_type_timelion/server/series_functions/movingstd.js
index a7ecb4d5b473..2b9ab08f02ed 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/movingstd.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/movingstd.js
@@ -61,7 +61,7 @@ export default new Chainable('movingstd', {
return alter(args, function (eachSeries, _window, _position) {
_position = _position || defaultPosition;
- if (!_.contains(positions, _position)) {
+ if (!_.includes(positions, _position)) {
throw new Error(
i18n.translate(
'timelion.serverSideErrors.movingstdFunction.notValidPositionErrorMessage',
diff --git a/src/plugins/vis_type_timelion/server/series_functions/points.js b/src/plugins/vis_type_timelion/server/series_functions/points.js
index bf797bb5aa34..74d616cffd52 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/points.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/points.js
@@ -105,7 +105,7 @@ export default new Chainable('points', {
}
symbol = symbol || defaultSymbol;
- if (!_.contains(validSymbols, symbol)) {
+ if (!_.includes(validSymbols, symbol)) {
throw new Error(
i18n.translate('timelion.serverSideErrors.pointsFunction.notValidSymbolErrorMessage', {
defaultMessage: 'Valid symbols are: {validSymbols}',
diff --git a/src/plugins/vis_type_timelion/server/series_functions/static.test.js b/src/plugins/vis_type_timelion/server/series_functions/static.test.js
index 88ec9fecd904..36c5dc708f86 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/static.test.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/static.test.js
@@ -26,7 +26,7 @@ import invoke from './helpers/invoke_series_fn.js';
describe('static.js', () => {
it('returns a series in which all numbers are the same', () => {
return invoke(fn, [5]).then((r) => {
- expect(_.unique(_.map(r.output.list[0].data, 1))).to.eql([5]);
+ expect(_.uniq(_.map(r.output.list[0].data, 1))).to.eql([5]);
});
});
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.tsx b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.tsx
index 0363ba486a77..fcb22a9e7970 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.tsx
@@ -39,7 +39,7 @@ interface AggRowProps {
export function AggRow(props: AggRowProps) {
let iconType = 'eyeClosed';
let iconColor = 'subdued';
- const lastSibling = last(props.siblings);
+ const lastSibling = last(props.siblings) as MetricsItemsSchema;
if (lastSibling.id === props.model.id) {
iconType = 'eye';
diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js b/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js
index beb691f4b711..0638c6e67f5e 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js
@@ -31,7 +31,7 @@ export const seriesChangeHandler = (props, items) => (doc) => {
const metric = newMetricAggFn();
metric.type = doc.type;
const incompatPipelines = ['calculation', 'series_agg'];
- if (!_.contains(incompatPipelines, doc.type)) metric.field = doc.id;
+ if (!_.includes(incompatPipelines, doc.type)) metric.field = doc.id;
return metric;
});
} else {
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/_vis_types.scss b/src/plugins/vis_type_timeseries/public/application/components/vis_types/_vis_types.scss
index 3db09bace079..c445d456a170 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/_vis_types.scss
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/_vis_types.scss
@@ -2,7 +2,11 @@
display: flex;
flex-direction: column;
flex: 1 1 100%;
- padding: $euiSizeS;
+
+ // border used in lieu of padding to prevent overlapping background-color
+ border-width: $euiSizeS;
+ border-style: solid;
+ border-color: transparent;
.tvbVisTimeSeries {
overflow: hidden;
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
index ddfaf3c1428d..612a7a48bade 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
@@ -34,7 +34,7 @@ import { getInterval } from '../../lib/get_interval';
import { areFieldsDifferent } from '../../lib/charts';
import { createXaxisFormatter } from '../../lib/create_xaxis_formatter';
import { STACKED_OPTIONS } from '../../../visualizations/constants';
-import { getCoreStart, getUISettings } from '../../../../services';
+import { getCoreStart } from '../../../../services';
export class TimeseriesVisualization extends Component {
static propTypes = {
@@ -154,7 +154,7 @@ export class TimeseriesVisualization extends Component {
const styles = reactCSS({
default: {
tvbVis: {
- backgroundColor: get(model, 'background_color'),
+ borderColor: get(model, 'background_color'),
},
},
});
@@ -237,7 +237,6 @@ export class TimeseriesVisualization extends Component {
}
});
- const darkMode = getUISettings().get('theme:darkMode');
return (
values.map(({ key, docs }) => ({
@@ -56,7 +56,6 @@ const handleCursorUpdate = (cursor) => {
};
export const TimeSeries = ({
- darkMode,
backgroundColor,
showGrid,
legend,
@@ -90,15 +89,15 @@ export const TimeSeries = ({
const timeZone = getTimezone(uiSettings);
const hasBarChart = series.some(({ bars }) => bars?.show);
- // compute the theme based on the bg color
- const theme = getTheme(darkMode, backgroundColor);
// apply legend style change if bgColor is configured
const classes = classNames('tvbVisTimeSeries', getChartClasses(backgroundColor));
// If the color isn't configured by the user, use the color mapping service
// to assign a color from the Kibana palette. Colors will be shared across the
// session, including dashboards.
- const { colors } = getChartsSetup();
+ const { colors, theme: themeService } = getChartsSetup();
+ const baseTheme = getBaseTheme(themeService.useChartsBaseTheme(), backgroundColor);
+
colors.mappedColors.mapKeys(series.filter(({ color }) => !color).map(({ label }) => label));
const onBrushEndListener = ({ x }) => {
@@ -118,7 +117,7 @@ export const TimeSeries = ({
onBrushEnd={onBrushEndListener}
animateData={false}
onPointerUpdate={handleCursorUpdate}
- theme={
+ theme={[
hasBarChart
? {}
: {
@@ -127,9 +126,14 @@ export const TimeSeries = ({
fill: '#F00',
},
},
- }
- }
- baseTheme={theme}
+ },
+ {
+ background: {
+ color: backgroundColor,
+ },
+ },
+ ]}
+ baseTheme={baseTheme}
tooltip={{
snap: true,
type: tooltipMode === 'show_focused' ? TooltipType.Follow : TooltipType.VerticalCursor,
@@ -269,7 +273,6 @@ TimeSeries.defaultProps = {
};
TimeSeries.propTypes = {
- darkMode: PropTypes.bool,
backgroundColor: PropTypes.string,
showGrid: PropTypes.bool,
legend: PropTypes.bool,
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts
index 57ca38168ac2..d7e6560a8dc9 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts
@@ -17,28 +17,30 @@
* under the License.
*/
-import { getTheme } from './theme';
+import { getBaseTheme } from './theme';
import { LIGHT_THEME, DARK_THEME } from '@elastic/charts';
describe('TSVB theme', () => {
it('should return the basic themes if no bg color is specified', () => {
// use original dark/light theme
- expect(getTheme(false)).toEqual(LIGHT_THEME);
- expect(getTheme(true)).toEqual(DARK_THEME);
+ expect(getBaseTheme(LIGHT_THEME)).toEqual(LIGHT_THEME);
+ expect(getBaseTheme(DARK_THEME)).toEqual(DARK_THEME);
// discard any wrong/missing bg color
- expect(getTheme(true, null)).toEqual(DARK_THEME);
- expect(getTheme(true, '')).toEqual(DARK_THEME);
- expect(getTheme(true, undefined)).toEqual(DARK_THEME);
+ expect(getBaseTheme(DARK_THEME, null)).toEqual(DARK_THEME);
+ expect(getBaseTheme(DARK_THEME, '')).toEqual(DARK_THEME);
+ expect(getBaseTheme(DARK_THEME, undefined)).toEqual(DARK_THEME);
});
it('should return a highcontrast color theme for a different background', () => {
// red use a near full-black color
- expect(getTheme(false, 'red').axes.axisTitleStyle.fill).toEqual('rgb(23,23,23)');
+ expect(getBaseTheme(LIGHT_THEME, 'red').axes.axisTitleStyle.fill).toEqual('rgb(23,23,23)');
// violet increased the text color to full white for higer contrast
- expect(getTheme(false, '#ba26ff').axes.axisTitleStyle.fill).toEqual('rgb(255,255,255)');
+ expect(getBaseTheme(LIGHT_THEME, '#ba26ff').axes.axisTitleStyle.fill).toEqual(
+ 'rgb(255,255,255)'
+ );
// light yellow, prefer the LIGHT_THEME fill color because already with a good contrast
- expect(getTheme(false, '#fff49f').axes.axisTitleStyle.fill).toEqual('#333');
+ expect(getBaseTheme(LIGHT_THEME, '#fff49f').axes.axisTitleStyle.fill).toEqual('#333');
});
});
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts
index 2694732aa381..0e13fd7ef68f 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts
@@ -94,9 +94,15 @@ function isValidColor(color: string | null | undefined): color is string {
}
}
-export function getTheme(darkMode: boolean, bgColor?: string | null): Theme {
+/**
+ * compute base chart theme based on the background color
+ *
+ * @param baseTheme
+ * @param bgColor
+ */
+export function getBaseTheme(baseTheme: Theme, bgColor?: string | null): Theme {
if (!isValidColor(bgColor)) {
- return darkMode ? DARK_THEME : LIGHT_THEME;
+ return baseTheme;
}
const bgLuminosity = computeRelativeLuminosity(bgColor);
diff --git a/src/plugins/vis_type_timeseries/server/lib/get_fields.ts b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts
index fd20ff8b024b..0f0d99bff6f1 100644
--- a/src/plugins/vis_type_timeseries/server/lib/get_fields.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { uniq } from 'lodash';
+import { uniqBy } from 'lodash';
import { first, map } from 'rxjs/operators';
import { KibanaRequest, RequestHandlerContext } from 'kibana/server';
@@ -87,5 +87,5 @@ export async function getFields(
(field) => field.aggregatable && !indexPatterns.isNestedField(field)
);
- return uniq(fields, (field) => field.name);
+ return uniqBy(fields, (field) => field.name);
}
diff --git a/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts b/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts
index f6754e5fd9ca..a9b542af68c9 100644
--- a/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts
+++ b/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts
@@ -40,7 +40,7 @@ export const tsvbTelemetrySavedObjectType: SavedObjectsType = {
},
},
migrations: {
- '7.7.0': flow(resetCount),
- '7.8.0': flow(resetCount),
+ '7.7.0': flow(resetCount),
+ '7.8.0': flow(resetCount),
},
};
diff --git a/src/plugins/vis_type_vega/public/vega_fn.ts b/src/plugins/vis_type_vega/public/vega_fn.ts
index a9c915fcfb63..6b1af6044a2c 100644
--- a/src/plugins/vis_type_vega/public/vega_fn.ts
+++ b/src/plugins/vis_type_vega/public/vega_fn.ts
@@ -22,6 +22,7 @@ import { i18n } from '@kbn/i18n';
import { ExpressionFunctionDefinition, KibanaContext, Render } from '../../expressions/public';
import { VegaVisualizationDependencies } from './plugin';
import { createVegaRequestHandler } from './vega_request_handler';
+import { TimeRange, Query } from '../../data/public';
type Input = KibanaContext | null;
type Output = Promise>;
@@ -58,9 +59,9 @@ export const createVegaFn = (
const vegaRequestHandler = createVegaRequestHandler(dependencies, context.abortSignal);
const response = await vegaRequestHandler({
- timeRange: get(input, 'timeRange'),
- query: get(input, 'query'),
- filters: get(input, 'filters'),
+ timeRange: get(input, 'timeRange') as TimeRange,
+ query: get(input, 'query') as Query,
+ filters: get(input, 'filters') as any,
visParams: { spec: args.spec },
});
diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts
index 7c4f3b3ec884..708e8cf15f02 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { capitalize } from 'lodash';
+import { upperFirst } from 'lodash';
import { BasicVislibParams, ValueAxis, SeriesParam } from '../../../types';
import { ChartModes, ChartTypes, InterpolationModes, Positions } from '../../../utils/collections';
@@ -67,7 +67,7 @@ const getUpdatedAxisName = (
axisPosition: ValueAxis['position'],
valueAxes: BasicVislibParams['valueAxes']
) => {
- const axisName = capitalize(axisPosition) + AXIS_PREFIX;
+ const axisName = upperFirst(axisPosition) + AXIS_PREFIX;
const nextAxisNameNumber = valueAxes.reduce(countNextAxisNumber(axisName, 'name'), 1);
return `${axisName}${nextAxisNameNumber}`;
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js
index 87477332f76e..4d4660371eaa 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js
@@ -30,5 +30,5 @@ export function flattenSeries(obj) {
obj = obj.rows ? obj.rows : obj.columns;
- return _.chain(obj).pluck('series').flattenDeep().value();
+ return _.chain(obj).map('series').flattenDeep().value();
}
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js
index 5e78637ef0c0..f04d9d17eecc 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js
@@ -166,9 +166,9 @@ describe('Vislib Labels Module Test Suite', function () {
seriesArr = Array.isArray(seriesLabels);
rowsArr = Array.isArray(rowsLabels);
uniqSeriesLabels = _.chain(rowsData.rows)
- .pluck('series')
+ .map('series')
.flattenDeep()
- .pluck('label')
+ .map('label')
.uniq()
.value();
});
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js
index 489cb81306b3..cf98425c04ce 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js
@@ -28,5 +28,5 @@ export function uniqLabels(arr) {
throw new TypeError('UniqLabelUtil expects an array of objects');
}
- return _(arr).pluck('label').unique().value();
+ return _(arr).map('label').uniq().value();
}
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
index a2fe4d9249bd..f7e44ed27878 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
@@ -18,7 +18,7 @@
*/
import React, { BaseSyntheticEvent, KeyboardEvent, PureComponent } from 'react';
import classNames from 'classnames';
-import { compact, uniq, map, every, isUndefined } from 'lodash';
+import { compact, uniqBy, map, every, isUndefined } from 'lodash';
import { i18n } from '@kbn/i18n';
import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui';
@@ -119,7 +119,7 @@ export class VisLegend extends PureComponent {
getSeriesLabels = (data: any[]) => {
const values = data.map((chart) => chart.series).reduce((a, b) => a.concat(b), []);
- return compact(uniq(values, 'label')).map((label: any) => ({
+ return compact(uniqBy(values, 'label')).map((label: any) => ({
...label,
values: [label.values[0].seriesRaw],
}));
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts b/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
index 6b507862fb84..da046af83a49 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
@@ -39,7 +39,7 @@ export function getPieNames(data: any[]): string[] {
});
});
- return _.uniq(names, 'label');
+ return _.uniqBy(names, 'label');
}
/**
@@ -61,7 +61,7 @@ function getNames(data: any, columns: any): string[] {
.sortBy(function (obj) {
return obj.index;
})
- .unique(function (d) {
+ .uniqBy(function (d) {
return d.label;
})
.value();
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js
index e22105d5a086..5324dc5318be 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js
@@ -110,7 +110,7 @@ function getOverflow(size, pos, containers) {
}
function mergeOverflows(dest, src) {
- _.merge(dest, src, function (a, b) {
+ _.mergeWith(dest, src, function (a, b) {
if (a == null || b == null) return a || b;
if (a < 0 && b < 0) return Math.min(a, b);
return Math.max(a, b);
@@ -131,7 +131,7 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
const stash = '_' + prop;
// list of directions in order of preference
- const dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
+ const dirs = _.uniq([prev[stash], pref, fallback].filter(Boolean));
let dir;
let value;
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js
index 0bfcedc5e605..bafc3199de89 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js
@@ -218,7 +218,7 @@ Tooltip.prototype.render = function () {
if (html) allContents.push({ id, html, order });
- const allHtml = _(allContents).sortBy('order').pluck('html').compact().join('\n');
+ const allHtml = _(allContents).sortBy('order').map('html').compact().join('\n');
if (allHtml) {
$tooltip.html(allHtml);
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js
index 3269f54a621d..8b7a44d95bb3 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js
@@ -35,9 +35,9 @@ export function flattenData(obj) {
}
return _(charts ? charts : [obj])
- .pluck('series')
+ .map('series')
.flattenDeep()
- .pluck('values')
+ .map('values')
.flattenDeep()
.filter(Boolean)
.value();
diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts
index c5fb4761eb9e..8a1f80df9f4d 100644
--- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts
@@ -71,7 +71,7 @@ export function getSeries(table: Table, chart: Chart) {
seriesLabel = prefix + seriesLabel;
}
- point.seriesId = seriesId;
+ (point.seriesId as string | number) = seriesId;
addToSiri(
seriesMap,
point,
diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/data.js b/src/plugins/vis_type_vislib/public/vislib/lib/data.js
index 98d384f95a83..3633063966e1 100644
--- a/src/plugins/vis_type_vislib/public/vislib/lib/data.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/data.js
@@ -248,7 +248,7 @@ export class Data {
const visData = this.getVisData();
return _.reduce(
- _.pluck(visData, 'geoJson.properties'),
+ _.map(visData, 'geoJson.properties'),
function (minMax, props) {
return {
min: Math.min(props.min, minMax.min),
@@ -312,7 +312,7 @@ export class Data {
* @returns {Array} Value objects
*/
flatten() {
- return _(this.chartData()).pluck('series').flattenDeep().pluck('values').flattenDeep().value();
+ return _(this.chartData()).map('series').flattenDeep().map('values').flattenDeep().value();
}
/**
@@ -383,7 +383,7 @@ export class Data {
.sortBy(function (obj) {
return obj.index;
})
- .unique(function (d) {
+ .uniqBy(function (d) {
return d.label;
})
.value();
@@ -452,7 +452,7 @@ export class Data {
});
});
- return _.uniq(names, 'label');
+ return _.uniqBy(names, 'label');
}
/**
diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js
index 37f395aab401..4c50472b9d11 100644
--- a/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js
@@ -18,7 +18,7 @@
*/
import d3 from 'd3';
-import { get, pull, restParam, size, reduce } from 'lodash';
+import { get, pull, rest, size, reduce } from 'lodash';
import $ from 'jquery';
import { DIMMING_OPACITY_SETTING } from '../../../common';
@@ -97,7 +97,7 @@ export class Dispatch {
* @param {*} [arg...] - any number of arguments that will be applied to each handler
* @return {Dispatch} - this, for chaining
*/
- emit = restParam(function (name, args) {
+ emit = rest(function (name, args) {
if (!this._listeners[name]) {
return this;
}
diff --git a/src/plugins/visualizations/public/persisted_state/persisted_state.ts b/src/plugins/visualizations/public/persisted_state/persisted_state.ts
index 7465f969f456..c926c456da21 100644
--- a/src/plugins/visualizations/public/persisted_state/persisted_state.ts
+++ b/src/plugins/visualizations/public/persisted_state/persisted_state.ts
@@ -19,8 +19,17 @@
import { EventEmitter } from 'events';
-import { isPlainObject, cloneDeep, get, set, isEqual, isString, merge } from 'lodash';
-import toPath from 'lodash/internal/toPath';
+import {
+ isPlainObject,
+ cloneDeep,
+ get,
+ set,
+ isEqual,
+ isString,
+ merge,
+ mergeWith,
+ toPath,
+} from 'lodash';
function prepSetParams(key: PersistedStateKey, value: any, path: PersistedStatePath) {
// key must be the value, set the entire state using it
@@ -150,7 +159,7 @@ export class PersistedState extends EventEmitter {
while (partialPath.length > 0) {
const lastKey = partialPath.splice(partialPath.length - 1, 1)[0];
const statePath = [...this._path, partialPath];
- const stateVal = statePath.length > 0 ? get(stateTree, statePath) : stateTree;
+ const stateVal = statePath.length > 0 ? get(stateTree, statePath as string[]) : stateTree;
// if stateVal isn't an object, do nothing
if (!isPlainObject(stateVal)) return;
@@ -240,7 +249,7 @@ export class PersistedState extends EventEmitter {
// If `mergeMethod` is provided it is invoked to produce the merged values of the
// destination and source properties.
// If `mergeMethod` returns `undefined` the default merging method is used
- this._mergedState = merge(targetObj, sourceObj, mergeMethod);
+ this._mergedState = mergeWith(targetObj, sourceObj, mergeMethod);
// sanity check; verify that there are actually changes
if (isEqual(this._mergedState, this._defaultState)) this._changedState = {};
diff --git a/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts b/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts
index 0c27c3a2c778..60945b912e1b 100644
--- a/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts
+++ b/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts
@@ -49,7 +49,7 @@ export async function findListItems({
}, acc);
}, {} as { [visType: string]: VisualizationsAppExtension });
const searchOption = (field: string, ...defaults: string[]) =>
- _(extensions).pluck(field).concat(defaults).compact().flatten().uniq().value() as string[];
+ _(extensions).map(field).concat(defaults).compact().flatten().uniq().value() as string[];
const searchOptions = {
type: searchOption('docTypes', 'visualization'),
searchFields: searchOption('searchFields', 'title^3', 'description'),
diff --git a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
index 47757593958d..dc6ac4919a4c 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
@@ -19,7 +19,7 @@
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
-import { sortByOrder } from 'lodash';
+import { orderBy } from 'lodash';
import React, { ChangeEvent } from 'react';
import {
@@ -201,7 +201,7 @@ class TypeSelection extends React.Component {
diff --git a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
index 27fe722019a2..74881b9d99ae 100644
--- a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
+++ b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
@@ -65,7 +65,7 @@ const migrateIndexPattern: SavedObjectMigrationFn = (doc) => {
// [TSVB] Migrate percentile-rank aggregation (value -> values)
const migratePercentileRankAggregation: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
let visState;
if (visStateJSON) {
@@ -101,7 +101,7 @@ const migratePercentileRankAggregation: SavedObjectMigrationFn = (doc)
// [TSVB] Remove stale opperator key
const migrateOperatorKeyTypo: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
let visState;
if (visStateJSON) {
@@ -137,7 +137,7 @@ const migrateOperatorKeyTypo: SavedObjectMigrationFn = (doc) => {
* @see https://github.com/elastic/kibana/pull/58462/files#diff-ae69fe15b20a5099d038e9bbe2ed3849
**/
const migrateSplitByChartRow: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
let visState: any;
if (visStateJSON) {
@@ -177,7 +177,7 @@ const migrateSplitByChartRow: SavedObjectMigrationFn = (doc) => {
// Migrate date histogram aggregation (remove customInterval)
const migrateDateHistogramAggregation: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
let visState;
if (visStateJSON) {
@@ -219,7 +219,7 @@ const migrateDateHistogramAggregation: SavedObjectMigrationFn = (doc)
};
const removeDateHistogramTimeZones: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
let visState;
try {
@@ -251,7 +251,7 @@ const removeDateHistogramTimeZones: SavedObjectMigrationFn = (doc) =>
// migrate gauge verticalSplit to alignment
// https://github.com/elastic/kibana/issues/34636
const migrateGaugeVerticalSplitToAlignment: SavedObjectMigrationFn = (doc, logger) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
try {
@@ -289,7 +289,7 @@ const transformFilterStringToQueryObject: SavedObjectMigrationFn = (do
// Migrate filters
// If any filters exist and they are a string, we assume it to be lucene and transform the filter into an object accordingly
const newDoc = cloneDeep(doc);
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
let visState;
try {
@@ -298,7 +298,7 @@ const transformFilterStringToQueryObject: SavedObjectMigrationFn = (do
// let it go, the data is invalid and we'll leave it as is
}
if (visState) {
- const visType = get(visState, 'params.type');
+ const visType = get(visState, 'params.type');
const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
if (tsvbTypes.indexOf(visType) === -1) {
// skip
@@ -373,7 +373,7 @@ const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn
// Migrate split_filters in TSVB objects that weren't migrated in 7.3
// If any filters exist and they are a string, we assume them to be lucene syntax and transform the filter into an object accordingly
const newDoc = cloneDeep(doc);
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
let visState;
try {
@@ -382,7 +382,7 @@ const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn
// let it go, the data is invalid and we'll leave it as is
}
if (visState) {
- const visType = get(visState, 'params.type');
+ const visType = get(visState, 'params.type');
const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
if (tsvbTypes.indexOf(visType) === -1) {
// skip
@@ -415,7 +415,7 @@ const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn
};
const migrateFiltersAggQuery: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
try {
@@ -447,7 +447,7 @@ const migrateFiltersAggQuery: SavedObjectMigrationFn = (doc) => {
};
const replaceMovAvgToMovFn: SavedObjectMigrationFn = (doc, logger) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
let visState;
if (visStateJSON) {
@@ -495,7 +495,7 @@ const replaceMovAvgToMovFn: SavedObjectMigrationFn = (doc, logger) =>
};
const migrateFiltersAggQueryStringQueries: SavedObjectMigrationFn = (doc, logger) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
try {
@@ -533,7 +533,7 @@ const addDocReferences: SavedObjectMigrationFn = (doc) => ({
});
const migrateSavedSearch: SavedObjectMigrationFn = (doc) => {
- const savedSearchId = get(doc, 'attributes.savedSearchId');
+ const savedSearchId = get(doc, 'attributes.savedSearchId');
if (savedSearchId && doc.references) {
doc.references.push({
@@ -550,7 +550,7 @@ const migrateSavedSearch: SavedObjectMigrationFn = (doc) => {
};
const migrateControls: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
if (visStateJSON) {
let visState;
@@ -617,7 +617,7 @@ const migrateTableSplits: SavedObjectMigrationFn = (doc) => {
};
const migrateMatchAllQuery: SavedObjectMigrationFn = (doc) => {
- const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
+ const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
if (searchSourceJSON) {
let searchSource: any;
@@ -651,7 +651,7 @@ const migrateMatchAllQuery: SavedObjectMigrationFn = (doc) => {
// [TSVB] Default color palette is changing, keep the default for older viz
const migrateTsvbDefaultColorPalettes: SavedObjectMigrationFn = (doc) => {
- const visStateJSON = get(doc, 'attributes.visState');
+ const visStateJSON = get(doc, 'attributes.visState');
let visState;
if (visStateJSON) {
@@ -693,30 +693,24 @@ export const visualizationSavedObjectTypeMigrations = {
* in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7
* only contained the 6.7.2 migration and not the 7.0.1 migration.
*/
- '6.7.2': flow>(
- migrateMatchAllQuery,
- removeDateHistogramTimeZones
- ),
- '7.0.0': flow>(
+ '6.7.2': flow(migrateMatchAllQuery, removeDateHistogramTimeZones),
+ '7.0.0': flow(
addDocReferences,
migrateIndexPattern,
migrateSavedSearch,
migrateControls,
migrateTableSplits
),
- '7.0.1': flow>(removeDateHistogramTimeZones),
- '7.2.0': flow>(
- migratePercentileRankAggregation,
- migrateDateHistogramAggregation
- ),
- '7.3.0': flow>(
+ '7.0.1': flow(removeDateHistogramTimeZones),
+ '7.2.0': flow(migratePercentileRankAggregation, migrateDateHistogramAggregation),
+ '7.3.0': flow(
migrateGaugeVerticalSplitToAlignment,
transformFilterStringToQueryObject,
migrateFiltersAggQuery,
replaceMovAvgToMovFn
),
- '7.3.1': flow>(migrateFiltersAggQueryStringQueries),
- '7.4.2': flow>(transformSplitFiltersStringToQueryObject),
- '7.7.0': flow>(migrateOperatorKeyTypo, migrateSplitByChartRow),
- '7.8.0': flow>(migrateTsvbDefaultColorPalettes),
+ '7.3.1': flow(migrateFiltersAggQueryStringQueries),
+ '7.4.2': flow(transformSplitFiltersStringToQueryObject),
+ '7.7.0': flow(migrateOperatorKeyTypo, migrateSplitByChartRow),
+ '7.8.0': flow(migrateTsvbDefaultColorPalettes),
};
diff --git a/src/plugins/visualize/public/application/utils/create_visualize_app_state.ts b/src/plugins/visualize/public/application/utils/create_visualize_app_state.ts
index 1e05c48ba7da..52b7e3ede298 100644
--- a/src/plugins/visualize/public/application/utils/create_visualize_app_state.ts
+++ b/src/plugins/visualize/public/application/utils/create_visualize_app_state.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { isFunction, omit, union } from 'lodash';
+import { isFunction, omitBy, union } from 'lodash';
import { migrateAppState } from './migrate_app_state';
import {
@@ -35,9 +35,9 @@ interface Arguments {
}
function toObject(state: PureVisState): PureVisState {
- return omit(state, (value, key: string) => {
+ return omitBy(state, (value, key: string) => {
return key.charAt(0) === '$' || key.charAt(0) === '_' || isFunction(value);
- });
+ }) as PureVisState;
}
export function createVisualizeAppState({ stateDefaults, kbnUrlStateStorage }: Arguments) {
diff --git a/src/plugins/visualize/public/application/utils/migrate_app_state.ts b/src/plugins/visualize/public/application/utils/migrate_app_state.ts
index f5f1a1785bbd..94eba5a6d7ce 100644
--- a/src/plugins/visualize/public/application/utils/migrate_app_state.ts
+++ b/src/plugins/visualize/public/application/utils/migrate_app_state.ts
@@ -36,7 +36,7 @@ export function migrateAppState(appState: VisualizeAppState) {
return appState;
}
- const visAggs: any = get(appState, 'vis.aggs');
+ const visAggs: any = get(appState, 'vis.aggs');
if (visAggs) {
let splitCount = 0;
diff --git a/src/setup_node_env/patches/child_process.js b/src/setup_node_env/harden/child_process.js
similarity index 97%
rename from src/setup_node_env/patches/child_process.js
rename to src/setup_node_env/harden/child_process.js
index fb857b2092ee..6b1ba779605c 100644
--- a/src/setup_node_env/patches/child_process.js
+++ b/src/setup_node_env/harden/child_process.js
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+var hook = require('require-in-the-middle');
// Ensure, when spawning a new child process, that the `options` and the
// `options.env` object passed to the child process function doesn't inherit
// from `Object.prototype`. This protects against similar RCE vulnerabilities
// as described in CVE-2019-7609
-module.exports = function (cp) {
+hook(['child_process'], function (cp) {
// The `exec` function is currently just a wrapper around `execFile`. So for
// now there's no need to patch it. If this changes in the future, our tests
// will fail and we can uncomment the line below.
@@ -36,7 +37,7 @@ module.exports = function (cp) {
cp.spawnSync = new Proxy(cp.spawnSync, { apply: patchOptions(true) });
return cp;
-};
+});
function patchOptions(hasArgs) {
return function apply(target, thisArg, args) {
diff --git a/src/setup_node_env/harden.js b/src/setup_node_env/harden/index.js
similarity index 80%
rename from src/setup_node_env/harden.js
rename to src/setup_node_env/harden/index.js
index dead3db1d60b..25cb3bcd78ff 100644
--- a/src/setup_node_env/harden.js
+++ b/src/setup_node_env/harden/index.js
@@ -17,8 +17,5 @@
* under the License.
*/
-var hook = require('require-in-the-middle');
-
-hook(['child_process'], function (exports, name) {
- return require(`./patches/${name}`)(exports); // eslint-disable-line import/no-dynamic-require
-});
+require('./child_process');
+require('./lodash_template');
diff --git a/src/setup_node_env/harden/lodash_template.js b/src/setup_node_env/harden/lodash_template.js
new file mode 100644
index 000000000000..2add624f9f32
--- /dev/null
+++ b/src/setup_node_env/harden/lodash_template.js
@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+var hook = require('require-in-the-middle');
+var isIterateeCall = require('lodash/_isIterateeCall');
+
+hook(['lodash'], function (lodash) {
+ lodash.template = createProxy(lodash.template);
+ return lodash;
+});
+
+hook(['lodash/template'], function (template) {
+ return createProxy(template);
+});
+
+hook(['lodash/fp'], function (fp) {
+ fp.template = createFpProxy(fp.template);
+ return fp;
+});
+
+hook(['lodash/fp/template'], function (template) {
+ return createFpProxy(template);
+});
+
+function createProxy(template) {
+ return new Proxy(template, {
+ apply: function (target, thisArg, args) {
+ if (args.length === 1 || isIterateeCall(args)) {
+ return target.apply(thisArg, [args[0], { sourceURL: '' }]);
+ }
+
+ var options = Object.assign({}, args[1]);
+ options.sourceURL = (options.sourceURL + '').replace(/\s/g, ' ');
+ var newArgs = args.slice(0); // copy
+ newArgs.splice(1, 1, options); // replace options in the copy
+ return target.apply(thisArg, newArgs);
+ },
+ });
+}
+
+function createFpProxy(template) {
+ // we have to do the require here, so that we get the patched version
+ var _ = require('lodash');
+ return new Proxy(template, {
+ apply: function (target, thisArg, args) {
+ // per https://github.com/lodash/lodash/wiki/FP-Guide
+ // > Iteratee arguments are capped to avoid gotchas with variadic iteratees.
+ // this means that we can't specify the options in the second argument to fp.template because it's ignored.
+ // Instead, we're going to use the non-FP _.template with only the first argument which has already been patched
+ return _.template(args[0]);
+ },
+ });
+}
diff --git a/src/test_utils/get_url.js b/src/test_utils/get_url.js
index fbe16e798fff..182cb8e6e118 100644
--- a/src/test_utils/get_url.js
+++ b/src/test_utils/get_url.js
@@ -44,7 +44,7 @@ export default function getUrl(config, app) {
}
getUrl.noAuth = function getUrlNoAuth(config, app) {
- config = _.pick(config, function (val, param) {
+ config = _.pickBy(config, function (val, param) {
return param !== 'auth';
});
return getUrl(config, app);
diff --git a/src/test_utils/kbn_server.ts b/src/test_utils/kbn_server.ts
index 12f7eb5a0a04..6a20261421b5 100644
--- a/src/test_utils/kbn_server.ts
+++ b/src/test_utils/kbn_server.ts
@@ -217,7 +217,7 @@ export function createTestServers({
if (!adjustTimeout) {
throw new Error('adjustTimeout is required in order to avoid flaky tests');
}
- const license = get<'oss' | 'basic' | 'gold' | 'trial'>(settings, 'es.license', 'oss');
+ const license = get(settings, 'es.license', 'oss');
const usersToBeAdded = get(settings, 'users', []);
if (usersToBeAdded.length > 0) {
if (license !== 'trial') {
diff --git a/test/api_integration/apis/saved_objects/migrations.js b/test/api_integration/apis/saved_objects/migrations.js
index d0ff4cc06c57..9ea3cf087be9 100644
--- a/test/api_integration/apis/saved_objects/migrations.js
+++ b/test/api_integration/apis/saved_objects/migrations.js
@@ -293,7 +293,7 @@ export default ({ getService }) => {
// It only created the original and the dest
assert.deepEqual(
- _.pluck(
+ _.map(
await callCluster('cat.indices', { index: '.migration-c*', format: 'json' }),
'index'
).sort(),
diff --git a/test/functional/apps/dashboard/index.js b/test/functional/apps/dashboard/index.js
index 1e310c1ddd26..5a30456bd59a 100644
--- a/test/functional/apps/dashboard/index.js
+++ b/test/functional/apps/dashboard/index.js
@@ -49,6 +49,7 @@ export default function ({ getService, loadTestFile }) {
after(unloadCurrentData);
loadTestFile(require.resolve('./empty_dashboard'));
+ loadTestFile(require.resolve('./url_field_formatter'));
loadTestFile(require.resolve('./embeddable_rendering'));
loadTestFile(require.resolve('./create_and_add_embeddables'));
loadTestFile(require.resolve('./edit_embeddable_redirects'));
diff --git a/test/functional/apps/dashboard/url_field_formatter.ts b/test/functional/apps/dashboard/url_field_formatter.ts
new file mode 100644
index 000000000000..9b05b9b777b9
--- /dev/null
+++ b/test/functional/apps/dashboard/url_field_formatter.ts
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const { common, dashboard, settings, timePicker, visChart } = getPageObjects([
+ 'common',
+ 'dashboard',
+ 'settings',
+ 'timePicker',
+ 'visChart',
+ ]);
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+ const testSubjects = getService('testSubjects');
+ const browser = getService('browser');
+ const fieldName = 'clientip';
+
+ const clickFieldAndCheckUrl = async (fieldLink: WebElementWrapper) => {
+ const fieldValue = await fieldLink.getVisibleText();
+ await fieldLink.click();
+ const windowHandlers = await browser.getAllWindowHandles();
+ expect(windowHandlers.length).to.equal(2);
+ await browser.switchToWindow(windowHandlers[1]);
+ const currentUrl = await browser.getCurrentUrl();
+ const fieldUrl = common.getHostPort() + '/app/' + fieldValue;
+ expect(currentUrl).to.equal(fieldUrl);
+ };
+
+ describe('Changing field formatter to Url', () => {
+ before(async function () {
+ await esArchiver.load('dashboard/current/kibana');
+ await kibanaServer.uiSettings.replace({
+ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
+ });
+ await common.navigateToApp('settings');
+ await settings.clickKibanaIndexPatterns();
+ await settings.clickIndexPatternLogstash();
+ await settings.filterField(fieldName);
+ await settings.openControlsByName(fieldName);
+ await settings.setFieldFormat('url');
+ await settings.controlChangeSave();
+ });
+
+ it('applied on dashboard', async () => {
+ await common.navigateToApp('dashboard');
+ await dashboard.loadSavedDashboard('dashboard with everything');
+ await dashboard.waitForRenderComplete();
+ const fieldLink = await visChart.getFieldLinkInVisTable(`${fieldName}: Descending`, 1);
+ await clickFieldAndCheckUrl(fieldLink);
+ });
+
+ it('applied on discover', async () => {
+ await common.navigateToApp('discover');
+ await timePicker.setAbsoluteRange(
+ 'Sep 19, 2017 @ 06:31:44.000',
+ 'Sep 23, 2018 @ 18:31:44.000'
+ );
+ await testSubjects.click('docTableExpandToggleColumn');
+ const fieldLink = await testSubjects.find(`tableDocViewRow-${fieldName}-value`);
+ await clickFieldAndCheckUrl(fieldLink);
+ });
+
+ afterEach(async function () {
+ const windowHandlers = await browser.getAllWindowHandles();
+ if (windowHandlers.length > 1) {
+ await browser.closeCurrentWindow();
+ await browser.switchToWindow(windowHandlers[0]);
+ }
+ });
+ });
+}
diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js
index c69111be6972..03db3a2b108f 100644
--- a/test/functional/apps/management/_import_objects.js
+++ b/test/functional/apps/management/_import_objects.js
@@ -19,7 +19,7 @@
import expect from '@kbn/expect';
import path from 'path';
-import { indexBy } from 'lodash';
+import { keyBy } from 'lodash';
export default function ({ getService, getPageObjects }) {
const kibanaServer = getService('kibanaServer');
@@ -50,12 +50,12 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.savedObjects.clickImportDone();
// get all the elements in the table, and index them by the 'title' visible text field
- const elements = indexBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
+ const elements = keyBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
log.debug("check that 'Log Agents' is in table as a visualization");
expect(elements['Log Agents'].objectType).to.eql('visualization');
await elements['logstash-*'].relationshipsElement.click();
- const flyout = indexBy(await PageObjects.savedObjects.getRelationshipFlyout(), 'title');
+ const flyout = keyBy(await PageObjects.savedObjects.getRelationshipFlyout(), 'title');
log.debug(
"check that 'Shared-Item Visualization AreaChart' shows 'logstash-*' as it's Parent"
);
@@ -150,7 +150,7 @@ export default function ({ getService, getPageObjects }) {
});
it('should not import saved objects linked to saved searches when saved search index pattern does not exist', async function () {
- const elements = indexBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
+ const elements = keyBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
await elements['logstash-*'].checkbox.click();
await PageObjects.savedObjects.clickDelete();
@@ -182,7 +182,7 @@ export default function ({ getService, getPageObjects }) {
it('should import saved objects with index patterns when index patterns does not exists', async () => {
// First, we need to delete the index pattern
- const elements = indexBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
+ const elements = keyBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
await elements['logstash-*'].checkbox.click();
await PageObjects.savedObjects.clickDelete();
@@ -321,7 +321,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.savedObjects.clickImportDone();
// Second, we need to delete the index pattern
- const elements = indexBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
+ const elements = keyBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
await elements['logstash-*'].checkbox.click();
await PageObjects.savedObjects.clickDelete();
@@ -353,7 +353,7 @@ export default function ({ getService, getPageObjects }) {
it('should import saved objects with index patterns when index patterns does not exists', async () => {
// First, we need to delete the index pattern
- const elements = indexBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
+ const elements = keyBy(await PageObjects.savedObjects.getElementsInTable(), 'title');
await elements['logstash-*'].checkbox.click();
await PageObjects.savedObjects.clickDelete();
diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
index 673fba0c346b..590631ad48b0 100644
--- a/test/functional/page_objects/visualize_chart_page.ts
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -302,6 +302,20 @@ export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrPr
return element.getVisibleText();
}
+ public async getFieldLinkInVisTable(fieldName: string, rowIndex: number = 1) {
+ const tableVis = await testSubjects.find('tableVis');
+ const $ = await tableVis.parseDomContent();
+ const headers = $('span[ng-bind="::col.title"]')
+ .toArray()
+ .map((header: any) => $(header).text());
+ const fieldColumnIndex = headers.indexOf(fieldName);
+ return await find.byCssSelector(
+ `[data-test-subj="paginated-table-body"] tr:nth-of-type(${rowIndex}) td:nth-of-type(${
+ fieldColumnIndex + 1
+ }) a`
+ );
+ }
+
/**
* If you are writing new tests, you should rather look into getTableVisContent method instead.
* @deprecated Use getTableVisContent instead.
diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts
index d6a4fc91481d..2d35551b0480 100644
--- a/test/functional/services/common/browser.ts
+++ b/test/functional/services/common/browser.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { cloneDeep } from 'lodash';
+import { cloneDeepWith } from 'lodash';
import { Key, Origin } from 'selenium-webdriver';
// @ts-ignore internal modules are not typed
import { LegacyActionSequence } from 'selenium-webdriver/lib/actions';
@@ -471,7 +471,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
): Promise {
return await driver.executeScript(
fn,
- ...cloneDeep(args, (arg) => {
+ ...cloneDeepWith(args, (arg) => {
if (arg instanceof WebElementWrapper) {
return arg._webElement;
}
@@ -501,7 +501,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
): Promise {
return await driver.executeAsyncScript(
fn,
- ...cloneDeep(args, (arg) => {
+ ...cloneDeepWith(args, (arg) => {
if (arg instanceof WebElementWrapper) {
return arg._webElement;
}
diff --git a/test/harden/lodash_template.js b/test/harden/lodash_template.js
new file mode 100644
index 000000000000..170e3a8fba43
--- /dev/null
+++ b/test/harden/lodash_template.js
@@ -0,0 +1,181 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+require('../../src/setup_node_env');
+const _ = require('lodash');
+const template = require('lodash/template');
+const fp = require('lodash/fp');
+const fpTemplate = require('lodash/fp/template');
+const test = require('tape');
+
+Object.prototype.sourceURL = '\u2028\u2029\n;global.whoops=true'; // eslint-disable-line no-extend-native
+
+test.onFinish(() => {
+ delete Object.prototype.sourceURL;
+});
+
+test('test setup ok', (t) => {
+ t.equal({}.sourceURL, '\u2028\u2029\n;global.whoops=true');
+ t.end();
+});
+
+[_.template, template].forEach((fn) => {
+ test(`_.template('<%= foo %>')`, (t) => {
+ const output = fn('<%= foo %>')({ foo: 'bar' });
+ t.equal(output, 'bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+
+ test(`_.template('<%= foo %>', {})`, (t) => {
+ const output = fn('<%= foo %>', Object.freeze({}))({ foo: 'bar' });
+ t.equal(output, 'bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+
+ test(`_.template('<%= data.foo %>', { variable: 'data' })`, (t) => {
+ const output = fn('<%= data.foo %>', Object.freeze({ variable: 'data' }))({ foo: 'bar' });
+ t.equal(output, 'bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+
+ test(`_.template('<%= foo %>', { sourceURL: '/foo/bar' })`, (t) => {
+ // throwing errors in the template and parsing the stack, which is a string, is super ugly, but all I know to do
+ const template = fn('<% throw new Error() %>', Object.freeze({ sourceURL: '/foo/bar' }));
+ t.plan(2);
+ try {
+ template();
+ } catch (err) {
+ const path = parsePathFromStack(err.stack);
+ t.equal(path, '/foo/bar');
+ t.equal(global.whoops, undefined);
+ }
+ });
+
+ test(`_.template('<%= foo %>', { sourceURL: '\\u2028\\u2029\\nglobal.whoops=true' })`, (t) => {
+ // throwing errors in the template and parsing the stack, which is a string, is super ugly, but all I know to do
+ const template = fn(
+ '<% throw new Error() %>',
+ Object.freeze({ sourceURL: '\u2028\u2029\nglobal.whoops=true' })
+ );
+ t.plan(2);
+ try {
+ template();
+ } catch (err) {
+ const path = parsePathFromStack(err.stack);
+ t.equal(path, 'global.whoops=true');
+ t.equal(global.whoops, undefined);
+ }
+ });
+
+ test(`_.template used as an iteratee call(`, (t) => {
+ const templateStrArr = ['<%= data.foo %>', 'example <%= data.foo %>'];
+ const output = _.map(templateStrArr, fn);
+
+ t.equal(output[0]({ data: { foo: 'bar' } }), 'bar');
+ t.equal(output[1]({ data: { foo: 'bar' } }), 'example bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+});
+
+[fp.template, fpTemplate].forEach((fn) => {
+ test(`fp.template('<%= foo %>')`, (t) => {
+ const output = fn('<%= foo %>')({ foo: 'bar' });
+ t.equal(output, 'bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+
+ test(`fp.template('<%= foo %>', {})`, (t) => {
+ // fp.template ignores the second argument, this is negligible in this situation since options is an empty object
+ const output = fn('<%= foo %>', Object.freeze({}))({ foo: 'bar' });
+ t.equal(output, 'bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+
+ test(`fp.template('<%= data.foo %>', { variable: 'data' })`, (t) => {
+ // fp.template ignores the second argument, this causes an error to be thrown
+ t.plan(2);
+ try {
+ fn('<%= data.foo %>', Object.freeze({ variable: 'data' }))({ foo: 'bar' });
+ } catch (err) {
+ t.equal(err.message, 'data is not defined');
+ t.equal(global.whoops, undefined);
+ }
+ });
+
+ test(`fp.template('<%= foo %>', { sourceURL: '/foo/bar' })`, (t) => {
+ // fp.template ignores the second argument, the sourceURL is ignored
+ // throwing errors in the template and parsing the stack, which is a string, is super ugly, but all I know to do
+ // our patching to hard-code the sourceURL and use non-FP _.template does slightly alter the stack-traces but it's negligible
+ const template = fn('<% throw new Error() %>', Object.freeze({ sourceURL: '/foo/bar' }));
+ t.plan(3);
+ try {
+ template();
+ } catch (err) {
+ const path = parsePathFromStack(err.stack);
+ t.match(path, /^eval at /);
+ t.doesNotMatch(path, /\/foo\/bar/);
+ t.equal(global.whoops, undefined);
+ }
+ });
+
+ test(`fp.template('<%= foo %>', { sourceURL: '\\u2028\\u2029\\nglobal.whoops=true' })`, (t) => {
+ // fp.template ignores the second argument, the sourceURL is ignored
+ // throwing errors in the template and parsing the stack, which is a string, is super ugly, but all I know to do
+ // our patching to hard-code the sourceURL and use non-FP _.template does slightly alter the stack-traces but it's negligible
+ const template = fn(
+ '<% throw new Error() %>',
+ Object.freeze({ sourceURL: '\u2028\u2029\nglobal.whoops=true' })
+ );
+ t.plan(3);
+ try {
+ template();
+ } catch (err) {
+ const path = parsePathFromStack(err.stack);
+ t.match(path, /^eval at /);
+ t.doesNotMatch(path, /\/foo\/bar/);
+ t.equal(global.whoops, undefined);
+ }
+ });
+
+ test(`fp.template used as an iteratee call(`, (t) => {
+ const templateStrArr = ['<%= data.foo %>', 'example <%= data.foo %>'];
+ const output = fp.map(fn)(templateStrArr);
+
+ t.equal(output[0]({ data: { foo: 'bar' } }), 'bar');
+ t.equal(output[1]({ data: { foo: 'bar' } }), 'example bar');
+ t.equal(global.whoops, undefined);
+ t.end();
+ });
+});
+
+function parsePathFromStack(stack) {
+ const lines = stack.split('\n');
+ // the frame starts at the second line
+ const frame = lines[1];
+
+ // the path is in parathensis, and ends with a colon before the line/column numbers
+ const [, path] = /\(([^:]+)/.exec(frame);
+ return path;
+}
diff --git a/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_visual_regression.sh
index a32782deec65..17345d430188 100755
--- a/test/scripts/jenkins_visual_regression.sh
+++ b/test/scripts/jenkins_visual_regression.sh
@@ -11,7 +11,7 @@ mkdir -p "$installDir"
tar -xzf "$linuxBuild" -C "$installDir" --strip=1
echo " -> running visual regression tests from kibana directory"
-yarn percy exec -t 500 -- -- \
+yarn percy exec -t 10000 -- -- \
node scripts/functional_tests \
--debug --bail \
--kibana-install-dir "$installDir" \
diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh
index b67c1c9060a6..36bf3409a542 100755
--- a/test/scripts/jenkins_xpack_visual_regression.sh
+++ b/test/scripts/jenkins_xpack_visual_regression.sh
@@ -13,7 +13,7 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
echo " -> running visual regression tests from x-pack directory"
cd "$XPACK_DIR"
-yarn percy exec -t 500 -- -- \
+yarn percy exec -t 10000 -- -- \
node scripts/functional_tests \
--debug --bail \
--kibana-install-dir "$installDir" \
diff --git a/test/tsconfig.json b/test/tsconfig.json
index a270144bd49f..87e79b295315 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -14,7 +14,6 @@
"include": [
"**/*.ts",
"**/*.tsx",
- "../typings/lodash.topath/*.ts",
"../typings/elastic__node_crypto.d.ts",
"typings/**/*"
],
diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts
index 3a71c3aa9d3d..e35ef41420dd 100644
--- a/test/visual_regression/services/visual_testing/visual_testing.ts
+++ b/test/visual_regression/services/visual_testing/visual_testing.ts
@@ -19,7 +19,6 @@
import { postSnapshot } from '@percy/agent/dist/utils/sdk-utils';
import { Test } from 'mocha';
-import _ from 'lodash';
import testSubjSelector from '@kbn/test-subj-selector';
diff --git a/vars/kibanaCoverage.groovy b/vars/kibanaCoverage.groovy
index e511d7a8fc15..66ebe3478fbe 100644
--- a/vars/kibanaCoverage.groovy
+++ b/vars/kibanaCoverage.groovy
@@ -1,3 +1,46 @@
+def downloadPrevious(title) {
+ def vaultSecret = 'secret/gce/elastic-bekitzur/service-account/kibana'
+
+ withGcpServiceAccount.fromVaultSecret(vaultSecret, 'value') {
+ kibanaPipeline.bash('''
+
+ gsutil -m cp -r gs://elastic-bekitzur-kibana-coverage-live/previous_pointer/previous.txt . || echo "### Previous Pointer NOT FOUND?"
+
+ if [ -e ./previous.txt ]; then
+ mv previous.txt downloaded_previous.txt
+ echo "### downloaded_previous.txt"
+ cat downloaded_previous.txt
+ fi
+
+ ''', title)
+
+ def previous = sh(script: 'cat downloaded_previous.txt', label: '### Capture Previous Sha', returnStdout: true).trim()
+
+ return previous
+ }
+}
+
+def uploadPrevious(title) {
+ def vaultSecret = 'secret/gce/elastic-bekitzur/service-account/kibana'
+
+ withGcpServiceAccount.fromVaultSecret(vaultSecret, 'value') {
+ kibanaPipeline.bash('''
+
+ collectPrevious() {
+ PREVIOUS=$(git log --pretty=format:%h -1)
+ echo "### PREVIOUS: ${PREVIOUS}"
+ echo $PREVIOUS > previous.txt
+ }
+ collectPrevious
+
+ gsutil cp previous.txt gs://elastic-bekitzur-kibana-coverage-live/previous_pointer/
+
+
+ ''', title)
+
+ }
+}
+
def uploadCoverageStaticSite(timestamp) {
def uploadPrefix = "gs://elastic-bekitzur-kibana-coverage-live/"
def uploadPrefixWithTimeStamp = "${uploadPrefix}${timestamp}/"
@@ -67,6 +110,7 @@ EOF
cat src/dev/code_coverage/www/index.html
''', "### Combine Index Partials")
}
+
def collectVcsInfo(title) {
kibanaPipeline.bash('''
predicate() {
@@ -125,31 +169,31 @@ def uploadCombinedReports() {
)
}
-def ingestData(jobName, buildNum, buildUrl, title) {
+def ingestData(jobName, buildNum, buildUrl, previousSha, title) {
kibanaPipeline.bash("""
source src/dev/ci_setup/setup_env.sh
yarn kbn bootstrap --prefer-offline
# Using existing target/kibana-coverage folder
- . src/dev/code_coverage/shell_scripts/ingest_coverage.sh '${jobName}' ${buildNum} '${buildUrl}'
+ . src/dev/code_coverage/shell_scripts/ingest_coverage.sh '${jobName}' ${buildNum} '${buildUrl}' ${previousSha}
""", title)
}
-def ingestWithVault(jobName, buildNum, buildUrl, title) {
+def ingestWithVault(jobName, buildNum, buildUrl, previousSha, title) {
def vaultSecret = 'secret/kibana-issues/prod/coverage/elasticsearch'
withVaultSecret(secret: vaultSecret, secret_field: 'host', variable_name: 'HOST_FROM_VAULT') {
withVaultSecret(secret: vaultSecret, secret_field: 'username', variable_name: 'USER_FROM_VAULT') {
withVaultSecret(secret: vaultSecret, secret_field: 'password', variable_name: 'PASS_FROM_VAULT') {
- ingestData(jobName, buildNum, buildUrl, title)
+ ingestData(jobName, buildNum, buildUrl, previousSha, title)
}
}
}
}
-def ingest(jobName, buildNumber, buildUrl, timestamp, title) {
+def ingest(jobName, buildNumber, buildUrl, timestamp, previousSha, title) {
withEnv([
"TIME_STAMP=${timestamp}",
]) {
- ingestWithVault(jobName, buildNumber, buildUrl, title)
+ ingestWithVault(jobName, buildNumber, buildUrl, previousSha, title)
}
}
diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts
index 0600ed8e3fbf..7c495ad605f6 100644
--- a/x-pack/legacy/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts
+++ b/x-pack/legacy/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts
@@ -38,7 +38,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
if (!response.found) {
return null;
}
- const beat = _get(response, '_source.beat');
+ const beat = _get(response, '_source.beat') as CMBeat;
beat.tags = beat.tags || [];
return beat;
}
@@ -101,7 +101,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
const response = await this.database.search(user, params);
- const beats = _get(response, 'hits.hits', []);
+ const beats = _get(response, 'hits.hits', []) as CMBeat[];
if (beats.length === 0) {
return [];
@@ -127,14 +127,12 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
const response = await this.database.search(user, params);
- const beats = _get(response, 'hits.hits', []);
+ const beats = _get(response, 'hits.hits', []) as CMBeat[];
if (beats.length === 0) {
return null;
}
- return omit(_get(formatWithTags(beats[0]), '_source.beat'), [
- 'access_token',
- ]);
+ return omit(_get(formatWithTags(beats[0]), '_source.beat'), ['access_token']) as CMBeat;
}
public async getAll(user: FrameworkUser, ESQuery?: any) {
@@ -171,7 +169,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
if (!response) {
return [];
}
- const beats = _get(response, 'hits.hits', []);
+ const beats = _get(response, 'hits.hits', []) as any;
return beats.map((beat: any) =>
formatWithTags(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat)
@@ -202,7 +200,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
});
- return _get(response, 'items', []).map((item: any, resultIdx: number) => ({
+ return (_get(response, 'items', []) as any).map((item: any, resultIdx: number) => ({
idxInRequest: removals[resultIdx].idxInRequest,
result: item.update.result,
status: item.update.status,
@@ -237,7 +235,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
refresh: 'wait_for',
});
// console.log(response.items[0].update.error);
- return _get(response, 'items', []).map((item: any, resultIdx: any) => ({
+ return (_get(response, 'items', []) as any).map((item: any, resultIdx: any) => ({
idxInRequest: assignments[resultIdx].idxInRequest,
result: item.update.result,
status: item.update.status,
diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts
index 2bc6f1875644..ec559c3ee479 100644
--- a/x-pack/legacy/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts
+++ b/x-pack/legacy/plugins/beats_management/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts
@@ -35,7 +35,7 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
};
const response = await this.database.search(user, params);
- const configs = get(response, 'hits.hits', []);
+ const configs = get(response, 'hits.hits', []);
return configs.map((tag: any) => ({ ...tag._source.tag, config: JSON.parse(tag._source.tag) }));
}
@@ -71,7 +71,7 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
} else {
response = await this.database.search(user, params);
}
- const configs = get(response, 'hits.hits', []);
+ const configs = get(response, 'hits.hits', []);
return {
blocks: configs.map((block: any) => ({
diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts
index 4e032001809f..b5be3cfa99e5 100644
--- a/x-pack/legacy/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts
+++ b/x-pack/legacy/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts
@@ -43,7 +43,7 @@ export class ElasticsearchTagsAdapter implements CMTagsAdapter {
};
}
const response = await this.database.search(user, params);
- const tags = get(response, 'hits.hits', []);
+ const tags = get(response, 'hits.hits', []) as any;
return tags.map((tag: any) => ({ hasConfigurationBlocksTypes: [], ...tag._source.tag }));
}
@@ -63,7 +63,7 @@ export class ElasticsearchTagsAdapter implements CMTagsAdapter {
const beatsResponse = await this.database.search(user, params);
- const beats = get(beatsResponse, 'hits.hits', []).map(
+ const beats = (get(beatsResponse, 'hits.hits', []) as BeatTag[]).map(
(beat: any) => beat._source.beat
);
@@ -142,7 +142,7 @@ export class ElasticsearchTagsAdapter implements CMTagsAdapter {
};
const response = await this.database.index(user, params);
- return get(response, 'result');
+ return get(response, 'result') as string;
}
public async getWithoutConfigTypes(
@@ -172,7 +172,7 @@ export class ElasticsearchTagsAdapter implements CMTagsAdapter {
size: 10000,
};
const response = await this.database.search(user, params);
- const tags = get(response, 'hits.hits', []);
+ const tags = get(response, 'hits.hits', []) as any;
return tags.map((tag: any) => ({ hasConfigurationBlocksTypes: [], ...tag._source.tag }));
}
diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts
index 4987e4dbd4e0..6c5125ea4e0e 100644
--- a/x-pack/legacy/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts
+++ b/x-pack/legacy/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts
@@ -34,10 +34,10 @@ export class ElasticsearchTokensAdapter implements CMTokensAdapter {
const response = await this.database.get(user, params);
- const tokenDetails = get(response, '_source.enrollment_token', {
+ const tokenDetails = get(response, '_source.enrollment_token', {
expires_on: '0',
token: null,
- });
+ }) as TokenEnrollmentData;
// Elasticsearch might return fast if the token is not found. OR it might return fast
// if the token *is* found. Either way, an attacker could using a timing attack to figure
diff --git a/x-pack/package.json b/x-pack/package.json
index 0a8bc6f1e6f5..b721cb2fc563 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -81,7 +81,7 @@
"@types/jsdom": "^16.2.3",
"@types/json-stable-stringify": "^1.0.32",
"@types/jsonwebtoken": "^7.2.8",
- "@types/lodash": "^3.10.1",
+ "@types/lodash": "^4.14.155",
"@types/mapbox-gl": "^1.9.1",
"@types/memoize-one": "^4.1.0",
"@types/mime": "^2.0.1",
@@ -281,11 +281,7 @@
"json-stable-stringify": "^1.0.1",
"jsonwebtoken": "^8.5.1",
"jsts": "^1.6.2",
- "lodash": "npm:@elastic/lodash@3.10.1-kibana4",
- "lodash.keyby": "^4.6.0",
- "lodash.mean": "^4.1.0",
- "lodash.topath": "^4.5.2",
- "lodash.uniqby": "^4.7.0",
+ "lodash": "^4.17.15",
"lz-string": "^1.4.4",
"mapbox-gl": "^1.10.0",
"mapbox-gl-draw-rectangle-mode": "^1.0.4",
diff --git a/x-pack/plugins/actions/README.md b/x-pack/plugins/actions/README.md
index 605676cee363..494f2f38e8bf 100644
--- a/x-pack/plugins/actions/README.md
+++ b/x-pack/plugins/actions/README.md
@@ -71,6 +71,7 @@ Table of Contents
- [`params`](#params-7)
- [`subActionParams (pushToService)`](#subactionparams-pushtoservice-1)
- [Command Line Utility](#command-line-utility)
+- [Developing New Action Types](#developing-new-action-types)
## Terminology
@@ -606,3 +607,39 @@ $ kbn-action create .slack "post to slack" '{"webhookUrl": "https://hooks.slack.
"version": "WzMsMV0="
}
```
+
+# Developing New Action Types
+
+When creating a new action type, your plugin will eventually call `server.plugins.actions.setup.registerType()` to register the type with the actions plugin, but there are some additional things to think about about and implement.
+
+Consider working with the alerting team on early structure /design feedback of new actions, especially as the APIs and infrastructure are still under development.
+
+## licensing
+
+Currently actions are licensed as "basic" if the action only interacts with the stack, eg the server log and es index actions. Other actions are at least "gold" level.
+
+## plugin location
+
+Currently actions that are licensed as "basic" **MUST** be implemented in the actions plugin, other actions can be implemented in any other plugin that pre-reqs the actions plugin. If the new action is generic across the stack, it probably belongs in the actions plugin, but if your action is very specific to a plugin/solution, it might be easiest to implement it in the plugin/solution. Keep in mind that if Kibana is run without the plugin being enabled, any actions defined in that plugin will not run, nor will those actions be available via APIs or UI.
+
+Actions that take URLs or hostnames should check that those values are whitelisted. The whitelisting utilities are currently internal to the actions plugin, and so such actions will need to be implemented in the actions plugin. Longer-term, we will expose these utilities so they can be used by alerts implemented in other plugins; see [issue #64659](https://github.com/elastic/kibana/issues/64659).
+
+## documentation
+
+You should also create some asciidoc for the new action type. An entry should be made in the action type index - [`docs/user/alerting/action-types.asciidoc`](../../../docs/user/alerting/action-types.asciidoc) which points to a new document for the action type that should be in the directory [`docs/user/alerting/action-types`](../../../docs/user/alerting/action-types).
+
+## tests
+
+The action type should have both jest tests and functional tests. For functional tests, if your action interacts with a 3rd party service via HTTP, you may be able to create a simulator for your service, to test with. See the existing functional test servers in the directory [`x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server`](../../test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server)
+
+## action type config and secrets
+
+Action types must define `config` and `secrets` which are used to create connectors. This data should be described with `@kbn/config-schema` object schemas, and you **MUST NOT** use `schema.maybe()` to define properties.
+
+This is due to the fact that the structures are persisted in saved objects, which performs partial updates on the persisted data. If a property value is already persisted, but an update either doesn't include the property, or sets it to `undefined`, the persisted value will not be changed. Beyond this being a semantic error in general, it also ends up invalidating the encryption used to save secrets, and will render the secrets will not be able to be unencrypted later.
+
+Instead of `schema.maybe()`, use `schema.nullable()`, which is the same as `schema.maybe()` except that when passed an `undefined` value, the object returned from the validation will be set to `null`. The resulting type will be `property-type | null`, whereas with `schema.maybe()` it would be `property-type | undefined`.
+
+## user interface
+
+In order to make this action usable in the Kibana UI, you will need to provide all the UI editing aspects of the action. The existing action type user interfaces are defined in [`x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types`](../triggers_actions_ui/public/application/components/builtin_action_types). For more information, see the [UI documentation](../triggers_actions_ui/README.md#create-and-register-new-action-type-ui).
diff --git a/x-pack/plugins/actions/server/builtin_action_types/case/utils.ts b/x-pack/plugins/actions/server/builtin_action_types/case/utils.ts
index dd8d971b7df4..2d81c2bf4e15 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/case/utils.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/case/utils.ts
@@ -26,7 +26,7 @@ import {
ExecutorSubActionPushParams,
} from './types';
-import { transformers, Transformer } from './transformers';
+import { transformers } from './transformers';
import { SUPPORTED_SOURCE_FIELDS } from './constants';
@@ -205,7 +205,7 @@ export const transformFields = ({
currentIncident,
}: TransformFieldsArgs): Record => {
return fields.reduce((prev, cur) => {
- const transform = flow(...cur.pipes.map((p) => transformers[p]));
+ const transform = flow(...cur.pipes.map((p) => transformers[p]));
return {
...prev,
[cur.key]: transform({
@@ -228,7 +228,7 @@ export const transformFields = ({
export const transformComments = (comments: Comment[], pipes: string[]): Comment[] => {
return comments.map((c) => ({
...c,
- comment: flow(...pipes.map((p) => transformers[p]))({
+ comment: flow(...pipes.map((p) => transformers[p]))({
value: c.comment,
date: c.updatedAt ?? c.createdAt,
user:
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index 5dff06292220..aa546e08ea1b 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -20,7 +20,7 @@ export function createActionsUsageCollector(
try {
const doc = await getLatestTaskState(await taskManager);
// get the accumulated state from the recurring task
- const state: ActionsUsage = get(doc, 'state');
+ const state: ActionsUsage = get(doc, 'state') as ActionsUsage;
return {
...state,
diff --git a/x-pack/plugins/alerts/server/alerts_client.ts b/x-pack/plugins/alerts/server/alerts_client.ts
index 6b091a5a4503..e8e6f82f1388 100644
--- a/x-pack/plugins/alerts/server/alerts_client.ts
+++ b/x-pack/plugins/alerts/server/alerts_client.ts
@@ -5,7 +5,7 @@
*/
import Boom from 'boom';
-import { omit, isEqual, pluck } from 'lodash';
+import { omit, isEqual, map } from 'lodash';
import { i18n } from '@kbn/i18n';
import {
Logger,
@@ -647,7 +647,7 @@ export class AlertsClient {
private validateActions(alertType: AlertType, actions: NormalizedAlertAction[]): void {
const { actionGroups: alertTypeActionGroups } = alertType;
const usedAlertActionGroups = actions.map((action) => action.group);
- const availableAlertTypeActionGroups = new Set(pluck(alertTypeActionGroups, 'id'));
+ const availableAlertTypeActionGroups = new Set(map(alertTypeActionGroups, 'id'));
const invalidActionGroups = usedAlertActionGroups.filter(
(group) => !availableAlertTypeActionGroups.has(group)
);
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 8d859a570ba9..e1e1568d2f13 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
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { pluck } from 'lodash';
+import { map } from 'lodash';
import { AlertAction, State, Context, AlertType } from '../types';
import { Logger, KibanaRequest } from '../../../../../src/core/server';
import { transformActionParams } from './transform_action_params';
@@ -46,7 +46,7 @@ export function createExecutionHandler({
eventLogger,
request,
}: CreateExecutionHandlerOptions) {
- const alertTypeActionGroups = new Set(pluck(alertType.actionGroups, 'id'));
+ const alertTypeActionGroups = new Set(map(alertType.actionGroups, 'id'));
return async ({ actionGroup, context, state, alertInstanceId }: ExecutionHandlerOptions) => {
if (!alertTypeActionGroups.has(actionGroup)) {
logger.error(`Invalid action group "${actionGroup}" for alert "${alertType.id}".`);
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 3512ab16a371..3c66b57bb941 100644
--- a/x-pack/plugins/alerts/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { pick, mapValues, omit, without } from 'lodash';
+import { pickBy, mapValues, omit, without } from 'lodash';
import { Logger, SavedObject, KibanaRequest } from '../../../../../src/core/server';
import { TaskRunnerContext } from './task_runner_factory';
import { ConcreteTaskInstance } from '../../../task_manager/server';
@@ -18,12 +18,11 @@ import {
IntervalSchedule,
Services,
AlertInfoParams,
- RawAlertInstance,
AlertTaskState,
+ RawAlertInstance,
} from '../types';
import { promiseResult, map, Resultable, asOk, asErr, resolveErr } from '../lib/result_type';
import { taskInstanceToAlertTaskInstance } from './alert_task_instance';
-import { AlertInstances } from '../alert_instance/alert_instance';
import { EVENT_LOG_ACTIONS } from '../plugin';
import { IEvent, IEventLogger, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
import { isAlertSavedObjectNotFoundError } from '../lib/is_alert_not_found_error';
@@ -167,7 +166,7 @@ export class TaskRunner {
} = this.taskInstance;
const namespace = this.context.spaceIdToNamespace(spaceId);
- const alertInstances = mapValues(
+ const alertInstances = mapValues, AlertInstance>(
alertRawInstances,
(rawAlertInstance) => new AlertInstance(rawAlertInstance)
);
@@ -227,9 +226,8 @@ export class TaskRunner {
eventLogger.logEvent(event);
// Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object
- const instancesWithScheduledActions = pick(
- alertInstances,
- (alertInstance: AlertInstance) => alertInstance.hasScheduledActions()
+ const instancesWithScheduledActions = pickBy(alertInstances, (alertInstance: AlertInstance) =>
+ alertInstance.hasScheduledActions()
);
const currentAlertInstanceIds = Object.keys(instancesWithScheduledActions);
generateNewAndResolvedInstanceEvents({
@@ -242,10 +240,7 @@ export class TaskRunner {
});
if (!muteAll) {
- const enabledAlertInstances = omit(
- instancesWithScheduledActions,
- ...mutedInstanceIds
- );
+ const enabledAlertInstances = omit(instancesWithScheduledActions, ...mutedInstanceIds);
await Promise.all(
Object.entries(enabledAlertInstances)
@@ -260,7 +255,7 @@ export class TaskRunner {
return {
alertTypeState: updatedAlertTypeState || undefined,
- alertInstances: mapValues(
+ alertInstances: mapValues, RawAlertInstance>(
instancesWithScheduledActions,
(alertInstance) => alertInstance.toRaw()
),
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 64f846d13c0b..fa4a0e40ddee 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
@@ -5,7 +5,7 @@
*/
import Mustache from 'mustache';
-import { isString, cloneDeep } from 'lodash';
+import { isString, cloneDeepWith } from 'lodash';
import { AlertActionParams, State, Context } from '../types';
interface TransformActionParamsOptions {
@@ -29,7 +29,7 @@ export function transformActionParams({
actionParams,
state,
}: TransformActionParamsOptions): AlertActionParams {
- const result = cloneDeep(actionParams, (value: unknown) => {
+ const result = cloneDeepWith(actionParams, (value: unknown) => {
if (!isString(value)) return;
// when the list of variables we pass in here changes,
diff --git a/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts b/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts
index 7491508ee074..64d3ad54a231 100644
--- a/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts
+++ b/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts
@@ -20,7 +20,7 @@ export function createAlertsUsageCollector(
try {
const doc = await getLatestTaskState(await taskManager);
// get the accumulated state from the recurring task
- const state: AlertsUsage = get(doc, 'state');
+ const state: AlertsUsage = get(doc, 'state') as AlertsUsage;
return {
...state,
diff --git a/x-pack/plugins/apm/common/projections/services.ts b/x-pack/plugins/apm/common/projections/services.ts
index 80a3471e9c30..809caeeaf608 100644
--- a/x-pack/plugins/apm/common/projections/services.ts
+++ b/x-pack/plugins/apm/common/projections/services.ts
@@ -16,25 +16,37 @@ import { rangeFilter } from '../utils/range_filter';
export function getServicesProjection({
setup,
+ noEvents,
}: {
setup: Setup & SetupTimeRange & SetupUIFilters;
+ noEvents?: boolean;
}) {
const { start, end, uiFiltersES, indices } = setup;
return {
- index: [
- indices['apm_oss.metricsIndices'],
- indices['apm_oss.errorIndices'],
- indices['apm_oss.transactionIndices'],
- ],
+ ...(noEvents
+ ? {}
+ : {
+ index: [
+ indices['apm_oss.metricsIndices'],
+ indices['apm_oss.errorIndices'],
+ indices['apm_oss.transactionIndices'],
+ ],
+ }),
body: {
size: 0,
query: {
bool: {
filter: [
- {
- terms: { [PROCESSOR_EVENT]: ['transaction', 'error', 'metric'] },
- },
+ ...(noEvents
+ ? []
+ : [
+ {
+ terms: {
+ [PROCESSOR_EVENT]: ['transaction', 'error', 'metric'],
+ },
+ },
+ ]),
{ range: rangeFilter(start, end) },
...uiFiltersES,
],
diff --git a/x-pack/plugins/apm/common/projections/util/merge_projection/index.ts b/x-pack/plugins/apm/common/projections/util/merge_projection/index.ts
index f3ae0752b908..9dc1c815bf16 100644
--- a/x-pack/plugins/apm/common/projections/util/merge_projection/index.ts
+++ b/x-pack/plugins/apm/common/projections/util/merge_projection/index.ts
@@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { merge, isPlainObject, cloneDeep } from 'lodash';
+import { mergeWith, isPlainObject, cloneDeep } from 'lodash';
import { DeepPartial } from 'utility-types';
import { AggregationInputMap } from '../../../../typings/elasticsearch/aggregations';
import {
@@ -35,7 +35,7 @@ export function mergeProjection<
T extends Projection,
U extends SourceProjection
>(target: T, source: U): DeepMerge {
- return merge({}, cloneDeep(target), source, (a, b) => {
+ return mergeWith({}, cloneDeep(target), source, (a, b) => {
if (isPlainObject(a) && isPlainObject(b)) {
return undefined;
}
diff --git a/x-pack/plugins/apm/common/utils/array_union_to_callable.ts b/x-pack/plugins/apm/common/utils/array_union_to_callable.ts
new file mode 100644
index 000000000000..23ea86006b88
--- /dev/null
+++ b/x-pack/plugins/apm/common/utils/array_union_to_callable.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { ValuesType } from 'utility-types';
+
+// work around a TypeScript limitation described in https://stackoverflow.com/posts/49511416
+
+export const arrayUnionToCallable = (
+ array: T
+): Array> => {
+ return array;
+};
diff --git a/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts b/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
new file mode 100644
index 000000000000..458d21bfea58
--- /dev/null
+++ b/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { joinByKey } from './';
+
+describe('joinByKey', () => {
+ it('joins by a string key', () => {
+ const joined = joinByKey(
+ [
+ {
+ serviceName: 'opbeans-node',
+ avg: 10,
+ },
+ {
+ serviceName: 'opbeans-node',
+ count: 12,
+ },
+ {
+ serviceName: 'opbeans-java',
+ avg: 11,
+ },
+ {
+ serviceName: 'opbeans-java',
+ p95: 18,
+ },
+ ],
+ 'serviceName'
+ );
+
+ expect(joined.length).toBe(2);
+
+ expect(joined).toEqual([
+ {
+ serviceName: 'opbeans-node',
+ avg: 10,
+ count: 12,
+ },
+ {
+ serviceName: 'opbeans-java',
+ avg: 11,
+ p95: 18,
+ },
+ ]);
+ });
+
+ it('joins by a record key', () => {
+ const joined = joinByKey(
+ [
+ {
+ key: {
+ serviceName: 'opbeans-node',
+ transactionName: '/api/opbeans-node',
+ },
+ avg: 10,
+ },
+ {
+ key: {
+ serviceName: 'opbeans-node',
+ transactionName: '/api/opbeans-node',
+ },
+ count: 12,
+ },
+ {
+ key: {
+ serviceName: 'opbeans-java',
+ transactionName: '/api/opbeans-java',
+ },
+ avg: 11,
+ },
+ {
+ key: {
+ serviceName: 'opbeans-java',
+ transactionName: '/api/opbeans-java',
+ },
+ p95: 18,
+ },
+ ],
+ 'key'
+ );
+
+ expect(joined.length).toBe(2);
+
+ expect(joined).toEqual([
+ {
+ key: {
+ serviceName: 'opbeans-node',
+ transactionName: '/api/opbeans-node',
+ },
+ avg: 10,
+ count: 12,
+ },
+ {
+ key: {
+ serviceName: 'opbeans-java',
+ transactionName: '/api/opbeans-java',
+ },
+ avg: 11,
+ p95: 18,
+ },
+ ]);
+ });
+});
diff --git a/x-pack/plugins/apm/common/utils/join_by_key/index.ts b/x-pack/plugins/apm/common/utils/join_by_key/index.ts
new file mode 100644
index 000000000000..b49f53640051
--- /dev/null
+++ b/x-pack/plugins/apm/common/utils/join_by_key/index.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { UnionToIntersection, ValuesType } from 'utility-types';
+import { isEqual } from 'lodash';
+
+/**
+ * Joins a list of records by a given key. Key can be any type of value, from
+ * strings to plain objects, as long as it is present in all records. `isEqual`
+ * is used for comparing keys.
+ *
+ * UnionToIntersection is needed to get all keys of union types, see below for
+ * example.
+ *
+ const agentNames = [{ serviceName: '', agentName: '' }];
+ const transactionRates = [{ serviceName: '', transactionsPerMinute: 1 }];
+ const flattened = joinByKey(
+ [...agentNames, ...transactionRates],
+ 'serviceName'
+ );
+*/
+
+type JoinedReturnType<
+ T extends Record,
+ U extends UnionToIntersection,
+ V extends keyof T & keyof U
+> = Array & Record>;
+
+export function joinByKey<
+ T extends Record,
+ U extends UnionToIntersection,
+ V extends keyof T & keyof U
+>(items: T[], key: V): JoinedReturnType {
+ return items.reduce>((prev, current) => {
+ let item = prev.find((prevItem) => isEqual(prevItem[key], current[key]));
+
+ if (!item) {
+ item = { ...current } as ValuesType>;
+ prev.push(item);
+ } else {
+ Object.assign(item, current);
+ }
+
+ return prev;
+ }, []);
+}
diff --git a/x-pack/plugins/apm/common/utils/left_join.ts b/x-pack/plugins/apm/common/utils/left_join.ts
deleted file mode 100644
index f3c4e48df755..000000000000
--- a/x-pack/plugins/apm/common/utils/left_join.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { Assign, Omit } from 'utility-types';
-
-export function leftJoin<
- TL extends object,
- K extends keyof TL,
- TR extends Pick
->(leftRecords: TL[], matchKey: K, rightRecords: TR[]) {
- const rightLookup = new Map(
- rightRecords.map((record) => [record[matchKey], record])
- );
- return leftRecords.map((record) => {
- const matchProp = (record[matchKey] as unknown) as TR[K];
- const matchingRightRecord = rightLookup.get(matchProp);
- return { ...record, ...matchingRightRecord };
- }) as Array>>>;
-}
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts b/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts
index 689b88390810..5791dfe5b946 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts
+++ b/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts
@@ -6,9 +6,6 @@
/* eslint-disable import/no-extraneous-dependencies */
-const RANGE_FROM = '2020-06-01T14:59:32.686Z';
-const RANGE_TO = '2020-06-16T16:59:36.219Z';
-
const BASE_URL = Cypress.config().baseUrl;
/** The default time in ms to wait for a Cypress command to complete */
@@ -16,20 +13,14 @@ export const DEFAULT_TIMEOUT = 60 * 1000;
export function loginAndWaitForPage(
url: string,
- dateRange?: { to: string; from: string }
+ dateRange: { to: string; from: string }
) {
const username = Cypress.env('elasticsearch_username');
const password = Cypress.env('elasticsearch_password');
cy.log(`Authenticating via ${username} / ${password}`);
- let rangeFrom = RANGE_FROM;
- let rangeTo = RANGE_TO;
- if (dateRange) {
- rangeFrom = dateRange.from;
- rangeTo = dateRange.to;
- }
-
- const fullUrl = `${BASE_URL}${url}?rangeFrom=${rangeFrom}&rangeTo=${rangeTo}`;
+
+ const fullUrl = `${BASE_URL}${url}?rangeFrom=${dateRange.from}&rangeTo=${dateRange.to}`;
cy.visit(fullUrl, { auth: { username, password } });
cy.viewport('macbook-15');
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature b/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature
index bc807d596a27..c98e3f81b2bc 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature
+++ b/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature
@@ -37,3 +37,6 @@ Feature: RUM Dashboard
When the user selected the breakdown
Then breakdown series should appear in chart
+ Scenario: Service name filter
+ When a user changes the selected service name
+ Then it displays relevant client metrics
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js b/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
index acccd86f3e4d..7fbce2583903 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
+++ b/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
@@ -1,25 +1,18 @@
module.exports = {
- "__version": "4.5.0",
- "APM": {
- "Transaction duration charts": {
- "1": "55 ms",
- "2": "28 ms",
- "3": "0 ms"
- }
- },
+ "__version": "4.9.0",
"RUM Dashboard": {
"Client metrics": {
- "1": "62 ",
- "2": "0.07 sec",
+ "1": "55 ",
+ "2": "0.08 sec",
"3": "0.01 sec"
},
"Rum page filters (example #1)": {
- "1": "15 ",
- "2": "0.07 sec",
+ "1": "8 ",
+ "2": "0.08 sec",
"3": "0.01 sec"
},
"Rum page filters (example #2)": {
- "1": "35 ",
+ "1": "28 ",
"2": "0.07 sec",
"3": "0.01 sec"
},
@@ -31,6 +24,11 @@ module.exports = {
},
"Page load distribution chart legends": {
"1": "Overall"
+ },
+ "Service name filter": {
+ "1": "7 ",
+ "2": "0.07 sec",
+ "3": "0.01 sec"
}
}
}
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/apm.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
index 361d055db9ac..c1402bbd035f 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
@@ -12,7 +12,10 @@ export const DEFAULT_TIMEOUT = 60 * 1000;
Given(`a user browses the APM UI application`, () => {
// open service overview page
- loginAndWaitForPage(`/app/apm#/services`);
+ loginAndWaitForPage(`/app/apm#/services`, {
+ from: '2020-06-01T14:59:32.686Z',
+ to: '2020-06-16T16:59:36.219Z',
+ });
});
When(`the user inspects the opbeans-node service`, () => {
@@ -34,9 +37,8 @@ Then(`should have correct y-axis ticks`, () => {
// wait for all loading to finish
cy.get('kbnLoadingIndicator').should('not.be.visible');
- cy.get(yAxisTick).eq(2).invoke('text').snapshot();
-
- cy.get(yAxisTick).eq(1).invoke('text').snapshot();
-
- cy.get(yAxisTick).eq(0).invoke('text').snapshot();
+ // literal assertions because snapshot() doesn't retry
+ cy.get(yAxisTick).eq(2).should('have.text', '55 ms');
+ cy.get(yAxisTick).eq(1).should('have.text', '28 ms');
+ cy.get(yAxisTick).eq(0).should('have.text', '0 ms');
});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
index 809b22490abd..89dc3437c3e6 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
@@ -18,7 +18,9 @@ Given(`a user click page load breakdown filter`, () => {
});
When(`the user selected the breakdown`, () => {
- cy.get('[data-cy=filter-breakdown-item_Browser]').click();
+ cy.get('[data-cy=filter-breakdown-item_Browser]', {
+ timeout: DEFAULT_TIMEOUT,
+ }).click();
// click outside popover to close it
cy.get('[data-cy=pageLoadDist]').click();
});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts
index 439003351aed..2600e5d07332 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts
@@ -5,6 +5,7 @@
*/
import { When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { DEFAULT_TIMEOUT } from './rum_dashboard';
When(/^the user filters by "([^"]*)"$/, (filterName) => {
// wait for all loading to finish
@@ -13,9 +14,13 @@ When(/^the user filters by "([^"]*)"$/, (filterName) => {
cy.get(`#local-filter-${filterName}`).click();
if (filterName === 'os') {
- cy.get('button.euiSelectableListItem[title="Mac OS X"]').click();
+ cy.get('button.euiSelectableListItem[title="Mac OS X"]', {
+ timeout: DEFAULT_TIMEOUT,
+ }).click();
} else {
- cy.get('button.euiSelectableListItem[title="DE"]').click();
+ cy.get('button.euiSelectableListItem[title="DE"]', {
+ timeout: DEFAULT_TIMEOUT,
+ }).click();
}
cy.get('[data-cy=applyFilter]').click();
});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts
new file mode 100644
index 000000000000..9a3d7b52674b
--- /dev/null
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { When, Then } from 'cypress-cucumber-preprocessor/steps';
+import { DEFAULT_TIMEOUT } from '../apm';
+
+When('a user changes the selected service name', (filterName) => {
+ // wait for all loading to finish
+ cy.get('kbnLoadingIndicator').should('not.be.visible');
+ cy.get(`[data-cy=serviceNameFilter]`, { timeout: DEFAULT_TIMEOUT }).select(
+ 'opbean-client-rum'
+ );
+});
+
+Then(`it displays relevant client metrics`, () => {
+ const clientMetrics = '[data-cy=client-metrics] .euiStat__title';
+
+ // wait for all loading to finish
+ cy.get('kbnLoadingIndicator').should('not.be.visible');
+ cy.get('.euiStat__title-isLoading').should('not.be.visible');
+
+ cy.get(clientMetrics).eq(2).invoke('text').snapshot();
+
+ cy.get(clientMetrics).eq(1).invoke('text').snapshot();
+
+ cy.get(clientMetrics).eq(0).invoke('text').snapshot();
+});
diff --git a/x-pack/plugins/apm/e2e/ingest-data/replay.js b/x-pack/plugins/apm/e2e/ingest-data/replay.js
index 483cc99df747..6bab95635f55 100644
--- a/x-pack/plugins/apm/e2e/ingest-data/replay.js
+++ b/x-pack/plugins/apm/e2e/ingest-data/replay.js
@@ -69,6 +69,14 @@ function incrementSpinnerCount({ success }) {
spinner.text = `Remaining: ${remaining}. Succeeded: ${requestProgress.succeeded}. Failed: ${requestProgress.failed}.`;
}
let iterIndex = 0;
+
+function setRumAgent(item) {
+ item.body = item.body.replace(
+ '"name":"client"',
+ '"name":"opbean-client-rum"'
+ );
+}
+
async function insertItem(item) {
try {
const url = `${APM_SERVER_URL}${item.url}`;
@@ -78,6 +86,8 @@ async function insertItem(item) {
if (item.url === '/intake/v2/rum/events') {
if (iterIndex === userAgents.length) {
+ // set some event agent to opbean
+ setRumAgent(item);
iterIndex = 0;
}
headers['User-Agent'] = userAgents[iterIndex];
diff --git a/x-pack/plugins/apm/e2e/package.json b/x-pack/plugins/apm/e2e/package.json
index 417dda4c5220..5101e64235c6 100644
--- a/x-pack/plugins/apm/e2e/package.json
+++ b/x-pack/plugins/apm/e2e/package.json
@@ -9,19 +9,19 @@
},
"dependencies": {
"@cypress/snapshot": "^2.1.3",
- "@cypress/webpack-preprocessor": "^5.2.0",
+ "@cypress/webpack-preprocessor": "^5.4.1",
"@types/cypress-cucumber-preprocessor": "^1.14.1",
- "@types/node": "^14.0.1",
+ "@types/node": "^14.0.14",
"axios": "^0.19.2",
- "cypress": "^4.5.0",
- "cypress-cucumber-preprocessor": "^2.3.1",
+ "cypress": "^4.9.0",
+ "cypress-cucumber-preprocessor": "^2.5.2",
"ora": "^4.0.4",
- "p-limit": "^2.3.0",
+ "p-limit": "^3.0.1",
"p-retry": "^4.2.0",
- "ts-loader": "^7.0.4",
- "typescript": "3.9.5",
- "wait-on": "^5.0.0",
+ "ts-loader": "^7.0.5",
+ "typescript": "3.9.6",
+ "wait-on": "^5.0.1",
"webpack": "^4.43.0",
- "yargs": "^15.3.1"
+ "yargs": "^15.4.0"
}
}
diff --git a/x-pack/plugins/apm/e2e/run-e2e.sh b/x-pack/plugins/apm/e2e/run-e2e.sh
index 43cc74a197f4..bc64f2b009d5 100755
--- a/x-pack/plugins/apm/e2e/run-e2e.sh
+++ b/x-pack/plugins/apm/e2e/run-e2e.sh
@@ -106,10 +106,12 @@ yarn &> ${TMP_DIR}/e2e-yarn.log
echo "" # newline
echo "${bold}Static mock data (logs: ${E2E_DIR}${TMP_DIR}/ingest-data.log)${normal}"
+STATIC_MOCK_FILENAME='2020-06-12.json'
+
# Download static data if not already done
-if [ ! -e "${TMP_DIR}/events.json" ]; then
- echo 'Downloading events.json...'
- curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/2020-06-12.json --output ${TMP_DIR}/events.json
+if [ ! -e "${TMP_DIR}/${STATIC_MOCK_FILENAME}" ]; then
+ echo "Downloading ${STATIC_MOCK_FILENAME}..."
+ curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/${STATIC_MOCK_FILENAME} --output ${TMP_DIR}/${STATIC_MOCK_FILENAME}
fi
# echo "Deleting existing indices (apm* and .apm*)"
@@ -117,7 +119,7 @@ curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/.a
curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/apm*" > /dev/null
# Ingest data into APM Server
-node ingest-data/replay.js --server-url http://localhost:$APM_SERVER_PORT --events ${TMP_DIR}/events.json 2>> ${TMP_DIR}/ingest-data.log
+node ingest-data/replay.js --server-url http://localhost:$APM_SERVER_PORT --events ${TMP_DIR}/${STATIC_MOCK_FILENAME} 2>> ${TMP_DIR}/ingest-data.log
# Abort if not all events were ingested correctly
if [ $? -ne 0 ]; then
diff --git a/x-pack/plugins/apm/e2e/yarn.lock b/x-pack/plugins/apm/e2e/yarn.lock
index 975154d71b85..936294052aa7 100644
--- a/x-pack/plugins/apm/e2e/yarn.lock
+++ b/x-pack/plugins/apm/e2e/yarn.lock
@@ -689,6 +689,14 @@
"@babel/plugin-transform-react-jsx-self" "^7.0.0"
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
+"@babel/runtime-corejs3@^7.8.3":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.4.tgz#f29fc1990307c4c57b10dbd6ce667b27159d9e0d"
+ integrity sha512-BFlgP2SoLO9HJX9WBwN67gHWMBhDX/eDz64Jajd6mR/UAUzqrNMm99d4qHnVaKscAElZoFiPv+JpR/Siud5lXw==
+ dependencies:
+ core-js-pure "^3.0.0"
+ regenerator-runtime "^0.13.4"
+
"@babel/runtime@7.3.1":
version "7.3.1"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
@@ -802,13 +810,14 @@
snap-shot-compare "2.8.3"
snap-shot-store "1.2.3"
-"@cypress/webpack-preprocessor@^5.2.0":
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.2.0.tgz#3a17b478f6e2d600e536e6dda9c2e349d25a297e"
- integrity sha512-uvo0FfKL+rIXrBGS6qPIaJRD8euK+t6YoZvrTuLPnStprzlgeGfSCnCDUEMJZqFk9LwBd1NtOop+J7qNuv74ng==
+"@cypress/webpack-preprocessor@^5.4.1":
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.1.tgz#eb58f6cd02932a95653c1a674cfd769da2409806"
+ integrity sha512-1E2BdVVXQ4wDQ7f3mXCvS9xmfTVwEoT3oqKhjAr1iNlTJpBq10Z0VNBZd3VZ3nmCTFwTuUvs735QGnRE1gQ1BA==
dependencies:
bluebird "3.7.1"
debug "4.1.1"
+ lodash "4.17.15"
"@cypress/xvfb@1.2.4":
version "1.2.4"
@@ -865,34 +874,6 @@
dependencies:
any-observable "^0.3.0"
-"@types/blob-util@1.3.3":
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a"
- integrity sha512-4ahcL/QDnpjWA2Qs16ZMQif7HjGP2cw3AGjHabybjw7Vm1EKu+cfQN1D78BaZbS1WJNa1opSMF5HNMztx7lR0w==
-
-"@types/bluebird@3.5.29":
- version "3.5.29"
- resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.29.tgz#7cd933c902c4fc83046517a1bef973886d00bdb6"
- integrity sha512-kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw==
-
-"@types/chai-jquery@1.1.40":
- version "1.1.40"
- resolved "https://registry.yarnpkg.com/@types/chai-jquery/-/chai-jquery-1.1.40.tgz#445bedcbbb2ae4e3027f46fa2c1733c43481ffa1"
- integrity sha512-mCNEZ3GKP7T7kftKeIs7QmfZZQM7hslGSpYzKbOlR2a2HCFf9ph4nlMRA9UnuOETeOQYJVhJQK7MwGqNZVyUtQ==
- dependencies:
- "@types/chai" "*"
- "@types/jquery" "*"
-
-"@types/chai@*":
- version "4.2.11"
- resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
- integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
-
-"@types/chai@4.2.7":
- version "4.2.7"
- resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.7.tgz#1c8c25cbf6e59ffa7d6b9652c78e547d9a41692d"
- integrity sha512-luq8meHGYwvky0O7u0eQZdA7B4Wd9owUCqvbw2m3XCrCU8mplYOujMBbvyS547AxJkC+pGnd0Cm15eNxEUNU8g==
-
"@types/color-name@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -903,71 +884,22 @@
resolved "https://registry.yarnpkg.com/@types/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.14.1.tgz#9787f4e89553ebc6359ce157a26ad51ed14aa98b"
integrity sha512-CpYsiQ49UrOmadhFg0G5RkokPUmGGctD01mOWjNxFxHw5VgIRv33L2RyFHL8klaAI4HaedGN3Tcj4HTQ65hn+A==
-"@types/jquery@*":
- version "3.3.38"
- resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.38.tgz#6385f1e1b30bd2bff55ae8ee75ea42a999cc3608"
- integrity sha512-nkDvmx7x/6kDM5guu/YpXkGZ/Xj/IwGiLDdKM99YA5Vag7pjGyTJ8BNUh/6hxEn/sEu5DKtyRgnONJ7EmOoKrA==
- dependencies:
- "@types/sizzle" "*"
-
-"@types/jquery@3.3.31":
- version "3.3.31"
- resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz#27c706e4bf488474e1cb54a71d8303f37c93451b"
- integrity sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==
- dependencies:
- "@types/sizzle" "*"
-
-"@types/lodash@4.14.149":
- version "4.14.149"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
- integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==
-
-"@types/minimatch@3.0.3":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
- integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/mocha@5.2.7":
- version "5.2.7"
- resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
- integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
-
-"@types/node@^14.0.1":
- version "14.0.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
- integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
+"@types/node@^14.0.14":
+ version "14.0.14"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce"
+ integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==
"@types/retry@^0.12.0":
version "0.12.0"
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
-"@types/sinon-chai@3.2.3":
- version "3.2.3"
- resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.3.tgz#afe392303dda95cc8069685d1e537ff434fa506e"
- integrity sha512-TOUFS6vqS0PVL1I8NGVSNcFaNJtFoyZPXZ5zur+qlhDfOmQECZZM4H4kKgca6O8L+QceX/ymODZASfUfn+y4yQ==
- dependencies:
- "@types/chai" "*"
- "@types/sinon" "*"
-
-"@types/sinon@*":
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.0.tgz#5b70a360f55645dd64f205defd2a31b749a59799"
- integrity sha512-v2TkYHkts4VXshMkcmot/H+ERZ2SevKa10saGaJPGCJ8vh3lKrC4u663zYEeRZxep+VbG6YRDtQ6gVqw9dYzPA==
- dependencies:
- "@types/sinonjs__fake-timers" "*"
-
-"@types/sinon@7.5.1":
- version "7.5.1"
- resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz#d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c"
- integrity sha512-EZQUP3hSZQyTQRfiLqelC9NMWd1kqLcmQE0dMiklxBkgi84T+cHOhnKpgk4NnOWpGX863yE6+IaGnOXUNFqDnQ==
-
-"@types/sinonjs__fake-timers@*":
+"@types/sinonjs__fake-timers@6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz#681df970358c82836b42f989188d133e218c458e"
integrity sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==
-"@types/sizzle@*", "@types/sizzle@2.3.2":
+"@types/sizzle@2.3.2":
version "2.3.2"
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
@@ -1262,10 +1194,10 @@ aproba@^1.1.1:
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-arch@2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
- integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
+arch@2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf"
+ integrity sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==
argparse@^1.0.7:
version "1.0.10"
@@ -1347,7 +1279,7 @@ async-each@^1.0.1:
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-async@^3.1.0:
+async@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
@@ -2046,10 +1978,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
-commander@4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.0.tgz#545983a0603fe425bc672d66c9e3c89c42121a83"
- integrity sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==
+commander@4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+ integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
commander@^2.19.0, commander@^2.20.0, commander@^2.9.0:
version "2.20.3"
@@ -2141,6 +2073,11 @@ core-js-compat@^3.1.1:
browserslist "^4.8.3"
semver "7.0.0"
+core-js-pure@^3.0.0:
+ version "3.6.5"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
+ integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
+
core-js@^2.4.0:
version "2.6.11"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
@@ -2278,10 +2215,10 @@ cyclist@^1.0.1:
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-cypress-cucumber-preprocessor@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-2.3.1.tgz#dc9dee8d59d3c787c5c70fc4271c32e95575b083"
- integrity sha512-cKa7/VsOthzvdSQSdFiLwSWtBrtDE2q/qAPDL6NWOF4Tqm/AWvvOv18b9l9Z1t4SpphezR7RGnG1QIU45y9PPw==
+cypress-cucumber-preprocessor@^2.5.2:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-2.5.2.tgz#d544616ece1fb361867e904678d970fe82398b54"
+ integrity sha512-djQjXmRWUKlA15GxWGhkqaeu1PalWeNrRyxij74QJ2dEp/ozQg35NeVABeWQjgjY2xTE87X6k5iC4y+Sbohe3A==
dependencies:
"@cypress/browserify-preprocessor" "^2.1.1"
chai "^4.1.2"
@@ -2297,48 +2234,39 @@ cypress-cucumber-preprocessor@^2.3.1:
minimist "^1.2.0"
through "^2.3.8"
-cypress@^4.5.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.5.0.tgz#01940d085f6429cec3c87d290daa47bb976a7c7b"
- integrity sha512-2A4g5FW5d2fHzq8HKUGAMVTnW6P8nlWYQALiCoGN4bqBLvgwhYM/oG9oKc2CS6LnvgHFiKivKzpm9sfk3uU3zQ==
+cypress@^4.9.0:
+ version "4.9.0"
+ resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.9.0.tgz#c188a3864ddf841c0fdc81a9e4eff5cf539cd1c1"
+ integrity sha512-qGxT5E0j21FPryzhb0OBjCdhoR/n1jXtumpFFSBPYWsaZZhNaBvc3XlBUDEZKkkXPsqUFYiyhWdHN/zo0t5FcA==
dependencies:
"@cypress/listr-verbose-renderer" "0.4.1"
"@cypress/request" "2.88.5"
"@cypress/xvfb" "1.2.4"
- "@types/blob-util" "1.3.3"
- "@types/bluebird" "3.5.29"
- "@types/chai" "4.2.7"
- "@types/chai-jquery" "1.1.40"
- "@types/jquery" "3.3.31"
- "@types/lodash" "4.14.149"
- "@types/minimatch" "3.0.3"
- "@types/mocha" "5.2.7"
- "@types/sinon" "7.5.1"
- "@types/sinon-chai" "3.2.3"
+ "@types/sinonjs__fake-timers" "6.0.1"
"@types/sizzle" "2.3.2"
- arch "2.1.1"
+ arch "2.1.2"
bluebird "3.7.2"
cachedir "2.3.0"
chalk "2.4.2"
check-more-types "2.24.0"
cli-table3 "0.5.1"
- commander "4.1.0"
+ commander "4.1.1"
common-tags "1.8.0"
debug "4.1.1"
- eventemitter2 "4.1.2"
+ eventemitter2 "6.4.2"
execa "1.0.0"
executable "4.1.1"
extract-zip "1.7.0"
fs-extra "8.1.0"
- getos "3.1.4"
+ getos "3.2.1"
is-ci "2.0.0"
- is-installed-globally "0.1.0"
+ is-installed-globally "0.3.2"
lazy-ass "1.6.0"
listr "0.14.3"
lodash "4.17.15"
log-symbols "3.0.0"
minimist "1.2.5"
- moment "2.24.0"
+ moment "2.26.0"
ospath "1.2.2"
pretty-bytes "5.3.0"
ramda "0.26.1"
@@ -2407,6 +2335,13 @@ decamelize@^1.2.0:
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+decamelize@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-3.2.0.tgz#84b8e8f4f8c579f938e35e2cc7024907e0090851"
+ integrity sha512-4TgkVUsmmu7oCSyGBm5FvfMoACuoh9EOidm7V5/J2X2djAwwt57qb3F2KMP2ITqODTCSwb+YRV+0Zqrv18k/hw==
+ dependencies:
+ xregexp "^4.2.4"
+
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2698,10 +2633,10 @@ esutils@^2.0.0, esutils@^2.0.2:
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-eventemitter2@4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-4.1.2.tgz#0e1a8477af821a6ef3995b311bf74c23a5247f15"
- integrity sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=
+eventemitter2@6.4.2:
+ version "6.4.2"
+ resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.2.tgz#f31f8b99d45245f0edbc5b00797830ff3b388970"
+ integrity sha512-r/Pwupa5RIzxIHbEKCkNXqpEQIIT4uQDxmP4G/Lug/NokVUWj0joz/WzWl3OxRpC5kDrH/WdiUJoR+IrwvXJEw==
events@^2.0.0:
version "2.1.0"
@@ -3040,12 +2975,12 @@ get-value@^2.0.3, get-value@^2.0.6:
resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-getos@3.1.4:
- version "3.1.4"
- resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.4.tgz#29cdf240ed10a70c049add7b6f8cb08c81876faf"
- integrity sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==
+getos@3.2.1:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
+ integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
dependencies:
- async "^3.1.0"
+ async "^3.2.0"
getpass@^0.1.1:
version "0.1.7"
@@ -3079,12 +3014,12 @@ glob@^7.0.0, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-dirs@^0.1.0:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
- integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+global-dirs@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
+ integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
dependencies:
- ini "^1.3.4"
+ ini "^1.3.5"
globals@^11.1.0:
version "11.12.0"
@@ -3261,7 +3196,7 @@ inherits@2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-ini@^1.3.4:
+ini@^1.3.4, ini@^1.3.5:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -3424,13 +3359,13 @@ is-glob@^4.0.0:
dependencies:
is-extglob "^2.1.1"
-is-installed-globally@0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
- integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
+is-installed-globally@0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
+ integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
dependencies:
- global-dirs "^0.1.0"
- is-path-inside "^1.0.0"
+ global-dirs "^2.0.1"
+ is-path-inside "^3.0.1"
is-interactive@^1.0.0:
version "1.0.0"
@@ -3456,12 +3391,10 @@ is-observable@^1.1.0:
dependencies:
symbol-observable "^1.1.0"
-is-path-inside@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
- integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
- dependencies:
- path-is-inside "^1.0.1"
+is-path-inside@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+ integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
is-plain-object@^2.0.3, is-plain-object@^2.0.4:
version "2.0.4"
@@ -4031,10 +3964,10 @@ module-deps@^6.0.0:
through2 "^2.0.0"
xtend "^4.0.0"
-moment@2.24.0:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
- integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+moment@2.26.0:
+ version "2.26.0"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
+ integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
move-concurrently@^1.0.1:
version "1.0.1"
@@ -4319,10 +4252,10 @@ p-limit@^2.0.0, p-limit@^2.2.0:
dependencies:
p-try "^2.0.0"
-p-limit@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
- integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+p-limit@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.1.tgz#584784ac0722d1aed09f19f90ed2999af6ce2839"
+ integrity sha512-mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg==
dependencies:
p-try "^2.0.0"
@@ -4436,11 +4369,6 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-path-is-inside@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
- integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
path-key@^2.0.0, path-key@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@@ -4711,6 +4639,11 @@ regenerator-runtime@^0.12.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+regenerator-runtime@^0.13.4:
+ version "0.13.5"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+ integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
regenerator-transform@^0.14.0:
version "0.14.1"
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
@@ -5503,10 +5436,10 @@ tough-cookie@~2.5.0:
psl "^1.1.28"
punycode "^2.1.1"
-ts-loader@^7.0.4:
- version "7.0.4"
- resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.4.tgz#5d9b95227de5afb91fdd9668f8920eb193cfe0cc"
- integrity sha512-5du6OQHl+4ZjO4crEyoYUyWSrmmo7bAO+inkaILZ68mvahqrfoa4nn0DRmpQ4ruT4l+cuJCgF0xD7SBIyLeeow==
+ts-loader@^7.0.5:
+ version "7.0.5"
+ resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.5.tgz#789338fb01cb5dc0a33c54e50558b34a73c9c4c5"
+ integrity sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==
dependencies:
chalk "^2.3.0"
enhanced-resolve "^4.0.0"
@@ -5561,10 +5494,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-typescript@3.9.5:
- version "3.9.5"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
- integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+typescript@3.9.6:
+ version "3.9.6"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
+ integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
umd@^3.0.0:
version "3.0.3"
@@ -5740,10 +5673,10 @@ vm-browserify@^1.0.0, vm-browserify@^1.0.1:
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
-wait-on@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.0.tgz#72e554b338490bbc7131362755ca1af04f46d029"
- integrity sha512-6v9lttmGGRT7Lr16E/0rISTBIV1DN72n9+77Bpt1iBfzmhBI+75RDlacFe0Q+JizkmwWXmgHUcFG5cgx3Bwqzw==
+wait-on@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.1.tgz#7dadfe83c36fdf034de996a41aa094af5cf23077"
+ integrity sha512-TxzkYIfRWK1hLc9IlUh9bE1mrvIIM3ptPRKQ86Z8Qo0tBQLCHEvWzkRD1Ge4FWprKflHOnAtqIBH2nKmib/lrg==
dependencies:
"@hapi/joi" "^17.1.1"
axios "^0.19.2"
@@ -5858,6 +5791,13 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+xregexp@^4.2.4:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
+ integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
+ dependencies:
+ "@babel/runtime-corejs3" "^7.8.3"
+
xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -5878,21 +5818,21 @@ yallist@^3.0.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-yargs-parser@^18.1.1:
- version "18.1.2"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
- integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
+yargs-parser@^18.1.2:
+ version "18.1.3"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+ integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
dependencies:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs@^15.3.1:
- version "15.3.1"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
- integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+yargs@^15.4.0:
+ version "15.4.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.0.tgz#53949fb768309bac1843de9b17b80051e9805ec2"
+ integrity sha512-D3fRFnZwLWp8jVAAhPZBsmeIHY8tTsb8ItV9KaAaopmC6wde2u6Yw29JBIZHXw14kgkRnYmDgmQU4FVMDlIsWw==
dependencies:
cliui "^6.0.0"
- decamelize "^1.2.0"
+ decamelize "^3.2.0"
find-up "^4.1.0"
get-caller-file "^2.0.1"
require-directory "^2.1.1"
@@ -5901,7 +5841,7 @@ yargs@^15.3.1:
string-width "^4.2.0"
which-module "^2.0.0"
y18n "^4.0.0"
- yargs-parser "^18.1.1"
+ yargs-parser "^18.1.2"
yauzl@2.10.0, yauzl@^2.10.0:
version "2.10.0"
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
index 7ee8dfa496b5..4e1af6e0dc23 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
@@ -65,7 +65,7 @@ interface Props {
function getCurrentTab(
tabs: ErrorTab[] = [],
currentTabKey: string | undefined
-) {
+): ErrorTab | {} {
const selectedTab = tabs.find(({ key }) => key === currentTabKey);
return selectedTab ? selectedTab : first(tabs) || {};
}
@@ -78,7 +78,7 @@ export function DetailView({ errorGroup, urlParams, location }: Props) {
}
const tabs = getTabs(error);
- const currentTab = getCurrentTab(tabs, urlParams.detailTab);
+ const currentTab = getCurrentTab(tabs, urlParams.detailTab) as ErrorTab;
const errorUrl = error.error.page?.url || error.url?.full;
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
index d71d5f2cb480..3cd04ee032e5 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@@ -10,7 +10,7 @@ import numeral from '@elastic/numeral';
import { i18n } from '@kbn/i18n';
import d3 from 'd3';
import { scaleUtc } from 'd3-scale';
-import mean from 'lodash.mean';
+import { mean } from 'lodash';
import React from 'react';
import { asRelativeDateTimeRange } from '../../../../utils/formatters';
import { getTimezoneOffsetInMs } from '../../../shared/charts/CustomPlot/getTimezoneOffsetInMs';
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
index 295f343b411a..1625fb4c1409 100644
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
@@ -259,4 +259,13 @@ export const routes: BreadcrumbRoute[] = [
}),
name: RouteName.RUM_OVERVIEW,
},
+ {
+ exact: true,
+ path: '/services/:serviceName/rum-overview',
+ component: () => ,
+ breadcrumb: i18n.translate('xpack.apm.home.rumOverview.title', {
+ defaultMessage: 'Real User Monitoring',
+ }),
+ name: RouteName.RUM_OVERVIEW,
+ },
];
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx
index c9e475ef1531..3ddaa66b8de5 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx
@@ -11,6 +11,7 @@ import {
EuiSpacer,
} from '@elastic/eui';
import React, { useMemo } from 'react';
+import { useRouteMatch } from 'react-router-dom';
import { useTrackPageview } from '../../../../../observability/public';
import { LocalUIFilters } from '../../shared/LocalUIFilters';
import { PROJECTION } from '../../../../common/projections/typings';
@@ -37,6 +38,10 @@ export function RumOverview() {
urlParams: { start, end },
} = useUrlParams();
+ const isRumServiceRoute = useRouteMatch(
+ '/services/:serviceName/rum-overview'
+ );
+
const { data } = useFetcher(
(callApmApi) => {
if (start && end) {
@@ -61,13 +66,17 @@ export function RumOverview() {
- service.serviceName) ?? []
- }
- />
-
-
+ {!isRumServiceRoute && (
+ <>
+ service.serviceName) ?? []
+ }
+ />
+
+ {' '}
+
+ )}
diff --git a/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx b/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx
index 81bdbdad805d..ce60ffa4ba4e 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx
@@ -22,11 +22,17 @@ import { ServiceMap } from '../ServiceMap';
import { ServiceMetrics } from '../ServiceMetrics';
import { ServiceNodeOverview } from '../ServiceNodeOverview';
import { TransactionOverview } from '../TransactionOverview';
-import { RumOverviewLink } from '../../shared/Links/apm/RumOverviewLink';
import { RumOverview } from '../RumDashboard';
+import { RumOverviewLink } from '../../shared/Links/apm/RumOverviewLink';
interface Props {
- tab: 'transactions' | 'errors' | 'metrics' | 'nodes' | 'service-map';
+ tab:
+ | 'transactions'
+ | 'errors'
+ | 'metrics'
+ | 'nodes'
+ | 'service-map'
+ | 'rum-overview';
}
export function ServiceDetailTabs({ tab }: Props) {
@@ -115,7 +121,7 @@ export function ServiceDetailTabs({ tab }: Props) {
if (isRumAgentName(agentName)) {
tabs.push({
link: (
-
+
{i18n.translate('xpack.apm.home.rumTabLabel', {
defaultMessage: 'Real User Monitoring',
})}
diff --git a/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx b/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx
index 8a3e2b1a02da..26cff5e71b61 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx
@@ -26,7 +26,7 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
-import { padLeft, range } from 'lodash';
+import { padStart, range } from 'lodash';
import moment from 'moment-timezone';
import React, { Component } from 'react';
import styled from 'styled-components';
@@ -288,7 +288,7 @@ export class WatcherFlyout extends Component<
// Generate UTC hours for Daily Report select field
const intervalHours = range(24).map((i) => {
- const hour = padLeft(i.toString(), 2, '0');
+ const hour = padStart(i.toString(), 2, '0');
return { value: `${hour}:00`, text: `${hour}:00 UTC` };
});
diff --git a/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts b/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
index f0bc313ab464..054476af28de 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
+++ b/x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
@@ -110,7 +110,7 @@ function renderMustache(
if (isObject(input)) {
return Object.keys(input).reduce((acc, key) => {
- const value = input[key];
+ const value = (input as any)[key];
return { ...acc, [key]: renderMustache(value, ctx) };
}, {});
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx
index c1bfce4cdca4..620ae6708eda 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx
@@ -12,7 +12,6 @@ import {
EuiFlexGroup,
EuiFlexItem,
} from '@elastic/eui';
-import _ from 'lodash';
import React, { useMemo } from 'react';
import { useTransactionCharts } from '../../../hooks/useTransactionCharts';
import { useTransactionDistribution } from '../../../hooks/useTransactionDistribution';
diff --git a/x-pack/plugins/apm/public/components/shared/Links/apm/RumOverviewLink.tsx b/x-pack/plugins/apm/public/components/shared/Links/apm/RumOverviewLink.tsx
index abca9817bd69..729ed9b10f82 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/apm/RumOverviewLink.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/apm/RumOverviewLink.tsx
@@ -11,21 +11,17 @@
*/
import React from 'react';
import { APMLink, APMLinkExtendProps } from './APMLink';
-import { useUrlParams } from '../../../../hooks/useUrlParams';
-import { pickKeys } from '../../../../../common/utils/pick_keys';
-const RumOverviewLink = (props: APMLinkExtendProps) => {
- const { urlParams } = useUrlParams();
+interface RumOverviewLinkProps extends APMLinkExtendProps {
+ serviceName?: string;
+}
+export function RumOverviewLink({
+ serviceName,
+ ...rest
+}: RumOverviewLinkProps) {
+ const path = serviceName
+ ? `/services/${serviceName}/rum-overview`
+ : '/rum-overview';
- const persistedFilters = pickKeys(
- urlParams,
- 'transactionResult',
- 'host',
- 'containerId',
- 'podName'
- );
-
- return ;
-};
-
-export { RumOverviewLink };
+ return ;
+}
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx
index e12a4a4831e1..0bb62bd8efcf 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx
@@ -60,6 +60,7 @@ const ServiceNameFilter = ({ serviceNames }: Props) => {
(props: Props) {
} = useUrlParams();
const renderedItems = useMemo(() => {
- // TODO: Use _.orderBy once we upgrade to lodash 4+
const sortedItems = sortItems
- ? sortByOrder(items, sortField, sortDirection)
+ ? orderBy(items, sortField, sortDirection as 'asc' | 'desc')
: items;
return sortedItems.slice(page * pageSize, (page + 1) * pageSize);
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx
index 01043f33ec7b..b37146f3b3be 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx
@@ -87,7 +87,7 @@ export function getGroupedStackframes(stackframes: IStackframe[]) {
!stackframe.exclude_from_grouping;
// append to group
- if (shouldAppend) {
+ if (prevGroup && shouldAppend) {
prevGroup.stackframes.push(stackframe);
return acc;
}
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
index 7f99939a0a0d..d3a9ade3925a 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
@@ -5,7 +5,7 @@
*/
import { i18n } from '@kbn/i18n';
import { Location } from 'history';
-import { pick, isEmpty } from 'lodash';
+import { pickBy, isEmpty } from 'lodash';
import moment from 'moment';
import url from 'url';
import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
@@ -63,13 +63,13 @@ export const getSections = ({
const uptimeLink = url.format({
pathname: basePath.prepend('/app/uptime'),
search: `?${fromQuery(
- pick(
+ pickBy(
{
dateRangeStart: urlParams.rangeFrom,
dateRangeEnd: urlParams.rangeTo,
search: `url.domain:"${transaction.url?.domain}"`,
},
- (val: string) => !isEmpty(val)
+ (val) => !isEmpty(val)
)
)}`,
});
diff --git a/x-pack/plugins/apm/public/components/shared/charts/ErrorRateChart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/ErrorRateChart/index.tsx
index 7aafa9e1fdce..de60441f4faa 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/ErrorRateChart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/ErrorRateChart/index.tsx
@@ -6,7 +6,7 @@
import { EuiTitle } from '@elastic/eui';
import theme from '@elastic/eui/dist/eui_theme_light.json';
import { i18n } from '@kbn/i18n';
-import mean from 'lodash.mean';
+import { mean } from 'lodash';
import React, { useCallback } from 'react';
import { useChartsSync } from '../../../../hooks/useChartsSync';
import { useFetcher } from '../../../../hooks/useFetcher';
diff --git a/x-pack/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx b/x-pack/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx
index 9f72ac6d5916..447e11eab5e4 100644
--- a/x-pack/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx
@@ -58,28 +58,29 @@ describe.skip('useFetcher', () => {
expect(hook.result.current).toEqual(true);
});
- it('is true for minimum 1000ms', () => {
- hook = renderHook((isLoading) => useDelayedVisibility(isLoading), {
- initialProps: false,
- });
+ // Disabled because it's flaky: https://github.com/elastic/kibana/issues/66389
+ // it('is true for minimum 1000ms', () => {
+ // hook = renderHook((isLoading) => useDelayedVisibility(isLoading), {
+ // initialProps: false,
+ // });
- hook.rerender(true);
+ // hook.rerender(true);
- act(() => {
- jest.advanceTimersByTime(100);
- });
+ // act(() => {
+ // jest.advanceTimersByTime(100);
+ // });
- hook.rerender(false);
- act(() => {
- jest.advanceTimersByTime(900);
- });
+ // hook.rerender(false);
+ // act(() => {
+ // jest.advanceTimersByTime(900);
+ // });
- expect(hook.result.current).toEqual(true);
+ // expect(hook.result.current).toEqual(true);
- act(() => {
- jest.advanceTimersByTime(100);
- });
+ // act(() => {
+ // jest.advanceTimersByTime(100);
+ // });
- expect(hook.result.current).toEqual(false);
- });
+ // expect(hook.result.current).toEqual(false);
+ // });
});
diff --git a/x-pack/plugins/apm/public/context/LoadingIndicatorContext.tsx b/x-pack/plugins/apm/public/context/LoadingIndicatorContext.tsx
index a26653d3d529..99822c0bbc5c 100644
--- a/x-pack/plugins/apm/public/context/LoadingIndicatorContext.tsx
+++ b/x-pack/plugins/apm/public/context/LoadingIndicatorContext.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { EuiPortal, EuiProgress } from '@elastic/eui';
-import { pick } from 'lodash';
+import { pickBy } from 'lodash';
import React, { Fragment, useMemo, useReducer } from 'react';
import { useDelayedVisibility } from '../components/shared/useDelayedVisibility';
@@ -26,7 +26,7 @@ function reducer(statuses: State, action: Action) {
// Return an object with only the ids with `true` as their value, so that ids
// that previously had `false` are removed and do not remain hanging around in
// the object.
- return pick(
+ return pickBy(
{ ...statuses, [action.id.toString()]: action.isLoading },
Boolean
);
diff --git a/x-pack/plugins/apm/public/context/UrlParamsContext/helpers.ts b/x-pack/plugins/apm/public/context/UrlParamsContext/helpers.ts
index 9ce993e84848..9745c9ffdc70 100644
--- a/x-pack/plugins/apm/public/context/UrlParamsContext/helpers.ts
+++ b/x-pack/plugins/apm/public/context/UrlParamsContext/helpers.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { compact, pick } from 'lodash';
+import { compact, pickBy } from 'lodash';
import datemath from '@elastic/datemath';
import { IUrlParams } from './types';
import { ProcessorEvent } from '../../../common/processor_event';
@@ -61,8 +61,8 @@ export function getPathAsArray(pathname: string = '') {
return compact(pathname.split('/'));
}
-export function removeUndefinedProps(obj: T): Partial {
- return pick(obj, (value) => value !== undefined);
+export function removeUndefinedProps(obj: T): Partial {
+ return pickBy(obj, (value) => value !== undefined);
}
export function getPathParams(pathname: string = ''): PathParams {
@@ -104,6 +104,7 @@ export function getPathParams(pathname: string = ''): PathParams {
serviceName,
};
case 'service-map':
+ case 'rum-overview':
return {
serviceName,
};
diff --git a/x-pack/plugins/apm/public/services/rest/observability_dashboard.ts b/x-pack/plugins/apm/public/services/rest/observability_dashboard.ts
index 589199221d7a..79ccf8dbd6f9 100644
--- a/x-pack/plugins/apm/public/services/rest/observability_dashboard.ts
+++ b/x-pack/plugins/apm/public/services/rest/observability_dashboard.ts
@@ -5,7 +5,7 @@
*/
import { i18n } from '@kbn/i18n';
-import mean from 'lodash.mean';
+import { mean } from 'lodash';
import { Theme } from '@kbn/ui-shared-deps/theme';
import {
ApmFetchDataResponse,
diff --git a/x-pack/plugins/apm/readme.md b/x-pack/plugins/apm/readme.md
index 778b1f2ad2d9..f460ff6ff9bf 100644
--- a/x-pack/plugins/apm/readme.md
+++ b/x-pack/plugins/apm/readme.md
@@ -81,37 +81,32 @@ For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
### API integration tests
Our tests are separated in two suites: one suite runs with a basic license, and the other
-with a trial license (the equivalent of gold+). This requires separate test servers and test runs.
+with a trial license (the equivalent of gold+). This requires separate test servers and test runners.
-**Start server**
-
-Basic:
+**Basic**
```
+# Start server
node scripts/functional_tests_server --config x-pack/test/apm_api_integration/basic/config.ts
-```
-
-Trial:
-```
-node scripts/functional_tests_server --config x-pack/test/apm_api_integration/trial/config.ts
+# Run tests
+node scripts/functional_test_runner --config x-pack/test/apm_api_integration/basic/config.ts
```
-**Run tests**
+The API tests for "basic" are located in `x-pack/test/apm_api_integration/basic/tests`.
-Basic:
+**Trial**
```
-node scripts/functional_test_runner --config x-pack/test/apm_api_integration/basic/config.ts
-```
-
-Trial:
+# Start server
+node scripts/functional_tests_server --config x-pack/test/apm_api_integration/trial/config.ts
-```
+# Run tests
node scripts/functional_test_runner --config x-pack/test/apm_api_integration/trial/config.ts
```
-APM tests are located in `x-pack/test/apm_api_integration`.
+The API tests for "trial" are located in `x-pack/test/apm_api_integration/trial/tests`.
+
For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
### Linting
diff --git a/x-pack/plugins/apm/server/lib/service_map/__snapshots__/get_service_map_from_trace_ids.test.ts.snap b/x-pack/plugins/apm/server/lib/service_map/__snapshots__/get_service_map_from_trace_ids.test.ts.snap
new file mode 100644
index 000000000000..1f4a8a4367fa
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/service_map/__snapshots__/get_service_map_from_trace_ids.test.ts.snap
@@ -0,0 +1,222 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getConnections transforms a list of paths into a list of connections filtered by service.name and environment 1`] = `
+Array [
+ Object {
+ "destination": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ "source": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "172.18.0.6:3000",
+ "span.subtype": "http",
+ "span.type": "external",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ "source": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "postgresql",
+ "span.subtype": "postgresql",
+ "span.type": "db",
+ },
+ "source": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ },
+ Object {
+ "destination": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.subtype": "http_rb",
+ "span.type": "ext",
+ },
+ "source": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ },
+ Object {
+ "destination": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ "source": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.subtype": "http",
+ "span.type": "external",
+ },
+ "source": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "172.18.0.7:3000",
+ "span.subtype": "http",
+ "span.type": "external",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "postgresql",
+ "span.subtype": "postgresql",
+ "span.type": "db",
+ },
+ "source": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ },
+ Object {
+ "destination": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ "source": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "postgresql",
+ "span.subtype": "postgresql",
+ "span.type": "db",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "93.184.216.34:80",
+ "span.subtype": "http",
+ "span.type": "external",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.subtype": "http_rb",
+ "span.type": "ext",
+ },
+ "source": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "redis",
+ "span.subtype": "redis",
+ "span.type": "cache",
+ },
+ "source": Object {
+ "agent.name": "nodejs",
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.subtype": "http_rb",
+ "span.type": "ext",
+ },
+ "source": Object {
+ "agent.name": "ruby",
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ },
+ },
+ Object {
+ "destination": Object {
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.subtype": "http",
+ "span.type": "external",
+ },
+ "source": Object {
+ "agent.name": "python",
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ },
+ },
+]
+`;
diff --git a/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts b/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
new file mode 100644
index 000000000000..08c8aba5f020
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
@@ -0,0 +1,232 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+ PROCESSOR_EVENT,
+ TRACE_ID,
+} from '../../../common/elasticsearch_fieldnames';
+import {
+ ConnectionNode,
+ ExternalConnectionNode,
+ ServiceConnectionNode,
+} from '../../../common/service_map';
+import { Setup } from '../helpers/setup_request';
+
+export async function fetchServicePathsFromTraceIds(
+ setup: Setup,
+ traceIds: string[]
+) {
+ const { indices, client } = setup;
+
+ const serviceMapParams = {
+ index: [
+ indices['apm_oss.spanIndices'],
+ indices['apm_oss.transactionIndices'],
+ ],
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ filter: [
+ {
+ terms: {
+ [PROCESSOR_EVENT]: ['span', 'transaction'],
+ },
+ },
+ {
+ terms: {
+ [TRACE_ID]: traceIds,
+ },
+ },
+ ],
+ },
+ },
+ aggs: {
+ service_map: {
+ scripted_metric: {
+ init_script: {
+ lang: 'painless',
+ source: `state.eventsById = new HashMap();
+
+ String[] fieldsToCopy = new String[] {
+ 'parent.id',
+ 'service.name',
+ 'service.environment',
+ 'span.destination.service.resource',
+ 'trace.id',
+ 'processor.event',
+ 'span.type',
+ 'span.subtype',
+ 'agent.name'
+ };
+ state.fieldsToCopy = fieldsToCopy;`,
+ },
+ map_script: {
+ lang: 'painless',
+ source: `def id;
+ if (!doc['span.id'].empty) {
+ id = doc['span.id'].value;
+ } else {
+ id = doc['transaction.id'].value;
+ }
+
+ def copy = new HashMap();
+ copy.id = id;
+
+ for(key in state.fieldsToCopy) {
+ if (!doc[key].empty) {
+ copy[key] = doc[key].value;
+ }
+ }
+
+ state.eventsById[id] = copy`,
+ },
+ combine_script: {
+ lang: 'painless',
+ source: `return state.eventsById;`,
+ },
+ reduce_script: {
+ lang: 'painless',
+ source: `
+ def getDestination ( def event ) {
+ def destination = new HashMap();
+ destination['span.destination.service.resource'] = event['span.destination.service.resource'];
+ destination['span.type'] = event['span.type'];
+ destination['span.subtype'] = event['span.subtype'];
+ return destination;
+ }
+
+ def processAndReturnEvent(def context, def eventId) {
+ if (context.processedEvents[eventId] != null) {
+ return context.processedEvents[eventId];
+ }
+
+ def event = context.eventsById[eventId];
+
+ if (event == null) {
+ return null;
+ }
+
+ def service = new HashMap();
+ service['service.name'] = event['service.name'];
+ service['service.environment'] = event['service.environment'];
+ service['agent.name'] = event['agent.name'];
+
+ def basePath = new ArrayList();
+
+ def parentId = event['parent.id'];
+ def parent;
+
+ if (parentId != null && parentId != event['id']) {
+ parent = processAndReturnEvent(context, parentId);
+ if (parent != null) {
+ /* copy the path from the parent */
+ basePath.addAll(parent.path);
+ /* flag parent path for removal, as it has children */
+ context.locationsToRemove.add(parent.path);
+
+ /* if the parent has 'span.destination.service.resource' set, and the service is different,
+ we've discovered a service */
+
+ if (parent['span.destination.service.resource'] != null
+ && parent['span.destination.service.resource'] != ""
+ && (parent['service.name'] != event['service.name']
+ || parent['service.environment'] != event['service.environment']
+ )
+ ) {
+ def parentDestination = getDestination(parent);
+ context.externalToServiceMap.put(parentDestination, service);
+ }
+ }
+ }
+
+ def lastLocation = basePath.size() > 0 ? basePath[basePath.size() - 1] : null;
+
+ def currentLocation = service;
+
+ /* only add the current location to the path if it's different from the last one*/
+ if (lastLocation == null || !lastLocation.equals(currentLocation)) {
+ basePath.add(currentLocation);
+ }
+
+ /* if there is an outgoing span, create a new path */
+ if (event['span.destination.service.resource'] != null
+ && event['span.destination.service.resource'] != '') {
+ def outgoingLocation = getDestination(event);
+ def outgoingPath = new ArrayList(basePath);
+ outgoingPath.add(outgoingLocation);
+ context.paths.add(outgoingPath);
+ }
+
+ event.path = basePath;
+
+ context.processedEvents[eventId] = event;
+ return event;
+ }
+
+ def context = new HashMap();
+
+ context.processedEvents = new HashMap();
+ context.eventsById = new HashMap();
+
+ context.paths = new HashSet();
+ context.externalToServiceMap = new HashMap();
+ context.locationsToRemove = new HashSet();
+
+ for (state in states) {
+ context.eventsById.putAll(state);
+ }
+
+ for (entry in context.eventsById.entrySet()) {
+ processAndReturnEvent(context, entry.getKey());
+ }
+
+ def paths = new HashSet();
+
+ for(foundPath in context.paths) {
+ if (!context.locationsToRemove.contains(foundPath)) {
+ paths.add(foundPath);
+ }
+ }
+
+ def response = new HashMap();
+ response.paths = paths;
+
+ def discoveredServices = new HashSet();
+
+ for(entry in context.externalToServiceMap.entrySet()) {
+ def map = new HashMap();
+ map.from = entry.getKey();
+ map.to = entry.getValue();
+ discoveredServices.add(map);
+ }
+ response.discoveredServices = discoveredServices;
+
+ return response;`,
+ },
+ },
+ },
+ },
+ },
+ };
+
+ const serviceMapFromTraceIdsScriptResponse = await client.search(
+ serviceMapParams
+ );
+
+ return serviceMapFromTraceIdsScriptResponse as {
+ aggregations?: {
+ service_map: {
+ value: {
+ paths: ConnectionNode[][];
+ discoveredServices: Array<{
+ from: ExternalConnectionNode;
+ to: ServiceConnectionNode;
+ }>;
+ };
+ };
+ };
+ };
+}
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.test.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.test.ts
new file mode 100644
index 000000000000..a3a7e5c995bf
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.test.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getConnections } from './get_service_map_from_trace_ids';
+import serviceMapFromTraceIdsScriptResponse from './mock_responses/get_service_map_from_trace_ids_script_response.json';
+import { PromiseReturnType } from '../../../typings/common';
+import { fetchServicePathsFromTraceIds } from './fetch_service_paths_from_trace_ids';
+
+describe('getConnections', () => {
+ it('transforms a list of paths into a list of connections filtered by service.name and environment', () => {
+ const response = serviceMapFromTraceIdsScriptResponse as PromiseReturnType<
+ typeof fetchServicePathsFromTraceIds
+ >;
+ const serviceName = 'opbeans-node';
+ const environment = 'production';
+
+ const connections = getConnections(
+ response.aggregations?.service_map.value.paths,
+ serviceName,
+ environment
+ );
+
+ expect(connections).toMatchSnapshot();
+ });
+});
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
index 01cbc1aa9b98..f6e331a09fa6 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
@@ -3,237 +3,27 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { find, uniq } from 'lodash';
+import { find, uniqBy } from 'lodash';
import {
- PROCESSOR_EVENT,
SERVICE_ENVIRONMENT,
SERVICE_NAME,
- TRACE_ID,
} from '../../../common/elasticsearch_fieldnames';
import {
Connection,
ConnectionNode,
- ExternalConnectionNode,
ServiceConnectionNode,
} from '../../../common/service_map';
import { Setup } from '../helpers/setup_request';
-
-export async function getServiceMapFromTraceIds({
- setup,
- traceIds,
- serviceName,
- environment,
-}: {
- setup: Setup;
- traceIds: string[];
- serviceName?: string;
- environment?: string;
-}) {
- const { indices, client } = setup;
-
- const serviceMapParams = {
- index: [
- indices['apm_oss.spanIndices'],
- indices['apm_oss.transactionIndices'],
- ],
- body: {
- size: 0,
- query: {
- bool: {
- filter: [
- {
- terms: {
- [PROCESSOR_EVENT]: ['span', 'transaction'],
- },
- },
- {
- terms: {
- [TRACE_ID]: traceIds,
- },
- },
- ],
- },
- },
- aggs: {
- service_map: {
- scripted_metric: {
- init_script: {
- lang: 'painless',
- source: `state.eventsById = new HashMap();
-
- String[] fieldsToCopy = new String[] {
- 'parent.id',
- 'service.name',
- 'service.environment',
- 'span.destination.service.resource',
- 'trace.id',
- 'processor.event',
- 'span.type',
- 'span.subtype',
- 'agent.name'
- };
- state.fieldsToCopy = fieldsToCopy;`,
- },
- map_script: {
- lang: 'painless',
- source: `def id;
- if (!doc['span.id'].empty) {
- id = doc['span.id'].value;
- } else {
- id = doc['transaction.id'].value;
- }
-
- def copy = new HashMap();
- copy.id = id;
-
- for(key in state.fieldsToCopy) {
- if (!doc[key].empty) {
- copy[key] = doc[key].value;
- }
- }
-
- state.eventsById[id] = copy`,
- },
- combine_script: {
- lang: 'painless',
- source: `return state.eventsById;`,
- },
- reduce_script: {
- lang: 'painless',
- source: `
- def getDestination ( def event ) {
- def destination = new HashMap();
- destination['span.destination.service.resource'] = event['span.destination.service.resource'];
- destination['span.type'] = event['span.type'];
- destination['span.subtype'] = event['span.subtype'];
- return destination;
- }
-
- def processAndReturnEvent(def context, def eventId) {
- if (context.processedEvents[eventId] != null) {
- return context.processedEvents[eventId];
- }
-
- def event = context.eventsById[eventId];
-
- if (event == null) {
- return null;
- }
-
- def service = new HashMap();
- service['service.name'] = event['service.name'];
- service['service.environment'] = event['service.environment'];
- service['agent.name'] = event['agent.name'];
-
- def basePath = new ArrayList();
-
- def parentId = event['parent.id'];
- def parent;
-
- if (parentId != null && parentId != event['id']) {
- parent = processAndReturnEvent(context, parentId);
- if (parent != null) {
- /* copy the path from the parent */
- basePath.addAll(parent.path);
- /* flag parent path for removal, as it has children */
- context.locationsToRemove.add(parent.path);
-
- /* if the parent has 'span.destination.service.resource' set, and the service is different,
- we've discovered a service */
-
- if (parent['span.destination.service.resource'] != null
- && parent['span.destination.service.resource'] != ""
- && (parent['service.name'] != event['service.name']
- || parent['service.environment'] != event['service.environment']
- )
- ) {
- def parentDestination = getDestination(parent);
- context.externalToServiceMap.put(parentDestination, service);
- }
- }
- }
-
- def lastLocation = basePath.size() > 0 ? basePath[basePath.size() - 1] : null;
-
- def currentLocation = service;
-
- /* only add the current location to the path if it's different from the last one*/
- if (lastLocation == null || !lastLocation.equals(currentLocation)) {
- basePath.add(currentLocation);
- }
-
- /* if there is an outgoing span, create a new path */
- if (event['span.destination.service.resource'] != null
- && event['span.destination.service.resource'] != '') {
- def outgoingLocation = getDestination(event);
- def outgoingPath = new ArrayList(basePath);
- outgoingPath.add(outgoingLocation);
- context.paths.add(outgoingPath);
- }
-
- event.path = basePath;
-
- context.processedEvents[eventId] = event;
- return event;
- }
-
- def context = new HashMap();
-
- context.processedEvents = new HashMap();
- context.eventsById = new HashMap();
-
- context.paths = new HashSet();
- context.externalToServiceMap = new HashMap();
- context.locationsToRemove = new HashSet();
-
- for (state in states) {
- context.eventsById.putAll(state);
- }
-
- for (entry in context.eventsById.entrySet()) {
- processAndReturnEvent(context, entry.getKey());
- }
-
- def paths = new HashSet();
-
- for(foundPath in context.paths) {
- if (!context.locationsToRemove.contains(foundPath)) {
- paths.add(foundPath);
- }
- }
-
- def response = new HashMap();
- response.paths = paths;
-
- def discoveredServices = new HashSet();
-
- for(entry in context.externalToServiceMap.entrySet()) {
- def map = new HashMap();
- map.from = entry.getKey();
- map.to = entry.getValue();
- discoveredServices.add(map);
- }
- response.discoveredServices = discoveredServices;
-
- return response;`,
- },
- },
- },
- },
- },
- };
-
- const serviceMapResponse = await client.search(serviceMapParams);
-
- const scriptResponse = serviceMapResponse.aggregations?.service_map.value as {
- paths: ConnectionNode[][];
- discoveredServices: Array<{
- from: ExternalConnectionNode;
- to: ServiceConnectionNode;
- }>;
- };
-
- let paths = scriptResponse.paths;
+import { fetchServicePathsFromTraceIds } from './fetch_service_paths_from_trace_ids';
+
+export function getConnections(
+ paths?: ConnectionNode[][],
+ serviceName?: string,
+ environment?: string
+) {
+ if (!paths) {
+ return [];
+ }
if (serviceName || environment) {
paths = paths.filter((path) => {
@@ -257,26 +47,51 @@ export async function getServiceMapFromTraceIds({
});
}
- const connections = uniq(
- paths.flatMap((path) => {
- return path.reduce((conns, location, index) => {
- const prev = path[index - 1];
- if (prev) {
- return conns.concat({
- source: prev,
- destination: location,
- });
- }
- return conns;
- }, [] as Connection[]);
- }, [] as Connection[]),
- (value, _index, array) => {
- return find(array, value);
- }
+ const connectionsArr = paths.flatMap((path) => {
+ return path.reduce((conns, location, index) => {
+ const prev = path[index - 1];
+ if (prev) {
+ return conns.concat({
+ source: prev,
+ destination: location,
+ });
+ }
+ return conns;
+ }, [] as Connection[]);
+ }, [] as Connection[]);
+
+ const connections = uniqBy(connectionsArr, (value) =>
+ find(connectionsArr, value)
);
+ return connections;
+}
+
+export async function getServiceMapFromTraceIds({
+ setup,
+ traceIds,
+ serviceName,
+ environment,
+}: {
+ setup: Setup;
+ traceIds: string[];
+ serviceName?: string;
+ environment?: string;
+}) {
+ const serviceMapFromTraceIdsScriptResponse = await fetchServicePathsFromTraceIds(
+ setup,
+ traceIds
+ );
+
+ const serviceMapScriptedAggValue =
+ serviceMapFromTraceIdsScriptResponse.aggregations?.service_map.value;
+
return {
- connections,
- discoveredServices: scriptResponse.discoveredServices,
+ connections: getConnections(
+ serviceMapScriptedAggValue?.paths,
+ serviceName,
+ environment
+ ),
+ discoveredServices: serviceMapScriptedAggValue?.discoveredServices ?? [],
};
}
diff --git a/x-pack/plugins/apm/server/lib/service_map/mock_responses/get_service_map_from_trace_ids_script_response.json b/x-pack/plugins/apm/server/lib/service_map/mock_responses/get_service_map_from_trace_ids_script_response.json
new file mode 100644
index 000000000000..49d8efebbf43
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/service_map/mock_responses/get_service_map_from_trace_ids_script_response.json
@@ -0,0 +1,1165 @@
+{
+ "took": 43,
+ "timed_out": false,
+ "_shards": { "total": 6, "successful": 6, "skipped": 0, "failed": 0 },
+ "hits": {
+ "total": { "value": 465, "relation": "eq" },
+ "max_score": null,
+ "hits": []
+ },
+ "aggregations": {
+ "service_map": {
+ "value": {
+ "paths": [
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.6:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.6:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.7:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.7:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.7:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "93.184.216.34:80",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.7:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "redis",
+ "span.destination.service.resource": "redis",
+ "span.type": "cache"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "redis",
+ "span.destination.service.resource": "redis",
+ "span.type": "cache"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "postgresql",
+ "span.destination.service.resource": "postgresql",
+ "span.type": "db"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "redis",
+ "span.destination.service.resource": "redis",
+ "span.type": "cache"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.6:3000",
+ "span.type": "external"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "redis",
+ "span.destination.service.resource": "redis",
+ "span.type": "cache"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "ext"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "redis",
+ "span.destination.service.resource": "redis",
+ "span.type": "cache"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ },
+ {
+ "span.subtype": "redis",
+ "span.destination.service.resource": "redis",
+ "span.type": "cache"
+ }
+ ],
+ [
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ },
+ {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ },
+ {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ }
+ ]
+ ],
+ "discoveredServices": [
+ {
+ "from": {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "external"
+ },
+ "to": {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ }
+ },
+ {
+ "from": {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.7:3000",
+ "span.type": "external"
+ },
+ "to": {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ }
+ },
+ {
+ "from": {
+ "span.subtype": "http",
+ "span.destination.service.resource": "opbeans-ruby:3000",
+ "span.type": "external"
+ },
+ "to": {
+ "service.environment": "production",
+ "service.name": "opbeans-ruby",
+ "agent.name": "ruby"
+ }
+ },
+ {
+ "from": {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-node:3000",
+ "span.type": "ext"
+ },
+ "to": {
+ "service.environment": "production",
+ "service.name": "opbeans-node",
+ "agent.name": "nodejs"
+ }
+ },
+ {
+ "from": {
+ "span.subtype": "http_rb",
+ "span.destination.service.resource": "opbeans-python:3000",
+ "span.type": "ext"
+ },
+ "to": {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ }
+ },
+ {
+ "from": {
+ "span.subtype": "http",
+ "span.destination.service.resource": "172.18.0.6:3000",
+ "span.type": "external"
+ },
+ "to": {
+ "service.environment": "production",
+ "service.name": "opbeans-python",
+ "agent.name": "python"
+ }
+ }
+ ]
+ }
+ }
+ }
+}
diff --git a/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts b/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts
index 835c00b8df23..2e394f44b25b 100644
--- a/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts
@@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { sortBy, pick, identity } from 'lodash';
+import { sortBy, pickBy, identity } from 'lodash';
import { ValuesType } from 'utility-types';
import {
SERVICE_NAME,
@@ -112,7 +112,7 @@ export function transformServiceMapResponses(response: ServiceMapResponse) {
id: matchedServiceNodes[0][SERVICE_NAME],
},
...matchedServiceNodes.map((serviceNode) =>
- pick(serviceNode, identity)
+ pickBy(serviceNode, identity)
)
),
};
diff --git a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
index 3f8d6b22cd00..0fc1f89a3723 100644
--- a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
@@ -113,76 +113,244 @@ Object {
`;
exports[`services queries fetches the service items 1`] = `
-Object {
- "body": Object {
- "aggs": Object {
- "services": Object {
- "aggs": Object {
- "agents": Object {
- "terms": Object {
- "field": "agent.name",
- "size": 1,
+Array [
+ Object {
+ "body": Object {
+ "aggs": Object {
+ "services": Object {
+ "aggs": Object {
+ "average": Object {
+ "avg": Object {
+ "field": "transaction.duration.us",
+ },
},
},
- "avg": Object {
- "avg": Object {
- "field": "transaction.duration.us",
+ "terms": Object {
+ "field": "service.name",
+ "size": 500,
+ },
+ },
+ },
+ "query": Object {
+ "bool": Object {
+ "filter": Array [
+ Object {
+ "range": Object {
+ "@timestamp": Object {
+ "format": "epoch_millis",
+ "gte": 1528113600000,
+ "lte": 1528977600000,
+ },
+ },
+ },
+ Object {
+ "term": Object {
+ "my.custom.ui.filter": "foo-bar",
+ },
+ },
+ Object {
+ "term": Object {
+ "processor.event": "transaction",
+ },
+ },
+ ],
+ },
+ },
+ "size": 0,
+ },
+ "index": "myIndex",
+ "size": 0,
+ },
+ Object {
+ "body": Object {
+ "aggs": Object {
+ "services": Object {
+ "aggs": Object {
+ "agent_name": Object {
+ "top_hits": Object {
+ "_source": Array [
+ "agent.name",
+ ],
+ "size": 1,
+ },
},
},
- "environments": Object {
- "terms": Object {
- "field": "service.environment",
+ "terms": Object {
+ "field": "service.name",
+ "size": 500,
+ },
+ },
+ },
+ "query": Object {
+ "bool": Object {
+ "filter": Array [
+ Object {
+ "range": Object {
+ "@timestamp": Object {
+ "format": "epoch_millis",
+ "gte": 1528113600000,
+ "lte": 1528977600000,
+ },
+ },
+ },
+ Object {
+ "term": Object {
+ "my.custom.ui.filter": "foo-bar",
+ },
+ },
+ Object {
+ "terms": Object {
+ "processor.event": Array [
+ "metric",
+ "error",
+ "transaction",
+ ],
+ },
},
+ ],
+ },
+ },
+ "size": 0,
+ },
+ "index": Array [
+ "myIndex",
+ "myIndex",
+ "myIndex",
+ ],
+ },
+ Object {
+ "body": Object {
+ "aggs": Object {
+ "services": Object {
+ "terms": Object {
+ "field": "service.name",
+ "size": 500,
},
- "events": Object {
- "terms": Object {
- "field": "processor.event",
+ },
+ },
+ "query": Object {
+ "bool": Object {
+ "filter": Array [
+ Object {
+ "range": Object {
+ "@timestamp": Object {
+ "format": "epoch_millis",
+ "gte": 1528113600000,
+ "lte": 1528977600000,
+ },
+ },
},
+ Object {
+ "term": Object {
+ "my.custom.ui.filter": "foo-bar",
+ },
+ },
+ Object {
+ "term": Object {
+ "processor.event": "transaction",
+ },
+ },
+ ],
+ },
+ },
+ "size": 0,
+ },
+ "index": "myIndex",
+ },
+ Object {
+ "body": Object {
+ "aggs": Object {
+ "services": Object {
+ "terms": Object {
+ "field": "service.name",
+ "size": 500,
},
},
- "terms": Object {
- "field": "service.name",
- "size": 500,
+ },
+ "query": Object {
+ "bool": Object {
+ "filter": Array [
+ Object {
+ "range": Object {
+ "@timestamp": Object {
+ "format": "epoch_millis",
+ "gte": 1528113600000,
+ "lte": 1528977600000,
+ },
+ },
+ },
+ Object {
+ "term": Object {
+ "my.custom.ui.filter": "foo-bar",
+ },
+ },
+ Object {
+ "term": Object {
+ "processor.event": "error",
+ },
+ },
+ ],
},
},
+ "size": 0,
},
- "query": Object {
- "bool": Object {
- "filter": Array [
- Object {
- "terms": Object {
- "processor.event": Array [
- "transaction",
- "error",
- "metric",
- ],
+ "index": "myIndex",
+ },
+ Object {
+ "body": Object {
+ "aggs": Object {
+ "services": Object {
+ "aggs": Object {
+ "environments": Object {
+ "terms": Object {
+ "field": "service.environment",
+ },
},
},
- Object {
- "range": Object {
- "@timestamp": Object {
- "format": "epoch_millis",
- "gte": 1528113600000,
- "lte": 1528977600000,
+ "terms": Object {
+ "field": "service.name",
+ "size": 500,
+ },
+ },
+ },
+ "query": Object {
+ "bool": Object {
+ "filter": Array [
+ Object {
+ "range": Object {
+ "@timestamp": Object {
+ "format": "epoch_millis",
+ "gte": 1528113600000,
+ "lte": 1528977600000,
+ },
},
},
- },
- Object {
- "term": Object {
- "my.custom.ui.filter": "foo-bar",
+ Object {
+ "term": Object {
+ "my.custom.ui.filter": "foo-bar",
+ },
},
- },
- ],
+ Object {
+ "terms": Object {
+ "processor.event": Array [
+ "transaction",
+ "error",
+ "metric",
+ ],
+ },
+ },
+ ],
+ },
},
+ "size": 0,
},
- "size": 0,
+ "index": Array [
+ "myIndex",
+ "myIndex",
+ "myIndex",
+ ],
},
- "index": Array [
- "myIndex",
- "myIndex",
- "myIndex",
- ],
-}
+]
`;
exports[`services queries fetches the service transaction types 1`] = `
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
index acf052affabd..14772e77fe1c 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
@@ -3,14 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-
-import { mergeProjection } from '../../../../common/projections/util/merge_projection';
-import {
- PROCESSOR_EVENT,
- AGENT_NAME,
- SERVICE_ENVIRONMENT,
- TRANSACTION_DURATION,
-} from '../../../../common/elasticsearch_fieldnames';
+import { joinByKey } from '../../../../common/utils/join_by_key';
import { PromiseReturnType } from '../../../../typings/common';
import {
Setup,
@@ -18,75 +11,45 @@ import {
SetupUIFilters,
} from '../../helpers/setup_request';
import { getServicesProjection } from '../../../../common/projections/services';
+import {
+ getTransactionDurationAverages,
+ getAgentNames,
+ getTransactionRates,
+ getErrorRates,
+ getEnvironments,
+} from './get_services_items_stats';
export type ServiceListAPIResponse = PromiseReturnType;
-export async function getServicesItems(
- setup: Setup & SetupTimeRange & SetupUIFilters
-) {
- const { start, end, client } = setup;
-
- const projection = getServicesProjection({ setup });
-
- const params = mergeProjection(projection, {
- body: {
- size: 0,
- aggs: {
- services: {
- terms: {
- ...projection.body.aggs.services.terms,
- size: 500,
- },
- aggs: {
- avg: {
- avg: { field: TRANSACTION_DURATION },
- },
- agents: {
- terms: { field: AGENT_NAME, size: 1 },
- },
- events: {
- terms: { field: PROCESSOR_EVENT },
- },
- environments: {
- terms: { field: SERVICE_ENVIRONMENT },
- },
- },
- },
- },
- },
- });
-
- const resp = await client.search(params);
- const aggs = resp.aggregations;
-
- const serviceBuckets = aggs?.services.buckets || [];
-
- const items = serviceBuckets.map((bucket) => {
- const eventTypes = bucket.events.buckets;
-
- const transactions = eventTypes.find((e) => e.key === 'transaction');
- const totalTransactions = transactions?.doc_count || 0;
-
- const errors = eventTypes.find((e) => e.key === 'error');
- const totalErrors = errors?.doc_count || 0;
-
- const deltaAsMinutes = (end - start) / 1000 / 60;
- const transactionsPerMinute = totalTransactions / deltaAsMinutes;
- const errorsPerMinute = totalErrors / deltaAsMinutes;
-
- const environmentsBuckets = bucket.environments.buckets;
- const environments = environmentsBuckets.map(
- (environmentBucket) => environmentBucket.key as string
- );
-
- return {
- serviceName: bucket.key as string,
- agentName: bucket.agents.buckets[0]?.key as string | undefined,
- transactionsPerMinute,
- errorsPerMinute,
- avgResponseTime: bucket.avg.value,
- environments,
- };
- });
-
- return items;
+export type ServicesItemsSetup = Setup & SetupTimeRange & SetupUIFilters;
+export type ServicesItemsProjection = ReturnType;
+
+export async function getServicesItems(setup: ServicesItemsSetup) {
+ const params = {
+ projection: getServicesProjection({ setup, noEvents: true }),
+ setup,
+ };
+
+ const [
+ transactionDurationAverages,
+ agentNames,
+ transactionRates,
+ errorRates,
+ environments,
+ ] = await Promise.all([
+ getTransactionDurationAverages(params),
+ getAgentNames(params),
+ getTransactionRates(params),
+ getErrorRates(params),
+ getEnvironments(params),
+ ]);
+
+ const allMetrics = [
+ ...transactionDurationAverages,
+ ...agentNames,
+ ...transactionRates,
+ ...errorRates,
+ ...environments,
+ ];
+
+ return joinByKey(allMetrics, 'serviceName');
}
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items_stats.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items_stats.ts
new file mode 100644
index 000000000000..c28bcad841ff
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items_stats.ts
@@ -0,0 +1,309 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { arrayUnionToCallable } from '../../../../common/utils/array_union_to_callable';
+import {
+ PROCESSOR_EVENT,
+ TRANSACTION_DURATION,
+ AGENT_NAME,
+ SERVICE_ENVIRONMENT,
+} from '../../../../common/elasticsearch_fieldnames';
+import { mergeProjection } from '../../../../common/projections/util/merge_projection';
+import { ProcessorEvent } from '../../../../common/processor_event';
+import {
+ ServicesItemsSetup,
+ ServicesItemsProjection,
+} from './get_services_items';
+
+const MAX_NUMBER_OF_SERVICES = 500;
+
+const getDeltaAsMinutes = (setup: ServicesItemsSetup) =>
+ (setup.end - setup.start) / 1000 / 60;
+
+interface AggregationParams {
+ setup: ServicesItemsSetup;
+ projection: ServicesItemsProjection;
+}
+
+export const getTransactionDurationAverages = async ({
+ setup,
+ projection,
+}: AggregationParams) => {
+ const { client, indices } = setup;
+
+ const response = await client.search(
+ mergeProjection(projection, {
+ size: 0,
+ index: indices['apm_oss.transactionIndices'],
+ body: {
+ query: {
+ bool: {
+ filter: projection.body.query.bool.filter.concat({
+ term: {
+ [PROCESSOR_EVENT]: ProcessorEvent.transaction,
+ },
+ }),
+ },
+ },
+ aggs: {
+ services: {
+ terms: {
+ ...projection.body.aggs.services.terms,
+ size: MAX_NUMBER_OF_SERVICES,
+ },
+ aggs: {
+ average: {
+ avg: {
+ field: TRANSACTION_DURATION,
+ },
+ },
+ },
+ },
+ },
+ },
+ })
+ );
+
+ const { aggregations } = response;
+
+ if (!aggregations) {
+ return [];
+ }
+
+ return aggregations.services.buckets.map((bucket) => ({
+ serviceName: bucket.key as string,
+ avgResponseTime: bucket.average.value,
+ }));
+};
+
+export const getAgentNames = async ({
+ setup,
+ projection,
+}: AggregationParams) => {
+ const { client, indices } = setup;
+ const response = await client.search(
+ mergeProjection(projection, {
+ index: [
+ indices['apm_oss.metricsIndices'],
+ indices['apm_oss.errorIndices'],
+ indices['apm_oss.transactionIndices'],
+ ],
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ filter: [
+ ...projection.body.query.bool.filter,
+ {
+ terms: {
+ [PROCESSOR_EVENT]: [
+ ProcessorEvent.metric,
+ ProcessorEvent.error,
+ ProcessorEvent.transaction,
+ ],
+ },
+ },
+ ],
+ },
+ },
+ aggs: {
+ services: {
+ terms: {
+ ...projection.body.aggs.services.terms,
+ size: MAX_NUMBER_OF_SERVICES,
+ },
+ aggs: {
+ agent_name: {
+ top_hits: {
+ _source: [AGENT_NAME],
+ size: 1,
+ },
+ },
+ },
+ },
+ },
+ },
+ })
+ );
+
+ const { aggregations } = response;
+
+ if (!aggregations) {
+ return [];
+ }
+
+ return aggregations.services.buckets.map((bucket) => ({
+ serviceName: bucket.key as string,
+ agentName: (bucket.agent_name.hits.hits[0]?._source as {
+ agent: {
+ name: string;
+ };
+ }).agent.name,
+ }));
+};
+
+export const getTransactionRates = async ({
+ setup,
+ projection,
+}: AggregationParams) => {
+ const { client, indices } = setup;
+ const response = await client.search(
+ mergeProjection(projection, {
+ index: indices['apm_oss.transactionIndices'],
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ filter: [
+ ...projection.body.query.bool.filter,
+ {
+ term: {
+ [PROCESSOR_EVENT]: ProcessorEvent.transaction,
+ },
+ },
+ ],
+ },
+ },
+ aggs: {
+ services: {
+ terms: {
+ ...projection.body.aggs.services.terms,
+ size: MAX_NUMBER_OF_SERVICES,
+ },
+ },
+ },
+ },
+ })
+ );
+
+ const { aggregations } = response;
+
+ if (!aggregations) {
+ return [];
+ }
+
+ const deltaAsMinutes = getDeltaAsMinutes(setup);
+
+ return arrayUnionToCallable(aggregations.services.buckets).map((bucket) => {
+ const transactionsPerMinute = bucket.doc_count / deltaAsMinutes;
+ return {
+ serviceName: bucket.key as string,
+ transactionsPerMinute,
+ };
+ });
+};
+
+export const getErrorRates = async ({
+ setup,
+ projection,
+}: AggregationParams) => {
+ const { client, indices } = setup;
+ const response = await client.search(
+ mergeProjection(projection, {
+ index: indices['apm_oss.errorIndices'],
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ filter: [
+ ...projection.body.query.bool.filter,
+ {
+ term: {
+ [PROCESSOR_EVENT]: ProcessorEvent.error,
+ },
+ },
+ ],
+ },
+ },
+ aggs: {
+ services: {
+ terms: {
+ ...projection.body.aggs.services.terms,
+ size: MAX_NUMBER_OF_SERVICES,
+ },
+ },
+ },
+ },
+ })
+ );
+
+ const { aggregations } = response;
+
+ if (!aggregations) {
+ return [];
+ }
+
+ const deltaAsMinutes = getDeltaAsMinutes(setup);
+
+ return aggregations.services.buckets.map((bucket) => {
+ const errorsPerMinute = bucket.doc_count / deltaAsMinutes;
+ return {
+ serviceName: bucket.key as string,
+ errorsPerMinute,
+ };
+ });
+};
+
+export const getEnvironments = async ({
+ setup,
+ projection,
+}: AggregationParams) => {
+ const { client, indices } = setup;
+ const response = await client.search(
+ mergeProjection(projection, {
+ index: [
+ indices['apm_oss.metricsIndices'],
+ indices['apm_oss.errorIndices'],
+ indices['apm_oss.transactionIndices'],
+ ],
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ filter: [
+ ...projection.body.query.bool.filter,
+ {
+ terms: {
+ [PROCESSOR_EVENT]: [
+ ProcessorEvent.transaction,
+ ProcessorEvent.error,
+ ProcessorEvent.metric,
+ ],
+ },
+ },
+ ],
+ },
+ },
+ aggs: {
+ services: {
+ terms: {
+ ...projection.body.aggs.services.terms,
+ size: MAX_NUMBER_OF_SERVICES,
+ },
+ aggs: {
+ environments: {
+ terms: {
+ field: SERVICE_ENVIRONMENT,
+ },
+ },
+ },
+ },
+ },
+ },
+ })
+ );
+
+ const { aggregations } = response;
+
+ if (!aggregations) {
+ return [];
+ }
+
+ return aggregations.services.buckets.map((bucket) => ({
+ serviceName: bucket.key as string,
+ environments: bucket.environments.buckets.map((env) => env.key as string),
+ }));
+};
diff --git a/x-pack/plugins/apm/server/lib/services/queries.test.ts b/x-pack/plugins/apm/server/lib/services/queries.test.ts
index d90cd8bf1390..b2fe7efeaf95 100644
--- a/x-pack/plugins/apm/server/lib/services/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/services/queries.test.ts
@@ -40,7 +40,9 @@ describe('services queries', () => {
it('fetches the service items', async () => {
mock = await inspectSearchParams((setup) => getServicesItems(setup));
- expect(mock.params).toMatchSnapshot();
+ const allParams = mock.spy.mock.calls.map((call) => call[0]);
+
+ expect(allParams).toMatchSnapshot();
});
it('fetches the legacy data status', async () => {
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/transform.ts b/x-pack/plugins/apm/server/lib/transaction_groups/transform.ts
index 81dba39e9d71..b04ff6764675 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/transform.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/transform.ts
@@ -5,7 +5,7 @@
*/
import moment from 'moment';
-import { sortByOrder } from 'lodash';
+import { orderBy } from 'lodash';
import { ESResponse } from './fetcher';
function calculateRelativeImpacts(items: ITransactionGroup[]) {
@@ -27,7 +27,7 @@ function calculateRelativeImpacts(items: ITransactionGroup[]) {
const getBuckets = (response: ESResponse) => {
if (response.aggregations) {
- return sortByOrder(
+ return orderBy(
response.aggregations.transaction_groups.buckets,
['sum.value'],
['desc']
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
index 5af8b9f78cec..3c48c14c2a47 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { flatten, sortByOrder, last } from 'lodash';
+import { flatten, orderBy, last } from 'lodash';
import {
SERVICE_NAME,
SPAN_SUBTYPE,
@@ -138,13 +138,13 @@ export async function getTransactionBreakdown({
};
const visibleKpis = resp.aggregations
- ? sortByOrder(formatBucket(resp.aggregations), 'percentage', 'desc').slice(
+ ? orderBy(formatBucket(resp.aggregations), 'percentage', 'desc').slice(
0,
MAX_KPIS
)
: [];
- const kpis = sortByOrder(visibleKpis, 'name').map((kpi, index) => {
+ const kpis = orderBy(visibleKpis, 'name').map((kpi, index) => {
return {
...kpi,
color: getVizColorForIndex(index),
@@ -186,8 +186,8 @@ export async function getTransactionBreakdown({
// is drawn correctly.
// If we set all values to 0, the chart always displays null values as 0,
// and the chart looks weird.
- const hasAnyValues = lastValues.some((value) => value.y !== null);
- const hasNullValues = lastValues.some((value) => value.y === null);
+ const hasAnyValues = lastValues.some((value) => value?.y !== null);
+ const hasNullValues = lastValues.some((value) => value?.y === null);
if (hasAnyValues && hasNullValues) {
Object.values(updatedSeries).forEach((series) => {
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
index 31bc0563ec13..588d5c7896db 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
@@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { cloneDeep, sortByOrder } from 'lodash';
+import { cloneDeep, orderBy } from 'lodash';
import { UIFilters } from '../../../../typings/ui_filters';
import { Projection } from '../../../../common/projections/typings';
import { PromiseReturnType } from '../../../../../observability/typings/common';
@@ -47,7 +47,7 @@ export async function getLocalUIFilters({
return {
...filter,
- options: sortByOrder(
+ options: orderBy(
buckets.map((bucket) => {
return {
name: bucket.key as string,
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.ts b/x-pack/plugins/apm/server/routes/create_api/index.ts
index b21f0ea8d32d..92f52dd1552d 100644
--- a/x-pack/plugins/apm/server/routes/create_api/index.ts
+++ b/x-pack/plugins/apm/server/routes/create_api/index.ts
@@ -140,6 +140,7 @@ export function createApi() {
// Only return values for parameters that have runtime types,
// but always include query as _debug is always set even if
// it's not defined in the route.
+ // @ts-ignore
params: pick(parsedParams, ...Object.keys(params), 'query'),
config,
logger,
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index 08eba00251e2..74ab717b8de5 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -6,7 +6,7 @@
import * as t from 'io-ts';
import Boom from 'boom';
-import { unique } from 'lodash';
+import { uniq } from 'lodash';
import { setupRequest } from '../lib/helpers/setup_request';
import { getServiceAgentName } from '../lib/services/get_service_agent_name';
import { getServices } from '../lib/services/get_services';
@@ -160,7 +160,7 @@ export const serviceAnnotationsCreateRoute = createRoute(() => ({
...body.service,
name: path.serviceName,
},
- tags: unique(['apm'].concat(body.tags ?? [])),
+ tags: uniq(['apm'].concat(body.tags ?? [])),
});
},
}));
diff --git a/x-pack/plugins/beats_management/public/components/enroll_beats.tsx b/x-pack/plugins/beats_management/public/components/enroll_beats.tsx
index e609cd83587c..5bf0f51f4835 100644
--- a/x-pack/plugins/beats_management/public/components/enroll_beats.tsx
+++ b/x-pack/plugins/beats_management/public/components/enroll_beats.tsx
@@ -18,7 +18,7 @@ import {
EuiTitle,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-import { capitalize } from 'lodash';
+import { upperFirst } from 'lodash';
import React from 'react';
import { CMBeat } from '../../../../legacy/plugins/beats_management/common/domain_types';
@@ -93,7 +93,7 @@ export class EnrollBeat extends React.Component
}
const cmdText = `${this.state.command
.replace('{{beatType}}', this.state.beatType)
- .replace('{{beatTypeInCaps}}', capitalize(this.state.beatType))} enroll ${
+ .replace('{{beatTypeInCaps}}', upperFirst(this.state.beatType))} enroll ${
window.location.protocol
}//${window.location.host}${this.props.frameworkBasePath} ${this.props.enrollmentToken}`;
@@ -183,7 +183,7 @@ export class EnrollBeat extends React.Component
id="xpack.beatsManagement.enrollBeat.yourBeatTypeHostTitle"
defaultMessage="On the host where your {beatType} is installed, run:"
values={{
- beatType: capitalize(this.state.beatType),
+ beatType: upperFirst(this.state.beatType),
}}
/>
@@ -220,7 +220,7 @@ export class EnrollBeat extends React.Component
id="xpack.beatsManagement.enrollBeat.waitingBeatTypeToEnrollTitle"
defaultMessage="Waiting for {beatType} to enroll…"
values={{
- beatType: capitalize(this.state.beatType),
+ beatType: upperFirst(this.state.beatType),
}}
/>
diff --git a/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx b/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx
index 947e22ee2908..ebac34afa016 100644
--- a/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx
+++ b/x-pack/plugins/beats_management/public/components/navigation/connected_link.tsx
@@ -3,6 +3,8 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
+
+import _ from 'lodash';
import React from 'react';
import { EuiLink } from '@elastic/eui';
diff --git a/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx b/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx
index 94e4ca46aec1..6bbf269711fb 100644
--- a/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx
+++ b/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx
@@ -6,7 +6,7 @@
import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiToolTip, IconColor } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { sortBy, uniq } from 'lodash';
+import { sortBy, uniqBy } from 'lodash';
import moment from 'moment';
import React from 'react';
import {
@@ -226,7 +226,7 @@ export const BeatsTableType: TableType = {
// render: (tags?: BeatTag[]) =>
// tags && tags.length ? (
//
- // {moment(first(sortByOrder(tags, ['last_updated'], ['desc'])).last_updated).fromNow()}
+ // {moment(first(orderBy(tags, ['last_updated'], ['desc'])).last_updated).fromNow()}
//
// ) : null,
// sortable: true,
@@ -249,7 +249,7 @@ export const BeatsTableType: TableType = {
name: i18n.translate('xpack.beatsManagement.beatsTable.typeLabel', {
defaultMessage: 'Type',
}),
- options: uniq(
+ options: uniqBy(
data.map(({ type }: { type: any }) => ({ value: type })),
'value'
),
diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts
index 8e3f58b18f39..24a7e5c3af8f 100644
--- a/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts
+++ b/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts
@@ -32,14 +32,14 @@ export class MemoryBeatsAdapter implements CMBeatsAdapter {
}
public async getAll() {
- return this.beatsDB.map((beat: any) => omit(beat, ['access_token']));
+ return this.beatsDB.map((beat: any) => omit(beat, ['access_token'])) as CMBeat[];
}
public async getBeatsWithTag(tagId: string): Promise