string | |
| ["data-test-subj"](./kibana-plugin-core-public.overlayflyoutopenoptions._data-test-subj_.md) | string | |
| [className](./kibana-plugin-core-public.overlayflyoutopenoptions.classname.md) | string | |
| [closeButtonAriaLabel](./kibana-plugin-core-public.overlayflyoutopenoptions.closebuttonarialabel.md) | string | |
| [hideCloseButton](./kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md) | boolean | |
| [maxWidth](./kibana-plugin-core-public.overlayflyoutopenoptions.maxwidth.md) | boolean | number | string | |
+| [onClose](./kibana-plugin-core-public.overlayflyoutopenoptions.onclose.md) | (flyout: OverlayRef) => void | EuiFlyout onClose handler. If provided the consumer is responsible for calling flyout.close() to close the flyout; |
| [ownFocus](./kibana-plugin-core-public.overlayflyoutopenoptions.ownfocus.md) | boolean | |
| [size](./kibana-plugin-core-public.overlayflyoutopenoptions.size.md) | EuiFlyoutSize | |
diff --git a/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.onclose.md b/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.onclose.md
new file mode 100644
index 0000000000000..5cfbba4c84a36
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.onclose.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-core-public](./kibana-plugin-core-public.md) > [OverlayFlyoutOpenOptions](./kibana-plugin-core-public.overlayflyoutopenoptions.md) > [onClose](./kibana-plugin-core-public.overlayflyoutopenoptions.onclose.md)
+
+## OverlayFlyoutOpenOptions.onClose property
+
+EuiFlyout onClose handler. If provided the consumer is responsible for calling flyout.close() to close the flyout;
+
+Signature:
+
+```typescript
+onClose?: (flyout: OverlayRef) => void;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md
index c4d09001087de..9111941b368ee 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md
@@ -13,7 +13,7 @@ constructor(indexPattern: IndexPattern, configStates: PickPick<Pick<{ type: string; enabled?: boolean | undefined; id?: string | undefined; params?: {} | import("@kbn/common-utils").SerializableRecord | undefined; schema?: string | undefined; }, "schema" | "enabled" | "id" | "params"> & Pick<{ type: string | IAggType; }, "type"> & Pick<{ type: string | IAggType; }, never>, "schema" | "type" | "enabled" | "id" | "params">[] | undefined | |
+| configStates | Pick<Pick<{ type: string; enabled?: boolean | undefined; id?: string | undefined; params?: {} | import("@kbn/utility-types").SerializableRecord | undefined; schema?: string | undefined; }, "schema" | "enabled" | "id" | "params"> & Pick<{ type: string | IAggType; }, "type"> & Pick<{ type: string | IAggType; }, never>, "schema" | "type" | "enabled" | "id" | "params">[] | undefined | |
| opts | AggConfigsOptions | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigserialized.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigserialized.md
index 9660a15d94a69..631569464e176 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigserialized.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigserialized.md
@@ -13,7 +13,7 @@ export declare type AggConfigSerialized = Ensure<{
type: string;
enabled?: boolean;
id?: string;
- params?: {} | SerializableState;
+ params?: {} | SerializableRecord;
schema?: string;
-}, SerializableState>;
+}, SerializableRecord>;
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md
index 3b768404aab95..c25cd70e99b4f 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md
@@ -14,7 +14,7 @@
```typescript
esKuery: {
nodeTypes: import("@kbn/es-query/target_types/kuery/node_types").NodeTypes;
- fromKueryExpression: (expression: any, parseOptions?: Partial() => {} | |
| [inject](./kibana-plugin-plugins-data-public.filtermanager.inject.md) | | any | |
| [migrateToLatest](./kibana-plugin-plugins-data-public.filtermanager.migratetolatest.md) | | any | |
-| [telemetry](./kibana-plugin-plugins-data-public.filtermanager.telemetry.md) | | (filters: import("@kbn/common-utils").SerializableRecord, collector: unknown) => {} | |
+| [telemetry](./kibana-plugin-plugins-data-public.filtermanager.telemetry.md) | | (filters: import("@kbn/utility-types").SerializableRecord, collector: unknown) => {} | |
## Methods
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.telemetry.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.telemetry.md
index df5b4ea0a26c8..0eeb026abf2e1 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.telemetry.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.telemetry.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-telemetry: (filters: import("@kbn/common-utils").SerializableRecord, collector: unknown) => {};
+telemetry: (filters: import("@kbn/utility-types").SerializableRecord, collector: unknown) => {};
```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md
index f0261648e32ab..620a547d30245 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md
@@ -9,7 +9,7 @@
```typescript
esKuery: {
nodeTypes: import("@kbn/es-query/target_types/kuery/node_types").NodeTypes;
- fromKueryExpression: (expression: any, parseOptions?: PartialIEmbeddable | |
+
+Returns:
+
+`void`
+
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.deferembeddableload.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.deferembeddableload.md
new file mode 100644
index 0000000000000..86ef74ef312ec
--- /dev/null
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.deferembeddableload.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) > [Embeddable](./kibana-plugin-plugins-embeddable-public.embeddable.md) > [deferEmbeddableLoad](./kibana-plugin-plugins-embeddable-public.embeddable.deferembeddableload.md)
+
+## Embeddable.deferEmbeddableLoad property
+
+Signature:
+
+```typescript
+readonly deferEmbeddableLoad: boolean;
+```
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.md
index fe64bcf7c1177..ef9e0ee72862f 100644
--- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.md
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.md
@@ -20,6 +20,7 @@ export declare abstract class EmbeddableError | |
| [id](./kibana-plugin-plugins-embeddable-public.embeddable.id.md) | | string | |
| [input](./kibana-plugin-plugins-embeddable-public.embeddable.input.md) | | TEmbeddableInput | |
@@ -48,6 +49,7 @@ export declare abstract class Embeddablereload is calledThe order would be as follows: input$ output$ reload() \-\-\-- updated$ |
| [render(el)](./kibana-plugin-plugins-embeddable-public.embeddable.render.md) | | |
+| [setInitializationFinished()](./kibana-plugin-plugins-embeddable-public.embeddable.setinitializationfinished.md) | | communicate to the parent embeddable that this embeddable's initialization is finished. This only applies to embeddables which defer their loading state with deferEmbeddableLoad. |
| [supportedTriggers()](./kibana-plugin-plugins-embeddable-public.embeddable.supportedtriggers.md) | | |
| [updateInput(changes)](./kibana-plugin-plugins-embeddable-public.embeddable.updateinput.md) | | |
| [updateOutput(outputChanges)](./kibana-plugin-plugins-embeddable-public.embeddable.updateoutput.md) | | |
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.setinitializationfinished.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.setinitializationfinished.md
new file mode 100644
index 0000000000000..d407c7b820454
--- /dev/null
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddable.setinitializationfinished.md
@@ -0,0 +1,17 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) > [Embeddable](./kibana-plugin-plugins-embeddable-public.embeddable.md) > [setInitializationFinished](./kibana-plugin-plugins-embeddable-public.embeddable.setinitializationfinished.md)
+
+## Embeddable.setInitializationFinished() method
+
+communicate to the parent embeddable that this embeddable's initialization is finished. This only applies to embeddables which defer their loading state with deferEmbeddableLoad.
+
+Signature:
+
+```typescript
+protected setInitializationFinished(): void;
+```
+Returns:
+
+`void`
+
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.icontainer.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.icontainer.md
index cba430069c7a4..701948bbba4d9 100644
--- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.icontainer.md
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.icontainer.md
@@ -18,6 +18,7 @@ export interface IContainerE | the embeddable to set |
+
+Returns:
+
+`void`
+
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.deferembeddableload.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.deferembeddableload.md
new file mode 100644
index 0000000000000..638c66690a4ae
--- /dev/null
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.deferembeddableload.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) > [IEmbeddable](./kibana-plugin-plugins-embeddable-public.iembeddable.md) > [deferEmbeddableLoad](./kibana-plugin-plugins-embeddable-public.iembeddable.deferembeddableload.md)
+
+## IEmbeddable.deferEmbeddableLoad property
+
+If set to true, defer embeddable load tells the container that this embeddable type isn't completely loaded when the constructor returns. This embeddable will have to manually call setChildLoaded on its parent when all of its initial output is finalized. For instance, after loading a saved object.
+
+Signature:
+
+```typescript
+readonly deferEmbeddableLoad: boolean;
+```
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
index f96477ed65a04..dd0227b1ef72b 100644
--- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
@@ -14,6 +14,7 @@ export interface IEmbeddableboolean | If set to true, defer embeddable load tells the container that this embeddable type isn't completely loaded when the constructor returns. This embeddable will have to manually call setChildLoaded on its parent when all of its initial output is finalized. For instance, after loading a saved object. |
| [enhancements](./kibana-plugin-plugins-embeddable-public.iembeddable.enhancements.md) | object | Extra abilities added to Embeddable by *_enhanced plugins. |
| [fatalError](./kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md) | Error | If this embeddable has encountered a fatal error, that error will be stored here |
| [id](./kibana-plugin-plugins-embeddable-public.iembeddable.id.md) | string | A unique identifier for this embeddable. Mainly only used by containers to map their Panel States to a child embeddable instance. |
diff --git a/docs/maps/images/app_gis_icon.png b/docs/maps/images/app_gis_icon.png
new file mode 100644
index 0000000000000..5fbc032584130
Binary files /dev/null and b/docs/maps/images/app_gis_icon.png differ
diff --git a/docs/maps/maps-getting-started.asciidoc b/docs/maps/maps-getting-started.asciidoc
index 97a5fc7ddaef4..548a574293403 100644
--- a/docs/maps/maps-getting-started.asciidoc
+++ b/docs/maps/maps-getting-started.asciidoc
@@ -34,8 +34,7 @@ refer to <
+
+
+`;
+
+exports[`EuiCodeEditor props aria attributes allows setting aria-describedby on textbox 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`EuiCodeEditor props aria attributes allows setting aria-labelledby on textbox 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`EuiCodeEditor props isReadOnly renders alternate hint text 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`EuiCodeEditor props theme renders terminal theme 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/src/plugins/es_ui_shared/public/components/code_editor/_code_editor.scss b/src/plugins/es_ui_shared/public/components/code_editor/_code_editor.scss
new file mode 100644
index 0000000000000..a3acf6b46e1de
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/components/code_editor/_code_editor.scss
@@ -0,0 +1,38 @@
+.euiCodeEditorWrapper {
+ position: relative;
+
+ .ace_hidden-cursors {
+ opacity: 0;
+ }
+
+ &.euiCodeEditorWrapper-isEditing {
+ .ace_hidden-cursors {
+ opacity: 1;
+ }
+ }
+}
+
+.euiCodeEditorKeyboardHint {
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: transparentize($euiColorGhost, .3);
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ opacity: 0;
+ cursor: pointer;
+ height: 100%;
+ width: 100%;
+
+ &:focus {
+ opacity: 1;
+ border: 2px solid $euiColorPrimary;
+ z-index: $euiZLevel1;
+ }
+
+ &.euiCodeEditorKeyboardHint-isInactive {
+ display: none;
+ }
+}
diff --git a/src/plugins/es_ui_shared/public/components/code_editor/_index.scss b/src/plugins/es_ui_shared/public/components/code_editor/_index.scss
new file mode 100644
index 0000000000000..e68320413af86
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/components/code_editor/_index.scss
@@ -0,0 +1 @@
+@import 'code_editor';
diff --git a/src/plugins/es_ui_shared/public/components/code_editor/code_editor.test.tsx b/src/plugins/es_ui_shared/public/components/code_editor/code_editor.test.tsx
new file mode 100644
index 0000000000000..b5e23bfc3f95b
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/components/code_editor/code_editor.test.tsx
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { mount, ReactWrapper } from 'enzyme';
+import EuiCodeEditor from './code_editor';
+// @ts-ignore
+import { keys } from '@elastic/eui/lib/services';
+import { findTestSubject, requiredProps, takeMountedSnapshot } from '@elastic/eui/lib/test';
+
+describe('EuiCodeEditor', () => {
+ test('is rendered', () => {
+ const component = mount(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {prompt}
+
+
+ );
+ }
+}
+
+// Needed for React.lazy
+// eslint-disable-next-line import/no-default-export
+export default EuiCodeEditor;
diff --git a/src/plugins/es_ui_shared/public/components/code_editor/index.tsx b/src/plugins/es_ui_shared/public/components/code_editor/index.tsx
new file mode 100644
index 0000000000000..3424f89d8ee82
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/components/code_editor/index.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { EuiLoadingContentProps, EuiLoadingContent } from '@elastic/eui';
+import type { EuiCodeEditorProps } from './code_editor';
+
+const Placeholder = ({ height }: { height?: string }) => {
+ const numericalHeight = height ? parseInt(height, 10) : 0;
+ // The height of one EuiLoadingContent line is 24px.
+ const lineHeight = 24;
+ const calculatedLineCount =
+ numericalHeight < lineHeight ? 1 : Math.floor(numericalHeight / lineHeight);
+ const lines = Math.min(10, calculatedLineCount);
+
+ return ...
+ );
+};
+```
+
+### discard
+
+**Type:** `string[]`
+
+If there are certain fields that you want to discard when checking if the form has been modified you can provide an array of field paths to the `discard` option.
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
index 72990808e61a9..2106bd50dad03 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
@@ -10,7 +10,7 @@ import React, { useEffect, FunctionComponent } from 'react';
import { act } from 'react-dom/test-utils';
import { registerTestBed, TestBed } from '../shared_imports';
-import { FormHook, OnUpdateHandler, FieldConfig } from '../types';
+import { FormHook, OnUpdateHandler, FieldConfig, FieldHook } from '../types';
import { useForm } from '../hooks/use_form';
import { Form } from './form';
import { UseField } from './use_field';
@@ -54,6 +54,145 @@ describe('{i18nTexts.description}
+
+ {field ? (
+
+
+
+ {children}
+
+
+
+
+
+
+ {isCustomId && (
+
+ loadFromCluster()}
+ data-test-subj="loadDocsFromClusterButton"
+ >
+ {i18n.translate(
+ 'indexPatternFieldEditor.fieldPreview.documentIdField.loadDocumentsFromCluster',
+ {
+ defaultMessage: 'Load documents from cluster',
+ }
+ )}
+
+
+ )}
+
+
+ {showNavButtons && (
+
+
+
+
+
+
+
+
+ )}
+
+
+ );
+};
diff --git a/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.scss b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.scss
new file mode 100644
index 0000000000000..d1bb8cb5731c9
--- /dev/null
+++ b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.scss
@@ -0,0 +1,63 @@
+/**
+[1] This corresponds to the ITEM_HEIGHT declared in "field_list.tsx"
+[2] This corresponds to the SHOW_MORE_HEIGHT declared in "field_list.tsx"
+[3] We need the tooltip to be 100% to display the text ellipsis of the field value
+*/
+
+$previewFieldItemHeight: 40px; /* [1] */
+$previewShowMoreHeight: 40px; /* [2] */
+
+.indexPatternFieldEditor__previewFieldList {
+ position: relative;
+
+ &__item {
+ border-bottom: $euiBorderThin;
+ height: $previewFieldItemHeight;
+ align-items: center;
+ overflow: hidden;
+
+ &--highlighted {
+ $backgroundColor: tintOrShade($euiColorWarning, 90%, 70%);
+ background: $backgroundColor;
+ font-weight: 600;
+ }
+
+ &__key, &__value {
+ overflow: hidden;
+ }
+
+ &__actions {
+ flex-basis: 24px !important;
+ }
+
+ &__actionsBtn {
+ display: none;
+ }
+
+ &--pinned .indexPatternFieldEditor__previewFieldList__item__actionsBtn,
+ &:hover .indexPatternFieldEditor__previewFieldList__item__actionsBtn {
+ display: block;
+ }
+
+ &__value .euiToolTipAnchor {
+ width: 100%; /* [3] */
+ }
+
+ &__key__wrapper, &__value__wrapper {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ width: 100%;
+ }
+ }
+
+ &__showMore {
+ position: absolute;
+ width: 100%;
+ height: $previewShowMoreHeight;
+ bottom: $previewShowMoreHeight * -1;
+ display: flex;
+ align-items: flex-end;
+ }
+}
diff --git a/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx
new file mode 100644
index 0000000000000..aae0f0c74a5f1
--- /dev/null
+++ b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx
@@ -0,0 +1,235 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import React, { useState, useMemo, useCallback } from 'react';
+import VirtualList from 'react-tiny-virtual-list';
+import { i18n } from '@kbn/i18n';
+import { get } from 'lodash';
+import { EuiButtonEmpty, EuiButton, EuiSpacer, EuiEmptyPrompt, EuiTextColor } from '@elastic/eui';
+
+import { useFieldEditorContext } from '../../field_editor_context';
+import {
+ useFieldPreviewContext,
+ defaultValueFormatter,
+ FieldPreview,
+} from '../field_preview_context';
+import { PreviewListItem } from './field_list_item';
+
+import './field_list.scss';
+
+const ITEM_HEIGHT = 40;
+const SHOW_MORE_HEIGHT = 40;
+const INITIAL_MAX_NUMBER_OF_FIELDS = 7;
+
+export type DocumentField = FieldPreview & {
+ isPinned?: boolean;
+};
+
+interface Props {
+ height: number;
+ clearSearch: () => void;
+ searchValue?: string;
+}
+
+/**
+ * Escape regex special characters (e.g /, ^, $...) with a "\"
+ * Copied from https://stackoverflow.com/a/9310752
+ */
+function escapeRegExp(text: string) {
+ return text.replace(/[-\[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
+function fuzzyMatch(searchValue: string, text: string) {
+ const pattern = `.*${searchValue.split('').map(escapeRegExp).join('.*')}.*`;
+ const regex = new RegExp(pattern, 'i');
+ return regex.test(text);
+}
+
+export const PreviewFieldList: React.FC+ {i18n.translate( + 'indexPatternFieldEditor.fieldPreview.searchResult.emptyPromptTitle', + { + defaultMessage: 'No matching fields in this index pattern', + } + )} +
+ + } + titleSize="xs" + actions={ +
+
+ {showAllFields
+ ? i18n.translate('indexPatternFieldEditor.fieldPreview.showLessFieldsButtonLabel', {
+ defaultMessage: 'Show less',
+ })
+ : i18n.translate('indexPatternFieldEditor.fieldPreview.showMoreFieldsButtonLabel', {
+ defaultMessage: 'Show more',
+ })}
+
+
+ );
+
+ if (currentDocument === undefined || height === -1) {
+ return null;
+ }
+
+ return (
+
+ {isEmptySearchResultVisible ? (
+ renderEmptyResult()
+ ) : (
+ {
+ const field = filteredFields[index];
+
+ return (
+
+ );
+};
diff --git a/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list_item.tsx b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list_item.tsx
new file mode 100644
index 0000000000000..348c442a1cd37
--- /dev/null
+++ b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list_item.tsx
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, { useState } from 'react';
+import classnames from 'classnames';
+import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem, EuiToolTip, EuiButtonIcon, EuiButtonEmpty } from '@elastic/eui';
+
+import { ImagePreviewModal } from '../image_preview_modal';
+import type { DocumentField } from './field_list';
+
+interface Props {
+ field: DocumentField;
+ toggleIsPinned?: (name: string) => void;
+ highlighted?: boolean;
+}
+
+export const PreviewListItem: React.FC
+
+ );
+ }}
+ />
+ )}
+
+ {renderToggleFieldsButton()}
+
+ {key}
+
+ -
+
-
+
+
+
+ {isEmptyPromptVisible ? (
+ setSearchValue(e.target.value)}
+ placeholder={i18n.translate(
+ 'indexPatternFieldEditor.fieldPreview.filterFieldsPlaceholder',
+ {
+ defaultMessage: 'Filter fields',
+ }
+ )}
+ fullWidth
+ data-test-subj="filterFieldsInput"
+ />
+
+ {(resizeRef) => (
+
+
+ )}
+
+ )}
+
+ );
+};
diff --git a/src/plugins/index_pattern_field_editor/public/components/preview/field_preview_context.tsx b/src/plugins/index_pattern_field_editor/public/components/preview/field_preview_context.tsx
new file mode 100644
index 0000000000000..e1fc4b05883f4
--- /dev/null
+++ b/src/plugins/index_pattern_field_editor/public/components/preview/field_preview_context.tsx
@@ -0,0 +1,599 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, {
+ createContext,
+ useState,
+ useContext,
+ useMemo,
+ useCallback,
+ useEffect,
+ useRef,
+ FunctionComponent,
+} from 'react';
+import useDebounce from 'react-use/lib/useDebounce';
+import { i18n } from '@kbn/i18n';
+import { get } from 'lodash';
+
+import type { FieldPreviewContext, FieldFormatConfig } from '../../types';
+import { parseEsError } from '../../lib/runtime_field_validation';
+import { RuntimeType, RuntimeField } from '../../shared_imports';
+import { useFieldEditorContext } from '../field_editor_context';
+
+type From = 'cluster' | 'custom';
+interface EsDocument {
+ _id: string;
+ [key: string]: any;
+}
+
+interface PreviewError {
+ code: 'DOC_NOT_FOUND' | 'PAINLESS_SCRIPT_ERROR' | 'ERR_FETCHING_DOC';
+ error: Record
+ setSearchValue('')}
+ searchValue={searchValue}
+ // We add a key to force rerender the virtual list whenever the window height changes
+ key={fieldListHeight}
+ />
+
+ )}
+ + {i18n.translate('indexPatternFieldEditor.fieldPreview.emptyPromptDescription', { + defaultMessage: + 'Enter the name of an existing field or define a script to view a preview of the calculated output.', + })} +
+{error.error.reason}
+ ) : ( +{error.error.message}
+ )} +
+
+
+
+
+
+
+ {isUpdating && (
+
+
+
+
+ {i18nTexts.updatingLabel}
+
+
+ )}
+
+
+
+ {i18n.translate('indexPatternFieldEditor.fieldPreview.subTitle', {
+ defaultMessage: 'From: {from}',
+ values: {
+ from: from.value === 'cluster' ? indexPattern.title : i18nTexts.customData,
+ },
+ })}
+
+
+
+ );
+};
diff --git a/src/plugins/index_pattern_field_editor/public/components/preview/image_preview_modal.tsx b/src/plugins/index_pattern_field_editor/public/components/preview/image_preview_modal.tsx
new file mode 100644
index 0000000000000..69be3d144bfda
--- /dev/null
+++ b/src/plugins/index_pattern_field_editor/public/components/preview/image_preview_modal.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { EuiModal, EuiModalBody } from '@elastic/eui';
+
+/**
+ * By default the image formatter sets the max-width to "none" on the {i18nTexts.title}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+jest.mock('react-monaco-editor', () => {
+ return function JestMockEditor() {
+ return mockMonacoEditor;
+ };
+});
+
+// Mock the htmlIdGenerator to generate predictable ids for snapshot tests
+jest.mock('@elastic/eui', () => {
+ const original = jest.requireActual('@elastic/eui');
+
+ return {
+ ...original,
+ htmlIdGenerator: () => {
+ return () => '1234';
+ },
+ };
+});
diff --git a/src/plugins/kibana_react/public/code_editor/code_editor.test.tsx b/src/plugins/kibana_react/public/code_editor/code_editor.test.tsx
index 0f279e3bfea32..a15e21861aa2e 100644
--- a/src/plugins/kibana_react/public/code_editor/code_editor.test.tsx
+++ b/src/plugins/kibana_react/public/code_editor/code_editor.test.tsx
@@ -7,9 +7,16 @@
*/
import React from 'react';
-import { CodeEditor } from './code_editor';
+import { ReactWrapper } from 'enzyme';
+import { mountWithIntl, findTestSubject } from '@kbn/test/jest';
import { monaco } from '@kbn/monaco';
-import { shallow } from 'enzyme';
+
+import { keys } from '@elastic/eui';
+
+// This import needs to come before './code_editor' below as it sets the jest.mocks
+import { mockedEditorInstance } from './code_editor.test.helpers';
+
+import { CodeEditor } from './code_editor';
// disabled because this is a test, but also it seems we shouldn't need this?
/* eslint-disable-next-line @kbn/eslint/module_migration */
@@ -36,64 +43,131 @@ const logs = `
[Sun Mar 7 21:16:17 2004] [error] [client xx.xx.xx.xx] File does not exist: /home/httpd/twiki/view/Main/WebHome
`;
-test('is rendered', () => {
- const component = shallow(
-
+ {isReadOnly ? (
+
+ {isReadOnly ? (
+
+ {renderPrompt()}
+
+
+ );
+};
// React.lazy requires default export
// eslint-disable-next-line import/no-default-export
diff --git a/src/plugins/kibana_react/public/code_editor/editor.scss b/src/plugins/kibana_react/public/code_editor/editor.scss
index 23a3e3af7e656..d35b8f3103df3 100644
--- a/src/plugins/kibana_react/public/code_editor/editor.scss
+++ b/src/plugins/kibana_react/public/code_editor/editor.scss
@@ -1,3 +1,24 @@
.react-monaco-editor-container .monaco-editor .inputarea:focus {
animation: none !important; // Removes textarea EUI blue underline animation from EUI
}
+
+.kibanaCodeEditor {
+ position: relative;
+ height: 100%;
+
+ &__keyboardHint {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ left: 0;
+
+ &:focus {
+ z-index: $euiZLevel1;
+ }
+
+ &--isInactive {
+ display: none;
+ }
+ }
+}
diff --git a/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap b/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
index 9ad2bd73674bd..d90daa33d1686 100644
--- a/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
+++ b/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
@@ -2,6 +2,7 @@
exports[`KibanaPageTemplate render basic template 1`] = `
+
+
+
+
+
+`;
+
+exports[`NoDataCard props href 1`] = `
+
+
+ Card title
+
+
+
+
+
+ + Description +
+
+
+`;
+
+exports[`NoDataCard props recommended 1`] = `
+
+
+
+ Card title
+
+
+
+
+
+
+ + Description +
+
+
+`;
+
+exports[`NoDataCard renders 1`] = `
+
+
+ Card title
+
+
+
+
+ Recommended
+
+
+
+
+ + Description +
+
+
+`;
diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.test.tsx b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.test.tsx
new file mode 100644
index 0000000000000..45cc32cae06d6
--- /dev/null
+++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { ElasticAgentCard } from './elastic_agent_card';
+
+jest.mock('../../../context', () => ({
+ ...jest.requireActual('../../../context'),
+ useKibana: jest.fn().mockReturnValue({
+ services: {
+ http: { basePath: { prepend: jest.fn((path: string) => (path ? path : 'path')) } },
+ uiSettings: { get: jest.fn() },
+ },
+ }),
+}));
+
+describe('ElasticAgentCard', () => {
+ test('renders', () => {
+ const component = shallow(
+
+ Card title
+
+
+
+
+ + Description +
+
+
+
+ {pageTitle || (
+
+
+
+
+
+ {renderActions}
+
+ {actionsKeys.length > 1 ? (
+ <>
+
+
+
+ ) : undefined}
+
+ );
+};
diff --git a/src/plugins/kibana_react/public/page_template/page_template.scss b/src/plugins/kibana_react/public/page_template/page_template.scss
index 631511cd0475f..6b1c17e870e8f 100644
--- a/src/plugins/kibana_react/public/page_template/page_template.scss
+++ b/src/plugins/kibana_react/public/page_template/page_template.scss
@@ -10,4 +10,8 @@
&.kbnPageTemplate__pageSideBar--shrink {
min-width: $euiSizeXXL;
}
+
+ .kbnPageTemplate--centeredBody & {
+ border-right: $euiBorderThin;
+ }
}
diff --git a/src/plugins/kibana_react/public/page_template/page_template.test.tsx b/src/plugins/kibana_react/public/page_template/page_template.test.tsx
index 2fdedce23b09b..6c6c4bb33e6bb 100644
--- a/src/plugins/kibana_react/public/page_template/page_template.test.tsx
+++ b/src/plugins/kibana_react/public/page_template/page_template.test.tsx
@@ -8,7 +8,7 @@
import React from 'react';
import { shallow } from 'enzyme';
-import { KibanaPageTemplate } from './page_template';
+import { KibanaPageTemplate, KibanaPageTemplateProps } from './page_template';
import { EuiEmptyPrompt } from '@elastic/eui';
import { KibanaPageTemplateSolutionNavProps } from './solution_nav';
@@ -51,6 +51,16 @@ const navItems: KibanaPageTemplateSolutionNavProps['items'] = [
},
];
+const noDataConfig: KibanaPageTemplateProps['noDataConfig'] = {
+ solution: 'Elastic',
+ actions: {
+ elasticAgent: {},
+ beats: {},
+ custom: {},
+ },
+ docsLink: 'test',
+};
+
describe('KibanaPageTemplate', () => {
test('render default empty prompt', () => {
const component = shallow(
@@ -126,6 +136,26 @@ describe('KibanaPageTemplate', () => {
expect(component).toMatchSnapshot();
});
+ test('render noDataContent', () => {
+ const component = shallow(
+
+ {pageTitle || (
+
+
+
+
Example of a Sharing menu using components from Reporting
+Example of a Sharing menu using components from Reporting
-
+
+
+ {forwardedParams ? (
+ <>
+
+
+ {JSON.stringify(forwardedParams)}
+
+ ) : (
+ <>
+
+
+ {'{}'}
+
+ )}
+
{logos.map((item, index) => (
{
- public setup(core: CoreSetup, { developerExamples, screenshotMode }: SetupDeps): void {
+ public setup(core: CoreSetup, { developerExamples, screenshotMode, share }: SetupDeps): void {
core.application.register({
id: PLUGIN_ID,
title: PLUGIN_NAME,
@@ -30,7 +30,12 @@ export class ReportingExamplePlugin implements Plugin {
unknown
];
// Render the application
- return renderApp(coreStart, { ...depsStart, screenshotMode }, params);
+ return renderApp(
+ coreStart,
+ { ...depsStart, screenshotMode, share },
+ params,
+ params.history.location.state as MyForwardableState
+ );
},
});
@@ -40,6 +45,8 @@ export class ReportingExamplePlugin implements Plugin {
title: 'Reporting integration',
description: 'Demonstrate how to put an Export button on a page and generate reports.',
});
+
+ share.url.locators.create(new ReportingExampleLocatorDefinition());
}
public start() {}
diff --git a/x-pack/examples/reporting_example/public/types.ts b/x-pack/examples/reporting_example/public/types.ts
index 55a573285e24f..fb28293ab63a3 100644
--- a/x-pack/examples/reporting_example/public/types.ts
+++ b/x-pack/examples/reporting_example/public/types.ts
@@ -7,6 +7,7 @@
import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
import { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import { SharePluginSetup } from 'src/plugins/share/public';
import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
import { ReportingStart } from '../../../plugins/reporting/public';
@@ -17,9 +18,12 @@ export interface PluginStart {}
export interface SetupDeps {
developerExamples: DeveloperExamplesSetup;
+ share: SharePluginSetup;
screenshotMode: ScreenshotModePluginSetup;
}
export interface StartDeps {
navigation: NavigationPublicPluginStart;
reporting: ReportingStart;
}
+
+export type MyForwardableState = Record;
diff --git a/x-pack/plugins/actions/server/index.test.ts b/x-pack/plugins/actions/server/index.test.ts
new file mode 100644
index 0000000000000..56f3533b47e3f
--- /dev/null
+++ b/x-pack/plugins/actions/server/index.test.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { config } from './index';
+import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+
+const CONFIG_PATH = 'xpack.actions';
+const applyStackAlertDeprecations = (settings: Record = {}) => {
+ const deprecations = config.deprecations!(configDeprecationFactory);
+ const deprecationMessages: string[] = [];
+ const _config = {
+ [CONFIG_PATH]: settings,
+ };
+ const { config: migrated } = applyDeprecations(
+ _config,
+ deprecations.map((deprecation) => ({
+ deprecation,
+ path: CONFIG_PATH,
+ })),
+ () => ({ message }) => deprecationMessages.push(message)
+ );
+ return {
+ messages: deprecationMessages,
+ migrated,
+ };
+};
+
+describe('index', () => {
+ describe('deprecations', () => {
+ it('should deprecate .enabled flag', () => {
+ const { messages } = applyStackAlertDeprecations({ enabled: false });
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "\\"xpack.actions.enabled\\" is deprecated. The ability to disable this plugin will be removed in 8.0.0.",
+ ]
+ `);
+ });
+ });
+});
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index 230ed826cb108..bf59a1a11687d 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-
+import { get } from 'lodash';
import type { PublicMethodsOf } from '@kbn/utility-types';
import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
import { ActionsPlugin } from './plugin';
@@ -59,7 +59,8 @@ export const config: PluginConfigDescriptor = {
deprecations: ({ renameFromRoot, unused }) => [
renameFromRoot('xpack.actions.whitelistedHosts', 'xpack.actions.allowedHosts'),
(settings, fromPath, addDeprecation) => {
- const customHostSettings = settings?.xpack?.actions?.customHostSettings ?? [];
+ const actions = get(settings, fromPath);
+ const customHostSettings = actions?.customHostSettings ?? [];
if (
customHostSettings.find(
(customHostSchema: CustomHostSettings) =>
@@ -84,7 +85,8 @@ export const config: PluginConfigDescriptor = {
}
},
(settings, fromPath, addDeprecation) => {
- if (!!settings?.xpack?.actions?.rejectUnauthorized) {
+ const actions = get(settings, fromPath);
+ if (!!actions?.rejectUnauthorized) {
addDeprecation({
message:
`"xpack.actions.rejectUnauthorized" is deprecated. Use "xpack.actions.verificationMode" instead, ` +
@@ -102,7 +104,8 @@ export const config: PluginConfigDescriptor = {
}
},
(settings, fromPath, addDeprecation) => {
- if (!!settings?.xpack?.actions?.proxyRejectUnauthorizedCertificates) {
+ const actions = get(settings, fromPath);
+ if (!!actions?.proxyRejectUnauthorizedCertificates) {
addDeprecation({
message:
`"xpack.actions.proxyRejectUnauthorizedCertificates" is deprecated. Use "xpack.actions.proxyVerificationMode" instead, ` +
@@ -119,5 +122,16 @@ export const config: PluginConfigDescriptor = {
});
}
},
+ (settings, fromPath, addDeprecation) => {
+ const actions = get(settings, fromPath);
+ if (actions?.enabled === false || actions?.enabled === true) {
+ addDeprecation({
+ message: `"xpack.actions.enabled" is deprecated. The ability to disable this plugin will be removed in 8.0.0.`,
+ correctiveActions: {
+ manualSteps: [`Remove "xpack.actions.enabled" from your kibana configs.`],
+ },
+ });
+ }
+ },
],
};
diff --git a/x-pack/plugins/alerting/server/index.test.ts b/x-pack/plugins/alerting/server/index.test.ts
new file mode 100644
index 0000000000000..45a632e0ef4ad
--- /dev/null
+++ b/x-pack/plugins/alerting/server/index.test.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { config } from './index';
+import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+
+const CONFIG_PATH = 'xpack.alerting';
+const applyStackAlertDeprecations = (settings: Record = {}) => {
+ const deprecations = config.deprecations!(configDeprecationFactory);
+ const deprecationMessages: string[] = [];
+ const _config = {
+ [CONFIG_PATH]: settings,
+ };
+ const { config: migrated } = applyDeprecations(
+ _config,
+ deprecations.map((deprecation) => ({
+ deprecation,
+ path: CONFIG_PATH,
+ })),
+ () => ({ message }) => deprecationMessages.push(message)
+ );
+ return {
+ messages: deprecationMessages,
+ migrated,
+ };
+};
+
+describe('index', () => {
+ describe('deprecations', () => {
+ it('should deprecate .enabled flag', () => {
+ const { messages } = applyStackAlertDeprecations({ enabled: false });
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "\\"xpack.alerting.enabled\\" is deprecated. The ability to disable this plugin will be removed in 8.0.0.",
+ ]
+ `);
+ });
+ });
+});
diff --git a/x-pack/plugins/alerting/server/index.ts b/x-pack/plugins/alerting/server/index.ts
index 4e03ad63168b3..3b4688173e9b5 100644
--- a/x-pack/plugins/alerting/server/index.ts
+++ b/x-pack/plugins/alerting/server/index.ts
@@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-
+import { get } from 'lodash';
import type { PublicMethodsOf } from '@kbn/utility-types';
import { RulesClient as RulesClientClass } from './rules_client';
import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
@@ -58,5 +58,16 @@ export const config: PluginConfigDescriptor = {
'xpack.alerts.invalidateApiKeysTask.removalDelay',
'xpack.alerting.invalidateApiKeysTask.removalDelay'
),
+ (settings, fromPath, addDeprecation) => {
+ const alerting = get(settings, fromPath);
+ if (alerting?.enabled === false || alerting?.enabled === true) {
+ addDeprecation({
+ message: `"xpack.alerting.enabled" is deprecated. The ability to disable this plugin will be removed in 8.0.0.`,
+ correctiveActions: {
+ manualSteps: [`Remove "xpack.alerting.enabled" from your kibana configs.`],
+ },
+ });
+ }
+ },
],
};
diff --git a/x-pack/plugins/apm/common/alert_types.ts b/x-pack/plugins/apm/common/alert_types.ts
index fa706b7d8cb35..68ca22c41ec92 100644
--- a/x-pack/plugins/apm/common/alert_types.ts
+++ b/x-pack/plugins/apm/common/alert_types.ts
@@ -7,6 +7,7 @@
import { i18n } from '@kbn/i18n';
import type { ValuesType } from 'utility-types';
+import type { AsDuration, AsPercent } from '../../observability/common';
import type { ActionGroup } from '../../alerting/common';
import { ANOMALY_SEVERITY, ANOMALY_THRESHOLD } from './ml_constants';
@@ -28,6 +29,89 @@ const THRESHOLD_MET_GROUP: ActionGroup = {
}),
};
+export function formatErrorCountReason({
+ threshold,
+ measured,
+ serviceName,
+}: {
+ threshold: number;
+ measured: number;
+ serviceName: string;
+}) {
+ return i18n.translate('xpack.apm.alertTypes.errorCount.reason', {
+ defaultMessage: `Error count is greater than {threshold} (current value is {measured}) for {serviceName}`,
+ values: {
+ threshold,
+ measured,
+ serviceName,
+ },
+ });
+}
+
+export function formatTransactionDurationReason({
+ threshold,
+ measured,
+ serviceName,
+ asDuration,
+}: {
+ threshold: number;
+ measured: number;
+ serviceName: string;
+ asDuration: AsDuration;
+}) {
+ return i18n.translate('xpack.apm.alertTypes.transactionDuration.reason', {
+ defaultMessage: `Latency is above {threshold} (current value is {measured}) for {serviceName}`,
+ values: {
+ threshold: asDuration(threshold),
+ measured: asDuration(measured),
+ serviceName,
+ },
+ });
+}
+
+export function formatTransactionErrorRateReason({
+ threshold,
+ measured,
+ serviceName,
+ asPercent,
+}: {
+ threshold: number;
+ measured: number;
+ serviceName: string;
+ asPercent: AsPercent;
+}) {
+ return i18n.translate('xpack.apm.alertTypes.transactionErrorRate.reason', {
+ defaultMessage: `Failed transactions rate is greater than {threshold} (current value is {measured}) for {serviceName}`,
+ values: {
+ threshold: asPercent(threshold, 100),
+ measured: asPercent(measured, 100),
+ serviceName,
+ },
+ });
+}
+
+export function formatTransactionDurationAnomalyReason({
+ serviceName,
+ severityLevel,
+ measured,
+}: {
+ serviceName: string;
+ severityLevel: string;
+ measured: number;
+}) {
+ return i18n.translate(
+ 'xpack.apm.alertTypes.transactionDurationAnomaly.reason',
+ {
+ defaultMessage: `{severityLevel} anomaly detected for {serviceName} (score was {measured})`,
+ values: {
+ serviceName,
+ severityLevel,
+ measured,
+ },
+ }
+ );
+}
+
export const ALERT_TYPES_CONFIG: Record<
AlertType,
{
diff --git a/x-pack/plugins/apm/common/environment_filter_values.ts b/x-pack/plugins/apm/common/environment_filter_values.ts
index fa5c580e89785..f0bd386f36de8 100644
--- a/x-pack/plugins/apm/common/environment_filter_values.ts
+++ b/x-pack/plugins/apm/common/environment_filter_values.ts
@@ -7,9 +7,10 @@
import { i18n } from '@kbn/i18n';
import { SERVICE_ENVIRONMENT } from './elasticsearch_fieldnames';
+import { Environment } from './environment_rt';
-const ENVIRONMENT_ALL_VALUE = 'ENVIRONMENT_ALL';
-const ENVIRONMENT_NOT_DEFINED_VALUE = 'ENVIRONMENT_NOT_DEFINED';
+const ENVIRONMENT_ALL_VALUE = 'ENVIRONMENT_ALL' as const;
+const ENVIRONMENT_NOT_DEFINED_VALUE = 'ENVIRONMENT_NOT_DEFINED' as const;
export function getEnvironmentLabel(environment: string) {
if (!environment || environment === ENVIRONMENT_NOT_DEFINED_VALUE) {
@@ -59,7 +60,7 @@ export function getNextEnvironmentUrlParam({
currentEnvironmentUrlParam,
}: {
requestedEnvironment?: string;
- currentEnvironmentUrlParam?: string;
+ currentEnvironmentUrlParam: Environment;
}) {
const normalizedRequestedEnvironment =
requestedEnvironment || ENVIRONMENT_NOT_DEFINED.value;
@@ -67,7 +68,7 @@ export function getNextEnvironmentUrlParam({
currentEnvironmentUrlParam || ENVIRONMENT_ALL.value;
if (normalizedRequestedEnvironment === normalizedQueryEnvironment) {
- return currentEnvironmentUrlParam;
+ return currentEnvironmentUrlParam || ENVIRONMENT_ALL.value;
}
return ENVIRONMENT_ALL.value;
diff --git a/x-pack/plugins/apm/common/environment_rt.ts b/x-pack/plugins/apm/common/environment_rt.ts
new file mode 100644
index 0000000000000..e9337da9bdcf5
--- /dev/null
+++ b/x-pack/plugins/apm/common/environment_rt.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import * as t from 'io-ts';
+import { nonEmptyStringRt } from '@kbn/io-ts-utils';
+import {
+ ENVIRONMENT_ALL,
+ ENVIRONMENT_NOT_DEFINED,
+} from './environment_filter_values';
+
+export const environmentRt = t.type({
+ environment: t.union([
+ t.literal(ENVIRONMENT_NOT_DEFINED.value),
+ t.literal(ENVIRONMENT_ALL.value),
+ nonEmptyStringRt,
+ ]),
+});
+
+export type Environment = t.TypeOf['environment'];
diff --git a/x-pack/plugins/apm/common/search_strategies/correlations/types.ts b/x-pack/plugins/apm/common/search_strategies/correlations/types.ts
index bb697f0984335..70c1c7524cfe9 100644
--- a/x-pack/plugins/apm/common/search_strategies/correlations/types.ts
+++ b/x-pack/plugins/apm/common/search_strategies/correlations/types.ts
@@ -19,8 +19,8 @@ export interface ResponseHit {
}
export interface SearchServiceParams {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName?: string;
transactionName?: string;
transactionType?: string;
diff --git a/x-pack/plugins/apm/common/utils/environment_query.test.ts b/x-pack/plugins/apm/common/utils/environment_query.test.ts
index a4ffec0d64d3e..fbd1b6b9a7a2d 100644
--- a/x-pack/plugins/apm/common/utils/environment_query.test.ts
+++ b/x-pack/plugins/apm/common/utils/environment_query.test.ts
@@ -10,9 +10,9 @@ import { ENVIRONMENT_NOT_DEFINED } from '../environment_filter_values';
import { environmentQuery } from './environment_query';
describe('environmentQuery', () => {
- describe('when environment is undefined', () => {
+ describe('when environment is an empty string', () => {
it('returns an empty query', () => {
- expect(environmentQuery()).toEqual([]);
+ expect(environmentQuery('')).toEqual([]);
});
});
diff --git a/x-pack/plugins/apm/common/utils/environment_query.ts b/x-pack/plugins/apm/common/utils/environment_query.ts
index acc75c13a0e35..7b35f90d87691 100644
--- a/x-pack/plugins/apm/common/utils/environment_query.ts
+++ b/x-pack/plugins/apm/common/utils/environment_query.ts
@@ -13,7 +13,7 @@ import {
} from '../environment_filter_values';
export function environmentQuery(
- environment?: string
+ environment: string
): QueryDslQueryContainer[] {
if (!environment || environment === ENVIRONMENT_ALL.value) {
return [];
diff --git a/x-pack/plugins/apm/common/utils/formatters/duration.ts b/x-pack/plugins/apm/common/utils/formatters/duration.ts
index b060f1aa6e005..917521117af4e 100644
--- a/x-pack/plugins/apm/common/utils/formatters/duration.ts
+++ b/x-pack/plugins/apm/common/utils/formatters/duration.ts
@@ -35,7 +35,7 @@ export type TimeFormatter = (
type TimeFormatterBuilder = (max: number) => TimeFormatter;
-function getUnitLabelAndConvertedValue(
+export function getUnitLabelAndConvertedValue(
unitKey: DurationTimeUnit,
value: number
) {
@@ -122,14 +122,17 @@ function convertTo({
export const toMicroseconds = (value: number, timeUnit: TimeUnit) =>
moment.duration(value, timeUnit).asMilliseconds() * 1000;
-function getDurationUnitKey(max: number): DurationTimeUnit {
- if (max > toMicroseconds(10, 'hours')) {
+export function getDurationUnitKey(
+ max: number,
+ threshold = 10
+): DurationTimeUnit {
+ if (max > toMicroseconds(threshold, 'hours')) {
return 'hours';
}
- if (max > toMicroseconds(10, 'minutes')) {
+ if (max > toMicroseconds(threshold, 'minutes')) {
return 'minutes';
}
- if (max > toMicroseconds(10, 'seconds')) {
+ if (max > toMicroseconds(threshold, 'seconds')) {
return 'seconds';
}
if (max > toMicroseconds(1, 'milliseconds')) {
diff --git a/x-pack/plugins/apm/ftr_e2e/README.md b/x-pack/plugins/apm/ftr_e2e/README.md
new file mode 100644
index 0000000000000..007200a6a549a
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/README.md
@@ -0,0 +1,26 @@
+# APM E2E
+
+APM uses [FTR](../../../../packages/kbn-test/README.md) (functional test runner) and [Cypress](https://www.cypress.io/) to run the e2e tests. The tests are located at `kibana/x-pack/plugins/apm/ftr_e2e/cypress/integration`.
+
+## Running tests
+
+**Run all tests**
+
+```sh
+//kibana directory
+node x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js
+```
+
+**Run specific test**
+
+```sh
+//kibana directory
+node x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js --spec ./cypress/integration/read_only_user/home.spec.ts
+```
+
+## Opening tests
+
+```sh
+//kibana directory
+node x-pack/plugins/apm/scripts/ftr_e2e/cypress_open.js
+```
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
index 76461d49ba012..e26261035c084 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
@@ -7,6 +7,7 @@
import url from 'url';
import archives_metadata from '../../fixtures/es_archiver/archives_metadata';
+import { esArchiverLoad, esArchiverUnload } from '../../tasks/es_archiver';
const { start, end } = archives_metadata['apm_8.0.0'];
@@ -27,6 +28,12 @@ const apisToIntercept = [
];
describe('Home page', () => {
+ before(() => {
+ esArchiverLoad('apm_8.0.0');
+ });
+ after(() => {
+ esArchiverUnload('apm_8.0.0');
+ });
beforeEach(() => {
cy.loginAsReadOnlyUser();
});
@@ -39,10 +46,9 @@ describe('Home page', () => {
);
});
- // Flaky
- it.skip('includes services with only metric documents', () => {
+ it('includes services with only metric documents', () => {
cy.visit(
- `${serviceInventoryHref}&kuery=not%2520(processor.event%2520%253A%2522transaction%2522%2520)`
+ `${serviceInventoryHref}&kuery=not%20(processor.event%3A%22transaction%22)`
);
cy.contains('opbeans-python');
cy.contains('opbeans-java');
@@ -50,11 +56,7 @@ describe('Home page', () => {
});
describe('navigations', () => {
- /*
- This test is flaky, there's a problem with EuiBasicTable, that it blocks any action while loading is enabled.
- So it might fail to click on the service link.
- */
- it.skip('navigates to service overview page with transaction type', () => {
+ it('navigates to service overview page with transaction type', () => {
apisToIntercept.map(({ endpoint, name }) => {
cy.intercept('GET', endpoint).as(name);
});
@@ -63,9 +65,6 @@ describe('Home page', () => {
cy.contains('Services');
- cy.wait('@servicesMainStatistics', { responseTimeout: 10000 });
- cy.wait('@servicesDetailedStatistics', { responseTimeout: 10000 });
-
cy.get('[data-test-subj="serviceLink_rum-js"]').then((element) => {
element[0].click();
});
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/instances_table.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/instances_table.spec.ts
index 40a08035f5213..9428f9b9e6bb6 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/instances_table.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/instances_table.spec.ts
@@ -67,8 +67,7 @@ describe('Instances table', () => {
cy.contains('opbeans-java');
cy.contains(serviceNodeName);
});
- // For some reason the details panel is not opening after clicking on the button.
- it.skip('shows instance details', () => {
+ it('shows instance details', () => {
apisToIntercept.map(({ endpoint, name }) => {
cy.intercept('GET', endpoint).as(name);
});
@@ -88,8 +87,7 @@ describe('Instances table', () => {
cy.contains('Service');
});
});
- // For some reason the tooltip is not opening after clicking on the button.
- it.skip('shows actions available', () => {
+ it('shows actions available', () => {
apisToIntercept.map(({ endpoint, name }) => {
cy.intercept('GET', endpoint).as(name);
});
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_run.ts b/x-pack/plugins/apm/ftr_e2e/cypress_run.ts
index 0e9efb775fc7a..eb319f4b30835 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress_run.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress_run.ts
@@ -4,15 +4,17 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-
+import { argv } from 'yargs';
import { FtrConfigProviderContext } from '@kbn/test';
import { cypressRunTests } from './cypress_start';
+const spec = argv.grep as string;
+
async function runE2ETests({ readConfigFile }: FtrConfigProviderContext) {
const cypressConfig = await readConfigFile(require.resolve('./config.ts'));
return {
...cypressConfig.getAll(),
- testRunner: cypressRunTests,
+ testRunner: cypressRunTests(spec),
};
}
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_start.ts b/x-pack/plugins/apm/ftr_e2e/cypress_start.ts
index a6027367d7868..7468a4473b311 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress_start.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress_start.ts
@@ -11,17 +11,19 @@ import { FtrProviderContext } from './ftr_provider_context';
import archives_metadata from './cypress/fixtures/es_archiver/archives_metadata';
import { createKibanaUserRole } from '../scripts/kibana-security/create_kibana_user_role';
-export async function cypressRunTests({ getService }: FtrProviderContext) {
- try {
- const result = await cypressStart(getService, cypress.run);
+export function cypressRunTests(spec?: string) {
+ return async ({ getService }: FtrProviderContext) => {
+ try {
+ const result = await cypressStart(getService, cypress.run, spec);
- if (result && (result.status === 'failed' || result.totalFailed > 0)) {
+ if (result && (result.status === 'failed' || result.totalFailed > 0)) {
+ process.exit(1);
+ }
+ } catch (error) {
+ console.error('errors: ', error);
process.exit(1);
}
- } catch (error) {
- console.error('errors: ', error);
- process.exit(1);
- }
+ };
}
export async function cypressOpenTests({ getService }: FtrProviderContext) {
@@ -30,7 +32,8 @@ export async function cypressOpenTests({ getService }: FtrProviderContext) {
async function cypressStart(
getService: FtrProviderContext['getService'],
- cypressExecution: typeof cypress.run | typeof cypress.open
+ cypressExecution: typeof cypress.run | typeof cypress.open,
+ spec?: string
) {
const config = getService('config');
@@ -56,6 +59,7 @@ async function cypressStart(
});
return cypressExecution({
+ ...(spec !== 'undefined' ? { spec } : {}),
config: { baseUrl: kibanaUrl },
env: {
START_DATE: start,
diff --git a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
index 12102a294bf9f..5905f700b0bbe 100644
--- a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
@@ -21,7 +21,13 @@ import {
} from '@kbn/rule-data-utils/target_node/technical_field_names';
import type { ObservabilityRuleTypeRegistry } from '../../../../observability/public';
import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
-import { AlertType } from '../../../common/alert_types';
+import {
+ AlertType,
+ formatErrorCountReason,
+ formatTransactionDurationAnomalyReason,
+ formatTransactionDurationReason,
+ formatTransactionErrorRateReason,
+} from '../../../common/alert_types';
// copied from elasticsearch_fieldnames.ts to limit page load bundle size
const SERVICE_ENVIRONMENT = 'service.environment';
@@ -53,13 +59,10 @@ export function registerApmAlerts(
}),
format: ({ fields }) => {
return {
- reason: i18n.translate('xpack.apm.alertTypes.errorCount.reason', {
- defaultMessage: `Error count is greater than {threshold} (current value is {measured}) for {serviceName}`,
- values: {
- threshold: fields[ALERT_EVALUATION_THRESHOLD],
- measured: fields[ALERT_EVALUATION_VALUE],
- serviceName: String(fields[SERVICE_NAME][0]),
- },
+ reason: formatErrorCountReason({
+ threshold: fields[ALERT_EVALUATION_THRESHOLD]!,
+ measured: fields[ALERT_EVALUATION_VALUE]!,
+ serviceName: String(fields[SERVICE_NAME][0]),
}),
link: format({
pathname: `/app/apm/services/${String(
@@ -105,17 +108,12 @@ export function registerApmAlerts(
}
),
format: ({ fields, formatters: { asDuration } }) => ({
- reason: i18n.translate(
- 'xpack.apm.alertTypes.transactionDuration.reason',
- {
- defaultMessage: `Latency is above {threshold} (current value is {measured}) for {serviceName}`,
- values: {
- threshold: asDuration(fields[ALERT_EVALUATION_THRESHOLD]),
- measured: asDuration(fields[ALERT_EVALUATION_VALUE]),
- serviceName: String(fields[SERVICE_NAME][0]),
- },
- }
- ),
+ reason: formatTransactionDurationReason({
+ threshold: fields[ALERT_EVALUATION_THRESHOLD]!,
+ measured: fields[ALERT_EVALUATION_VALUE]!,
+ serviceName: String(fields[SERVICE_NAME][0]),
+ asDuration,
+ }),
link: format({
pathname: `/app/apm/services/${fields[SERVICE_NAME][0]!}`,
query: {
@@ -161,17 +159,12 @@ export function registerApmAlerts(
}
),
format: ({ fields, formatters: { asPercent } }) => ({
- reason: i18n.translate(
- 'xpack.apm.alertTypes.transactionErrorRate.reason',
- {
- defaultMessage: `Failed transactions rate is greater than {threshold} (current value is {measured}) for {serviceName}`,
- values: {
- threshold: asPercent(fields[ALERT_EVALUATION_THRESHOLD], 100),
- measured: asPercent(fields[ALERT_EVALUATION_VALUE], 100),
- serviceName: String(fields[SERVICE_NAME][0]),
- },
- }
- ),
+ reason: formatTransactionErrorRateReason({
+ threshold: fields[ALERT_EVALUATION_THRESHOLD]!,
+ measured: fields[ALERT_EVALUATION_VALUE]!,
+ serviceName: String(fields[SERVICE_NAME][0]),
+ asPercent,
+ }),
link: format({
pathname: `/app/apm/services/${String(fields[SERVICE_NAME][0]!)}`,
query: {
@@ -216,17 +209,11 @@ export function registerApmAlerts(
}
),
format: ({ fields }) => ({
- reason: i18n.translate(
- 'xpack.apm.alertTypes.transactionDurationAnomaly.reason',
- {
- defaultMessage: `{severityLevel} anomaly detected for {serviceName} (score was {measured})`,
- values: {
- serviceName: String(fields[SERVICE_NAME][0]),
- severityLevel: String(fields[ALERT_SEVERITY_LEVEL]),
- measured: Number(fields[ALERT_EVALUATION_VALUE]),
- },
- }
- ),
+ reason: formatTransactionDurationAnomalyReason({
+ serviceName: String(fields[SERVICE_NAME][0]),
+ severityLevel: String(fields[ALERT_SEVERITY_LEVEL]),
+ measured: Number(fields[ALERT_EVALUATION_VALUE]),
+ }),
link: format({
pathname: `/app/apm/services/${String(fields[SERVICE_NAME][0])}`,
query: {
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx
index abcacbe89587b..4e0867553f421 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx
@@ -34,6 +34,7 @@ import {
import { TRANSACTION_PAGE_LOAD } from '../../../../../common/transaction_types';
import { useIndexPattern } from './use_index_pattern';
import { environmentQuery } from './queries';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
const filterNames: UxLocalUIFilterName[] = [
'location',
@@ -71,7 +72,7 @@ function LocalUIFilters() {
const getFilters = useMemo(() => {
const dataFilters: ESFilter[] = [
...RUM_DATA_FILTERS,
- ...environmentQuery(environment),
+ ...environmentQuery(environment || ENVIRONMENT_ALL.value),
];
if (serviceName) {
dataFilters.push({
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/queries.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/queries.ts
index 12f1fc0f0faea..b20a122b35a7f 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/queries.ts
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/queries.ts
@@ -15,7 +15,7 @@ import {
type QueryDslQueryContainer = ESFilter;
export function environmentQuery(
- environment?: string
+ environment: string
): QueryDslQueryContainer[] {
if (!environment || environment === ENVIRONMENT_ALL.value) {
return [];
diff --git a/x-pack/plugins/apm/public/components/app/TraceLink/get_redirect_to_trace_page_url.ts b/x-pack/plugins/apm/public/components/app/TraceLink/get_redirect_to_trace_page_url.ts
index 673b48ce63e98..a94ecd5c8f875 100644
--- a/x-pack/plugins/apm/public/components/app/TraceLink/get_redirect_to_trace_page_url.ts
+++ b/x-pack/plugins/apm/public/components/app/TraceLink/get_redirect_to_trace_page_url.ts
@@ -20,7 +20,7 @@ export const getRedirectToTracePageUrl = ({
format({
pathname: `/traces`,
query: {
- kuery: encodeURIComponent(`${TRACE_ID} : "${traceId}"`),
+ kuery: `${TRACE_ID} : "${traceId}"`,
rangeFrom,
rangeTo,
},
diff --git a/x-pack/plugins/apm/public/components/app/TraceLink/trace_link.test.tsx b/x-pack/plugins/apm/public/components/app/TraceLink/trace_link.test.tsx
index 0661b5ddc871d..58e1b8d7a6770 100644
--- a/x-pack/plugins/apm/public/components/app/TraceLink/trace_link.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/TraceLink/trace_link.test.tsx
@@ -97,7 +97,7 @@ describe('TraceLink', () => {
const component = shallow( 0}
+ status={
+ Array.isArray(overallHistogram)
+ ? FETCH_STATUS.SUCCESS
+ : FETCH_STATUS.LOADING
+ }
>
- durationFormatter(d).formatted}
- />
-
- d === 0 || Number.isInteger(Math.log10(d)) ? d : ''
- }
- />
-
-
+ {
+ const unit = getDurationUnitKey(d, 1);
+ const converted = getUnitLabelAndConvertedValue(unit, d);
+ const convertedValueParts = converted.convertedValue.split('.');
+ const convertedValue =
+ convertedValueParts.length === 2 &&
+ convertedValueParts[1] === '0'
+ ? convertedValueParts[0]
+ : converted.convertedValue;
+ return `${convertedValue}${converted.unitLabel}`;
+ }}
+ />
+
+
);
}
diff --git a/x-pack/plugins/apm/public/components/app/correlations/error_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/error_correlations.tsx
index 7202231fa66b2..298206f30d614 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/error_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/error_correlations.tsx
@@ -22,6 +22,7 @@ import { useUiTracker } from '../../../../../observability/public';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { useApmParams } from '../../../hooks/use_apm_params';
import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
import { useTheme } from '../../../hooks/use_theme';
import { APIReturnType } from '../../../services/rest/createCallApmApi';
@@ -53,14 +54,7 @@ export function ErrorCorrelations({ onClose }: Props) {
const { serviceName } = useApmServiceContext();
const { urlParams } = useUrlParams();
- const {
- environment,
- kuery,
- transactionName,
- transactionType,
- start,
- end,
- } = urlParams;
+ const { transactionName, transactionType, start, end } = urlParams;
const { defaultFieldNames } = useFieldNames();
const [fieldNames, setFieldNames] = useLocalStorage(
`apm.correlations.errors.fields:${serviceName}`,
@@ -68,6 +62,10 @@ export function ErrorCorrelations({ onClose }: Props) {
);
const hasFieldNames = fieldNames.length > 0;
+ const {
+ query: { environment, kuery },
+ } = useApmParams('/services/:serviceName');
+
const { data: overallData, status: overallStatus } = useFetcher(
(callApmApi) => {
if (start && end) {
diff --git a/x-pack/plugins/apm/public/components/app/correlations/index.tsx b/x-pack/plugins/apm/public/components/app/correlations/index.tsx
index 0bb7ac3c17c42..57ba75d945ee5 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/index.tsx
@@ -40,16 +40,14 @@ import {
IStickyProperty,
StickyProperties,
} from '../../shared/sticky_properties';
-import {
- getEnvironmentLabel,
- getNextEnvironmentUrlParam,
-} from '../../../../common/environment_filter_values';
+import { getEnvironmentLabel } from '../../../../common/environment_filter_values';
import {
SERVICE_ENVIRONMENT,
SERVICE_NAME,
TRANSACTION_NAME,
} from '../../../../common/elasticsearch_fieldnames';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
+import { useApmParams } from '../../../hooks/use_apm_params';
const errorRateTab = {
key: 'errorRate',
@@ -73,6 +71,10 @@ export function Correlations() {
const { urlParams } = useUrlParams();
const { serviceName } = useApmServiceContext();
+ const {
+ query: { environment },
+ } = useApmParams('/services/:serviceName');
+
const history = useHistory();
const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
const [currentTab, setCurrentTab] = useState(latencyCorrelationsTab.key);
@@ -89,13 +91,8 @@ export function Correlations() {
useTrackMetric({ ...metric, delay: 15000 });
const stickyProperties: IStickyProperty[] = useMemo(() => {
- const nextEnvironment = getNextEnvironmentUrlParam({
- requestedEnvironment: serviceName,
- currentEnvironmentUrlParam: urlParams.environment,
- });
-
const properties: IStickyProperty[] = [];
- if (serviceName !== undefined && nextEnvironment !== undefined) {
+ if (serviceName !== undefined) {
properties.push({
label: i18n.translate('xpack.apm.correlations.serviceLabel', {
defaultMessage: 'Service',
@@ -106,16 +103,14 @@ export function Correlations() {
});
}
- if (urlParams.environment) {
- properties.push({
- label: i18n.translate('xpack.apm.correlations.environmentLabel', {
- defaultMessage: 'Environment',
- }),
- fieldName: SERVICE_ENVIRONMENT,
- val: getEnvironmentLabel(urlParams.environment),
- width: '20%',
- });
- }
+ properties.push({
+ label: i18n.translate('xpack.apm.correlations.environmentLabel', {
+ defaultMessage: 'Environment',
+ }),
+ fieldName: SERVICE_ENVIRONMENT,
+ val: getEnvironmentLabel(environment),
+ width: '20%',
+ });
if (urlParams.transactionName) {
properties.push({
@@ -129,7 +124,7 @@ export function Correlations() {
}
return properties;
- }, [serviceName, urlParams.environment, urlParams.transactionName]);
+ }, [serviceName, environment, urlParams.transactionName]);
return (
<>
diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
index 400a9f227959f..0871447337780 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
@@ -31,6 +31,7 @@ import { useFieldNames } from './use_field_names';
import { useLocalStorage } from '../../../hooks/useLocalStorage';
import { useUiTracker } from '../../../../../observability/public';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
+import { useApmParams } from '../../../hooks/use_apm_params';
type OverallLatencyApiResponse = NonNullable<
APIReturnType<'GET /api/apm/correlations/latency/overall_distribution'>
@@ -51,15 +52,13 @@ export function LatencyCorrelations({ onClose }: Props) {
] = useState(null);
const { serviceName } = useApmServiceContext();
- const { urlParams } = useUrlParams();
+
const {
- environment,
- kuery,
- transactionName,
- transactionType,
- start,
- end,
- } = urlParams;
+ query: { kuery, environment },
+ } = useApmParams('/services/:serviceName');
+
+ const { urlParams } = useUrlParams();
+ const { transactionName, transactionType, start, end } = urlParams;
const { defaultFieldNames } = useFieldNames();
const [fieldNames, setFieldNames] = useLocalStorage(
`apm.correlations.latency.fields:${serviceName}`,
diff --git a/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx
index 7b9c8461221d6..bbd6648ccaf6e 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx
@@ -349,33 +349,29 @@ export function MlLatencyCorrelations({ onClose }: Props) {
)}
-
-
+
-
+
{fallbackToTransactions && (
@@ -51,7 +60,11 @@ export function ServiceOverview() {
)}
-
@@ -61,11 +74,15 @@ export function ServiceOverview() {
responsive={false}
>
-
-
@@ -81,6 +98,8 @@ export function ServiceOverview() {
-
{!isRumAgent && (
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
index 085c69bb9eecf..642725727eedf 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
@@ -26,7 +26,6 @@ export function ServiceOverviewDependenciesTable() {
urlParams: {
start,
end,
- environment,
comparisonEnabled,
comparisonType,
latencyAggregationType,
@@ -35,7 +34,7 @@ export function ServiceOverviewDependenciesTable() {
const {
query,
- query: { kuery, rangeFrom, rangeTo },
+ query: { environment, kuery, rangeFrom, rangeTo },
} = useApmParams('/services/:serviceName/*');
const { offset } = getTimeRangeComparison({
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx
index cd2c70b0f10b7..ae1fc581f5fdc 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_column.tsx
@@ -62,6 +62,7 @@ export function getColumns({
return
-
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/Waterfall/span_flyout/sticky_span_properties.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/Waterfall/span_flyout/sticky_span_properties.tsx
index bce59b02f102c..97e353d22ccf6 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/Waterfall/span_flyout/sticky_span_properties.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/Waterfall/span_flyout/sticky_span_properties.tsx
@@ -56,7 +56,10 @@ export function StickySpanProperties({ span, transaction }: Props) {
val: (
diff --git a/x-pack/plugins/apm/public/components/routing/home/index.tsx b/x-pack/plugins/apm/public/components/routing/home/index.tsx
index 1502038b378b2..ce74a48fd8c86 100644
--- a/x-pack/plugins/apm/public/components/routing/home/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/home/index.tsx
@@ -9,11 +9,13 @@ import { Outlet } from '@kbn/typed-react-router-config';
import * as t from 'io-ts';
import React from 'react';
import { Redirect } from 'react-router-dom';
+import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
+import { environmentRt } from '../../../../common/environment_rt';
import { BackendDetailOverview } from '../../app/backend_detail_overview';
import { BackendInventory } from '../../app/backend_inventory';
import { Breadcrumb } from '../../app/breadcrumb';
import { ServiceInventory } from '../../app/service_inventory';
-import { ServiceMap } from '../../app/service_map';
+import { ServiceMapHome } from '../../app/service_map';
import { TraceOverview } from '../../app/trace_overview';
import { ApmMainTemplate } from '../templates/apm_main_template';
@@ -55,13 +57,11 @@ export const home = {
element: ,
- environment?: string
+ environment: string
) {
- const nextEnvironmentQueryParam =
- environment !== ENVIRONMENT_ALL.value ? environment : undefined;
+ const nextEnvironmentQueryParam = environment;
history.push({
...location,
search: fromQuery({
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
index ff9e46fc0552a..20c623d6792e6 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
@@ -33,6 +33,8 @@ const ALERT_RULE_TYPE_ID: typeof ALERT_RULE_TYPE_ID_TYPED = ALERT_RULE_TYPE_ID_N
interface Props {
height?: number;
+ kuery: string;
+ environment: string;
}
const options: Array<{ value: LatencyAggregationType; text: string }> = [
@@ -45,7 +47,7 @@ function filterNil(value: T | null | undefined): value is T {
return value != null;
}
-export function LatencyChart({ height }: Props) {
+export function LatencyChart({ height, kuery, environment }: Props) {
const history = useHistory();
const theme = useTheme();
const comparisonChartTheme = getComparisonChartTheme(theme);
@@ -56,7 +58,10 @@ export function LatencyChart({ height }: Props) {
const {
latencyChartsData,
latencyChartsStatus,
- } = useTransactionLatencyChartsFetcher();
+ } = useTransactionLatencyChartsFetcher({
+ kuery,
+ environment,
+ });
const {
currentPeriod,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
index 39b7f488d68e6..f9b22c422e3e3 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
@@ -24,6 +24,7 @@ import { StoryContext } from '@storybook/react';
import React, { ComponentType } from 'react';
import { MemoryRouter, Route } from 'react-router-dom';
import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
import {
ApmPluginContext,
@@ -119,7 +120,9 @@ export default {
};
export function Example(_args: Args) {
- return
+
{hasValidTimeseries(series) ? (
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx
index 0e2b1e185f9d9..6f18b649502d5 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx
@@ -15,11 +15,15 @@ import { BreakdownChart } from '../breakdown_chart';
export function TransactionBreakdownChart({
height,
showAnnotations = true,
+ environment,
+ kuery,
}: {
height?: number;
showAnnotations?: boolean;
+ environment: string;
+ kuery: string;
}) {
- const { data, status } = useTransactionBreakdown();
+ const { data, status } = useTransactionBreakdown({ environment, kuery });
const { annotations } = useAnnotationsContext();
const { timeseries } = data;
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts b/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts
index 233d0821a5319..29c47489bd104 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts
@@ -9,9 +9,15 @@ import { useFetcher } from '../../../../hooks/use_fetcher';
import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
-export function useTransactionBreakdown() {
+export function useTransactionBreakdown({
+ kuery,
+ environment,
+}: {
+ kuery: string;
+ environment: string;
+}) {
const {
- urlParams: { environment, kuery, start, end, transactionName },
+ urlParams: { start, end, transactionName },
} = useUrlParams();
const { transactionType, serviceName } = useApmServiceContext();
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx
index 3135be151fce7..dab6b9a7c5562 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx
@@ -14,20 +14,29 @@ import { LatencyChart } from '../latency_chart';
import { TransactionBreakdownChart } from '../transaction_breakdown_chart';
import { TransactionErrorRateChart } from '../transaction_error_rate_chart/';
-export function TransactionCharts() {
+export function TransactionCharts({
+ kuery,
+ environment,
+}: {
+ kuery: string;
+ environment: string;
+}) {
return (
<>
-
+
-
-
@@ -35,10 +44,16 @@ export function TransactionCharts() {
-
-
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx
index 1685051bb44e8..930b54717f22c 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_error_rate_chart/index.tsx
@@ -29,6 +29,8 @@ function yLabelFormat(y?: number | null) {
interface Props {
height?: number;
showAnnotations?: boolean;
+ kuery: string;
+ environment: string;
}
type ErrorRate = APIReturnType<'GET /api/apm/services/{serviceName}/transactions/charts/error_rate'>;
@@ -49,12 +51,12 @@ const INITIAL_STATE: ErrorRate = {
export function TransactionErrorRateChart({
height,
showAnnotations = true,
+ environment,
+ kuery,
}: Props) {
const theme = useTheme();
const {
urlParams: {
- environment,
- kuery,
start,
end,
transactionName,
diff --git a/x-pack/plugins/apm/public/components/shared/dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/shared/dependencies_table/index.tsx
index 0b8fb787c8d8a..9c5c6368f5758 100644
--- a/x-pack/plugins/apm/public/components/shared/dependencies_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/dependencies_table/index.tsx
@@ -82,6 +82,7 @@ export function DependenciesTable(props: Props) {
render: (_, { currentStats, previousStats }) => {
return (
({
@@ -97,6 +99,7 @@ export function KueryBar(props: { prepend?: React.ReactNode | string }) {
groupId,
processorEvent,
serviceName,
+ environment,
urlParams,
}),
query: inputValue,
@@ -137,7 +140,7 @@ export function KueryBar(props: { prepend?: React.ReactNode | string }) {
...location,
search: fromQuery({
...toQuery(location.search),
- kuery: encodeURIComponent(inputValue.trim()),
+ kuery: inputValue.trim(),
}),
});
} catch (e) {
@@ -148,7 +151,7 @@ export function KueryBar(props: { prepend?: React.ReactNode | string }) {
return (
{
if (
transactionGroupsTotalItems &&
@@ -217,9 +216,7 @@ export function TransactionsTable({
comparisonEnabled,
});
- const isLoading =
- status === FETCH_STATUS.LOADING ||
- transactionGroupDetailedStatisticsStatus === FETCH_STATUS.LOADING;
+ const isLoading = status === FETCH_STATUS.LOADING;
const pagination = {
pageIndex,
diff --git a/x-pack/plugins/apm/public/context/annotations/annotations_context.tsx b/x-pack/plugins/apm/public/context/annotations/annotations_context.tsx
index 78ddb1e4560c5..db73f56b32dd7 100644
--- a/x-pack/plugins/apm/public/context/annotations/annotations_context.tsx
+++ b/x-pack/plugins/apm/public/context/annotations/annotations_context.tsx
@@ -7,7 +7,6 @@
import React, { createContext } from 'react';
import { Annotation } from '../../../common/annotations';
-import { useApmParams } from '../../hooks/use_apm_params';
import { useFetcher } from '../../hooks/use_fetcher';
import { useUrlParams } from '../url_params_context/use_url_params';
@@ -19,15 +18,15 @@ const INITIAL_STATE = { annotations: [] };
export function AnnotationsContextProvider({
children,
+ environment,
+ serviceName,
}: {
children: React.ReactNode;
+ environment: string;
+ serviceName?: string;
}) {
- const { path } = useApmParams('/*');
-
- const serviceName = 'serviceName' in path ? path.serviceName : undefined;
-
const {
- urlParams: { environment, start, end },
+ urlParams: { start, end },
} = useUrlParams();
const { data = INITIAL_STATE } = useFetcher(
diff --git a/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx b/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx
index 1f454855b0f25..9a66441b8e98b 100644
--- a/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx
@@ -50,7 +50,12 @@ export function ApmServiceContextProvider({
agentName,
});
- const { alerts } = useServiceAlertsFetcher({ serviceName, transactionType });
+ const { alerts } = useServiceAlertsFetcher({
+ serviceName,
+ transactionType,
+ environment: query.environment,
+ kuery: query.kuery,
+ });
return (
>(
path: TPath,
optional: true
-): OutputOf | undefined;
+): TypeOf | undefined;
export function useApmParams>(
path: TPath
-): OutputOf;
+): TypeOf;
export function useApmParams(
path: string,
optional?: true
-): OutputOf> | undefined {
+): TypeOf> | undefined {
return useParams(path, optional);
}
diff --git a/x-pack/plugins/apm/public/hooks/use_error_group_distribution_fetcher.tsx b/x-pack/plugins/apm/public/hooks/use_error_group_distribution_fetcher.tsx
index 3ef685abe0847..b0c26ce1febbb 100644
--- a/x-pack/plugins/apm/public/hooks/use_error_group_distribution_fetcher.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_error_group_distribution_fetcher.tsx
@@ -11,12 +11,16 @@ import { useFetcher } from './use_fetcher';
export function useErrorGroupDistributionFetcher({
serviceName,
groupId,
+ kuery,
+ environment,
}: {
serviceName: string;
groupId: string | undefined;
+ kuery: string;
+ environment: string;
}) {
const {
- urlParams: { environment, kuery, start, end },
+ urlParams: { start, end },
} = useUrlParams();
const { data } = useFetcher(
(callApmApi) => {
diff --git a/x-pack/plugins/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx b/x-pack/plugins/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx
index 51e5429633eae..9d7c350cf67c1 100644
--- a/x-pack/plugins/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx
@@ -8,9 +8,9 @@
import { useUrlParams } from '../context/url_params_context/use_url_params';
import { useFetcher } from './use_fetcher';
-export function useFallbackToTransactionsFetcher() {
+export function useFallbackToTransactionsFetcher({ kuery }: { kuery: string }) {
const {
- urlParams: { kuery, start, end },
+ urlParams: { start, end },
} = useUrlParams();
const { data = { fallbackToTransactions: false } } = useFetcher(
(callApmApi) => {
diff --git a/x-pack/plugins/apm/public/hooks/use_service_metric_charts_fetcher.ts b/x-pack/plugins/apm/public/hooks/use_service_metric_charts_fetcher.ts
index 37eca08225e8f..f041d63d2bbbb 100644
--- a/x-pack/plugins/apm/public/hooks/use_service_metric_charts_fetcher.ts
+++ b/x-pack/plugins/apm/public/hooks/use_service_metric_charts_fetcher.ts
@@ -17,11 +17,15 @@ const INITIAL_DATA: MetricsChartsByAgentAPIResponse = {
export function useServiceMetricChartsFetcher({
serviceNodeName,
+ kuery,
+ environment,
}: {
serviceNodeName: string | undefined;
+ kuery: string;
+ environment: string;
}) {
const {
- urlParams: { environment, kuery, start, end },
+ urlParams: { start, end },
} = useUrlParams();
const { agentName, serviceName } = useApmServiceContext();
diff --git a/x-pack/plugins/apm/public/hooks/use_transaction_distribution_fetcher.ts b/x-pack/plugins/apm/public/hooks/use_transaction_distribution_fetcher.ts
index 8e48f386772b3..7bf01e976e923 100644
--- a/x-pack/plugins/apm/public/hooks/use_transaction_distribution_fetcher.ts
+++ b/x-pack/plugins/apm/public/hooks/use_transaction_distribution_fetcher.ts
@@ -24,13 +24,17 @@ const INITIAL_DATA = {
export function useTransactionDistributionFetcher({
transactionName,
+ kuery,
+ environment,
}: {
transactionName: string;
+ kuery: string;
+ environment: string;
}) {
const { serviceName, transactionType } = useApmServiceContext();
const {
- urlParams: { environment, kuery, start, end, transactionId, traceId },
+ urlParams: { start, end, transactionId, traceId },
} = useUrlParams();
const history = useHistory();
diff --git a/x-pack/plugins/apm/public/hooks/use_transaction_latency_chart_fetcher.ts b/x-pack/plugins/apm/public/hooks/use_transaction_latency_chart_fetcher.ts
index 5ae4a138608ec..d176861db2f09 100644
--- a/x-pack/plugins/apm/public/hooks/use_transaction_latency_chart_fetcher.ts
+++ b/x-pack/plugins/apm/public/hooks/use_transaction_latency_chart_fetcher.ts
@@ -13,13 +13,17 @@ import { getLatencyChartSelector } from '../selectors/latency_chart_selectors';
import { useTheme } from './use_theme';
import { getTimeRangeComparison } from '../components/shared/time_comparison/get_time_range_comparison';
-export function useTransactionLatencyChartsFetcher() {
+export function useTransactionLatencyChartsFetcher({
+ kuery,
+ environment,
+}: {
+ kuery: string;
+ environment: string;
+}) {
const { transactionType, serviceName } = useApmServiceContext();
const theme = useTheme();
const {
urlParams: {
- environment,
- kuery,
start,
end,
transactionName,
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 0631dba7e2a34..32eed1cf53d80 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -81,6 +81,24 @@ export interface ApmPluginStartDeps {
fleet?: FleetStart;
}
+const servicesTitle = i18n.translate('xpack.apm.navigation.servicesTitle', {
+ defaultMessage: 'Services',
+});
+const tracesTitle = i18n.translate('xpack.apm.navigation.tracesTitle', {
+ defaultMessage: 'Traces',
+});
+const serviceMapTitle = i18n.translate('xpack.apm.navigation.serviceMapTitle', {
+ defaultMessage: 'Service Map',
+});
+
+const backendsTitle = i18n.translate('xpack.apm.navigation.backendsTitle', {
+ defaultMessage: 'Backends',
+});
+
+const newBadgeLabel = i18n.translate('xpack.apm.navigation.newBadge', {
+ defaultMessage: 'NEW',
+});
+
export class ApmPlugin implements Plugin {
constructor(
private readonly initializerContext: PluginInitializerContext
@@ -96,21 +114,6 @@ export class ApmPlugin implements Plugin {
pluginSetupDeps.home.featureCatalogue.register(featureCatalogueEntry);
}
- const servicesTitle = i18n.translate('xpack.apm.navigation.servicesTitle', {
- defaultMessage: 'Services',
- });
- const tracesTitle = i18n.translate('xpack.apm.navigation.tracesTitle', {
- defaultMessage: 'Traces',
- });
- const serviceMapTitle = i18n.translate(
- 'xpack.apm.navigation.serviceMapTitle',
- { defaultMessage: 'Service Map' }
- );
-
- const backendsTitle = i18n.translate('xpack.apm.navigation.backendsTitle', {
- defaultMessage: 'Backends',
- });
-
// register observability nav if user has access to plugin
plugins.observability.navigation.registerSections(
from(core.getStartServices()).pipe(
@@ -124,11 +127,11 @@ export class ApmPlugin implements Plugin {
entries: [
{ label: servicesTitle, app: 'apm', path: '/services' },
{ label: tracesTitle, app: 'apm', path: '/traces' },
- { label: serviceMapTitle, app: 'apm', path: '/service-map' },
{
label: backendsTitle,
app: 'apm',
path: '/backends',
+ sideBadgeLabel: newBadgeLabel,
onClick: () => {
const { usageCollection } = pluginsStart as {
usageCollection?: UsageCollectionStart;
@@ -143,6 +146,7 @@ export class ApmPlugin implements Plugin {
}
},
},
+ { label: serviceMapTitle, app: 'apm', path: '/service-map' },
],
},
diff --git a/x-pack/plugins/apm/readme.md b/x-pack/plugins/apm/readme.md
index 9cfb6210e2541..ef3e1f018ded6 100644
--- a/x-pack/plugins/apm/readme.md
+++ b/x-pack/plugins/apm/readme.md
@@ -33,11 +33,7 @@ _Docker Compose is required_
### Cypress tests
-```sh
-node x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js
-```
-
-_Starts Kibana (:5701), APM Server (:8201) and Elasticsearch (:9201). Ingests sample data into Elasticsearch via APM Server and runs the Cypress tests_
+See [ftr_e2e](./ftr_e2e)
### Jest tests
@@ -82,9 +78,10 @@ For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
### API integration tests
-API tests are separated in two suites:
- - a basic license test suite
- - a trial license test suite (the equivalent of gold+)
+API tests are separated in two suites:
+
+- a basic license test suite
+- a trial license test suite (the equivalent of gold+)
This requires separate test servers and test runners.
@@ -112,10 +109,10 @@ node scripts/functional_test_runner --config x-pack/test/apm_api_integration/tri
The API tests for "trial" are located in `x-pack/test/apm_api_integration/trial/tests`.
-
**API Test tips**
- - For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
- - To update snapshots append `--updateSnapshots` to the functional_test_runner command
+
+- For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
+- To update snapshots append `--updateSnapshots` to the functional_test_runner command
## Linting
diff --git a/x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js b/x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js
index 39548717aa2f4..98469008e3412 100644
--- a/x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js
+++ b/x-pack/plugins/apm/scripts/ftr_e2e/cypress_run.js
@@ -5,12 +5,15 @@
* 2.0.
*/
+const { argv } = require('yargs');
const childProcess = require('child_process');
const path = require('path');
+const { spec } = argv;
+
const e2eDir = path.join(__dirname, '../../ftr_e2e');
childProcess.execSync(
- `node ../../../../scripts/functional_tests --config ./cypress_run.ts`,
+ `node ../../../../scripts/functional_tests --config ./cypress_run.ts --grep ${spec}`,
{ cwd: e2eDir, stdio: 'inherit' }
);
diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js b/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
index e0151c473d6e2..68cba9b397f2e 100644
--- a/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
+++ b/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
@@ -38,6 +38,7 @@ async function prepareBaseTsConfig() {
compilerOptions: {
...config.compilerOptions,
incremental: false,
+ composite: false,
},
include: [],
},
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts b/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
index 022fad6fa7840..db79b4f11df29 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
@@ -8,7 +8,7 @@
import { Observable } from 'rxjs';
import { Logger } from 'kibana/server';
import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../alerting/server';
-import { RuleDataClient } from '../../../../rule_registry/server';
+import { IRuleDataClient } from '../../../../rule_registry/server';
import { registerTransactionDurationAlertType } from './register_transaction_duration_alert_type';
import { registerTransactionDurationAnomalyAlertType } from './register_transaction_duration_anomaly_alert_type';
import { registerErrorCountAlertType } from './register_error_count_alert_type';
@@ -17,7 +17,7 @@ import { MlPluginSetup } from '../../../../ml/server';
import { registerTransactionErrorRateAlertType } from './register_transaction_error_rate_alert_type';
export interface RegisterRuleDependencies {
- ruleDataClient: RuleDataClient;
+ ruleDataClient: IRuleDataClient;
ml?: MlPluginSetup;
alerting: AlertingPluginSetupContract;
config$: Observable;
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
index 6a6a67e9fd97f..c78c24fba8673 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
@@ -10,10 +10,12 @@ import { take } from 'rxjs/operators';
import type {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_TYPED,
+ ALERT_REASON as ALERT_REASON_TYPED,
} from '@kbn/rule-data-utils';
import {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_NON_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_NON_TYPED,
+ ALERT_REASON as ALERT_REASON_NON_TYPED,
// @ts-expect-error
} from '@kbn/rule-data-utils/target_node/technical_field_names';
import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
@@ -26,6 +28,7 @@ import {
AlertType,
APM_SERVER_FEATURE_ID,
ALERT_TYPES_CONFIG,
+ formatErrorCountReason,
} from '../../../common/alert_types';
import {
PROCESSOR_EVENT,
@@ -41,6 +44,7 @@ import { RegisterRuleDependencies } from './register_apm_alerts';
const ALERT_EVALUATION_THRESHOLD: typeof ALERT_EVALUATION_THRESHOLD_TYPED = ALERT_EVALUATION_THRESHOLD_NON_TYPED;
const ALERT_EVALUATION_VALUE: typeof ALERT_EVALUATION_VALUE_TYPED = ALERT_EVALUATION_VALUE_NON_TYPED;
+const ALERT_REASON: typeof ALERT_REASON_TYPED = ALERT_REASON_NON_TYPED;
const paramsSchema = schema.object({
windowSize: schema.number(),
@@ -158,6 +162,11 @@ export function registerErrorCountAlertType({
[PROCESSOR_EVENT]: ProcessorEvent.error,
[ALERT_EVALUATION_VALUE]: errorCount,
[ALERT_EVALUATION_THRESHOLD]: alertParams.threshold,
+ [ALERT_REASON]: formatErrorCountReason({
+ serviceName,
+ threshold: alertParams.threshold,
+ measured: errorCount,
+ }),
},
})
.scheduleActions(alertTypeConfig.defaultActionGroupId, {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
index 790e62eae66d4..553b791e757b2 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -11,12 +11,15 @@ import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
import type {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_TYPED,
+ ALERT_REASON as ALERT_REASON_TYPED,
} from '@kbn/rule-data-utils';
import {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_NON_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_NON_TYPED,
+ ALERT_REASON as ALERT_REASON_NON_TYPED,
// @ts-expect-error
} from '@kbn/rule-data-utils/target_node/technical_field_names';
+import { asDuration } from '../../../../observability/common/utils/formatters';
import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
import {
getEnvironmentLabel,
@@ -26,6 +29,7 @@ import {
AlertType,
APM_SERVER_FEATURE_ID,
ALERT_TYPES_CONFIG,
+ formatTransactionDurationReason,
} from '../../../common/alert_types';
import {
PROCESSOR_EVENT,
@@ -43,6 +47,7 @@ import { RegisterRuleDependencies } from './register_apm_alerts';
const ALERT_EVALUATION_THRESHOLD: typeof ALERT_EVALUATION_THRESHOLD_TYPED = ALERT_EVALUATION_THRESHOLD_NON_TYPED;
const ALERT_EVALUATION_VALUE: typeof ALERT_EVALUATION_VALUE_TYPED = ALERT_EVALUATION_VALUE_NON_TYPED;
+const ALERT_REASON: typeof ALERT_REASON_TYPED = ALERT_REASON_NON_TYPED;
const paramsSchema = schema.object({
serviceName: schema.string(),
@@ -178,6 +183,12 @@ export function registerTransactionDurationAlertType({
[PROCESSOR_EVENT]: ProcessorEvent.transaction,
[ALERT_EVALUATION_VALUE]: transactionDuration,
[ALERT_EVALUATION_THRESHOLD]: alertParams.threshold,
+ [ALERT_REASON]: formatTransactionDurationReason({
+ measured: transactionDuration,
+ serviceName: alertParams.serviceName,
+ threshold: alertParams.threshold,
+ asDuration,
+ }),
},
})
.scheduleActions(alertTypeConfig.defaultActionGroupId, {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
index 2041f06a5a6a8..e38262773b6db 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
@@ -14,12 +14,14 @@ import type {
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_TYPED,
ALERT_SEVERITY_LEVEL as ALERT_SEVERITY_LEVEL_TYPED,
ALERT_SEVERITY_VALUE as ALERT_SEVERITY_VALUE_TYPED,
+ ALERT_REASON as ALERT_REASON_TYPED,
} from '@kbn/rule-data-utils';
import {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_NON_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_NON_TYPED,
ALERT_SEVERITY_LEVEL as ALERT_SEVERITY_LEVEL_NON_TYPED,
ALERT_SEVERITY_VALUE as ALERT_SEVERITY_VALUE_NON_TYPED,
+ ALERT_REASON as ALERT_REASON_NON_TYPED,
// @ts-expect-error
} from '@kbn/rule-data-utils/target_node/technical_field_names';
import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
@@ -37,6 +39,7 @@ import {
AlertType,
ALERT_TYPES_CONFIG,
ANOMALY_ALERT_SEVERITY_TYPES,
+ formatTransactionDurationAnomalyReason,
} from '../../../common/alert_types';
import { getMLJobs } from '../service_map/get_service_anomalies';
import { apmActionVariables } from './action_variables';
@@ -50,6 +53,7 @@ const ALERT_EVALUATION_THRESHOLD: typeof ALERT_EVALUATION_THRESHOLD_TYPED = ALER
const ALERT_EVALUATION_VALUE: typeof ALERT_EVALUATION_VALUE_TYPED = ALERT_EVALUATION_VALUE_NON_TYPED;
const ALERT_SEVERITY_LEVEL: typeof ALERT_SEVERITY_LEVEL_TYPED = ALERT_SEVERITY_LEVEL_NON_TYPED;
const ALERT_SEVERITY_VALUE: typeof ALERT_SEVERITY_VALUE_TYPED = ALERT_SEVERITY_VALUE_NON_TYPED;
+const ALERT_REASON: typeof ALERT_REASON_TYPED = ALERT_REASON_NON_TYPED;
const paramsSchema = schema.object({
serviceName: schema.maybe(schema.string()),
@@ -258,6 +262,11 @@ export function registerTransactionDurationAnomalyAlertType({
[ALERT_SEVERITY_VALUE]: score,
[ALERT_EVALUATION_VALUE]: score,
[ALERT_EVALUATION_THRESHOLD]: threshold,
+ [ALERT_REASON]: formatTransactionDurationAnomalyReason({
+ measured: score,
+ serviceName,
+ severityLevel,
+ }),
},
})
.scheduleActions(alertTypeConfig.defaultActionGroupId, {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
index fc63e4827e5de..17061cdacd51e 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
@@ -10,10 +10,12 @@ import { take } from 'rxjs/operators';
import type {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_TYPED,
+ ALERT_REASON as ALERT_REASON_TYPED,
} from '@kbn/rule-data-utils';
import {
ALERT_EVALUATION_THRESHOLD as ALERT_EVALUATION_THRESHOLD_NON_TYPED,
ALERT_EVALUATION_VALUE as ALERT_EVALUATION_VALUE_NON_TYPED,
+ ALERT_REASON as ALERT_REASON_NON_TYPED,
// @ts-expect-error
} from '@kbn/rule-data-utils/target_node/technical_field_names';
import {
@@ -26,6 +28,7 @@ import {
AlertType,
ALERT_TYPES_CONFIG,
APM_SERVER_FEATURE_ID,
+ formatTransactionErrorRateReason,
} from '../../../common/alert_types';
import {
EVENT_OUTCOME,
@@ -42,9 +45,11 @@ import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
import { apmActionVariables } from './action_variables';
import { alertingEsClient } from './alerting_es_client';
import { RegisterRuleDependencies } from './register_apm_alerts';
+import { asPercent } from '../../../../observability/common/utils/formatters';
const ALERT_EVALUATION_THRESHOLD: typeof ALERT_EVALUATION_THRESHOLD_TYPED = ALERT_EVALUATION_THRESHOLD_NON_TYPED;
const ALERT_EVALUATION_VALUE: typeof ALERT_EVALUATION_VALUE_TYPED = ALERT_EVALUATION_VALUE_NON_TYPED;
+const ALERT_REASON: typeof ALERT_REASON_TYPED = ALERT_REASON_NON_TYPED;
const paramsSchema = schema.object({
windowSize: schema.number(),
@@ -217,6 +222,12 @@ export function registerTransactionErrorRateAlertType({
[PROCESSOR_EVENT]: ProcessorEvent.transaction,
[ALERT_EVALUATION_VALUE]: errorRate,
[ALERT_EVALUATION_THRESHOLD]: alertParams.threshold,
+ [ALERT_REASON]: formatTransactionErrorRateReason({
+ threshold: alertParams.threshold,
+ measured: errorRate,
+ asPercent,
+ serviceName,
+ }),
},
})
.scheduleActions(alertTypeConfig.defaultActionGroupId, {
diff --git a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
index 679f33707b5b5..26667dff90c6e 100644
--- a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
@@ -8,7 +8,7 @@
import { Logger } from 'kibana/server';
import { of } from 'rxjs';
import { elasticsearchServiceMock } from 'src/core/server/mocks';
-import type { RuleDataClient } from '../../../../../rule_registry/server';
+import type { IRuleDataClient } from '../../../../../rule_registry/server';
import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../../alerting/server';
import { APMConfig, APM_SERVER_FEATURE_ID } from '../../..';
@@ -63,7 +63,8 @@ export const createRuleTypeMocks = () => {
};
},
isWriteEnabled: jest.fn(() => true),
- } as unknown) as RuleDataClient,
+ indexName: '.alerts-observability.apm.alerts',
+ } as unknown) as IRuleDataClient,
},
services,
scheduleActions,
diff --git a/x-pack/plugins/apm/server/lib/backends/get_error_rate_charts_for_backend.ts b/x-pack/plugins/apm/server/lib/backends/get_error_rate_charts_for_backend.ts
index 736b146d3d2ab..aa20b4b586335 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_error_rate_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_error_rate_charts_for_backend.ts
@@ -30,8 +30,8 @@ export async function getErrorRateChartsForBackend({
setup: Setup;
start: number;
end: number;
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
offset?: string;
}) {
const { apmEventClient } = setup;
diff --git a/x-pack/plugins/apm/server/lib/backends/get_latency_charts_for_backend.ts b/x-pack/plugins/apm/server/lib/backends/get_latency_charts_for_backend.ts
index 79f3ee4dbef95..9ef238fa13147 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_latency_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_latency_charts_for_backend.ts
@@ -30,8 +30,8 @@ export async function getLatencyChartsForBackend({
setup: Setup;
start: number;
end: number;
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
offset?: string;
}) {
const { apmEventClient } = setup;
diff --git a/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts b/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
index ae8a6db903d8a..19a26c3fcf035 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
@@ -29,8 +29,8 @@ export async function getThroughputChartsForBackend({
setup: Setup;
start: number;
end: number;
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
offset?: string;
}) {
const { apmEventClient } = setup;
diff --git a/x-pack/plugins/apm/server/lib/backends/get_top_backends.ts b/x-pack/plugins/apm/server/lib/backends/get_top_backends.ts
index 9b361774b8a9f..15fb58345e5c0 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_top_backends.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_top_backends.ts
@@ -25,9 +25,9 @@ export async function getTopBackends({
start: number;
end: number;
numBuckets: number;
- environment?: string;
+ environment: string;
offset?: string;
- kuery?: string;
+ kuery: string;
}) {
const statsItems = await getConnectionStats({
setup,
diff --git a/x-pack/plugins/apm/server/lib/backends/get_upstream_services_for_backend.ts b/x-pack/plugins/apm/server/lib/backends/get_upstream_services_for_backend.ts
index a3f6fbc31f942..adc461f882216 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_upstream_services_for_backend.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_upstream_services_for_backend.ts
@@ -27,8 +27,8 @@ export async function getUpstreamServicesForBackend({
end: number;
backendName: string;
numBuckets: number;
- kuery?: string;
- environment?: string;
+ kuery: string;
+ environment: string;
offset?: string;
}) {
const statsItems = await getConnectionStats({
diff --git a/x-pack/plugins/apm/server/lib/correlations/get_filters.ts b/x-pack/plugins/apm/server/lib/correlations/get_filters.ts
index d6e8f3f57c91a..db932593a9181 100644
--- a/x-pack/plugins/apm/server/lib/correlations/get_filters.ts
+++ b/x-pack/plugins/apm/server/lib/correlations/get_filters.ts
@@ -19,8 +19,8 @@ import { ProcessorEvent } from '../../../common/processor_event';
export interface CorrelationsOptions {
setup: Setup & SetupTimeRange;
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string | undefined;
transactionType: string | undefined;
transactionName: string | undefined;
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts
index 712343d445d44..a9d2110117d89 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts
@@ -28,6 +28,7 @@ describe('get buckets', () => {
environment: 'prod',
serviceName: 'myServiceName',
bucketSize: 10,
+ kuery: '',
setup: {
start: 1528113600000,
end: 1528977600000,
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
index 48bdfd84b0443..0a09ad45e44f7 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
@@ -23,8 +23,8 @@ export async function getBuckets({
bucketSize,
setup,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
groupId?: string;
bucketSize: number;
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
index 6bb43a395f235..297df8b7900af 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
@@ -20,8 +20,8 @@ export async function getErrorDistribution({
groupId,
setup,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
groupId?: string;
setup: Setup & SetupTimeRange;
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts
index a0298d1fe1fba..482076ebc1efa 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts
@@ -10,6 +10,7 @@ import {
SearchParamsMock,
inspectSearchParams,
} from '../../../utils/test_helpers';
+import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
describe('error distribution queries', () => {
let mock: SearchParamsMock;
@@ -23,6 +24,8 @@ describe('error distribution queries', () => {
getErrorDistribution({
serviceName: 'serviceName',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
@@ -35,6 +38,8 @@ describe('error distribution queries', () => {
serviceName: 'serviceName',
groupId: 'foo',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_group_sample.ts b/x-pack/plugins/apm/server/lib/errors/get_error_group_sample.ts
index 1a05f55dc8def..14aa7572c833f 100644
--- a/x-pack/plugins/apm/server/lib/errors/get_error_group_sample.ts
+++ b/x-pack/plugins/apm/server/lib/errors/get_error_group_sample.ts
@@ -24,8 +24,8 @@ export async function getErrorGroupSample({
groupId,
setup,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
groupId: string;
setup: Setup & SetupTimeRange;
diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts
index d705a2eb5a00c..05eee3f0e130f 100644
--- a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts
+++ b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts
@@ -26,8 +26,8 @@ export async function getErrorGroups({
sortDirection = 'desc',
setup,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
sortField?: string;
sortDirection?: 'asc' | 'desc';
diff --git a/x-pack/plugins/apm/server/lib/errors/queries.test.ts b/x-pack/plugins/apm/server/lib/errors/queries.test.ts
index f5b003dd261cf..3f5cdb2f6d243 100644
--- a/x-pack/plugins/apm/server/lib/errors/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/queries.test.ts
@@ -11,6 +11,7 @@ import {
SearchParamsMock,
inspectSearchParams,
} from '../../utils/test_helpers';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
describe('error queries', () => {
let mock: SearchParamsMock;
@@ -25,6 +26,8 @@ describe('error queries', () => {
groupId: 'groupId',
serviceName: 'serviceName',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
@@ -38,6 +41,8 @@ describe('error queries', () => {
sortField: 'foo',
serviceName: 'serviceName',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
@@ -51,6 +56,8 @@ describe('error queries', () => {
sortField: 'latestOccurrenceAt',
serviceName: 'serviceName',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
diff --git a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_fallback_to_transactions.ts b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_fallback_to_transactions.ts
index d5c7eb596a986..e3c8f52146e94 100644
--- a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_fallback_to_transactions.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_fallback_to_transactions.ts
@@ -14,7 +14,7 @@ export async function getFallbackToTransactions({
kuery,
}: {
setup: Setup & Partial;
- kuery?: string;
+ kuery: string;
}): Promise {
const searchAggregatedTransactions =
config['xpack.apm.searchAggregatedTransactions'];
diff --git a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
index d1174fcfcac6c..ba069a8b3feb5 100644
--- a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
@@ -24,7 +24,7 @@ export async function getHasAggregatedTransactions({
start?: number;
end?: number;
apmEventClient: APMEventClient;
- kuery?: string;
+ kuery: string;
}) {
const response = await apmEventClient.search(
'get_has_aggregated_transactions',
@@ -65,7 +65,7 @@ export async function getSearchAggregatedTransactions({
start?: number;
end?: number;
apmEventClient: APMEventClient;
- kuery?: string;
+ kuery: string;
}): Promise {
const searchAggregatedTransactions =
config['xpack.apm.searchAggregatedTransactions'];
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
index e4d6d2e77f73c..a2c2886542743 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
@@ -15,8 +15,8 @@ export async function getDefaultMetricsCharts({
serviceName,
setup,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
}) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index 9f8e1057ba5a9..7a22a77efddb1 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -33,8 +33,8 @@ export async function fetchAndTransformGcMetrics({
fieldName,
operationName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
index 3ec40d5171694..82f30639884b5 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
@@ -38,8 +38,8 @@ function getGcRateChart({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
index 8e4416d94fb90..40c383216cb4e 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
@@ -38,8 +38,8 @@ function getGcTimeChart({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
index 191b8a0f638a9..670beec7ee690 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
@@ -59,8 +59,8 @@ export function getHeapMemoryChart({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
index 5a266b57bd598..5a10c18a00cef 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
@@ -22,8 +22,8 @@ export function getJavaMetricsCharts({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
index be222132b198f..4f93eeb826dd3 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
@@ -56,8 +56,8 @@ export async function getNonHeapMemoryChart({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
index c07ed43335569..da9d732b7c1b2 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
@@ -48,8 +48,8 @@ export async function getThreadCountChart({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
index a568d58bdd438..4f5c5b41dd660 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
@@ -59,8 +59,8 @@ export function getCPUChartData({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
index 1f7860d567b03..7bab19613589f 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
@@ -77,8 +77,8 @@ export async function getMemoryChartData({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
index 723636bf4c299..c53100b39d5c7 100644
--- a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
@@ -61,8 +61,8 @@ export async function fetchAndTransformMetrics({
additionalFilters = [],
operationName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
index 82fda1bb76b90..176d2611c3bd5 100644
--- a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
@@ -23,8 +23,8 @@ export async function getMetricsChartDataByAgent({
serviceNodeName,
agentName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/lib/metrics/queries.test.ts b/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
index 601f3aef3d5dc..db745d83e5187 100644
--- a/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
@@ -15,6 +15,7 @@ import {
inspectSearchParams,
} from '../../utils/test_helpers';
import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
describe('metrics queries', () => {
let mock: SearchParamsMock;
@@ -22,7 +23,13 @@ describe('metrics queries', () => {
const createTests = (serviceNodeName?: string) => {
it('fetches cpu chart data', async () => {
mock = await inspectSearchParams((setup) =>
- getCPUChartData({ setup, serviceName: 'foo', serviceNodeName })
+ getCPUChartData({
+ setup,
+ serviceName: 'foo',
+ serviceNodeName,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
+ })
);
expect(mock.params).toMatchSnapshot();
@@ -30,7 +37,13 @@ describe('metrics queries', () => {
it('fetches memory chart data', async () => {
mock = await inspectSearchParams((setup) =>
- getMemoryChartData({ setup, serviceName: 'foo', serviceNodeName })
+ getMemoryChartData({
+ setup,
+ serviceName: 'foo',
+ serviceNodeName,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
+ })
);
expect(mock.params).toMatchSnapshot();
@@ -38,7 +51,13 @@ describe('metrics queries', () => {
it('fetches heap memory chart data', async () => {
mock = await inspectSearchParams((setup) =>
- getHeapMemoryChart({ setup, serviceName: 'foo', serviceNodeName })
+ getHeapMemoryChart({
+ setup,
+ serviceName: 'foo',
+ serviceNodeName,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
+ })
);
expect(mock.params).toMatchSnapshot();
@@ -46,7 +65,13 @@ describe('metrics queries', () => {
it('fetches non heap memory chart data', async () => {
mock = await inspectSearchParams((setup) =>
- getNonHeapMemoryChart({ setup, serviceName: 'foo', serviceNodeName })
+ getNonHeapMemoryChart({
+ setup,
+ serviceName: 'foo',
+ serviceNodeName,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
+ })
);
expect(mock.params).toMatchSnapshot();
@@ -54,7 +79,13 @@ describe('metrics queries', () => {
it('fetches thread count chart data', async () => {
mock = await inspectSearchParams((setup) =>
- getThreadCountChart({ setup, serviceName: 'foo', serviceNodeName })
+ getThreadCountChart({
+ setup,
+ serviceName: 'foo',
+ serviceNodeName,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
+ })
);
expect(mock.params).toMatchSnapshot();
diff --git a/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts b/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts
index 76ef9fb95089f..99a358f33cf5e 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts
@@ -12,6 +12,7 @@ import {
import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
import { UxUIFilters } from '../../../../typings/ui_filters';
import { environmentQuery } from '../../../../common/utils/environment_query';
+import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
export function getEsFilter(uiFilters: UxUIFilters, exclude?: boolean) {
const localFilterValues = uiFilters;
@@ -36,6 +37,8 @@ export function getEsFilter(uiFilters: UxUIFilters, exclude?: boolean) {
return [
...mappedFilters,
- ...(exclude ? [] : environmentQuery(uiFilters.environment)),
+ ...(exclude
+ ? []
+ : environmentQuery(uiFilters.environment || ENVIRONMENT_ALL.value)),
];
}
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_query_with_params.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_query_with_params.test.ts
index c27757b4fae69..4b10ceb035e15 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_query_with_params.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_query_with_params.test.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import { getQueryWithParams } from './get_query_with_params';
describe('correlations', () => {
@@ -16,6 +17,8 @@ describe('correlations', () => {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
},
});
expect(query).toEqual({
@@ -45,6 +48,7 @@ describe('correlations', () => {
start: '2020',
end: '2021',
environment: 'dev',
+ kuery: '',
percentileThresholdValue: 75,
includeFrozen: false,
},
@@ -100,6 +104,8 @@ describe('correlations', () => {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
},
fieldName: 'actualFieldName',
fieldValue: 'actualFieldValue',
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_request_base.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_request_base.test.ts
index e3f5c4a42d803..b95db6d2691f1 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_request_base.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/get_request_base.test.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import { getRequestBase } from './get_request_base';
describe('correlations', () => {
@@ -13,6 +14,8 @@ describe('correlations', () => {
const requestBase = getRequestBase({
index: 'apm-*',
includeFrozen: true,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
});
expect(requestBase).toEqual({
index: 'apm-*',
@@ -24,6 +27,8 @@ describe('correlations', () => {
it('defaults ignore_throttled to true', () => {
const requestBase = getRequestBase({
index: 'apm-*',
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
});
expect(requestBase).toEqual({
index: 'apm-*',
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_correlation.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_correlation.test.ts
index b1ab4aad36249..5245af6cdadcd 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_correlation.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_correlation.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationCorrelation,
@@ -20,6 +21,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
const expectations = [1, 3, 5];
const ranges = [{ to: 1 }, { from: 1, to: 3 }, { from: 3, to: 5 }, { from: 5 }];
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_candidates.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_candidates.test.ts
index fb707231245d0..688af72e8f6d3 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_candidates.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_candidates.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import { hasPrefixToInclude } from '../utils/has_prefix_to_include';
@@ -22,6 +23,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
describe('query_field_candidates', () => {
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_value_pairs.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_value_pairs.test.ts
index 0ee57fd60cd68..a20720944f19b 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_value_pairs.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_field_value_pairs.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import { asyncSearchServiceLogProvider } from '../async_search_service_log';
import { asyncSearchServiceStateProvider } from '../async_search_service_state';
@@ -22,6 +23,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
describe('query_field_value_pairs', () => {
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_fractions.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_fractions.test.ts
index a44cc6131b4cc..73df48a0d8170 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_fractions.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_fractions.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationFractions,
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
const ranges = [{ to: 1 }, { from: 1, to: 3 }, { from: 3, to: 5 }, { from: 5 }];
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram.test.ts
index daa40725b7307..9b2a4807d4863 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationHistogram,
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
const interval = 100;
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_interval.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_interval.test.ts
index b40f685645a2e..bb76769fe94b5 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_interval.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_interval.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationHistogramInterval,
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
describe('query_histogram_interval', () => {
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_range_steps.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_range_steps.test.ts
index b909778e3e4ef..52cfe6168232d 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_range_steps.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histogram_range_steps.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationHistogramRangeSteps,
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
describe('query_histogram_range_steps', () => {
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histograms_generator.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histograms_generator.test.ts
index 7f89aa52367a0..22876684bec7e 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histograms_generator.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_histograms_generator.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import { asyncSearchServiceLogProvider } from '../async_search_service_log';
import { asyncSearchServiceStateProvider } from '../async_search_service_state';
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
const expectations = [1, 3, 5];
const ranges = [{ to: 1 }, { from: 1, to: 3 }, { from: 3, to: 5 }, { from: 5 }];
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_percentiles.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_percentiles.test.ts
index 2ca77f51be07c..cab2e283935d6 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_percentiles.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_percentiles.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationPercentiles,
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
describe('query_percentiles', () => {
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_ranges.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_ranges.test.ts
index fc995ae07b3d7..839d6a33cfe05 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_ranges.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/queries/query_ranges.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ElasticsearchClient } from 'src/core/server';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
import {
fetchTransactionDurationRanges,
@@ -19,6 +20,8 @@ const params = {
start: '2020',
end: '2021',
includeFrozen: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
const rangeSteps = [1, 3, 5];
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/correlations/search_strategy.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/correlations/search_strategy.test.ts
index 401cda97afefb..b5ab4a072be6c 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/correlations/search_strategy.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/correlations/search_strategy.test.ts
@@ -8,6 +8,7 @@
import type { estypes } from '@elastic/elasticsearch';
import { SearchStrategyDependencies } from 'src/plugins/data/server';
+import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import type { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
@@ -136,6 +137,8 @@ describe('APM Correlations search strategy', () => {
params = {
start: '2020',
end: '2021',
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
};
});
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
index 7ce4af41f4fec..98cfc7715d6fe 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
@@ -37,7 +37,7 @@ export async function getServiceAnomalies({
environment,
}: {
setup: Setup & SetupTimeRange;
- environment?: string;
+ environment: string;
}) {
return withApmSpan('get_service_anomalies', async () => {
const { ml, start, end } = setup;
@@ -153,7 +153,7 @@ export async function getServiceAnomalies({
export async function getMLJobs(
anomalyDetectors: ReturnType,
- environment?: string
+ environment: string
) {
const response = await getMlJobsWithAPMGroup(anomalyDetectors);
@@ -162,7 +162,7 @@ export async function getMLJobs(
const mlJobs = response.jobs.filter(
(job) => (job.custom_settings?.job_tags?.apm_ml_version ?? 0) >= 2
);
- if (environment && environment !== ENVIRONMENT_ALL.value) {
+ if (environment !== ENVIRONMENT_ALL.value) {
const matchingMLJob = mlJobs.find(
(job) => job.custom_settings?.job_tags?.environment === environment
);
@@ -176,7 +176,7 @@ export async function getMLJobs(
export async function getMLJobIds(
anomalyDetectors: ReturnType,
- environment?: string
+ environment: string
) {
const mlJobs = await getMLJobs(anomalyDetectors, environment);
return mlJobs.map((job) => job.job_id);
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
index 5fc022508d0a8..4e503e225fd47 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -25,11 +25,12 @@ import {
import { getServiceMapFromTraceIds } from './get_service_map_from_trace_ids';
import { getTraceSampleIds } from './get_trace_sample_ids';
import { transformServiceMapResponses } from './transform_service_map_responses';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
export interface IEnvOptions {
setup: Setup & SetupTimeRange;
serviceName?: string;
- environment?: string;
+ environment: string;
searchAggregatedTransactions: boolean;
logger: Logger;
}
@@ -67,8 +68,6 @@ async function getConnectionData({
chunks.map((traceIdsChunk) =>
getServiceMapFromTraceIds({
setup,
- serviceName,
- environment,
traceIds: traceIdsChunk,
})
)
@@ -92,6 +91,7 @@ async function getServicesData(options: IEnvOptions) {
const projection = getServicesProjection({
setup,
searchAggregatedTransactions,
+ kuery: '',
});
let filter = [
@@ -147,7 +147,10 @@ async function getServicesData(options: IEnvOptions) {
[SERVICE_NAME]: bucket.key as string,
[AGENT_NAME]:
(bucket.agent_name.buckets[0]?.key as string | undefined) || '',
- [SERVICE_ENVIRONMENT]: options.environment || null,
+ [SERVICE_ENVIRONMENT]:
+ options.environment === ENVIRONMENT_ALL.value
+ ? null
+ : options.environment,
};
}) || []
);
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts
index 17c3191d80ff4..9455e4f2479ff 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts
@@ -21,7 +21,7 @@ import { Setup, SetupTimeRange } from '../helpers/setup_request';
interface Options {
setup: Setup & SetupTimeRange;
- environment?: string;
+ environment: string;
backendName: string;
}
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
index 1e3f9df39aef9..b6c9b90bc5d22 100644
--- 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
@@ -7,7 +7,6 @@
import { getConnections } from './get_service_map_from_trace_ids';
import { Connection, ConnectionNode } from '../../../common/service_map';
-import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_values';
function getConnectionsPairs(connections: Connection[]) {
return connections
@@ -69,119 +68,26 @@ describe('getConnections', () => {
},
],
] as ConnectionNode[][];
- describe('if neither service name or environment is given', () => {
- it('includes all connections', () => {
- const connections = getConnections({
- paths,
- serviceName: undefined,
- environment: undefined,
- });
- const connectionsPairs = getConnectionsPairs(connections);
- expect(connectionsPairs).toEqual([
- 'opbeans-ruby:testing -> opbeans-node:null',
- 'opbeans-node:null -> opbeans-go:production',
- 'opbeans-go:production -> opbeans-java:production',
- 'opbeans-java:production -> external',
- 'opbeans-ruby:testing -> opbeans-python:testing',
- 'opbeans-python:testing -> external',
- ]);
- });
- });
-
- describe('if service name and environment are given', () => {
- it('shows all connections for opbeans-java and production', () => {
- const connections = getConnections({
- paths,
- serviceName: 'opbeans-java',
- environment: 'production',
- });
-
- const connectionsPairs = getConnectionsPairs(connections);
-
- expect(connectionsPairs).toEqual([
- 'opbeans-ruby:testing -> opbeans-node:null',
- 'opbeans-node:null -> opbeans-go:production',
- 'opbeans-go:production -> opbeans-java:production',
- 'opbeans-java:production -> external',
- ]);
- });
-
- it('shows all connections for opbeans-python and testing', () => {
- const connections = getConnections({
- paths,
- serviceName: 'opbeans-python',
- environment: 'testing',
- });
-
- const connectionsPairs = getConnectionsPairs(connections);
-
- expect(connectionsPairs).toEqual([
- 'opbeans-ruby:testing -> opbeans-python:testing',
- 'opbeans-python:testing -> external',
- ]);
- });
- });
-
- describe('if service name is given', () => {
- it('shows all connections for opbeans-node', () => {
- const connections = getConnections({
- paths,
- serviceName: 'opbeans-node',
- environment: undefined,
- });
-
- const connectionsPairs = getConnectionsPairs(connections);
-
- expect(connectionsPairs).toEqual([
- 'opbeans-ruby:testing -> opbeans-node:null',
- 'opbeans-node:null -> opbeans-go:production',
- 'opbeans-go:production -> opbeans-java:production',
- 'opbeans-java:production -> external',
- ]);
- });
- });
-
- describe('if environment is given', () => {
- it('shows all connections for testing environment', () => {
- const connections = getConnections({
- paths,
- serviceName: undefined,
- environment: 'testing',
- });
-
- const connectionsPairs = getConnectionsPairs(connections);
-
- expect(connectionsPairs).toEqual([
- 'opbeans-ruby:testing -> opbeans-node:null',
- 'opbeans-node:null -> opbeans-go:production',
- 'opbeans-go:production -> opbeans-java:production',
- 'opbeans-java:production -> external',
- 'opbeans-ruby:testing -> opbeans-python:testing',
- 'opbeans-python:testing -> external',
- ]);
+ it('includes all connections', () => {
+ const connections = getConnections({
+ paths,
});
- it('shows all connections for production environment', () => {
- const connections = getConnections({
- paths,
- serviceName: undefined,
- environment: 'production',
- });
-
- const connectionsPairs = getConnectionsPairs(connections);
- expect(connectionsPairs).toEqual([
- 'opbeans-ruby:testing -> opbeans-node:null',
- 'opbeans-node:null -> opbeans-go:production',
- 'opbeans-go:production -> opbeans-java:production',
- 'opbeans-java:production -> external',
- ]);
- });
+ const connectionsPairs = getConnectionsPairs(connections);
+ expect(connectionsPairs).toEqual([
+ 'opbeans-ruby:testing -> opbeans-node:null',
+ 'opbeans-node:null -> opbeans-go:production',
+ 'opbeans-go:production -> opbeans-java:production',
+ 'opbeans-java:production -> external',
+ 'opbeans-ruby:testing -> opbeans-python:testing',
+ 'opbeans-python:testing -> external',
+ ]);
});
});
describe('environment is "not defined"', () => {
- it('shows all connections where environment is not set', () => {
+ it('includes all connections', () => {
const environmentNotDefinedPaths = [
[
{
@@ -237,12 +143,12 @@ describe('getConnections', () => {
] as ConnectionNode[][];
const connections = getConnections({
paths: environmentNotDefinedPaths,
- serviceName: undefined,
- environment: ENVIRONMENT_NOT_DEFINED.value,
});
const connectionsPairs = getConnectionsPairs(connections);
expect(connectionsPairs).toEqual([
+ 'opbeans-go:production -> opbeans-java:production',
+ 'opbeans-java:production -> external',
'opbeans-go:null -> opbeans-java:null',
'opbeans-java:null -> external',
'opbeans-python:null -> opbeans-node:null',
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 7e43c8f684377..ed99f1909ab07 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
@@ -6,58 +6,19 @@
*/
import { find, uniqBy } from 'lodash';
-import {
- ENVIRONMENT_ALL,
- ENVIRONMENT_NOT_DEFINED,
-} from '../../../common/environment_filter_values';
-import {
- SERVICE_ENVIRONMENT,
- SERVICE_NAME,
-} from '../../../common/elasticsearch_fieldnames';
import { Connection, ConnectionNode } from '../../../common/service_map';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { fetchServicePathsFromTraceIds } from './fetch_service_paths_from_trace_ids';
export function getConnections({
paths,
- serviceName,
- environment,
}: {
paths: ConnectionNode[][] | undefined;
- serviceName: string | undefined;
- environment: string | undefined;
}) {
if (!paths) {
return [];
}
- if (serviceName || environment) {
- paths = paths.filter((path) => {
- return (
- path
- // Only apply the filter on node that contains service name, this filters out external nodes
- .filter((node) => {
- return node[SERVICE_NAME];
- })
- .some((node) => {
- if (serviceName && node[SERVICE_NAME] !== serviceName) {
- return false;
- }
-
- if (!environment || environment === ENVIRONMENT_ALL.value) {
- return true;
- }
-
- if (environment === ENVIRONMENT_NOT_DEFINED.value) {
- return !node[SERVICE_ENVIRONMENT];
- }
-
- return node[SERVICE_ENVIRONMENT] === environment;
- })
- );
- });
- }
-
const connectionsArr = paths.flatMap((path) => {
return path.reduce((conns, location, index) => {
const prev = path[index - 1];
@@ -81,13 +42,9 @@ export function getConnections({
export async function getServiceMapFromTraceIds({
setup,
traceIds,
- serviceName,
- environment,
}: {
setup: Setup & SetupTimeRange;
traceIds: string[];
- serviceName?: string;
- environment?: string;
}) {
const serviceMapFromTraceIdsScriptResponse = await fetchServicePathsFromTraceIds(
setup,
@@ -100,8 +57,6 @@ export async function getServiceMapFromTraceIds({
return {
connections: getConnections({
paths: serviceMapScriptedAggValue?.paths,
- serviceName,
- environment,
}),
discoveredServices: serviceMapScriptedAggValue?.discoveredServices ?? [],
};
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
index d812275d7103b..542d240b1cd1b 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
@@ -8,6 +8,7 @@
import { getServiceMapServiceNodeInfo } from './get_service_map_service_node_info';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import * as getErrorRateModule from '../transaction_groups/get_error_rate';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
describe('getServiceMapServiceNodeInfo', () => {
describe('with no results', () => {
@@ -77,6 +78,7 @@ describe('getServiceMapServiceNodeInfo', () => {
setup,
serviceName,
searchAggregatedTransactions: false,
+ environment: ENVIRONMENT_ALL.value,
});
expect(result).toEqual({
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
index f9af5d227a867..f74c68be1c8cc 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
@@ -36,13 +36,13 @@ import { getErrorRate } from '../transaction_groups/get_error_rate';
interface Options {
setup: Setup & SetupTimeRange;
- environment?: string;
+ environment: string;
serviceName: string;
searchAggregatedTransactions: boolean;
}
interface TaskParameters {
- environment?: string;
+ environment: string;
filter: ESFilter[];
searchAggregatedTransactions: boolean;
minutes: number;
@@ -103,7 +103,7 @@ async function getErrorStats({
}: {
setup: Options['setup'];
serviceName: string;
- environment?: string;
+ environment: string;
searchAggregatedTransactions: boolean;
}) {
return withApmSpan('get_error_rate_for_service_map_node', async () => {
@@ -115,6 +115,7 @@ async function getErrorStats({
searchAggregatedTransactions,
start,
end,
+ kuery: '',
});
return { avgErrorRate: noHits ? null : average };
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
index c97bfc1cfacc8..96889857de5f7 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
@@ -8,7 +8,6 @@
import Boom from '@hapi/boom';
import { sortBy, take, uniq } from 'lodash';
import { asMutableArray } from '../../../common/utils/as_mutable_array';
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
import {
SERVICE_ENVIRONMENT,
SERVICE_NAME,
@@ -29,26 +28,29 @@ export async function getTraceSampleIds({
setup,
}: {
serviceName?: string;
- environment?: string;
+ environment: string;
setup: Setup & SetupTimeRange;
}) {
const { start, end, apmEventClient, config } = setup;
const query = {
bool: {
- filter: [
- {
- exists: {
- field: SPAN_DESTINATION_SERVICE_RESOURCE,
- },
- },
- ...rangeQuery(start, end),
- ] as ESFilter[],
+ filter: [...rangeQuery(start, end)],
},
- } as { bool: { filter: ESFilter[]; must_not?: ESFilter[] | ESFilter } };
+ };
+
+ let events: ProcessorEvent[];
if (serviceName) {
query.bool.filter.push({ term: { [SERVICE_NAME]: serviceName } });
+ events = [ProcessorEvent.span, ProcessorEvent.transaction];
+ } else {
+ events = [ProcessorEvent.span];
+ query.bool.filter.push({
+ exists: {
+ field: SPAN_DESTINATION_SERVICE_RESOURCE,
+ },
+ });
}
query.bool.filter.push(...environmentQuery(environment));
@@ -65,7 +67,7 @@ export async function getTraceSampleIds({
const params = {
apm: {
- events: [ProcessorEvent.span],
+ events,
},
body: {
size: 0,
@@ -78,6 +80,7 @@ export async function getTraceSampleIds({
[SPAN_DESTINATION_SERVICE_RESOURCE]: {
terms: {
field: SPAN_DESTINATION_SERVICE_RESOURCE,
+ missing_bucket: true,
},
},
},
diff --git a/x-pack/plugins/apm/server/lib/service_nodes/index.ts b/x-pack/plugins/apm/server/lib/service_nodes/index.ts
index 97c553f344205..4eb6abddd81a6 100644
--- a/x-pack/plugins/apm/server/lib/service_nodes/index.ts
+++ b/x-pack/plugins/apm/server/lib/service_nodes/index.ts
@@ -20,14 +20,21 @@ const getServiceNodes = async ({
kuery,
setup,
serviceName,
+ environment,
}: {
- kuery?: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
+ environment: string;
}) => {
const { apmEventClient } = setup;
- const projection = getServiceNodesProjection({ kuery, setup, serviceName });
+ const projection = getServiceNodesProjection({
+ kuery,
+ setup,
+ serviceName,
+ environment,
+ });
const params = mergeProjection(projection, {
body: {
diff --git a/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts b/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts
index 8fdb090ed8f6d..85f4b67fbe380 100644
--- a/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts
@@ -12,6 +12,7 @@ import {
} from '../../utils/test_helpers';
import { getServiceNodeMetadata } from '../services/get_service_node_metadata';
import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
describe('service node queries', () => {
let mock: SearchParamsMock;
@@ -22,7 +23,12 @@ describe('service node queries', () => {
it('fetches services nodes', async () => {
mock = await inspectSearchParams((setup) =>
- getServiceNodes({ setup, serviceName: 'foo' })
+ getServiceNodes({
+ setup,
+ serviceName: 'foo',
+ kuery: '',
+ environment: ENVIRONMENT_ALL.value,
+ })
);
expect(mock.params).toMatchSnapshot();
@@ -34,6 +40,7 @@ describe('service node queries', () => {
setup,
serviceName: 'foo',
serviceNodeName: 'bar',
+ kuery: '',
})
);
@@ -46,6 +53,7 @@ describe('service node queries', () => {
setup,
serviceName: 'foo',
serviceNodeName: SERVICE_NODE_NAME_MISSING,
+ kuery: '',
})
);
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts b/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts
index 7a36817dfc458..7439da9197667 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts
@@ -27,7 +27,7 @@ export async function getDerivedServiceAnnotations({
searchAggregatedTransactions,
}: {
serviceName: string;
- environment?: string;
+ environment: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
}) {
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
index 1e8b528142936..e811031fdddd8 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
@@ -31,7 +31,7 @@ export function getStoredAnnotations({
}: {
setup: Setup & SetupTimeRange;
serviceName: string;
- environment?: string;
+ environment: string;
client: ElasticsearchClient;
annotationsClient: ScopedAnnotationsClient;
logger: Logger;
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/index.ts b/x-pack/plugins/apm/server/lib/services/annotations/index.ts
index 3f60f5d47af16..1c4689f4ff8d2 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/index.ts
@@ -21,7 +21,7 @@ export async function getServiceAnnotations({
logger,
}: {
serviceName: string;
- environment?: string;
+ environment: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
annotationsClient?: ScopedAnnotationsClient;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts b/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts
index 4cbc62d87eff6..3b2354a54d96f 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_alerts.ts
@@ -8,7 +8,7 @@
import type { EVENT_KIND as EVENT_KIND_TYPED } from '@kbn/rule-data-utils';
// @ts-expect-error
import { EVENT_KIND as EVENT_KIND_NON_TYPED } from '@kbn/rule-data-utils/target_node/technical_field_names';
-import { RuleDataClient } from '../../../../rule_registry/server';
+import { IRuleDataClient } from '../../../../rule_registry/server';
import {
SERVICE_NAME,
TRANSACTION_TYPE,
@@ -26,11 +26,11 @@ export async function getServiceAlerts({
environment,
transactionType,
}: {
- ruleDataClient: RuleDataClient;
+ ruleDataClient: IRuleDataClient;
start: number;
end: number;
serviceName: string;
- environment?: string;
+ environment: string;
transactionType: string;
}) {
const response = await ruleDataClient.getReader().search({
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_dependencies.ts b/x-pack/plugins/apm/server/lib/services/get_service_dependencies.ts
index 1b3ffcab3f159..d4472d495230a 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_dependencies.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_dependencies.ts
@@ -25,7 +25,7 @@ export async function getServiceDependencies({
end: number;
serviceName: string;
numBuckets: number;
- environment?: string;
+ environment: string;
offset?: string;
}) {
const statsItems = await getConnectionStats({
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_dependencies_breakdown.ts b/x-pack/plugins/apm/server/lib/services/get_service_dependencies_breakdown.ts
index 8ebf6b7e017d4..c0e1af40d98db 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_dependencies_breakdown.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_dependencies_breakdown.ts
@@ -24,8 +24,8 @@ export async function getServiceDependenciesBreakdown({
start: number;
end: number;
serviceName: string;
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
}) {
const items = await getConnectionStats({
setup,
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_detailed_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_detailed_statistics.ts
index d277967dad774..237721dd8bd62 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_detailed_statistics.ts
@@ -29,13 +29,13 @@ export async function getServiceErrorGroupDetailedStatistics({
start,
end,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
setup: Setup;
numBuckets: number;
transactionType: string;
groupIds: string[];
- environment?: string;
+ environment: string;
start: number;
end: number;
}): Promise> {
@@ -117,13 +117,13 @@ export async function getServiceErrorGroupPeriods({
comparisonStart,
comparisonEnd,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
numBuckets: number;
transactionType: string;
groupIds: string[];
- environment?: string;
+ environment: string;
comparisonStart?: number;
comparisonEnd?: number;
}) {
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_main_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_main_statistics.ts
index 0d50e14fc89b0..cbeb720ea8d1b 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_main_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/get_service_error_group_main_statistics.ts
@@ -25,11 +25,11 @@ export async function getServiceErrorGroupMainStatistics({
transactionType,
environment,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
transactionType: string;
- environment?: string;
+ environment: string;
}) {
const { apmEventClient, start, end } = setup;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/index.ts b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/index.ts
index a58539da722c3..fc4dc44b259f6 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_error_groups/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_error_groups/index.ts
@@ -39,8 +39,8 @@ export async function getServiceErrorGroups({
sortField,
transactionType,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
size: number;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_infrastructure.ts b/x-pack/plugins/apm/server/lib/services/get_service_infrastructure.ts
index 79ecab45c75b3..b6621d590b17d 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_infrastructure.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_infrastructure.ts
@@ -23,9 +23,9 @@ export const getServiceInfrastructure = async ({
environment,
setup,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
- environment?: string;
+ environment: string;
setup: Setup & SetupTimeRange;
}) => {
const { apmEventClient, start, end } = setup;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/detailed_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/detailed_statistics.ts
index fc91efbc7c6e6..b806dd765f0ef 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_instances/detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/detailed_statistics.ts
@@ -16,8 +16,8 @@ import { getServiceInstancesSystemMetricStatistics } from './get_service_instanc
import { getServiceInstancesTransactionStatistics } from './get_service_instances_transaction_statistics';
interface ServiceInstanceDetailedStatisticsParams {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
latencyAggregationType: LatencyAggregationType;
setup: Setup;
serviceName: string;
@@ -75,8 +75,8 @@ export async function getServiceInstancesDetailedStatisticsPeriods({
comparisonStart,
comparisonEnd,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
latencyAggregationType: LatencyAggregationType;
setup: Setup & SetupTimeRange;
serviceName: string;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_system_metric_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_system_metric_statistics.ts
index 48209d98e86ce..61e89ed8ca5e3 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_system_metric_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_system_metric_statistics.ts
@@ -62,8 +62,8 @@ export async function getServiceInstancesSystemMetricStatistics<
end: number;
numBuckets?: number;
serviceNodeIds?: string[];
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
size?: number;
isComparisonSearch: T;
}): Promise>> {
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
index d0f58ee8be31f..a51f4c4e0fb7d 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
@@ -72,8 +72,8 @@ export async function getServiceInstancesTransactionStatistics<
end: number;
isComparisonSearch: T;
serviceNodeIds?: string[];
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
size?: number;
numBuckets?: number;
}): Promise>> {
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/main_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/main_statistics.ts
index 8bfa67f8c6247..9ca3d284bcc1a 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_instances/main_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/main_statistics.ts
@@ -13,8 +13,8 @@ import { getServiceInstancesSystemMetricStatistics } from './get_service_instanc
import { getServiceInstancesTransactionStatistics } from './get_service_instances_transaction_statistics';
interface ServiceInstanceMainStatisticsParams {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
latencyAggregationType: LatencyAggregationType;
setup: Setup & SetupTimeRange;
serviceName: string;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts b/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts
index 0f0c174179052..9a3dd1cc443b2 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts
@@ -13,6 +13,7 @@ import {
import { NOT_AVAILABLE_LABEL } from '../../../common/i18n';
import { mergeProjection } from '../../projections/util/merge_projection';
import { getServiceNodesProjection } from '../../projections/service_nodes';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
export async function getServiceNodeMetadata({
kuery,
@@ -20,7 +21,7 @@ export async function getServiceNodeMetadata({
serviceNodeName,
setup,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
serviceNodeName: string;
setup: Setup & SetupTimeRange;
@@ -33,6 +34,7 @@ export async function getServiceNodeMetadata({
setup,
serviceName,
serviceNodeName,
+ environment: ENVIRONMENT_ALL.value,
}),
{
body: {
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
index 9d5b173a1c7e2..d8a28a127499f 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
@@ -44,8 +44,8 @@ export async function getServiceTransactionGroupDetailedStatistics({
start,
end,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionNames: string[];
setup: Setup;
@@ -202,8 +202,8 @@ export async function getServiceTransactionGroupDetailedStatisticsPeriods({
latencyAggregationType: LatencyAggregationType;
comparisonStart?: number;
comparisonEnd?: number;
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
}) {
const { start, end } = setup;
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts b/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
index c8ae36946a2f3..d96c2cfae8f81 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
@@ -44,8 +44,8 @@ export async function getServiceTransactionGroups({
transactionType,
latencyAggregationType,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_health_statuses.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_health_statuses.ts
index 6fc868b0f0a4e..b5d29e1e22fb8 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_health_statuses.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_health_statuses.ts
@@ -11,7 +11,7 @@ import { getServiceAnomalies } from '../../service_map/get_service_anomalies';
import { ServicesItemsSetup } from './get_services_items';
interface AggregationParams {
- environment?: string;
+ environment: string;
setup: ServicesItemsSetup;
searchAggregatedTransactions: boolean;
}
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_service_transaction_stats.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_service_transaction_stats.ts
index 885d73b13bb93..7c4a7bc636c5a 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_service_transaction_stats.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_service_transaction_stats.ts
@@ -31,8 +31,8 @@ import {
import { ServicesItemsSetup } from './get_services_items';
interface AggregationParams {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: ServicesItemsSetup;
searchAggregatedTransactions: boolean;
maxNumServices: number;
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_from_metric_documents.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_from_metric_documents.ts
index a3bab48646eb6..f37fd6e24f3cd 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_services_from_metric_documents.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_from_metric_documents.ts
@@ -23,9 +23,9 @@ export async function getServicesFromMetricDocuments({
kuery,
}: {
setup: Setup & SetupTimeRange;
- environment?: string;
+ environment: string;
maxNumServices: number;
- kuery?: string;
+ kuery: string;
}) {
const { apmEventClient, start, end } = setup;
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 3b9792519d261..0f8405b241b5a 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
@@ -6,13 +6,12 @@
*/
import { Logger } from '@kbn/logging';
-import { asMutableArray } from '../../../../common/utils/as_mutable_array';
-import { joinByKey } from '../../../../common/utils/join_by_key';
import { withApmSpan } from '../../../utils/with_apm_span';
import { Setup, SetupTimeRange } from '../../helpers/setup_request';
import { getHealthStatuses } from './get_health_statuses';
import { getServicesFromMetricDocuments } from './get_services_from_metric_documents';
import { getServiceTransactionStats } from './get_service_transaction_stats';
+import { mergeServiceStats } from './merge_service_stats';
export type ServicesItemsSetup = Setup & SetupTimeRange;
@@ -25,8 +24,8 @@ export async function getServicesItems({
searchAggregatedTransactions,
logger,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: ServicesItemsSetup;
searchAggregatedTransactions: boolean;
logger: Logger;
@@ -53,31 +52,10 @@ export async function getServicesItems({
}),
]);
- const foundServiceNames = transactionStats.map(
- ({ serviceName }) => serviceName
- );
-
- const servicesWithOnlyMetricDocuments = servicesFromMetricDocuments.filter(
- ({ serviceName }) => !foundServiceNames.includes(serviceName)
- );
-
- const allServiceNames = foundServiceNames.concat(
- servicesWithOnlyMetricDocuments.map(({ serviceName }) => serviceName)
- );
-
- // make sure to exclude health statuses from services
- // that are not found in APM data
- const matchedHealthStatuses = healthStatuses.filter(({ serviceName }) =>
- allServiceNames.includes(serviceName)
- );
-
- return joinByKey(
- asMutableArray([
- ...transactionStats,
- ...servicesWithOnlyMetricDocuments,
- ...matchedHealthStatuses,
- ] as const),
- 'serviceName'
- );
+ return mergeServiceStats({
+ transactionStats,
+ servicesFromMetricDocuments,
+ healthStatuses,
+ });
});
}
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/index.ts b/x-pack/plugins/apm/server/lib/services/get_services/index.ts
index e76eb3c28fddb..61cb4a28586d7 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/index.ts
@@ -20,8 +20,8 @@ export async function getServices({
searchAggregatedTransactions,
logger,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
logger: Logger;
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/merge_service_stats.test.ts b/x-pack/plugins/apm/server/lib/services/get_services/merge_service_stats.test.ts
new file mode 100644
index 0000000000000..9fa077ee67c46
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/services/get_services/merge_service_stats.test.ts
@@ -0,0 +1,183 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { ServiceHealthStatus } from '../../../../common/service_health_status';
+import { PromiseReturnType } from '../../../../../observability/typings/common';
+import { getServiceTransactionStats } from './get_service_transaction_stats';
+import { mergeServiceStats } from './merge_service_stats';
+
+type ServiceTransactionStat = PromiseReturnType<
+ typeof getServiceTransactionStats
+>[number];
+
+function stat(values: Partial): ServiceTransactionStat {
+ return {
+ serviceName: 'opbeans-java',
+ environments: ['production'],
+ latency: 1,
+ throughput: 2,
+ transactionErrorRate: 3,
+ transactionType: 'request',
+ agentName: 'java',
+ ...values,
+ };
+}
+
+describe('mergeServiceStats', () => {
+ it('joins stats by service name', () => {
+ expect(
+ mergeServiceStats({
+ transactionStats: [
+ stat({
+ serviceName: 'opbeans-java',
+ environments: ['production'],
+ }),
+ stat({
+ serviceName: 'opbeans-java-2',
+ environments: ['staging'],
+ throughput: 4,
+ }),
+ ],
+ servicesFromMetricDocuments: [
+ {
+ environments: ['production'],
+ serviceName: 'opbeans-java',
+ agentName: 'java',
+ },
+ ],
+ healthStatuses: [
+ {
+ healthStatus: ServiceHealthStatus.healthy,
+ serviceName: 'opbeans-java',
+ },
+ ],
+ })
+ ).toEqual([
+ {
+ agentName: 'java',
+ environments: ['staging'],
+ serviceName: 'opbeans-java-2',
+ latency: 1,
+ throughput: 4,
+ transactionErrorRate: 3,
+ transactionType: 'request',
+ },
+ {
+ agentName: 'java',
+ environments: ['production'],
+ healthStatus: ServiceHealthStatus.healthy,
+ serviceName: 'opbeans-java',
+ latency: 1,
+ throughput: 2,
+ transactionErrorRate: 3,
+ transactionType: 'request',
+ },
+ ]);
+ });
+
+ it('shows services that only have metric documents', () => {
+ expect(
+ mergeServiceStats({
+ transactionStats: [
+ stat({
+ serviceName: 'opbeans-java-2',
+ environments: ['staging'],
+ }),
+ ],
+ servicesFromMetricDocuments: [
+ {
+ environments: ['production'],
+ serviceName: 'opbeans-java',
+ agentName: 'java',
+ },
+ ],
+ healthStatuses: [
+ {
+ healthStatus: ServiceHealthStatus.healthy,
+ serviceName: 'opbeans-java',
+ },
+ ],
+ })
+ ).toEqual([
+ {
+ agentName: 'java',
+ environments: ['staging'],
+ serviceName: 'opbeans-java-2',
+ latency: 1,
+ throughput: 2,
+ transactionErrorRate: 3,
+ transactionType: 'request',
+ },
+ {
+ agentName: 'java',
+ environments: ['production'],
+ healthStatus: ServiceHealthStatus.healthy,
+ serviceName: 'opbeans-java',
+ },
+ ]);
+ });
+
+ it('does not show services that only have ML data', () => {
+ expect(
+ mergeServiceStats({
+ transactionStats: [
+ stat({
+ serviceName: 'opbeans-java-2',
+ environments: ['staging'],
+ }),
+ ],
+ servicesFromMetricDocuments: [],
+ healthStatuses: [
+ {
+ healthStatus: ServiceHealthStatus.healthy,
+ serviceName: 'opbeans-java',
+ },
+ ],
+ })
+ ).toEqual([
+ {
+ agentName: 'java',
+ environments: ['staging'],
+ serviceName: 'opbeans-java-2',
+ latency: 1,
+ throughput: 2,
+ transactionErrorRate: 3,
+ transactionType: 'request',
+ },
+ ]);
+ });
+
+ it('concatenates environments from metric/transaction data', () => {
+ expect(
+ mergeServiceStats({
+ transactionStats: [
+ stat({
+ serviceName: 'opbeans-java',
+ environments: ['staging'],
+ }),
+ ],
+ servicesFromMetricDocuments: [
+ {
+ environments: ['production'],
+ serviceName: 'opbeans-java',
+ agentName: 'java',
+ },
+ ],
+ healthStatuses: [],
+ })
+ ).toEqual([
+ {
+ agentName: 'java',
+ environments: ['staging', 'production'],
+ serviceName: 'opbeans-java',
+ latency: 1,
+ throughput: 2,
+ transactionErrorRate: 3,
+ transactionType: 'request',
+ },
+ ]);
+ });
+});
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/merge_service_stats.ts b/x-pack/plugins/apm/server/lib/services/get_services/merge_service_stats.ts
new file mode 100644
index 0000000000000..00aaa6fd7066d
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/services/get_services/merge_service_stats.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { uniq } from 'lodash';
+import { asMutableArray } from '../../../../common/utils/as_mutable_array';
+import { joinByKey } from '../../../../common/utils/join_by_key';
+import { PromiseReturnType } from '../../../../../observability/typings/common';
+import { getHealthStatuses } from './get_health_statuses';
+import { getServicesFromMetricDocuments } from './get_services_from_metric_documents';
+import { getServiceTransactionStats } from './get_service_transaction_stats';
+
+export function mergeServiceStats({
+ transactionStats,
+ servicesFromMetricDocuments,
+ healthStatuses,
+}: {
+ transactionStats: PromiseReturnType;
+ servicesFromMetricDocuments: PromiseReturnType<
+ typeof getServicesFromMetricDocuments
+ >;
+ healthStatuses: PromiseReturnType;
+}) {
+ const foundServiceNames = transactionStats.map(
+ ({ serviceName }) => serviceName
+ );
+
+ const servicesWithOnlyMetricDocuments = servicesFromMetricDocuments.filter(
+ ({ serviceName }) => !foundServiceNames.includes(serviceName)
+ );
+
+ const allServiceNames = foundServiceNames.concat(
+ servicesWithOnlyMetricDocuments.map(({ serviceName }) => serviceName)
+ );
+
+ // make sure to exclude health statuses from services
+ // that are not found in APM data
+ const matchedHealthStatuses = healthStatuses.filter(({ serviceName }) =>
+ allServiceNames.includes(serviceName)
+ );
+
+ return joinByKey(
+ asMutableArray([
+ ...transactionStats,
+ ...servicesFromMetricDocuments,
+ ...matchedHealthStatuses,
+ ] as const),
+ 'serviceName',
+ function merge(a, b) {
+ const aEnvs = 'environments' in a ? a.environments : [];
+ const bEnvs = 'environments' in b ? b.environments : [];
+
+ return {
+ ...a,
+ ...b,
+ environments: uniq(aEnvs.concat(bEnvs)),
+ };
+ }
+ );
+}
diff --git a/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
index 90fa54f31eb34..4fb68fdd3f562 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
@@ -39,8 +39,8 @@ export async function getServiceTransactionDetailedStatistics({
offset,
}: {
serviceNames: string[];
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
offset?: string;
diff --git a/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/index.ts b/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/index.ts
index d4ce90c79f4a6..bc89d8d139c67 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/index.ts
@@ -18,8 +18,8 @@ export async function getServicesDetailedStatistics({
offset,
}: {
serviceNames: string[];
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
offset?: string;
diff --git a/x-pack/plugins/apm/server/lib/services/get_throughput.ts b/x-pack/plugins/apm/server/lib/services/get_throughput.ts
index b7f265daeb465..e866918fc29bb 100644
--- a/x-pack/plugins/apm/server/lib/services/get_throughput.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_throughput.ts
@@ -19,8 +19,8 @@ import {
import { Setup } from '../helpers/setup_request';
interface Options {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
searchAggregatedTransactions: boolean;
serviceName: string;
setup: Setup;
diff --git a/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts b/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts
index 4434cc89d24f2..b21aadbde2afb 100644
--- a/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts
@@ -189,10 +189,10 @@ export async function getServiceProfilingStatistics({
valueType,
logger,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
- environment?: string;
+ environment: string;
valueType: ProfilingValueType;
logger: Logger;
}) {
diff --git a/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_timeline.ts b/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_timeline.ts
index 19de91a5a1055..adb91b30e3cc2 100644
--- a/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_timeline.ts
+++ b/x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_timeline.ts
@@ -32,10 +32,10 @@ export async function getServiceProfilingTimeline({
environment,
setup,
}: {
- kuery?: string;
+ kuery: string;
serviceName: string;
setup: Setup & SetupTimeRange;
- environment?: string;
+ environment: string;
}) {
const { apmEventClient, start, end } = setup;
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 6adaca9c1a93d..a34382ddaf1fb 100644
--- a/x-pack/plugins/apm/server/lib/services/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/services/queries.test.ts
@@ -14,6 +14,7 @@ import {
SearchParamsMock,
inspectSearchParams,
} from '../../utils/test_helpers';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
describe('services queries', () => {
let mock: SearchParamsMock;
@@ -52,6 +53,8 @@ describe('services queries', () => {
setup,
searchAggregatedTransactions: false,
logger: {} as any,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
index fc1e800bb0543..75c14b4ffc503 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -29,8 +29,8 @@ import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { getAverages, getCounts, getSums } from './get_transaction_group_stats';
export interface TopTraceOptions {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
transactionName?: string;
searchAggregatedTransactions: boolean;
}
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
index 5c33959399104..22891d929e9c0 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
@@ -39,8 +39,8 @@ export async function getErrorRate({
start,
end,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionType?: string;
transactionName?: string;
@@ -144,8 +144,8 @@ export async function getErrorRatePeriods({
comparisonStart,
comparisonEnd,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionType?: string;
transactionName?: string;
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts b/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts
index 18f1c1bee50dc..e662a0d2d186f 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts
@@ -10,6 +10,7 @@ import {
SearchParamsMock,
inspectSearchParams,
} from '../../utils/test_helpers';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
describe('transaction group queries', () => {
let mock: SearchParamsMock;
@@ -23,6 +24,8 @@ describe('transaction group queries', () => {
topTransactionGroupsFetcher(
{
searchAggregatedTransactions: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
},
setup
)
@@ -37,6 +40,8 @@ describe('transaction group queries', () => {
topTransactionGroupsFetcher(
{
searchAggregatedTransactions: true,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
},
setup
)
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
index d8867c0dcc1e2..6c021fcada480 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
@@ -10,6 +10,7 @@ import * as constants from './constants';
import noDataResponse from './mock_responses/no_data.json';
import dataResponse from './mock_responses/data.json';
import { APMConfig } from '../../..';
+import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
const mockIndices = {
/* eslint-disable @typescript-eslint/naming-convention */
@@ -49,6 +50,8 @@ describe('getTransactionBreakdown', () => {
serviceName: 'myServiceName',
transactionType: 'request',
setup: getMockSetup(noDataResponse),
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
});
expect(Object.keys(response.timeseries).length).toBe(0);
@@ -59,6 +62,8 @@ describe('getTransactionBreakdown', () => {
serviceName: 'myServiceName',
transactionType: 'request',
setup: getMockSetup(dataResponse),
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
});
const { timeseries } = response;
@@ -87,6 +92,8 @@ describe('getTransactionBreakdown', () => {
serviceName: 'myServiceName',
transactionType: 'request',
setup: getMockSetup(dataResponse),
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
});
const { timeseries } = response;
@@ -99,6 +106,8 @@ describe('getTransactionBreakdown', () => {
serviceName: 'myServiceName',
transactionType: 'request',
setup: getMockSetup(dataResponse),
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
});
const { timeseries } = response;
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 0b0dd6924c4aa..0912fdcf38ee1 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -32,8 +32,8 @@ export async function getTransactionBreakdown({
transactionName,
transactionType,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
transactionName?: string;
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
index 62c284cd22053..e868f7de049f9 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
@@ -59,8 +59,8 @@ export async function getBuckets({
setup,
searchAggregatedTransactions,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionName: string;
transactionType: string;
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
index 34b790a267c83..9c056bc506e92 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
@@ -27,8 +27,8 @@ export async function getDistributionMax({
setup,
searchAggregatedTransactions,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionName: string;
transactionType: string;
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts
index ef92ce6edcafe..ef72f2434fde2 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts
@@ -30,8 +30,8 @@ export async function getTransactionDistribution({
setup,
searchAggregatedTransactions,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionName: string;
transactionType: string;
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/index.ts
index bcd279c57f4a5..b0a9b27ba771b 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/index.ts
@@ -25,7 +25,7 @@ export async function getAnomalySeries({
setup,
logger,
}: {
- environment?: string;
+ environment: string;
serviceName: string;
transactionType: string;
transactionName?: string;
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts
index 183a754ea0809..c2fd718fbc95c 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts
@@ -43,8 +43,8 @@ function searchLatency({
start,
end,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionType: string | undefined;
transactionName: string | undefined;
@@ -127,8 +127,8 @@ export async function getLatencyTimeseries({
start,
end,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
serviceName: string;
transactionType: string | undefined;
transactionName: string | undefined;
@@ -192,8 +192,8 @@ export async function getLatencyPeriods({
latencyAggregationType: LatencyAggregationType;
comparisonStart?: number;
comparisonEnd?: number;
- kuery?: string;
- environment?: string;
+ kuery: string;
+ environment: string;
}) {
const { start, end } = setup;
const options = {
diff --git a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
index 638d87112ced2..b1d942a261387 100644
--- a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
import {
inspectSearchParams,
SearchParamsMock,
@@ -26,6 +27,8 @@ describe('transaction queries', () => {
serviceName: 'foo',
transactionType: 'bar',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
@@ -39,6 +42,8 @@ describe('transaction queries', () => {
transactionType: 'bar',
transactionName: 'baz',
setup,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
@@ -55,6 +60,8 @@ describe('transaction queries', () => {
transactionId: 'quz',
setup,
searchAggregatedTransactions: false,
+ environment: ENVIRONMENT_ALL.value,
+ kuery: '',
})
);
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index 24d41e2574bbe..807d21768a50c 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -15,10 +15,10 @@ import {
Plugin,
PluginInitializerContext,
} from 'src/core/server';
-import { isEmpty, mapValues, once } from 'lodash';
+import { isEmpty, mapValues } from 'lodash';
import { SavedObjectsClient } from '../../../../src/core/server';
-import { TECHNICAL_COMPONENT_TEMPLATE_NAME } from '../../rule_registry/common/assets';
import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
+import { Dataset } from '../../rule_registry/server';
import { APMConfig, APMXPackConfig, APM_SERVER_FEATURE_ID } from '.';
import { mergeConfigs } from './index';
import { UI_SETTINGS } from '../../../../src/plugins/data/common';
@@ -106,79 +106,43 @@ export class APMPlugin
registerFeaturesUsage({ licensingPlugin: plugins.licensing });
- const { ruleDataService } = plugins.ruleRegistry;
const getCoreStart = () =>
core.getStartServices().then(([coreStart]) => coreStart);
- const alertsIndexPattern = ruleDataService.getFullAssetName(
- 'observability-apm*'
- );
-
- const initializeRuleDataTemplates = once(async () => {
- const componentTemplateName = ruleDataService.getFullAssetName(
- 'apm-mappings'
- );
-
- if (!ruleDataService.isWriteEnabled()) {
- return;
- }
-
- await ruleDataService.createOrUpdateComponentTemplate({
- name: componentTemplateName,
- body: {
- template: {
- settings: {
- number_of_shards: 1,
- },
- mappings: mappingFromFieldMap(
- {
- [SERVICE_NAME]: {
- type: 'keyword',
- },
- [SERVICE_ENVIRONMENT]: {
- type: 'keyword',
- },
- [TRANSACTION_TYPE]: {
- type: 'keyword',
- },
- [PROCESSOR_EVENT]: {
- type: 'keyword',
- },
+ const { ruleDataService } = plugins.ruleRegistry;
+ const ruleDataClient = ruleDataService.initializeIndex({
+ feature: APM_SERVER_FEATURE_ID,
+ registrationContext: 'observability.apm',
+ dataset: Dataset.alerts,
+ componentTemplateRefs: [],
+ componentTemplates: [
+ {
+ name: 'mappings',
+ version: 0,
+ mappings: mappingFromFieldMap(
+ {
+ [SERVICE_NAME]: {
+ type: 'keyword',
},
- 'strict'
- ),
- },
- },
- });
-
- await ruleDataService.createOrUpdateIndexTemplate({
- name: ruleDataService.getFullAssetName('apm-index-template'),
- body: {
- index_patterns: [alertsIndexPattern],
- composed_of: [
- ruleDataService.getFullAssetName(TECHNICAL_COMPONENT_TEMPLATE_NAME),
- componentTemplateName,
- ],
+ [SERVICE_ENVIRONMENT]: {
+ type: 'keyword',
+ },
+ [TRANSACTION_TYPE]: {
+ type: 'keyword',
+ },
+ [PROCESSOR_EVENT]: {
+ type: 'keyword',
+ },
+ },
+ 'strict'
+ ),
},
- });
- await ruleDataService.updateIndexMappingsMatchingPattern(
- alertsIndexPattern
- );
+ ],
+ indexTemplate: {
+ version: 0,
+ },
});
- // initialize eagerly
- const initializeRuleDataTemplatesPromise = initializeRuleDataTemplates().catch(
- (err) => {
- this.logger!.error(err);
- }
- );
-
- const ruleDataClient = ruleDataService.getRuleDataClient(
- APM_SERVER_FEATURE_ID,
- ruleDataService.getFullAssetName('observability-apm'),
- () => initializeRuleDataTemplatesPromise
- );
-
const resourcePlugins = mapValues(plugins, (value, key) => {
return {
setup: value,
diff --git a/x-pack/plugins/apm/server/projections/errors.ts b/x-pack/plugins/apm/server/projections/errors.ts
index 8f32dd9e5be58..c977123d6d31b 100644
--- a/x-pack/plugins/apm/server/projections/errors.ts
+++ b/x-pack/plugins/apm/server/projections/errors.ts
@@ -20,8 +20,8 @@ export function getErrorGroupsProjection({
setup,
serviceName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
}) {
diff --git a/x-pack/plugins/apm/server/projections/metrics.ts b/x-pack/plugins/apm/server/projections/metrics.ts
index 54bc498007cbb..21f6ee86e57b5 100644
--- a/x-pack/plugins/apm/server/projections/metrics.ts
+++ b/x-pack/plugins/apm/server/projections/metrics.ts
@@ -35,8 +35,8 @@ export function getMetricsProjection({
serviceName,
serviceNodeName,
}: {
- environment?: string;
- kuery?: string;
+ environment: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
diff --git a/x-pack/plugins/apm/server/projections/service_nodes.ts b/x-pack/plugins/apm/server/projections/service_nodes.ts
index 932309d9875c2..1e6a5b0e01113 100644
--- a/x-pack/plugins/apm/server/projections/service_nodes.ts
+++ b/x-pack/plugins/apm/server/projections/service_nodes.ts
@@ -11,22 +11,25 @@ import { mergeProjection } from './util/merge_projection';
import { getMetricsProjection } from './metrics';
export function getServiceNodesProjection({
- kuery,
setup,
serviceName,
serviceNodeName,
+ environment,
+ kuery,
}: {
- kuery?: string;
setup: Setup & SetupTimeRange;
serviceName: string;
serviceNodeName?: string;
+ environment: string;
+ kuery: string;
}) {
return mergeProjection(
getMetricsProjection({
- kuery,
setup,
serviceName,
serviceNodeName,
+ environment,
+ kuery,
}),
{
body: {
diff --git a/x-pack/plugins/apm/server/projections/services.ts b/x-pack/plugins/apm/server/projections/services.ts
index 52992f16dac85..6709c32bea3f9 100644
--- a/x-pack/plugins/apm/server/projections/services.ts
+++ b/x-pack/plugins/apm/server/projections/services.ts
@@ -16,7 +16,7 @@ export function getServicesProjection({
setup,
searchAggregatedTransactions,
}: {
- kuery?: string;
+ kuery: string;
setup: Setup & SetupTimeRange;
searchAggregatedTransactions: boolean;
}) {
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview.ts
index 0175860e93d35..13879cb5fecb7 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview.ts
@@ -12,7 +12,7 @@ import { getTransactionErrorRateChartPreview } from '../../lib/alerts/chart_prev
import { setupRequest } from '../../lib/helpers/setup_request';
import { createApmServerRoute } from '../create_apm_server_route';
import { createApmServerRouteRepository } from '../create_apm_server_route_repository';
-import { rangeRt } from '../default_api_types';
+import { environmentRt, rangeRt } from '../default_api_types';
const alertParamsRt = t.intersection([
t.partial({
@@ -22,9 +22,9 @@ const alertParamsRt = t.intersection([
t.literal('99th'),
]),
serviceName: t.string,
- environment: t.string,
transactionType: t.string,
}),
+ environmentRt,
rangeRt,
]);
diff --git a/x-pack/plugins/apm/server/routes/backends.ts b/x-pack/plugins/apm/server/routes/backends.ts
index c5c2b3cac2283..c22e196fda996 100644
--- a/x-pack/plugins/apm/server/routes/backends.ts
+++ b/x-pack/plugins/apm/server/routes/backends.ts
@@ -22,10 +22,15 @@ const topBackendsRoute = createApmServerRoute({
endpoint: 'GET /api/apm/backends/top_backends',
params: t.intersection([
t.type({
- query: t.intersection([rangeRt, t.type({ numBuckets: toNumberRt })]),
+ query: t.intersection([
+ rangeRt,
+ environmentRt,
+ kueryRt,
+ t.type({ numBuckets: toNumberRt }),
+ ]),
}),
t.partial({
- query: t.intersection([environmentRt, offsetRt, kueryRt]),
+ query: offsetRt,
}),
]),
options: {
diff --git a/x-pack/plugins/apm/server/routes/default_api_types.ts b/x-pack/plugins/apm/server/routes/default_api_types.ts
index 16de83687eb7c..5622b12e1b099 100644
--- a/x-pack/plugins/apm/server/routes/default_api_types.ts
+++ b/x-pack/plugins/apm/server/routes/default_api_types.ts
@@ -8,6 +8,8 @@
import * as t from 'io-ts';
import { isoToEpochRt } from '@kbn/io-ts-utils';
+export { environmentRt } from '../../common/environment_rt';
+
export const rangeRt = t.type({
start: isoToEpochRt,
end: isoToEpochRt,
@@ -20,6 +22,4 @@ export const comparisonRangeRt = t.partial({
comparisonEnd: isoToEpochRt,
});
-export const environmentRt = t.partial({ environment: t.string });
-
-export const kueryRt = t.partial({ kuery: t.string });
+export const kueryRt = t.type({ kuery: t.string });
diff --git a/x-pack/plugins/apm/server/routes/environments.ts b/x-pack/plugins/apm/server/routes/environments.ts
index e06fbdf7fb6d4..b9d44de681572 100644
--- a/x-pack/plugins/apm/server/routes/environments.ts
+++ b/x-pack/plugins/apm/server/routes/environments.ts
@@ -28,9 +28,13 @@ const environmentsRoute = createApmServerRoute({
const setup = await setupRequest(resources);
const { params } = resources;
const { serviceName } = params.query;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
const environments = await getEnvironments({
setup,
diff --git a/x-pack/plugins/apm/server/routes/observability_overview.ts b/x-pack/plugins/apm/server/routes/observability_overview.ts
index c2e3d0e81ce0a..838bc3a1f5c68 100644
--- a/x-pack/plugins/apm/server/routes/observability_overview.ts
+++ b/x-pack/plugins/apm/server/routes/observability_overview.ts
@@ -35,9 +35,13 @@ const observabilityOverviewRoute = createApmServerRoute({
const setup = await setupRequest(resources);
const { bucketSize } = resources.params.query;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
return withApmSpan('observability_overview', async () => {
const [serviceCount, transactionPerMinute] = await Promise.all([
diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts
index 023753932d21f..2aacecf4a23de 100644
--- a/x-pack/plugins/apm/server/routes/service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map.ts
@@ -50,9 +50,13 @@ const serviceMapRoute = createApmServerRoute({
query: { serviceName, environment },
} = params;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
return getServiceMap({
setup,
serviceName,
@@ -88,9 +92,13 @@ const serviceMapServiceNodeRoute = createApmServerRoute({
query: { environment },
} = params;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
return getServiceMapServiceNodeInfo({
environment,
diff --git a/x-pack/plugins/apm/server/routes/service_nodes.ts b/x-pack/plugins/apm/server/routes/service_nodes.ts
index a2eb12662cbca..af5d8b7591d5f 100644
--- a/x-pack/plugins/apm/server/routes/service_nodes.ts
+++ b/x-pack/plugins/apm/server/routes/service_nodes.ts
@@ -11,6 +11,7 @@ import { createApmServerRoute } from './create_apm_server_route';
import { setupRequest } from '../lib/helpers/setup_request';
import { getServiceNodes } from '../lib/service_nodes';
import { rangeRt, kueryRt } from './default_api_types';
+import { environmentRt } from '../../common/environment_rt';
const serviceNodesRoute = createApmServerRoute({
endpoint: 'GET /api/apm/services/{serviceName}/serviceNodes',
@@ -18,16 +19,21 @@ const serviceNodesRoute = createApmServerRoute({
path: t.type({
serviceName: t.string,
}),
- query: t.intersection([kueryRt, rangeRt]),
+ query: t.intersection([kueryRt, rangeRt, environmentRt]),
}),
options: { tags: ['access:apm'] },
handler: async (resources) => {
const setup = await setupRequest(resources);
const { params } = resources;
const { serviceName } = params.path;
- const { kuery } = params.query;
+ const { kuery, environment } = params.query;
- const serviceNodes = await getServiceNodes({ kuery, setup, serviceName });
+ const serviceNodes = await getServiceNodes({
+ kuery,
+ setup,
+ serviceName,
+ environment,
+ });
return { serviceNodes };
},
});
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index 10d5bc5e3abdb..b4d185fecf5e2 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -120,9 +120,13 @@ const serviceMetadataDetailsRoute = createApmServerRoute({
const { params } = resources;
const { serviceName } = params.path;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
return getServiceMetadataDetails({
serviceName,
@@ -144,9 +148,13 @@ const serviceMetadataIconsRoute = createApmServerRoute({
const { params } = resources;
const { serviceName } = params.path;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
return getServiceMetadataIcons({
serviceName,
@@ -169,9 +177,13 @@ const serviceAgentNameRoute = createApmServerRoute({
const setup = await setupRequest(resources);
const { params } = resources;
const { serviceName } = params.path;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ });
return getServiceAgentName({
serviceName,
@@ -198,9 +210,13 @@ const serviceTransactionTypesRoute = createApmServerRoute({
return getServiceTransactionTypes({
serviceName,
setup,
- searchAggregatedTransactions: await getSearchAggregatedTransactions(
- setup
- ),
+ searchAggregatedTransactions: await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ }),
});
},
});
@@ -248,17 +264,22 @@ const serviceAnnotationsRoute = createApmServerRoute({
const { observability } = plugins;
- const [
- annotationsClient,
- searchAggregatedTransactions,
- ] = await Promise.all([
- observability
- ? withApmSpan('get_scoped_annotations_client', () =>
- observability.setup.getScopedAnnotationsClient(context, request)
- )
- : undefined,
- getSearchAggregatedTransactions(setup),
- ]);
+ const [annotationsClient, searchAggregatedTransactions] = await Promise.all(
+ [
+ observability
+ ? withApmSpan('get_scoped_annotations_client', () =>
+ observability.setup.getScopedAnnotationsClient(context, request)
+ )
+ : undefined,
+ getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ start: setup.start,
+ end: setup.end,
+ kuery: '',
+ }),
+ ]
+ );
return getServiceAnnotations({
environment,
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
index f50770cb5ded7..71413cc757538 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
@@ -243,9 +243,11 @@ const listAgentConfigurationServicesRoute = createApmServerRoute({
options: { tags: ['access:apm'] },
handler: async (resources) => {
const setup = await setupRequest(resources);
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ kuery: '',
+ });
const serviceNames = await getServiceNames({
setup,
searchAggregatedTransactions,
@@ -267,9 +269,11 @@ const listAgentConfigurationEnvironmentsRoute = createApmServerRoute({
const { params } = resources;
const { serviceName } = params.query;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ kuery: '',
+ });
const environments = await getEnvironments({
serviceName,
diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection.ts b/x-pack/plugins/apm/server/routes/settings/anomaly_detection.ts
index 98467e1a4a0dd..d15f232411810 100644
--- a/x-pack/plugins/apm/server/routes/settings/anomaly_detection.ts
+++ b/x-pack/plugins/apm/server/routes/settings/anomaly_detection.ts
@@ -87,9 +87,11 @@ const anomalyDetectionEnvironmentsRoute = createApmServerRoute({
handler: async (resources) => {
const setup = await setupRequest(resources);
- const searchAggregatedTransactions = await getSearchAggregatedTransactions(
- setup
- );
+ const searchAggregatedTransactions = await getSearchAggregatedTransactions({
+ apmEventClient: setup.apmEventClient,
+ config: setup.config,
+ kuery: '',
+ });
const environments = await getAllEnvironments({
setup,
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index 4279cfd84328c..76f19a6a0ca3e 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -12,7 +12,7 @@ import {
KibanaRequest,
CoreStart,
} from 'src/core/server';
-import { RuleDataClient } from '../../../rule_registry/server';
+import { IRuleDataClient } from '../../../rule_registry/server';
import { AlertingApiRequestHandlerContext } from '../../../alerting/server';
import type { RacApiRequestHandlerContext } from '../../../rule_registry/server';
import { LicensingApiRequestHandlerContext } from '../../../licensing/server';
@@ -72,6 +72,6 @@ export interface APMRouteHandlerResources {
start: () => Promise[key]['start']>;
};
};
- ruleDataClient: RuleDataClient;
+ ruleDataClient: IRuleDataClient;
telemetryUsageCounter?: TelemetryUsageCounter;
}
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index c465176e7ed01..201fb5ab8f78f 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -1,42 +1,43 @@
{
- "id": "canvas",
- "version": "8.0.0",
- "kibanaVersion": "kibana",
- "configPath": ["xpack", "canvas"],
- "server": true,
- "ui": true,
- "requiredPlugins": [
- "bfetch",
- "charts",
- "data",
- "embeddable",
- "expressionError",
- "expressionImage",
- "expressionMetric",
- "expressionRepeatImage",
- "expressionRevealImage",
- "expressionShape",
- "expressions",
- "features",
- "inspector",
- "presentationUtil",
- "uiActions"
- ],
- "optionalPlugins": [
- "home",
- "reporting",
- "usageCollection"
- ],
- "requiredBundles": [
- "discover",
- "home",
- "kibanaLegacy",
- "kibanaReact",
- "kibanaUtils",
- "lens",
- "maps",
- "savedObjects",
- "visualizations",
- "fieldFormats"
- ]
- }
+ "id": "canvas",
+ "owner": {
+ "name": "Kibana Presentation",
+ "githubTeam": "kibana-presentation"
+ },
+ "description": "Adds Canvas application to Kibana",
+ "version": "8.0.0",
+ "kibanaVersion": "kibana",
+ "configPath": ["xpack", "canvas"],
+ "server": true,
+ "ui": true,
+ "requiredPlugins": [
+ "bfetch",
+ "charts",
+ "data",
+ "embeddable",
+ "expressionError",
+ "expressionImage",
+ "expressionMetric",
+ "expressionRepeatImage",
+ "expressionRevealImage",
+ "expressionShape",
+ "expressions",
+ "features",
+ "inspector",
+ "presentationUtil",
+ "uiActions"
+ ],
+ "optionalPlugins": ["home", "reporting", "usageCollection"],
+ "requiredBundles": [
+ "discover",
+ "home",
+ "kibanaLegacy",
+ "kibanaReact",
+ "kibanaUtils",
+ "lens",
+ "maps",
+ "savedObjects",
+ "visualizations",
+ "fieldFormats"
+ ]
+}
diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/index.js b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/index.js
index 75a2ecc98cdae..89faef29a3b02 100644
--- a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/index.js
+++ b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/index.js
@@ -5,28 +5,25 @@
* 2.0.
*/
-import { pure, compose, lifecycle, withState, branch, renderComponent } from 'recompose';
+import React, { useState, useEffect } from 'react';
import { PropTypes } from 'prop-types';
import { interpretAst } from '../../../lib/run_interpreter';
import { Loading } from '../../loading';
import { DatasourcePreview as Component } from './datasource_preview';
-export const DatasourcePreview = compose(
- pure,
- withState('datatable', 'setDatatable'),
- lifecycle({
- componentDidMount() {
- interpretAst(
- {
- type: 'expression',
- chain: [this.props.function],
- },
- {}
- ).then(this.props.setDatatable);
- },
- }),
- branch(({ datatable }) => !datatable, renderComponent(Loading))
-)(Component);
+export const DatasourcePreview = (props) => {
+ const [datatable, setDatatable] = useState();
+
+ useEffect(() => {
+ interpretAst({ type: 'expression', chain: [props.function] }, {}).then(setDatatable);
+ }, [props.function, setDatatable]);
+
+ if (!datatable) {
+ return | undefined;
+ onFocus: FocusEventHandler | undefined;
+ fields: string[];
+}
+
+export const ESFieldSelect: React.FunctionComponent = ({
+ value,
+ fields = [],
+ onChange,
+ onFocus,
+ onBlur,
+}) => {
const selectedOption = value ? [{ label: value }] : [];
const options = fields.map((field) => ({ label: field }));
-
return (
onChange(get(field, 'label', null))}
+ onChange={([field]) => onChange(field?.label ?? null)}
onSearchChange={(searchValue) => {
// resets input when user starts typing
if (searchValue) {
@@ -33,15 +45,3 @@ export const ESFieldSelect = ({ value, fields = [], onChange, onFocus, onBlur })
/>
);
};
-
-ESFieldSelect.propTypes = {
- onChange: PropTypes.func,
- onFocus: PropTypes.func,
- onBlur: PropTypes.func,
- value: PropTypes.string,
- fields: PropTypes.array,
-};
-
-ESFieldSelect.defaultProps = {
- fields: [],
-};
diff --git a/x-pack/plugins/canvas/public/components/es_field_select/index.js b/x-pack/plugins/canvas/public/components/es_field_select/index.js
deleted file mode 100644
index bbeefb73d3b83..0000000000000
--- a/x-pack/plugins/canvas/public/components/es_field_select/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { compose, withState, lifecycle } from 'recompose';
-import { getFields } from '../../lib/es_service';
-import { ESFieldSelect as Component } from './es_field_select';
-
-export const ESFieldSelect = compose(
- withState('fields', 'setFields', []),
- lifecycle({
- componentDidMount() {
- if (this.props.index) {
- getFields(this.props.index).then(this.props.setFields);
- }
- },
- componentDidUpdate({ index }) {
- const { value, onChange, setFields } = this.props;
- if (this.props.index !== index) {
- getFields(this.props.index).then((fields) => {
- setFields(fields);
- });
- }
-
- if (value && !this.props.fields.includes(value)) {
- onChange(null);
- }
- },
- })
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/es_field_select/index.tsx b/x-pack/plugins/canvas/public/components/es_field_select/index.tsx
new file mode 100644
index 0000000000000..3b3d5aa13fd24
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/es_field_select/index.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { getFields } from '../../lib/es_service';
+import { ESFieldSelect as Component, ESFieldSelectProps as Props } from './es_field_select';
+
+type ESFieldSelectProps = Omit;
+
+export const ESFieldSelect: React.FunctionComponent = (props) => {
+ const { index, value, onChange } = props;
+ const [fields, setFields] = useState([]);
+
+ useEffect(() => {
+ getFields(index).then((newFields) => setFields(newFields || []));
+ }, [index]);
+
+ useEffect(() => {
+ if (value && !fields.includes(value)) {
+ onChange(null);
+ }
+ }, [value, fields, onChange]);
+
+ return
diff --git a/x-pack/plugins/canvas/public/components/home/__snapshots__/home.stories.storyshot b/x-pack/plugins/canvas/public/components/home/__snapshots__/home.stories.storyshot
index 02f54723abd42..8359b186e4afd 100644
--- a/x-pack/plugins/canvas/public/components/home/__snapshots__/home.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/home/__snapshots__/home.stories.storyshot
@@ -2,7 +2,7 @@
exports[`Storyshots Home Home Page 1`] = `
+ Forwarded app state +
++ No forwarded app state found +
+- {i18n.translate( - 'xpack.apm.correlations.latencyCorrelations.chartTitle', - { - defaultMessage: - 'Latency distribution for {name} (Log-Log Plot)', - values: { - name: transactionName ?? serviceName, - }, - } - )} -
-+ {i18n.translate( + 'xpack.apm.correlations.latencyCorrelations.chartTitle', + { + defaultMessage: 'Latency distribution for {name} (Log-Log Plot)', + values: { + name: transactionName ?? serviceName, + }, + } + )} +
+
{histograms.length > 0 && selectedHistogram !== undefined && (
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
index cf4cc68865977..06d7b1ba585d5 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
@@ -94,14 +94,14 @@ function ErrorGroupHeader({
export function ErrorGroupDetails() {
const { urlParams } = useUrlParams();
- const { environment, kuery, start, end } = urlParams;
+ const { start, end } = urlParams;
const { serviceName } = useApmServiceContext();
const apmRouter = useApmRouter();
const {
path: { groupId },
- query: { rangeFrom, rangeTo },
+ query: { rangeFrom, rangeTo, environment, kuery },
} = useApmParams('/services/:serviceName/errors/:groupId');
useBreadcrumb({
@@ -114,6 +114,8 @@ export function ErrorGroupDetails() {
query: {
rangeFrom,
rangeTo,
+ environment,
+ kuery,
},
}),
});
@@ -144,6 +146,8 @@ export function ErrorGroupDetails() {
const { errorDistributionData } = useErrorGroupDistributionFetcher({
serviceName,
groupId,
+ environment,
+ kuery,
});
if (!errorGroupData || !errorDistributionData) {
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
index 910f6aba3303d..d8f96db6ed9e2 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
@@ -36,6 +36,8 @@ export function ErrorGroupOverview() {
const { errorDistributionData } = useErrorGroupDistributionFetcher({
serviceName,
groupId: undefined,
+ environment,
+ kuery,
});
const { data: errorGroupListData } = useFetcher(
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
index 2a59a98ee31f7..d0cf5c9893750 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
@@ -14,6 +14,7 @@ import { useAnomalyDetectionJobsContext } from '../../../context/anomaly_detecti
import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { useApmParams } from '../../../hooks/use_apm_params';
import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
import { useFallbackToTransactionsFetcher } from '../../../hooks/use_fallback_to_transactions_fetcher';
import { AggregatedTransactionsCallout } from '../../shared/aggregated_transactions_callout';
@@ -35,16 +36,15 @@ const initialData = {
let hasDisplayedToast = false;
-function useServicesFetcher() {
+function useServicesFetcher({
+ environment,
+ kuery,
+}: {
+ environment: string;
+ kuery: string;
+}) {
const {
- urlParams: {
- environment,
- kuery,
- start,
- end,
- comparisonEnabled,
- comparisonType,
- },
+ urlParams: { start, end, comparisonEnabled, comparisonType },
} = useUrlParams();
const { core } = useApmPluginContext();
const upgradeAssistantHref = useUpgradeAssistantHref();
@@ -82,7 +82,7 @@ function useServicesFetcher() {
const { mainStatisticsData, requestId } = data;
- const { data: comparisonData, status: comparisonStatus } = useFetcher(
+ const { data: comparisonData } = useFetcher(
(callApmApi) => {
if (start && end && mainStatisticsData.items.length) {
return callApmApi({
@@ -146,24 +146,29 @@ function useServicesFetcher() {
]);
return {
- servicesData: mainStatisticsData,
- servicesStatus: mainStatisticsStatus,
+ mainStatisticsData,
+ mainStatisticsStatus,
comparisonData,
- isLoading:
- mainStatisticsStatus === FETCH_STATUS.LOADING ||
- comparisonStatus === FETCH_STATUS.LOADING,
+ isLoading: mainStatisticsStatus === FETCH_STATUS.LOADING,
};
}
export function ServiceInventory() {
const { core } = useApmPluginContext();
- const { fallbackToTransactions } = useFallbackToTransactionsFetcher();
+
+ const {
+ query: { environment, kuery },
+ } = useApmParams('/services');
+
+ const { fallbackToTransactions } = useFallbackToTransactionsFetcher({
+ kuery,
+ });
const {
- servicesData,
- servicesStatus,
+ mainStatisticsData,
+ mainStatisticsStatus,
comparisonData,
isLoading,
- } = useServicesFetcher();
+ } = useServicesFetcher({ environment, kuery });
const {
anomalyDetectionJobsData,
@@ -200,13 +205,13 @@ export function ServiceInventory() {
= {
export default stories;
export const Backend: Story = () => {
- return = () => {
- return = () => {
- return = () => {
- return = () => {
- return ) => void;
}
interface PopoverProps {
focusedServiceName?: string;
+ environment: Environment;
+ kuery: string;
}
-export function Popover({ focusedServiceName }: PopoverProps) {
+export function Popover({
+ focusedServiceName,
+ environment,
+ kuery,
+}: PopoverProps) {
const theme = useTheme();
const cy = useContext(CytoscapeContext);
const [selectedNode, setSelectedNode] = useState<
@@ -171,6 +180,8 @@ export function Popover({ focusedServiceName }: PopoverProps) {
diff --git a/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx
index 0bdcb966211e4..652a1ed20bc92 100644
--- a/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx
@@ -9,13 +9,20 @@ import { EuiFlexGrid, EuiFlexItem, EuiPanel, EuiSpacer } from '@elastic/eui';
import React from 'react';
import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { useApmParams } from '../../../hooks/use_apm_params';
import { useServiceMetricChartsFetcher } from '../../../hooks/use_service_metric_charts_fetcher';
import { MetricsChart } from '../../shared/charts/metrics_chart';
export function ServiceMetrics() {
const { urlParams } = useUrlParams();
+ const {
+ query: { environment, kuery },
+ } = useApmParams('/services/:serviceName/metrics');
+
const { data, status } = useServiceMetricChartsFetcher({
serviceNodeName: undefined,
+ environment,
+ kuery,
});
const { start, end } = urlParams;
diff --git a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
index 1b5754ef74e8b..2e3f91e1419dd 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
@@ -47,7 +47,7 @@ const Truncate = euiStyled.span`
export function ServiceNodeMetrics() {
const {
- urlParams: { kuery, start, end },
+ urlParams: { start, end },
} = useUrlParams();
const { agentName, serviceName } = useApmServiceContext();
@@ -58,6 +58,8 @@ export function ServiceNodeMetrics() {
query,
} = useApmParams('/services/:serviceName/nodes/:serviceNodeName/metrics');
+ const { environment, kuery } = query;
+
useBreadcrumb({
title: getServiceNodeName(serviceNodeName),
href: apmRouter.link(
@@ -72,7 +74,11 @@ export function ServiceNodeMetrics() {
),
});
- const { data } = useServiceMetricChartsFetcher({ serviceNodeName });
+ const { data } = useServiceMetricChartsFetcher({
+ serviceNodeName,
+ kuery,
+ environment,
+ });
const { data: { host, containerId } = INITIAL_DATA, status } = useFetcher(
(callApmApi) => {
diff --git a/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
index 4346b391b3666..f36f6d4cc9b5a 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
@@ -19,6 +19,7 @@ import {
} from '../../../../common/utils/formatters';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { useApmParams } from '../../../hooks/use_apm_params';
import { useFetcher } from '../../../hooks/use_fetcher';
import { truncate, unit } from '../../../utils/style';
import { ServiceNodeMetricOverviewLink } from '../../shared/Links/apm/ServiceNodeMetricOverviewLink';
@@ -34,7 +35,11 @@ const ServiceNodeName = euiStyled.div`
function ServiceNodeOverview() {
const {
- urlParams: { kuery, start, end },
+ query: { environment, kuery },
+ } = useApmParams('/services/:serviceName/nodes');
+
+ const {
+ urlParams: { start, end },
} = useUrlParams();
const { serviceName } = useApmServiceContext();
@@ -52,13 +57,14 @@ function ServiceNodeOverview() {
},
query: {
kuery,
+ environment,
start,
end,
},
},
});
},
- [kuery, serviceName, start, end]
+ [kuery, environment, serviceName, start, end]
);
const items = data?.serviceNodes ?? [];
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
index a261095fbe2f6..a9fdd11805840 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
@@ -20,6 +20,7 @@ import { ServiceOverviewErrorsTable } from './service_overview_errors_table';
import { ServiceOverviewInstancesChartAndTable } from './service_overview_instances_chart_and_table';
import { ServiceOverviewThroughputChart } from './service_overview_throughput_chart';
import { TransactionsTable } from '../../shared/transactions_table';
+import { useApmParams } from '../../../hooks/use_apm_params';
import { useFallbackToTransactionsFetcher } from '../../../hooks/use_fallback_to_transactions_fetcher';
import { AggregatedTransactionsCallout } from '../../shared/aggregated_transactions_callout';
@@ -30,8 +31,13 @@ import { AggregatedTransactionsCallout } from '../../shared/aggregated_transacti
export const chartHeight = 288;
export function ServiceOverview() {
- const { fallbackToTransactions } = useFallbackToTransactionsFetcher();
const { agentName, serviceName } = useApmServiceContext();
+ const {
+ query: { environment, kuery },
+ } = useApmParams('/services/:serviceName/overview');
+ const { fallbackToTransactions } = useFallbackToTransactionsFetcher({
+ kuery,
+ });
// The default EuiFlexGroup breaks at 768, but we want to break at 992, so we
// observe the window width and set the flex directions of rows accordingly
@@ -41,7 +47,10 @@ export function ServiceOverview() {
const isIosAgent = isIosAgentName(agentName);
return (
-
+
+
+
+
-
+ />
+
+
(
= ({
- search,
- setSearch,
customElements,
- addCustomElement,
- findCustomElements,
+ onAddCustomElement,
onClose,
- removeCustomElement,
- updateCustomElement,
+ onRemoveCustomElement,
+ onUpdateCustomElement,
+ onSearch,
+ initialSearch = '',
}) => {
const hasLoadedElements = useRef(false);
const [elementToDelete, setElementToDelete] = useState(null);
const [elementToEdit, setElementToEdit] = useState(null);
+ const [search, setSearch] = useState(initialSearch);
useEffect(() => {
if (!hasLoadedElements.current) {
hasLoadedElements.current = true;
- findCustomElements();
+ onSearch('');
}
- }, [findCustomElements, hasLoadedElements]);
+ }, [onSearch, hasLoadedElements]);
const showEditModal = (element: CustomElement) => setElementToEdit(element);
const hideEditModal = () => setElementToEdit(null);
const handleEdit = async (name: string, description: string, image: string) => {
if (elementToEdit) {
- updateCustomElement(elementToEdit.id, name, description, image);
+ onUpdateCustomElement(elementToEdit.id, name, description, image);
}
hideEditModal();
};
@@ -150,7 +145,7 @@ export const SavedElementsModal: FunctionComponent = ({
const handleDelete = async () => {
if (elementToDelete) {
- removeCustomElement(elementToDelete.id);
+ onRemoveCustomElement(elementToDelete.id);
}
hideDeleteModal();
};
@@ -193,7 +188,7 @@ export const SavedElementsModal: FunctionComponent = ({
const sortElements = (elements: CustomElement[]): CustomElement[] =>
sortBy(elements, 'displayName');
- const onSearch = (e: ChangeEvent) => setSearch(e.target.value);
+ const onFieldSearch = (e: ChangeEvent) => setSearch(e.target.value);
let customElementContent = (
= ({
= ({
fullWidth
value={search}
placeholder={strings.getFindElementPlaceholder()}
- onChange={onSearch}
+ onChange={onFieldSearch}
/>
= ({
);
};
-
-SavedElementsModal.propTypes = {
- addCustomElement: PropTypes.func.isRequired,
- findCustomElements: PropTypes.func.isRequired,
- onClose: PropTypes.func.isRequired,
- removeCustomElement: PropTypes.func.isRequired,
- updateCustomElement: PropTypes.func.isRequired,
-};
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.ts b/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.ts
deleted file mode 100644
index 524c1a48b6cee..0000000000000
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { connect } from 'react-redux';
-import { Dispatch } from 'redux';
-import { compose, withState } from 'recompose';
-import { camelCase } from 'lodash';
-import { cloneSubgraphs } from '../../lib/clone_subgraphs';
-import * as customElementService from '../../lib/custom_element_service';
-import { withServices, WithServicesProps, pluginServices } from '../../services';
-// @ts-expect-error untyped local
-import { selectToplevelNodes } from '../../state/actions/transient';
-// @ts-expect-error untyped local
-import { insertNodes } from '../../state/actions/elements';
-import { getSelectedPage } from '../../state/selectors/workpad';
-import { trackCanvasUiMetric, METRIC_TYPE } from '../../lib/ui_metric';
-import {
- SavedElementsModal as Component,
- Props as ComponentProps,
-} from './saved_elements_modal.component';
-import { State, PositionedElement, CustomElement } from '../../../types';
-
-const customElementAdded = 'elements-custom-added';
-
-interface OwnProps {
- onClose: () => void;
-}
-
-interface OwnPropsWithState extends OwnProps {
- customElements: CustomElement[];
- setCustomElements: (customElements: CustomElement[]) => void;
- search: string;
- setSearch: (search: string) => void;
-}
-
-interface DispatchProps {
- selectToplevelNodes: (nodes: PositionedElement[]) => void;
- insertNodes: (selectedNodes: PositionedElement[], pageId: string) => void;
-}
-
-interface StateProps {
- pageId: string;
-}
-
-const mapStateToProps = (state: State): StateProps => ({
- pageId: getSelectedPage(state),
-});
-
-const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({
- selectToplevelNodes: (nodes: PositionedElement[]) =>
- dispatch(
- selectToplevelNodes(
- nodes
- .filter((e: PositionedElement): boolean => !e.position.parent)
- .map((e: PositionedElement): string => e.id)
- )
- ),
- insertNodes: (selectedNodes: PositionedElement[], pageId: string) =>
- dispatch(insertNodes(selectedNodes, pageId)),
-});
-
-const mergeProps = (
- stateProps: StateProps,
- dispatchProps: DispatchProps,
- ownProps: OwnPropsWithState & WithServicesProps
-): ComponentProps => {
- const notifyService = pluginServices.getServices().notify;
- const { pageId } = stateProps;
- const { onClose, search, setCustomElements } = ownProps;
-
- const findCustomElements = async () => {
- const { customElements } = await customElementService.find(search);
- setCustomElements(customElements);
- };
-
- return {
- ...ownProps,
- // add custom element to the page
- addCustomElement: (customElement: CustomElement) => {
- const { selectedNodes = [] } = JSON.parse(customElement.content) || {};
- const clonedNodes = selectedNodes && cloneSubgraphs(selectedNodes);
- if (clonedNodes) {
- dispatchProps.insertNodes(clonedNodes, pageId); // first clone and persist the new node(s)
- dispatchProps.selectToplevelNodes(clonedNodes); // then select the cloned node(s)
- }
- onClose();
- trackCanvasUiMetric(METRIC_TYPE.LOADED, customElementAdded);
- },
- // custom element search
- findCustomElements: async (text?: string) => {
- try {
- await findCustomElements();
- } catch (err) {
- notifyService.error(err, {
- title: `Couldn't find custom elements`,
- });
- }
- },
- // remove custom element
- removeCustomElement: async (id: string) => {
- try {
- await customElementService.remove(id);
- await findCustomElements();
- } catch (err) {
- notifyService.error(err, {
- title: `Couldn't delete custom elements`,
- });
- }
- },
- // update custom element
- updateCustomElement: async (id: string, name: string, description: string, image: string) => {
- try {
- await customElementService.update(id, {
- name: camelCase(name),
- displayName: name,
- image,
- help: description,
- });
- await findCustomElements();
- } catch (err) {
- notifyService.error(err, {
- title: `Couldn't update custom elements`,
- });
- }
- },
- };
-};
-
-export const SavedElementsModal = compose(
- withServices,
- withState('search', 'setSearch', ''),
- withState('customElements', 'setCustomElements', []),
- connect(mapStateToProps, mapDispatchToProps, mergeProps)
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx
new file mode 100644
index 0000000000000..19e786edfd5fb
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { camelCase } from 'lodash';
+import { cloneSubgraphs } from '../../lib/clone_subgraphs';
+import { useNotifyService, useCustomElementService } from '../../services';
+// @ts-expect-error untyped local
+import { selectToplevelNodes } from '../../state/actions/transient';
+// @ts-expect-error untyped local
+import { insertNodes } from '../../state/actions/elements';
+import { getSelectedPage } from '../../state/selectors/workpad';
+import { trackCanvasUiMetric, METRIC_TYPE } from '../../lib/ui_metric';
+import {
+ SavedElementsModal as Component,
+ Props as ComponentProps,
+} from './saved_elements_modal.component';
+import { PositionedElement, CustomElement } from '../../../types';
+
+const customElementAdded = 'elements-custom-added';
+
+export type Props = Pick;
+
+export const SavedElementsModal = ({ onClose }: Props) => {
+ const notifyService = useNotifyService();
+ const customElementService = useCustomElementService();
+ const dispatch = useDispatch();
+ const pageId = useSelector(getSelectedPage);
+ const [customElements, setCustomElements] = useState([]);
+
+ const onSearch = async (search = '') => {
+ try {
+ const { customElements: foundElements } = await customElementService.find(search);
+ setCustomElements(foundElements);
+ } catch (err) {
+ notifyService.error(err, {
+ title: `Couldn't find custom elements`,
+ });
+ }
+ };
+
+ const onAddCustomElement = (customElement: CustomElement) => {
+ const { selectedNodes = [] } = JSON.parse(customElement.content) || {};
+ const clonedNodes = selectedNodes && cloneSubgraphs(selectedNodes);
+
+ if (clonedNodes) {
+ dispatch(insertNodes(clonedNodes, pageId)); // first clone and persist the new node(s)
+ dispatch(
+ selectToplevelNodes(
+ clonedNodes
+ .filter((e: PositionedElement): boolean => !e.position.parent)
+ .map((e: PositionedElement): string => e.id)
+ )
+ ); // then select the cloned node(s)
+ }
+
+ onClose();
+ trackCanvasUiMetric(METRIC_TYPE.LOADED, customElementAdded);
+ };
+
+ const onRemoveCustomElement = async (id: string) => {
+ try {
+ await customElementService.remove(id);
+ await onSearch();
+ } catch (err) {
+ notifyService.error(err, {
+ title: `Couldn't delete custom elements`,
+ });
+ }
+ };
+
+ const onUpdateCustomElement = async (
+ id: string,
+ name: string,
+ description: string,
+ image: string
+ ) => {
+ try {
+ await customElementService.update(id, {
+ name: camelCase(name),
+ displayName: name,
+ image,
+ help: description,
+ });
+ await onSearch();
+ } catch (err) {
+ notifyService.error(err, {
+ title: `Couldn't update custom elements`,
+ });
+ }
+ };
+
+ return (
+ =>
- fetch
- .get(`${getApiPath()}/${customElementId}`)
- .then(({ data: element }: { data: CustomElement }) => element);
-
-export const update = (id: string, element: Partial): AxiosPromise =>
- fetch.put(`${getApiPath()}/${id}`, element);
-
-export const remove = (id: string): AxiosPromise => fetch.delete(`${getApiPath()}/${id}`);
-
-export const find = async (
- searchTerm: string
-): Promise<{ total: number; customElements: CustomElement[] }> => {
- const validSearchTerm = typeof searchTerm === 'string' && searchTerm.length > 0;
-
- return fetch
- .get(`${getApiPath()}/find?name=${validSearchTerm ? searchTerm : ''}&perPage=10000`)
- .then(
- ({ data: customElements }: { data: { total: number; customElements: CustomElement[] } }) =>
- customElements
- );
-};
diff --git a/x-pack/plugins/canvas/public/lib/element_handler_creators.ts b/x-pack/plugins/canvas/public/lib/element_handler_creators.ts
index a46252081e672..62d405e167f1e 100644
--- a/x-pack/plugins/canvas/public/lib/element_handler_creators.ts
+++ b/x-pack/plugins/canvas/public/lib/element_handler_creators.ts
@@ -9,7 +9,6 @@ import { camelCase } from 'lodash';
import { getClipboardData, setClipboardData } from './clipboard';
import { cloneSubgraphs } from './clone_subgraphs';
import { pluginServices } from '../services';
-import * as customElementService from './custom_element_service';
import { getId } from './get_id';
import { PositionedElement } from '../../types';
import { ELEMENT_NUDGE_OFFSET, ELEMENT_SHIFT_OFFSET } from '../../common/lib/constants';
@@ -71,6 +70,7 @@ export const basicHandlerCreators = {
image = ''
): void => {
const notifyService = pluginServices.getServices().notify;
+ const customElementService = pluginServices.getServices().customElement;
if (selectedNodes.length) {
const content = JSON.stringify({ selectedNodes });
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 841f4b6d7c157..c149c67544865 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -95,8 +95,6 @@ export class CanvasPlugin
}));
}
- setupExpressions({ coreSetup, setupPlugins });
-
coreSetup.application.register({
category: DEFAULT_APP_CATEGORIES.kibana,
id: 'canvas',
@@ -108,6 +106,7 @@ export class CanvasPlugin
const { CanvasSrcPlugin } = await import('../canvas_plugin_src/plugin');
const srcPlugin = new CanvasSrcPlugin();
srcPlugin.setup(coreSetup, { canvas: canvasApi });
+ setupExpressions({ coreSetup, setupPlugins });
// Get start services
const [coreStart, startPlugins] = await coreSetup.getStartServices();
diff --git a/x-pack/plugins/canvas/public/services/custom_element.ts b/x-pack/plugins/canvas/public/services/custom_element.ts
new file mode 100644
index 0000000000000..675a5a2f23c01
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/custom_element.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CustomElement } from '../../types';
+
+export interface CustomElementFindResponse {
+ total: number;
+ customElements: CustomElement[];
+}
+
+export interface CanvasCustomElementService {
+ create: (customElement: CustomElement) => Promise;
+ get: (customElementId: string) => Promise;
+ update: (id: string, element: Partial) => Promise;
+ remove: (id: string) => Promise;
+ find: (searchTerm: string) => Promise;
+}
diff --git a/x-pack/plugins/canvas/public/services/index.ts b/x-pack/plugins/canvas/public/services/index.ts
index 07c1c3c253ff8..f4292810b8089 100644
--- a/x-pack/plugins/canvas/public/services/index.ts
+++ b/x-pack/plugins/canvas/public/services/index.ts
@@ -8,18 +8,23 @@
export * from './legacy';
import { PluginServices } from '../../../../../src/plugins/presentation_util/public';
+
+import { CanvasCustomElementService } from './custom_element';
+import { CanvasEmbeddablesService } from './embeddables';
import { CanvasExpressionsService } from './expressions';
+import { CanvasLabsService } from './labs';
import { CanvasNavLinkService } from './nav_link';
-import { CanvasEmbeddablesService } from './embeddables';
import { CanvasNotifyService } from './notify';
import { CanvasPlatformService } from './platform';
import { CanvasReportingService } from './reporting';
import { CanvasWorkpadService } from './workpad';
export interface CanvasPluginServices {
+ customElement: CanvasCustomElementService;
+ embeddables: CanvasEmbeddablesService;
expressions: CanvasExpressionsService;
+ labs: CanvasLabsService;
navLink: CanvasNavLinkService;
- embeddables: CanvasEmbeddablesService;
notify: CanvasNotifyService;
platform: CanvasPlatformService;
reporting: CanvasReportingService;
@@ -28,11 +33,14 @@ export interface CanvasPluginServices {
export const pluginServices = new PluginServices();
+export const useCustomElementService = () =>
+ (() => pluginServices.getHooks().customElement.useService())();
+export const useEmbeddablesService = () =>
+ (() => pluginServices.getHooks().embeddables.useService())();
export const useExpressionsService = () =>
(() => pluginServices.getHooks().expressions.useService())();
+export const useLabsService = () => (() => pluginServices.getHooks().labs.useService())();
export const useNavLinkService = () => (() => pluginServices.getHooks().navLink.useService())();
-export const useEmbeddablesService = () =>
- (() => pluginServices.getHooks().embeddables.useService())();
export const useNotifyService = () => (() => pluginServices.getHooks().notify.useService())();
export const usePlatformService = () => (() => pluginServices.getHooks().platform.useService())();
export const useReportingService = () => (() => pluginServices.getHooks().reporting.useService())();
diff --git a/x-pack/plugins/canvas/public/services/kibana/custom_element.ts b/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
new file mode 100644
index 0000000000000..ec3b68d2d0bba
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+
+import { API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
+import { CustomElement } from '../../../types';
+import { CanvasStartDeps } from '../../plugin';
+import { CanvasCustomElementService } from '../custom_element';
+
+export type CanvasCustomElementServiceFactory = KibanaPluginServiceFactory<
+ CanvasCustomElementService,
+ CanvasStartDeps
+>;
+
+export const customElementServiceFactory: CanvasCustomElementServiceFactory = ({ coreStart }) => {
+ const { http } = coreStart;
+ const apiPath = `${API_ROUTE_CUSTOM_ELEMENT}`;
+
+ return {
+ create: (customElement) => http.post(apiPath, { body: JSON.stringify(customElement) }),
+ get: (customElementId) =>
+ http
+ .get(`${apiPath}/${customElementId}`)
+ .then(({ data: element }: { data: CustomElement }) => element),
+ update: (id, element) => http.put(`${apiPath}/${id}`, { body: JSON.stringify(element) }),
+ remove: (id) => http.delete(`${apiPath}/${id}`),
+ find: async (name) => {
+ return http.get(`${apiPath}/find`, {
+ query: {
+ name,
+ perPage: 10000,
+ },
+ });
+ },
+ };
+};
diff --git a/x-pack/plugins/canvas/public/services/kibana/index.ts b/x-pack/plugins/canvas/public/services/kibana/index.ts
index fb760fe4c183d..1eb010e8d6f9d 100644
--- a/x-pack/plugins/canvas/public/services/kibana/index.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/index.ts
@@ -14,16 +14,20 @@ import {
import { CanvasPluginServices } from '..';
import { CanvasStartDeps } from '../../plugin';
+import { customElementServiceFactory } from './custom_element';
import { embeddablesServiceFactory } from './embeddables';
import { expressionsServiceFactory } from './expressions';
+import { labsServiceFactory } from './labs';
import { navLinkServiceFactory } from './nav_link';
import { notifyServiceFactory } from './notify';
import { platformServiceFactory } from './platform';
import { reportingServiceFactory } from './reporting';
import { workpadServiceFactory } from './workpad';
-export { expressionsServiceFactory } from './expressions';
+export { customElementServiceFactory } from './custom_element';
export { embeddablesServiceFactory } from './embeddables';
+export { expressionsServiceFactory } from './expressions';
+export { labsServiceFactory } from './labs';
export { notifyServiceFactory } from './notify';
export { platformServiceFactory } from './platform';
export { reportingServiceFactory } from './reporting';
@@ -33,9 +37,11 @@ export const pluginServiceProviders: PluginServiceProviders<
CanvasPluginServices,
KibanaPluginServiceParams
> = {
+ customElement: new PluginServiceProvider(customElementServiceFactory),
+ embeddables: new PluginServiceProvider(embeddablesServiceFactory),
expressions: new PluginServiceProvider(expressionsServiceFactory),
+ labs: new PluginServiceProvider(labsServiceFactory),
navLink: new PluginServiceProvider(navLinkServiceFactory),
- embeddables: new PluginServiceProvider(embeddablesServiceFactory),
notify: new PluginServiceProvider(notifyServiceFactory),
platform: new PluginServiceProvider(platformServiceFactory),
reporting: new PluginServiceProvider(reportingServiceFactory),
diff --git a/x-pack/plugins/canvas/public/services/legacy/labs.ts b/x-pack/plugins/canvas/public/services/kibana/labs.ts
similarity index 60%
rename from x-pack/plugins/canvas/public/services/legacy/labs.ts
rename to x-pack/plugins/canvas/public/services/kibana/labs.ts
index 2a506d813bde9..58cbf4d181c17 100644
--- a/x-pack/plugins/canvas/public/services/legacy/labs.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/labs.ts
@@ -6,23 +6,19 @@
*/
import {
+ KibanaPluginServiceFactory,
projectIDs,
- PresentationLabsService,
} from '../../../../../../src/plugins/presentation_util/public';
-
-import { CanvasServiceFactory } from '.';
import { UI_SETTINGS } from '../../../common';
-export interface CanvasLabsService extends PresentationLabsService {
- projectIDs: typeof projectIDs;
- isLabsEnabled: () => boolean;
-}
+import { CanvasStartDeps } from '../../plugin';
+import { CanvasLabsService } from '../labs';
+
+export type CanvasLabsServiceFactory = KibanaPluginServiceFactory<
+ CanvasLabsService,
+ CanvasStartDeps
+>;
-export const labsServiceFactory: CanvasServiceFactory = async (
- _coreSetup,
- coreStart,
- _setupPlugins,
- startPlugins
-) => ({
+export const labsServiceFactory: CanvasLabsServiceFactory = ({ startPlugins, coreStart }) => ({
projectIDs,
isLabsEnabled: () => coreStart.uiSettings.get(UI_SETTINGS.ENABLE_LABS_UI),
...startPlugins.presentationUtil.labsService,
diff --git a/x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts b/x-pack/plugins/canvas/public/services/labs.ts
similarity index 50%
rename from x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts
rename to x-pack/plugins/canvas/public/services/labs.ts
index 78e145740da54..6d8171cdfe1de 100644
--- a/x-pack/plugins/rule_registry/server/event_log/utils/utility_types.ts
+++ b/x-pack/plugins/canvas/public/services/labs.ts
@@ -5,8 +5,12 @@
* 2.0.
*/
-export type DeepWriteable = { -readonly [P in keyof T]: DeepWriteable };
+import {
+ projectIDs,
+ PresentationLabsService,
+} from '../../../../../src/plugins/presentation_util/public';
-export type DeepPartial = {
- [P in keyof T]?: T[P] extends Array ? Array> : DeepPartial;
-};
+export interface CanvasLabsService extends PresentationLabsService {
+ projectIDs: typeof projectIDs;
+ isLabsEnabled: () => boolean;
+}
diff --git a/x-pack/plugins/canvas/public/services/legacy/context.tsx b/x-pack/plugins/canvas/public/services/legacy/context.tsx
index 37dca2c6820b8..79c13ed753ac9 100644
--- a/x-pack/plugins/canvas/public/services/legacy/context.tsx
+++ b/x-pack/plugins/canvas/public/services/legacy/context.tsx
@@ -26,7 +26,6 @@ const defaultContextValue = {
export const ServicesContext = createContext(defaultContextValue as CanvasServices);
export const useServices = () => useContext(ServicesContext);
-export const useLabsService = () => useServices().labs;
export const withServices = (type: ComponentType) => {
const EnhancedType: FC = (props) =>
createElement(type, { ...props, services: useServices() });
@@ -40,7 +39,6 @@ export const LegacyServicesProvider: FC<{
const specifiedProviders: CanvasServiceProviders = { ...services, ...providers };
const value = {
search: specifiedProviders.search.getService(),
- labs: specifiedProviders.labs.getService(),
};
return {children} ;
};
diff --git a/x-pack/plugins/canvas/public/services/legacy/index.ts b/x-pack/plugins/canvas/public/services/legacy/index.ts
index 61ebae07c38c8..fdc4e30cabe51 100644
--- a/x-pack/plugins/canvas/public/services/legacy/index.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/index.ts
@@ -9,7 +9,6 @@ import { BehaviorSubject } from 'rxjs';
import { CoreSetup, CoreStart, AppUpdater } from '../../../../../../src/core/public';
import { CanvasSetupDeps, CanvasStartDeps } from '../../plugin';
import { searchServiceFactory } from './search';
-import { labsServiceFactory } from './labs';
export { SearchService } from './search';
export { ExpressionsService } from '../../../../../../src/plugins/expressions/common';
@@ -68,14 +67,12 @@ export type ServiceFromProvider
+
+
+
+ {i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.entryPointsTable.emptyMessageLinkText',
+ { defaultMessage: 'Add an entry point' }
+ )}
+
+ ),
+ }}
+ />
+
+
+>({
+ path: ['enterprise_search', 'app_search', 'crawler', 'entry_points_table'],
+ actions: () => ({
+ onAdd: (entryPoint, entryPoints) => ({ entryPoint, entryPoints }),
+ onDelete: (entryPoint, entryPoints) => ({ entryPoint, entryPoints }),
+ onUpdate: (entryPoint, entryPoints) => ({ entryPoint, entryPoints }),
+ }),
+ listeners: () => ({
+ onAdd: ({ entryPoints }) => {
+ CrawlerSingleDomainLogic.actions.updateEntryPoints(entryPoints);
+ clearFlashMessages();
+ },
+ onDelete: ({ entryPoint, entryPoints }) => {
+ CrawlerSingleDomainLogic.actions.updateEntryPoints(entryPoints);
+ clearFlashMessages();
+ flashSuccessToast(`Entry point "${entryPoint.value}" was removed.`);
+ },
+ onUpdate: ({ entryPoints }) => {
+ CrawlerSingleDomainLogic.actions.updateEntryPoints(entryPoints);
+ clearFlashMessages();
+ },
+ }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/sitemaps_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/sitemaps_table.test.tsx
new file mode 100644
index 0000000000000..8d7aa83cd2ec6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/sitemaps_table.test.tsx
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { mockFlashMessageHelpers, setMockActions } from '../../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiEmptyPrompt, EuiFieldText } from '@elastic/eui';
+
+import { GenericEndpointInlineEditableTable } from '../../../../shared/tables/generic_endpoint_inline_editable_table';
+
+import { mountWithIntl } from '../../../../test_helpers';
+
+import { SitemapsTable } from './sitemaps_table';
+
+describe('SitemapsTable', () => {
+ const { clearFlashMessages, flashSuccessToast } = mockFlashMessageHelpers;
+ const engineName = 'my-engine';
+ const sitemaps = [
+ { id: '1', url: 'http://www.example.com/sitemap.xml' },
+ { id: '2', url: 'http://www.example.com/whatever/sitemaps.xml' },
+ ];
+ const domain = {
+ createdOn: '2018-01-01T00:00:00.000Z',
+ documentCount: 10,
+ id: '6113e1407a2f2e6f42489794',
+ url: 'https://www.elastic.co',
+ crawlRules: [],
+ entryPoints: [],
+ sitemaps,
+ };
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('renders', () => {
+ const wrapper = shallow(
+ = ({ domain, engineName, items }) => {
+ const { updateSitemaps } = useActions(CrawlerSingleDomainLogic);
+ const field = 'url';
+
+ const columns: Array> = [
+ {
+ editingRender: (sitemap, onChange, { isInvalid, isLoading }) => (
+ onChange(e.target.value)}
+ disabled={isLoading}
+ isInvalid={isInvalid}
+ />
+ ),
+ render: (sitemap) => {(sitemap as Sitemap)[field]} ,
+ name: i18n.translate('xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.urlTableHead', {
+ defaultMessage: 'URL',
+ }),
+ field,
+ },
+ ];
+
+ const sitemapsRoute = `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}/sitemaps`;
+ const getSitemapRoute = (sitemap: Sitemap) =>
+ `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}/sitemaps/${sitemap.id}`;
+
+ return (
+
+ {i18n.translate('xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.description', {
+ defaultMessage: 'Specify sitemap URLs for the crawler on this domain.',
+ })}
+
+ }
+ instanceId="SitemapsTable"
+ items={items}
+ canRemoveLastItem
+ noItemsMessage={(editNewItem) => (
+ <>
+
+ {i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.emptyMessageTitle',
+ {
+ defaultMessage: 'There are no existing sitemaps.',
+ }
+ )}
+
+ }
+ titleSize="s"
+ body={Add a sitemap to specify an entry point for the crawler. }
+ actions={{ADD_BUTTON_LABEL} }
+ />
+
+ )}
+ addRoute={sitemapsRoute}
+ deleteRoute={getSitemapRoute}
+ updateRoute={getSitemapRoute}
+ dataProperty="sitemaps"
+ onAdd={(_, newSitemaps) => {
+ updateSitemaps(newSitemaps as Sitemap[]);
+ clearFlashMessages();
+ }}
+ onDelete={(_, newSitemaps) => {
+ updateSitemaps(newSitemaps as Sitemap[]);
+ clearFlashMessages();
+ flashSuccessToast(
+ i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.deleteSuccessToastMessage',
+ {
+ defaultMessage: 'The sitemap has been deleted.',
+ }
+ )
+ );
+ }}
+ onUpdate={(_, newSitemaps) => {
+ updateSitemaps(newSitemaps as Sitemap[]);
+ clearFlashMessages();
+ }}
+ title={i18n.translate('xpack.enterpriseSearch.appSearch.crawler.sitemapsTable.title', {
+ defaultMessage: 'Sitemaps',
+ })}
+ disableReordering
+ />
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx
index 0a53c84525a82..2afb36a40fe0f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx
@@ -30,7 +30,7 @@ export const CrawlerLanding: React.FC = () => (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain.tsx
index 6419c31cc16ca..b93fb8592cff8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain.tsx
@@ -11,22 +11,26 @@ import { useParams } from 'react-router-dom';
import { useActions, useValues } from 'kea';
-import { EuiCode, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { EuiCode, EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { getEngineBreadcrumbs } from '../engine';
+import { EngineLogic, getEngineBreadcrumbs } from '../engine';
import { AppSearchPageTemplate } from '../layout';
+import { CrawlRulesTable } from './components/crawl_rules_table';
import { CrawlerStatusBanner } from './components/crawler_status_banner';
import { CrawlerStatusIndicator } from './components/crawler_status_indicator/crawler_status_indicator';
import { DeleteDomainPanel } from './components/delete_domain_panel';
+import { EntryPointsTable } from './components/entry_points_table';
import { ManageCrawlsPopover } from './components/manage_crawls_popover/manage_crawls_popover';
+import { SitemapsTable } from './components/sitemaps_table';
import { CRAWLER_TITLE } from './constants';
import { CrawlerSingleDomainLogic } from './crawler_single_domain_logic';
export const CrawlerSingleDomain: React.FC = () => {
const { domainId } = useParams() as { domainId: string };
+ const { engineName } = EngineLogic.values;
const { dataLoading, domain } = useValues(CrawlerSingleDomainLogic);
@@ -51,6 +55,27 @@ export const CrawlerSingleDomain: React.FC = () => {
>
+
+
+
+
+
+
{i18n.translate(
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts
index f6c3b2c87ab8c..492bd363a5f2d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts
@@ -16,7 +16,7 @@ import '../../__mocks__/engine_logic.mock';
import { nextTick } from '@kbn/test/jest';
import { CrawlerSingleDomainLogic, CrawlerSingleDomainValues } from './crawler_single_domain_logic';
-import { CrawlerDomain } from './types';
+import { CrawlerDomain, CrawlerPolicies, CrawlerRules } from './types';
const DEFAULT_VALUES: CrawlerSingleDomainValues = {
dataLoading: true,
@@ -51,6 +51,100 @@ describe('CrawlerSingleDomainLogic', () => {
expect(CrawlerSingleDomainLogic.values.domain).toEqual(domain);
});
});
+
+ describe('updateEntryPoints', () => {
+ beforeEach(() => {
+ mount({
+ domain: {
+ id: '507f1f77bcf86cd799439011',
+ entryPoints: [],
+ },
+ });
+
+ CrawlerSingleDomainLogic.actions.updateEntryPoints([
+ {
+ id: '1234',
+ value: '/',
+ },
+ ]);
+ });
+
+ it('should update the entry points on the domain', () => {
+ expect(CrawlerSingleDomainLogic.values.domain).toEqual({
+ id: '507f1f77bcf86cd799439011',
+ entryPoints: [
+ {
+ id: '1234',
+ value: '/',
+ },
+ ],
+ });
+ });
+ });
+
+ describe('updateSitemaps', () => {
+ beforeEach(() => {
+ mount({
+ domain: {
+ id: '507f1f77bcf86cd799439011',
+ sitemaps: [],
+ },
+ });
+
+ CrawlerSingleDomainLogic.actions.updateSitemaps([
+ {
+ id: '1234',
+ url: 'http://www.example.com/sitemap.xml',
+ },
+ ]);
+ });
+
+ it('should update the sitemaps on the domain', () => {
+ expect(CrawlerSingleDomainLogic.values.domain).toEqual({
+ id: '507f1f77bcf86cd799439011',
+ sitemaps: [
+ {
+ id: '1234',
+ url: 'http://www.example.com/sitemap.xml',
+ },
+ ],
+ });
+ });
+ });
+
+ describe('updateCrawlRules', () => {
+ beforeEach(() => {
+ mount({
+ domain: {
+ id: '507f1f77bcf86cd799439011',
+ crawlRules: [],
+ },
+ });
+
+ CrawlerSingleDomainLogic.actions.updateCrawlRules([
+ {
+ id: '1234',
+ policy: CrawlerPolicies.allow,
+ rule: CrawlerRules.beginsWith,
+ pattern: 'foo',
+ },
+ ]);
+ });
+
+ it('should update the crawl rules on the domain', () => {
+ expect(CrawlerSingleDomainLogic.values.domain).toEqual({
+ id: '507f1f77bcf86cd799439011',
+ crawlRules: [
+ {
+ id: '1234',
+ policy: CrawlerPolicies.allow,
+ rule: CrawlerRules.beginsWith,
+ pattern: 'foo',
+ },
+ ],
+ });
+ });
+ });
});
describe('listeners', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts
index 7b5ba6984f106..78912f736926d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts
@@ -14,7 +14,7 @@ import { KibanaLogic } from '../../../shared/kibana';
import { ENGINE_CRAWLER_PATH } from '../../routes';
import { EngineLogic, generateEnginePath } from '../engine';
-import { CrawlerDomain } from './types';
+import { CrawlerDomain, EntryPoint, Sitemap, CrawlRule } from './types';
import { crawlerDomainServerToClient, getDeleteDomainSuccessMessage } from './utils';
export interface CrawlerSingleDomainValues {
@@ -26,6 +26,9 @@ interface CrawlerSingleDomainActions {
deleteDomain(domain: CrawlerDomain): { domain: CrawlerDomain };
fetchDomainData(domainId: string): { domainId: string };
onReceiveDomainData(domain: CrawlerDomain): { domain: CrawlerDomain };
+ updateCrawlRules(crawlRules: CrawlRule[]): { crawlRules: CrawlRule[] };
+ updateEntryPoints(entryPoints: EntryPoint[]): { entryPoints: EntryPoint[] };
+ updateSitemaps(entryPoints: Sitemap[]): { sitemaps: Sitemap[] };
}
export const CrawlerSingleDomainLogic = kea<
@@ -36,6 +39,9 @@ export const CrawlerSingleDomainLogic = kea<
deleteDomain: (domain) => ({ domain }),
fetchDomainData: (domainId) => ({ domainId }),
onReceiveDomainData: (domain) => ({ domain }),
+ updateCrawlRules: (crawlRules) => ({ crawlRules }),
+ updateEntryPoints: (entryPoints) => ({ entryPoints }),
+ updateSitemaps: (sitemaps) => ({ sitemaps }),
},
reducers: {
dataLoading: [
@@ -48,6 +54,12 @@ export const CrawlerSingleDomainLogic = kea<
null,
{
onReceiveDomainData: (_, { domain }) => domain,
+ updateCrawlRules: (currentDomain, { crawlRules }) =>
+ ({ ...currentDomain, crawlRules } as CrawlerDomain),
+ updateEntryPoints: (currentDomain, { entryPoints }) =>
+ ({ ...currentDomain, entryPoints } as CrawlerDomain),
+ updateSitemaps: (currentDomain, { sitemaps }) =>
+ ({ ...currentDomain, sitemaps } as CrawlerDomain),
},
],
},
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
index 0902499feb4ed..1b46e21dbcb72 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
@@ -12,6 +12,25 @@ export enum CrawlerPolicies {
deny = 'deny',
}
+export const getReadableCrawlerPolicy = (policy: CrawlerPolicies) => {
+ switch (policy) {
+ case CrawlerPolicies.allow:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesPolicies.allowLabel',
+ {
+ defaultMessage: 'Allow',
+ }
+ );
+ case CrawlerPolicies.deny:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesPolicies.disallowLabel',
+ {
+ defaultMessage: 'Disallow',
+ }
+ );
+ }
+};
+
export enum CrawlerRules {
beginsWith = 'begins',
endsWith = 'ends',
@@ -19,6 +38,39 @@ export enum CrawlerRules {
regex = 'regex',
}
+export const getReadableCrawlerRule = (rule: CrawlerRules) => {
+ switch (rule) {
+ case CrawlerRules.beginsWith:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.beginsWithLabel',
+ {
+ defaultMessage: 'Begins with',
+ }
+ );
+ case CrawlerRules.endsWith:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.endsWithLabel',
+ {
+ defaultMessage: 'Ends with',
+ }
+ );
+ case CrawlerRules.contains:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.containsLabel',
+ {
+ defaultMessage: 'Contains',
+ }
+ );
+ case CrawlerRules.regex:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.regexLabel',
+ {
+ defaultMessage: 'Regex',
+ }
+ );
+ }
+};
+
export interface CrawlRule {
id: string;
policy: CrawlerPolicies;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx
index f81d8d64737df..f777278190db2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx
@@ -91,7 +91,7 @@ export const Credentials: React.FC = () => {
}
body={i18n.translate('xpack.enterpriseSearch.appSearch.credentials.empty.body', {
- defaultMessage: 'Click the "Create a key" button to make your first one.',
+ defaultMessage: 'Allow applications to access Elastic App Search on your behalf.',
})}
+ actions={
+
+ {i18n.translate('xpack.enterpriseSearch.appSearch.credentials.empty.buttonLabel', {
+ defaultMessage: 'Learn about API keys',
+ })}
+
+ }
/>
}
loading={!isCredentialsDataComplete}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/constants.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/constants.tsx
index 0f1b783ddd134..99b19989a3b60 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/constants.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/constants.tsx
@@ -57,13 +57,13 @@ export const SOURCE_ENGINES_TITLE = i18n.translate(
export const CREATE_AN_ENGINE_BUTTON_LABEL = i18n.translate(
'xpack.enterpriseSearch.appSearch.engines.createEngineButtonLabel',
{
- defaultMessage: 'Create an engine',
+ defaultMessage: 'Create engine',
}
);
export const CREATE_A_META_ENGINE_BUTTON_LABEL = i18n.translate(
'xpack.enterpriseSearch.appSearch.engines.createMetaEngineButtonLabel',
{
- defaultMessage: 'Create a meta engine',
+ defaultMessage: 'Create meta engine',
}
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.tsx
index ba79d62cfe615..28d4257f2487c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.tsx
@@ -20,7 +20,7 @@ export const LogRetentionConfirmationModal: React.FC = () => {
const CANNOT_BE_RECOVERED_TEXT = i18n.translate(
'xpack.enterpriseSearch.appSearch.settings.logRetention.modal.recovery',
{
- defaultMessage: 'Once your data has been removed, it cannot be recovered.',
+ defaultMessage: 'You cannot recover deleted data.',
}
);
@@ -72,7 +72,7 @@ export const LogRetentionConfirmationModal: React.FC = () => {
'xpack.enterpriseSearch.appSearch.settings.logRetention.modal.analytics.description',
{
defaultMessage:
- 'When disabling Analytics Logs, all your engines will immediately stop indexing Analytics Logs. Your existing data will be deleted in accordance with the storage timeframes outlined above.',
+ 'When you disable writing, engines stop logging analytics events. Your existing data is deleted according to the storage time frame.',
}
)}
@@ -117,7 +117,7 @@ export const LogRetentionConfirmationModal: React.FC = () => {
'xpack.enterpriseSearch.appSearch.settings.logRetention.modal.api.description',
{
defaultMessage:
- 'When disabling API Logs, all your engines will immediately stop indexing API Logs. Your existing data will be deleted in accordance with the storage timeframes outlined above.',
+ 'When you disable writing, engines stop logging API events. Your existing data is deleted according to the storage time frame.',
}
)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.tsx
index fb4b503c7e62c..9012a30b950d6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.tsx
@@ -42,22 +42,10 @@ export const LogRetentionPanel: React.FC = () => {
-
-
{
{i18n.translate(
'xpack.enterpriseSearch.appSearch.settings.logRetention.analytics.label',
{
- defaultMessage: 'Analytics Logs',
+ defaultMessage: 'Log analytics events',
}
)}
@@ -94,7 +82,7 @@ export const LogRetentionPanel: React.FC = () => {
{i18n.translate(
'xpack.enterpriseSearch.appSearch.settings.logRetention.api.label',
{
- defaultMessage: 'API Logs',
+ defaultMessage: 'Log API events',
}
)}
@@ -112,6 +100,20 @@ export const LogRetentionPanel: React.FC = () => {
data-test-subj="LogRetentionPanelAPISwitch"
/>
+
+
);
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx
index 3d96b22859fad..0fc22d8b0d406 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx
@@ -50,7 +50,7 @@ export const SetupGuide: React.FC = () => (
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/app_search.png b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/app_search.png
index 6cf0639167e2f..fc22f35d04037 100644
Binary files a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/app_search.png and b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/app_search.png differ
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/bg_enterprise_search.png b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/bg_enterprise_search.png
deleted file mode 100644
index 1b5e1e489fd96..0000000000000
Binary files a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/bg_enterprise_search.png and /dev/null differ
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/workplace_search.png b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/workplace_search.png
index 984662b65cb5d..7ad991f1047e3 100644
Binary files a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/workplace_search.png and b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/workplace_search.png differ
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.tsx
index f9f329c859110..0611c5f5ca7a3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.tsx
@@ -23,7 +23,7 @@ export const LicenseCallout: React.FC = () => {
if (hasPlatinumLicense && !isTrial) return null;
return (
-
+
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.scss
index cac03dc053552..26b974f4c84d4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.scss
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.scss
@@ -6,54 +6,10 @@
*/
.productCard {
- margin: $euiSizeS;
-
&__imageContainer {
- max-height: 115px;
- overflow: hidden;
- background-color: #0076CC;
-
- @include euiBreakpoint('s', 'm', 'l', 'xl') {
- max-height: none;
- }
- }
-
- &__image {
- width: 100%;
- height: auto;
- }
-
- .euiCard__content {
- max-width: 350px;
- margin-top: $euiSizeL;
-
- @include euiBreakpoint('s', 'm', 'l', 'xl') {
- margin-top: $euiSizeXL;
- }
- }
-
- .euiCard__title {
- margin-bottom: $euiSizeM;
- font-weight: $euiFontWeightBold;
-
- @include euiBreakpoint('s', 'm', 'l', 'xl') {
- margin-bottom: $euiSizeL;
- font-size: $euiSizeL;
- }
- }
-
- .euiCard__description {
- font-weight: $euiFontWeightMedium;
- color: $euiColorMediumShade;
- margin-bottom: $euiSize;
- }
-
- .euiCard__footer {
- margin-bottom: $euiSizeS;
-
- @include euiBreakpoint('s', 'm', 'l', 'xl') {
- margin-bottom: $euiSizeM;
- font-size: $euiSizeL;
+ @include euiBreakpoint('xs') {
+ max-height: 115px;
+ overflow: hidden;
}
}
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
index 9d54a9f1725e9..d15cb817f9064 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
@@ -32,7 +32,7 @@ describe('ProductCard', () => {
const button = card.find(EuiButtonTo);
expect(button.prop('to')).toEqual('/app/enterprise_search/app_search');
- expect(button.prop('children')).toEqual('Launch App Search');
+ expect(button.prop('children')).toEqual('Open App Search');
button.simulate('click');
expect(mockTelemetryActions.sendEnterpriseSearchTelemetry).toHaveBeenCalledWith({
@@ -50,7 +50,7 @@ describe('ProductCard', () => {
const button = card.find(EuiButtonTo);
expect(button.prop('to')).toEqual('/app/enterprise_search/workplace_search');
- expect(button.prop('children')).toEqual('Launch Workplace Search');
+ expect(button.prop('children')).toEqual('Open Workplace Search');
button.simulate('click');
expect(mockTelemetryActions.sendEnterpriseSearchTelemetry).toHaveBeenCalledWith({
@@ -66,6 +66,6 @@ describe('ProductCard', () => {
const card = wrapper.find(EuiCard).dive().shallow();
const button = card.find(EuiButtonTo);
- expect(button.prop('children')).toEqual('Setup Workplace Search');
+ expect(button.prop('children')).toEqual('Set up Workplace Search');
});
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
index f0790ced414b5..c8dd9523f62f4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
@@ -37,7 +37,7 @@ export const ProductCard: React.FC = ({ product, image }) => {
const LAUNCH_BUTTON_TEXT = i18n.translate(
'xpack.enterpriseSearch.overview.productCard.launchButton',
{
- defaultMessage: 'Launch {productName}',
+ defaultMessage: 'Open {productName}',
values: { productName: product.NAME },
}
);
@@ -45,7 +45,7 @@ export const ProductCard: React.FC = ({ product, image }) => {
const SETUP_BUTTON_TEXT = i18n.translate(
'xpack.enterpriseSearch.overview.productCard.setupButton',
{
- defaultMessage: 'Setup {productName}',
+ defaultMessage: 'Set up {productName}',
values: { productName: product.NAME },
}
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
index 90e16fe2d22fa..ee0209c1a124d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
@@ -11,8 +11,6 @@ import React from 'react';
import { shallow } from 'enzyme';
-import { EuiPage } from '@elastic/eui';
-
import { LicenseCallout } from '../license_callout';
import { ProductCard } from '../product_card';
import { SetupGuideCta } from '../setup_guide';
@@ -25,7 +23,6 @@ describe('ProductSelector', () => {
setMockValues({ config: { host: '' } });
const wrapper = shallow( = ({ access }) => {
const shouldShowWorkplaceSearchCard = !config.host || hasWorkplaceSearchAccess;
return (
-
+
+
+
+
+ {shouldShowAppSearchCard && (
+
+
+ )}
+ {shouldShowWorkplaceSearchCard && (
+
+
+ )}
+
+
+
-
-
-
-
-
-
-
-
-
-
- {shouldShowAppSearchCard && (
-
-
- )}
- {shouldShowWorkplaceSearchCard && (
-
-
- )}
-
-
-
-
+ {config.host ?
-
+
@@ -36,7 +38,7 @@ export const SetupGuideCta: React.FC = () => (
- 
+
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/constants.ts
index c5997222fef6e..3ab00cdd27e72 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/constants.ts
@@ -10,6 +10,6 @@ import { i18n } from '@kbn/i18n';
export const PRODUCT_SELECTOR_CALLOUT_HEADING = i18n.translate(
'xpack.enterpriseSearch.productSelectorCalloutTitle',
{
- defaultMessage: 'Enterprise-grade functionality for teams big and small',
+ defaultMessage: 'Enterprise-grade features for teams big and small',
}
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss
deleted file mode 100644
index 4be8d7322b4c8..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-.enterpriseSearchOverview {
- padding-top: 78px;
- background-image: url('./assets/bg_enterprise_search.png');
- background-repeat: no-repeat;
- background-size: 670px;
- background-position: center -27px;
-
- @include euiBreakpoint('m', 'l', 'xl') {
- padding-top: 158px;
- background-size: 1160px;
- background-position: center -48px;
- }
-
- &__header {
- text-align: center;
- margin: auto;
- @include euiBreakpoint('m', 'l', 'xl') {
- margin-bottom: $euiSizeL;
- }
- }
-
- // EUI override
- .euiTitle + .euiTitle {
- margin-top: 0;
-
- @include euiBreakpoint('m', 'l', 'xl') {
- margin-top: $euiSizeS;
- }
- }
-
- .enterpriseSearchOverview__card {
- flex-basis: 50%;
- }
-}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
index b21e46429672a..b1aab0dacabde 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
@@ -19,8 +19,6 @@ import { ProductSelector } from './components/product_selector';
import { SetupGuide } from './components/setup_guide';
import { ROOT_PATH, SETUP_GUIDE_PATH } from './routes';
-import './index.scss';
-
export const EnterpriseSearch: React.FC = ({ access = {} }) => {
const { errorConnecting } = useValues(HttpLogic);
const { config } = useValues(KibanaLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index cb73686eb4c5b..5a82f15a6cf04 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -64,7 +64,7 @@ describe('renderApp', () => {
it('renders EnterpriseSearch', () => {
mount(EnterpriseSearch);
- expect(mockContainer.querySelector('.enterpriseSearchOverview')).not.toBeNull();
+ expect(mockContainer.querySelector('.kbnPageTemplate')).not.toBeNull();
});
it('renders AppSearch', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/generic_endpoint_inline_editable_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/generic_endpoint_inline_editable_table.tsx
index 63b3d4b407667..4db5e81653a9a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/generic_endpoint_inline_editable_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/generic_endpoint_inline_editable_table.tsx
@@ -32,6 +32,7 @@ export interface GenericEndpointInlineEditableTableProps
onDelete(item: ItemWithAnID, items: ItemWithAnID[]): void;
onUpdate(item: ItemWithAnID, items: ItemWithAnID[]): void;
onReorder?(items: ItemWithAnID[]): void;
+ disableReordering?: boolean;
}
export const GenericEndpointInlineEditableTable = ({
diff --git a/x-pack/plugins/rule_registry/server/event_log/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/index.ts
similarity index 72%
rename from x-pack/plugins/rule_registry/server/event_log/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/index.ts
index cf7467588c22f..ce766171a85c6 100644
--- a/x-pack/plugins/rule_registry/server/event_log/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/tables/generic_endpoint_inline_editable_table/index.ts
@@ -5,6 +5,4 @@
* 2.0.
*/
-export * from './elasticsearch';
-export * from './event_schema';
-export * from './log';
+export { GenericEndpointInlineEditableTable } from './generic_endpoint_inline_editable_table';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/tables/inline_editable_table/inline_editable_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/tables/inline_editable_table/inline_editable_table.tsx
index 3e351f5826abc..093692dfde335 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/tables/inline_editable_table/inline_editable_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/tables/inline_editable_table/inline_editable_table.tsx
@@ -33,6 +33,7 @@ export interface InlineEditableTableProps- {
canRemoveLastItem?: boolean;
className?: string;
description?: React.ReactNode;
+ disableReordering?: boolean;
isLoading?: boolean;
lastItemWarning?: string;
noItemsMessage?: (editNewItem: () => void) => React.ReactNode;
@@ -170,6 +171,7 @@ export const InlineEditableTableContents =
- ({
noItemsMessage={noItemsMessage(editNewItem)}
onReorder={reorderItems}
disableDragging={isEditing}
+ {...rest}
/>
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/tables/reorderable_table/reorderable_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/tables/reorderable_table/reorderable_table.tsx
index f43b940fbf3e5..4cb12321bdfcf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/tables/reorderable_table/reorderable_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/tables/reorderable_table/reorderable_table.tsx
@@ -47,7 +47,7 @@ export const ReorderableTable =
- ({
: undefined} />
- {items.length === 0 && (
+ {items.length === 0 && unreorderableItems.length === 0 && (
{noItemsMessage}
@@ -71,20 +71,6 @@ export const ReorderableTable = - ({
)}
onReorder={onReorder}
/>
- {unreorderableItems.length > 0 && (
-
(
- }
- />
- )}
- />
- )}
)}
@@ -101,6 +87,21 @@ export const ReorderableTable = - ({
)}
/>
)}
+
+ {unreorderableItems.length > 0 && (
+
(
+ }
+ />
+ )}
+ />
+ )}
);
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/tables/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/tables/types.ts
index f2a2531726b33..8407a14eae207 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/tables/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/tables/types.ts
@@ -6,6 +6,6 @@
*/
export type ItemWithAnID = {
- id: number | null;
+ id: number | string | null;
created_at?: string;
} & object;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
index c599a13cc3119..5f515fc99769c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
@@ -28,7 +28,7 @@ export const contentSources = [
},
{
id: '124',
- serviceType: 'jira',
+ serviceType: 'jira_cloud',
searchable: true,
supportedByLicense: true,
status: 'synced',
@@ -43,6 +43,24 @@ export const contentSources = [
},
];
+const defaultIndexing = {
+ enabled: true,
+ defaultAction: 'include',
+ rules: [],
+ schedule: {
+ intervals: [],
+ blocked: [],
+ },
+ features: {
+ contentExtraction: {
+ enabled: true,
+ },
+ thumbnails: {
+ enabled: true,
+ },
+ },
+};
+
export const fullContentSources = [
{
...contentSources[0],
@@ -66,8 +84,11 @@ export const fullContentSources = [
type: 'summary',
},
],
+ indexing: defaultIndexing,
groups,
custom: false,
+ isIndexedSource: true,
+ areThumbnailsConfigEnabled: true,
accessToken: '123token',
urlField: 'myLink',
titleField: 'heading',
@@ -85,7 +106,10 @@ export const fullContentSources = [
details: [],
summary: [],
groups: [],
+ indexing: defaultIndexing,
custom: true,
+ isIndexedSource: true,
+ areThumbnailsConfigEnabled: true,
accessToken: '123token',
urlField: 'url',
titleField: 'title',
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.tsx
index 3611bfb2a3f69..6199ad672f361 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.tsx
@@ -35,7 +35,7 @@ export const ProductButton: React.FC = () => {
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
index e50b12f781947..8f9528d52195e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
@@ -129,12 +129,27 @@ interface SourceActivity {
status: string;
}
+interface IndexingConfig {
+ enabled: boolean;
+ features: {
+ contentExtraction: {
+ enabled: boolean;
+ };
+ thumbnails: {
+ enabled: boolean;
+ };
+ };
+}
+
export interface ContentSourceFullData extends ContentSourceDetails {
activities: SourceActivity[];
details: DescriptionList[];
summary: DocumentSummaryItem[];
groups: Group[];
+ indexing: IndexingConfig;
custom: boolean;
+ isIndexedSource: boolean;
+ areThumbnailsConfigEnabled: boolean;
accessToken: string;
urlField: string;
titleField: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
index da4346d54727c..0276e75e4d219 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
@@ -105,6 +105,84 @@ describe('SourceSettings', () => {
);
});
+ it('handles disabling synchronization', () => {
+ const wrapper = shallow(
+
+
+ setSynchronize(e.target.checked)}
+ label={SYNC_MANAGEMENT_SYNCHRONIZE_LABEL}
+ data-test-subj="SynchronizeToggle"
+ />
+
+
+
+
+ setThumbnails(e.target.checked)}
+ label={
+ areThumbnailsConfigEnabled
+ ? SYNC_MANAGEMENT_THUMBNAILS_LABEL
+ : SYNC_MANAGEMENT_THUMBNAILS_GLOBAL_CONFIG_LABEL
+ }
+ disabled={!areThumbnailsConfigEnabled}
+ data-test-subj="ThumbnailsToggle"
+ />
+
+
+
+
+ setContentExtraction(e.target.checked)}
+ label={SYNC_MANAGEMENT_CONTENT_EXTRACTION_LABEL}
+ data-test-subj="ContentExtractionToggle"
+ />
+
+
+
+
+
+ {SAVE_CHANGES_BUTTON}
+
+
+
+
+ )}
{
expect(onUpdateSourceNameSpy).toHaveBeenCalledWith(contentSource.name);
});
+ it('does not call onUpdateSourceName when the name is not supplied', async () => {
+ AppLogic.values.isOrganization = true;
+
+ const onUpdateSourceNameSpy = jest.spyOn(SourceLogic.actions, 'onUpdateSourceName');
+ const promise = Promise.resolve(contentSource);
+ http.patch.mockReturnValue(promise);
+ SourceLogic.actions.updateContentSource(contentSource.id, { indexing: { enabled: true } });
+
+ expect(http.patch).toHaveBeenCalledWith('/api/workplace_search/org/sources/123/settings', {
+ body: JSON.stringify({ content_source: { indexing: { enabled: true } } }),
+ });
+ await promise;
+ expect(onUpdateSourceNameSpy).not.toHaveBeenCalledWith(contentSource.name);
+ });
+
it('calls API and sets values (account)', async () => {
AppLogic.values.isOrganization = false;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
index 0fd44e01ae495..4d145bf798160 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
@@ -34,8 +34,11 @@ export interface SourceActions {
searchContentSourceDocuments(sourceId: string): { sourceId: string };
updateContentSource(
sourceId: string,
- source: { name: string }
- ): { sourceId: string; source: { name: string } };
+ source: SourceUpdatePayload
+ ): {
+ sourceId: string;
+ source: ContentSourceFullData;
+ };
resetSourceState(): void;
removeContentSource(sourceId: string): { sourceId: string };
initializeSource(sourceId: string): { sourceId: string };
@@ -57,6 +60,17 @@ interface SearchResultsResponse {
meta: Meta;
}
+interface SourceUpdatePayload {
+ name?: string;
+ indexing?: {
+ enabled?: boolean;
+ features?: {
+ thumbnails?: { enabled: boolean };
+ content_extraction?: { enabled: boolean };
+ };
+ };
+}
+
export const SourceLogic = kea>({
path: ['enterprise_search', 'workplace_search', 'source_logic'],
actions: {
@@ -69,7 +83,7 @@ export const SourceLogic = kea>({
initializeSource: (sourceId: string) => ({ sourceId }),
initializeFederatedSummary: (sourceId: string) => ({ sourceId }),
searchContentSourceDocuments: (sourceId: string) => ({ sourceId }),
- updateContentSource: (sourceId: string, source: { name: string }) => ({ sourceId, source }),
+ updateContentSource: (sourceId: string, source: SourceUpdatePayload) => ({ sourceId, source }),
removeContentSource: (sourceId: string) => ({
sourceId,
}),
@@ -209,7 +223,9 @@ export const SourceLogic = kea>({
const response = await HttpLogic.values.http.patch(route, {
body: JSON.stringify({ content_source: source }),
});
- actions.onUpdateSourceName(response.name);
+ if (source.name) {
+ actions.onUpdateSourceName(response.name);
+ }
} catch (e) {
flashAPIErrors(e);
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
index 58a80914fd3c5..05692a0ecab8c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
@@ -49,7 +49,7 @@ export const SetupGuide: React.FC = () => {
= {
+ schema: ConfigSchema,
+ deprecations: () => [
+ (settings, fromPath, addDeprecation) => {
+ if (
+ settings?.xpack?.eventLog?.enabled === false ||
+ settings?.xpack?.eventLog?.enabled === true
+ ) {
+ addDeprecation({
+ message: `"xpack.eventLog.enabled" is deprecated. The ability to disable this plugin will be removed in 8.0.0.`,
+ correctiveActions: {
+ manualSteps: [`Remove "xpack.eventLog.enabled" from your kibana configs.`],
+ },
+ });
+ }
+ },
+ ],
+};
export const plugin = (context: PluginInitializerContext) => new Plugin(context);
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
index 4f5c61b76f4e1..86c4238e9932a 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
@@ -18,6 +18,7 @@ import {
EuiText,
EuiIcon,
EuiToolTip,
+ EuiLink,
} from '@elastic/eui';
import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../common';
@@ -30,6 +31,7 @@ import {
usePackageInstallations,
useStartServices,
} from '../../../../../hooks';
+import { pkgKeyFromPackageInfo } from '../../../../../services';
interface Props {
packagePolicies: PackagePolicy[];
@@ -103,20 +105,30 @@ export const PackagePoliciesTable: React.FunctionComponent = ({
name: i18n.translate('xpack.fleet.policyDetails.packagePoliciesTable.nameColumnTitle', {
defaultMessage: 'Name',
}),
- render: (value: string, { description }) => (
- <>
+ render: (value: string, packagePolicy: InMemoryPackagePolicy) => (
+
{value}
- {description ? (
+ {packagePolicy.description ? (
-
+
) : null}
-
+
),
},
{
@@ -131,28 +143,41 @@ export const PackagePoliciesTable: React.FunctionComponent = ({
render(packageTitle: string, packagePolicy: InMemoryPackagePolicy) {
return (
- {packagePolicy.package && (
-
-
- )}
- {packageTitle}
- {packagePolicy.package && (
-
-
-
-
- )}
+
+
+
+ {packagePolicy.package && (
+
+
+ )}
+ {packageTitle}
+ {packagePolicy.package && (
+
+
+
+
+ )}
+
+
+
{packagePolicy.hasUpgrade && (
<>
@@ -220,7 +245,7 @@ export const PackagePoliciesTable: React.FunctionComponent = ({
],
},
],
- [agentPolicy, getHref]
+ [agentPolicy, getHref, hasWriteCapabilities]
);
return (
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
index 66b88c020f163..b20c275cdeddf 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
@@ -61,8 +61,8 @@ export const DefaultLayout: React.FunctionComponent = memo(({ section, ch
@@ -74,7 +74,7 @@ export const DefaultLayout: React.FunctionComponent = memo(({ section, ch
) => {
};
const updateJsonEditor = (testSubject: TestSubjects, value: object) => {
- find(testSubject).simulate('change', { jsonContent: JSON.stringify(value) });
+ find(testSubject).simulate('change', { jsonString: JSON.stringify(value) });
};
const getJsonEditorValue = (testSubject: TestSubjects) => {
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
index b2647b175b324..efd1ec7062423 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
@@ -6,6 +6,8 @@
*/
import React from 'react';
+/* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
+import '../../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
import { GlobalFlyout } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
import {
docLinksServiceMock,
@@ -30,16 +32,6 @@ jest.mock('@elastic/eui', () => {
}}
/>
),
- // Mocking EuiCodeEditor, which uses React Ace under the hood
- EuiCodeEditor: (props: any) => (
- {
- props.onChange(e.jsonContent);
- }}
- />
- ),
// Mocking EuiSuperSelect to be able to easily change its value
// with a `myWrapper.simulate('change', { target: { value: 'someValue' } })`
EuiSuperSelect: (props: any) => (
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
index 8f70406962e4c..7f6aea8878a77 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
@@ -7,23 +7,7 @@
import React from 'react';
import { act } from 'react-dom/test-utils';
-
-jest.mock('@elastic/eui', () => {
- const original = jest.requireActual('@elastic/eui');
-
- return {
- ...original,
- // Mocking EuiCodeEditor, which uses React Ace under the hood
- EuiCodeEditor: (props: any) => (
- {
- props.onChange(syntheticEvent.jsonString);
- }}
- />
- ),
- };
-});
+import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
jest.mock('lodash', () => {
const original = jest.requireActual('lodash');
diff --git a/x-pack/plugins/infra/common/alerting/metrics/types.ts b/x-pack/plugins/infra/common/alerting/metrics/types.ts
index 94ec40dd2847e..2e8ad1de3413c 100644
--- a/x-pack/plugins/infra/common/alerting/metrics/types.ts
+++ b/x-pack/plugins/infra/common/alerting/metrics/types.ts
@@ -6,7 +6,6 @@
*/
import * as rt from 'io-ts';
import { ANOMALY_THRESHOLD } from '../../infra_ml';
-import { ItemTypeRT } from '../../inventory_models/types';
// TODO: Have threshold and inventory alerts import these types from this file instead of from their
// local directories
@@ -55,95 +54,3 @@ export interface MetricAnomalyParams {
threshold: Exclude;
influencerFilter: rt.TypeOf | undefined;
}
-
-// Alert Preview API
-const baseAlertRequestParamsRT = rt.intersection([
- rt.partial({
- filterQuery: rt.union([rt.string, rt.undefined]),
- sourceId: rt.string,
- }),
- rt.type({
- lookback: rt.union([
- rt.literal('ms'),
- rt.literal('s'),
- rt.literal('m'),
- rt.literal('h'),
- rt.literal('d'),
- rt.literal('w'),
- rt.literal('M'),
- rt.literal('y'),
- ]),
- alertInterval: rt.string,
- alertThrottle: rt.string,
- alertOnNoData: rt.boolean,
- alertNotifyWhen: rt.string,
- }),
-]);
-
-const metricThresholdAlertPreviewRequestParamsRT = rt.intersection([
- baseAlertRequestParamsRT,
- rt.partial({
- groupBy: rt.union([rt.string, rt.array(rt.string), rt.undefined]),
- }),
- rt.type({
- alertType: rt.literal(METRIC_THRESHOLD_ALERT_TYPE_ID),
- criteria: rt.array(rt.any),
- }),
-]);
-export type MetricThresholdAlertPreviewRequestParams = rt.TypeOf<
- typeof metricThresholdAlertPreviewRequestParamsRT
->;
-
-const inventoryAlertPreviewRequestParamsRT = rt.intersection([
- baseAlertRequestParamsRT,
- rt.type({
- nodeType: ItemTypeRT,
- alertType: rt.literal(METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID),
- criteria: rt.array(rt.any),
- }),
-]);
-export type InventoryAlertPreviewRequestParams = rt.TypeOf<
- typeof inventoryAlertPreviewRequestParamsRT
->;
-
-const metricAnomalyAlertPreviewRequestParamsRT = rt.intersection([
- baseAlertRequestParamsRT,
- rt.type({
- nodeType: metricAnomalyNodeTypeRT,
- metric: metricAnomalyMetricRT,
- threshold: rt.number,
- alertType: rt.literal(METRIC_ANOMALY_ALERT_TYPE_ID),
- spaceId: rt.string,
- }),
- rt.partial({
- influencerFilter: metricAnomalyInfluencerFilterRT,
- }),
-]);
-export type MetricAnomalyAlertPreviewRequestParams = rt.TypeOf<
- typeof metricAnomalyAlertPreviewRequestParamsRT
->;
-
-export const alertPreviewRequestParamsRT = rt.union([
- metricThresholdAlertPreviewRequestParamsRT,
- inventoryAlertPreviewRequestParamsRT,
- metricAnomalyAlertPreviewRequestParamsRT,
-]);
-export type AlertPreviewRequestParams = rt.TypeOf;
-
-export const alertPreviewSuccessResponsePayloadRT = rt.type({
- numberOfGroups: rt.number,
- resultTotals: rt.intersection([
- rt.type({
- fired: rt.number,
- noData: rt.number,
- error: rt.number,
- notifications: rt.number,
- }),
- rt.partial({
- warning: rt.number,
- }),
- ]),
-});
-export type AlertPreviewSuccessResponsePayload = rt.TypeOf<
- typeof alertPreviewSuccessResponsePayloadRT
->;
diff --git a/x-pack/plugins/infra/common/search_strategies/log_entries/log_entries.ts b/x-pack/plugins/infra/common/search_strategies/log_entries/log_entries.ts
index b9841abad6ab5..cc6d3fbe585e0 100644
--- a/x-pack/plugins/infra/common/search_strategies/log_entries/log_entries.ts
+++ b/x-pack/plugins/infra/common/search_strategies/log_entries/log_entries.ts
@@ -6,7 +6,7 @@
*/
import * as rt from 'io-ts';
-import { DslQuery } from '@kbn/es-query';
+import { estypes } from '@elastic/elasticsearch';
import { logSourceColumnConfigurationRT } from '../../log_sources/log_source_configuration';
import {
logEntryAfterCursorRT,
@@ -14,7 +14,7 @@ import {
logEntryCursorRT,
logEntryRT,
} from '../../log_entry';
-import { JsonObject, jsonObjectRT } from '../../typed_json';
+import { jsonObjectRT } from '../../typed_json';
import { searchStrategyErrorRT } from '../common/errors';
export const LOG_ENTRIES_SEARCH_STRATEGY = 'infra-log-entries';
@@ -51,7 +51,7 @@ export const logEntriesSearchRequestParamsRT = rt.union([
export type LogEntriesSearchRequestParams = rt.TypeOf;
-export type LogEntriesSearchRequestQuery = JsonObject | DslQuery;
+export type LogEntriesSearchRequestQuery = estypes.QueryDslQueryContainer;
export const logEntriesSearchResponsePayloadRT = rt.intersection([
rt.type({
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index 1e7c747887cb1..763c96b415c13 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -15,7 +15,7 @@
"observability",
"ruleRegistry"
],
- "optionalPlugins": ["ml", "home", "embeddable"],
+ "optionalPlugins": ["ml", "home", "embeddable", "osquery"],
"server": true,
"ui": true,
"configPath": ["xpack", "infra"],
diff --git a/x-pack/plugins/infra/public/alerting/common/components/alert_preview.tsx b/x-pack/plugins/infra/public/alerting/common/components/alert_preview.tsx
deleted file mode 100644
index 7d7b0004fa068..0000000000000
--- a/x-pack/plugins/infra/public/alerting/common/components/alert_preview.tsx
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { omit } from 'lodash';
-import React, { useCallback, useMemo, useState } from 'react';
-import {
- EuiSpacer,
- EuiFormRow,
- EuiButton,
- EuiSelect,
- EuiFlexGroup,
- EuiFlexItem,
- EuiCallOut,
- EuiAccordion,
- EuiCodeBlock,
- EuiText,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import { AlertNotifyWhenType } from '../../../../../alerting/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { FORMATTERS } from '../../../../common/formatters';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../../triggers_actions_ui/public/types';
-import {
- AlertPreviewSuccessResponsePayload,
- AlertPreviewRequestParams,
-} from '../../../../common/alerting/metrics';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { getIntervalInSeconds } from '../../../../server/utils/get_interval_in_seconds';
-import { getAlertPreview, PreviewableAlertTypes } from './get_alert_preview';
-
-interface Props {
- alertInterval: string;
- alertThrottle: string;
- alertNotifyWhen: AlertNotifyWhenType;
- alertType: PreviewableAlertTypes;
- alertParams: { criteria?: any[]; sourceId: string } & Record;
- validate: (params: any) => ValidationResult;
- showNoDataResults?: boolean;
- groupByDisplayName?: string;
-}
-
-export const AlertPreview: React.FC = (props) => {
- const {
- alertParams,
- alertInterval,
- alertThrottle,
- alertNotifyWhen,
- alertType,
- validate,
- showNoDataResults,
- groupByDisplayName,
- } = props;
- const { http } = useKibana().services;
-
- const [previewLookbackInterval, setPreviewLookbackInterval] = useState('h');
- const [isPreviewLoading, setIsPreviewLoading] = useState(false);
- const [previewError, setPreviewError] = useState(false);
- const [previewResult, setPreviewResult] = useState<
- (AlertPreviewSuccessResponsePayload & Record) | null
- >(null);
-
- const onSelectPreviewLookbackInterval = useCallback((e) => {
- setPreviewLookbackInterval(e.target.value);
- }, []);
-
- const onClickPreview = useCallback(async () => {
- setIsPreviewLoading(true);
- setPreviewResult(null);
- setPreviewError(false);
- try {
- const result = await getAlertPreview({
- fetch: http!.fetch,
- params: {
- ...alertParams,
- lookback: previewLookbackInterval as 'h' | 'd' | 'w' | 'M',
- alertInterval,
- alertThrottle,
- alertNotifyWhen,
- alertOnNoData: showNoDataResults ?? false,
- } as AlertPreviewRequestParams,
- alertType,
- });
- setPreviewResult({ ...result, groupByDisplayName, previewLookbackInterval, alertThrottle });
- } catch (e) {
- setPreviewError(e);
- } finally {
- setIsPreviewLoading(false);
- }
- }, [
- alertParams,
- alertInterval,
- alertType,
- alertNotifyWhen,
- groupByDisplayName,
- previewLookbackInterval,
- alertThrottle,
- showNoDataResults,
- http,
- ]);
-
- const previewIntervalError = useMemo(() => {
- const intervalInSeconds = getIntervalInSeconds(alertInterval);
- const lookbackInSeconds = getIntervalInSeconds(`1${previewLookbackInterval}`);
- if (intervalInSeconds >= lookbackInSeconds) {
- return true;
- }
- return false;
- }, [previewLookbackInterval, alertInterval]);
-
- const isPreviewDisabled = useMemo(() => {
- if (!alertParams.criteria) return false;
- const validationResult = validate({ criteria: alertParams.criteria } as any);
- const hasValidationErrors = Object.values(validationResult.errors).some((result) =>
- Object.values(result).some((arr) => Array.isArray(arr) && arr.length)
- );
- return hasValidationErrors || previewIntervalError;
- }, [alertParams.criteria, previewIntervalError, validate]);
-
- const showNumberOfNotifications = useMemo(() => {
- if (!previewResult) return false;
- if (alertNotifyWhen === 'onActiveAlert') return false;
- const { notifications, fired, noData, error } = previewResult.resultTotals;
- const unthrottledNotifications = fired + (showNoDataResults ? noData + error : 0);
- return unthrottledNotifications > notifications;
- }, [previewResult, showNoDataResults, alertNotifyWhen]);
-
- const hasWarningThreshold = useMemo(
- () => alertParams.criteria?.some((c) => Reflect.has(c, 'warningThreshold')) ?? false,
- [alertParams]
- );
-
- return (
-
- <>
-
-
-
-
-
- {i18n.translate('xpack.infra.metrics.alertFlyout.testAlertCondition', {
- defaultMessage: 'Test alert condition',
- })}
-
-
-
- {previewResult && !previewIntervalError && (
- <>
-
- {i18n.translate(
- 'xpack.infra.metrics.alertFlyout.alertPreviewTotalNotificationsNumber',
- {
- defaultMessage:
- '{notifs, plural, one {# notification} other {# notifications}}',
- values: {
- notifs: previewResult.resultTotals.notifications,
- },
- }
- )}
-
- ),
- }}
- />
-
- ) : null}{' '}
-
-
- )}
- {previewIntervalError && (
- <>
- check every,
- }}
- />
-
-
- )}
- {previewError && (
- <>
- FOR THE LAST,
- }}
- />
-
- ) : (
-
-
-
-
- }
- >
- {previewError.body.message}
-
-
- )}
-
- )}
-
- )}
-
-
- );
-};
-
-const PreviewTextString = ({
- previewResult,
- hasWarningThreshold,
-}: {
- previewResult: AlertPreviewSuccessResponsePayload & Record;
- hasWarningThreshold: boolean;
-}) => {
- const instanceCount = hasWarningThreshold ? (
-
- e.value === previewResult.previewLookbackInterval)
- ?.shortText,
- }}
- />
- );
-
- return (
- {
- return await fetch(`${INFRA_ALERT_PREVIEW_PATH}`, {
- method: 'POST',
- body: JSON.stringify({
- ...params,
- alertType,
- }),
- });
-}
diff --git a/x-pack/plugins/infra/public/alerting/common/index.ts b/x-pack/plugins/infra/public/alerting/common/index.ts
deleted file mode 100644
index 3dc508e9b21f6..0000000000000
--- a/x-pack/plugins/infra/public/alerting/common/index.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-export { AlertPreview } from './components/alert_preview';
-
-export const previewOptions = [
- {
- value: 'h',
- text: i18n.translate('xpack.infra.metrics.alertFlyout.lastHourLabel', {
- defaultMessage: 'Last hour',
- }),
- shortText: i18n.translate('xpack.infra.metrics.alertFlyout.hourLabel', {
- defaultMessage: 'hour',
- }),
- },
- {
- value: 'd',
- text: i18n.translate('xpack.infra.metrics.alertFlyout.lastDayLabel', {
- defaultMessage: 'Last day',
- }),
- shortText: i18n.translate('xpack.infra.metrics.alertFlyout.dayLabel', {
- defaultMessage: 'day',
- }),
- },
- {
- value: 'w',
- text: i18n.translate('xpack.infra.metrics.alertFlyout.lastWeekLabel', {
- defaultMessage: 'Last week',
- }),
- shortText: i18n.translate('xpack.infra.metrics.alertFlyout.weekLabel', {
- defaultMessage: 'week',
- }),
- },
- {
- value: 'M',
- text: i18n.translate('xpack.infra.metrics.alertFlyout.lastMonthLabel', {
- defaultMessage: 'Last month',
- }),
- shortText: i18n.translate('xpack.infra.metrics.alertFlyout.monthLabel', {
- defaultMessage: 'month',
- }),
- },
-];
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
index c4f8b5a615b0f..78005d9d87cf9 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { debounce, pick, omit } from 'lodash';
+import { debounce, omit } from 'lodash';
import { Unit } from '@elastic/datemath';
import React, { useCallback, useMemo, useEffect, useState, ChangeEvent } from 'react';
import { IFieldType } from 'src/plugins/data/public';
@@ -26,8 +26,6 @@ import {
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { toMetricOpt } from '../../../../common/snapshot_metric_i18n';
-import { AlertPreview } from '../../common';
-import { METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
import {
Comparator,
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -68,7 +66,6 @@ import {
SnapshotCustomMetricInputRT,
} from '../../../../common/http_api/snapshot_api';
-import { validateMetricThreshold } from './validation';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
import { ExpressionChart } from './expression_chart';
@@ -113,15 +110,7 @@ export const defaultExpression = {
export const Expressions: React.FC = (props) => {
const { http, notifications } = useKibanaContextForPlugin().services;
- const {
- setAlertParams,
- alertParams,
- errors,
- alertInterval,
- alertThrottle,
- metadata,
- alertNotifyWhen,
- } = props;
+ const { setAlertParams, alertParams, errors, metadata } = props;
const { source, createDerivedIndexPattern } = useSourceViaHttp({
sourceId: 'default',
fetch: http.fetch,
@@ -403,17 +392,6 @@ export const Expressions: React.FC = (props) => {
= (props) => {
const { http, notifications } = useKibanaContextForPlugin().services;
const { space } = useActiveKibanaSpace();
- const {
- setAlertParams,
- alertParams,
- alertInterval,
- alertThrottle,
- alertNotifyWhen,
- metadata,
- } = props;
+ const { setAlertParams, alertParams, alertInterval, metadata } = props;
const { source, createDerivedIndexPattern } = useSourceViaHttp({
sourceId: 'default',
fetch: http.fetch,
@@ -258,23 +245,6 @@ export const Expression: React.FC = (props) => {
onChangeFieldValue={updateInfluencerFieldValue}
/>
= (props) => {
- const {
- setAlertParams,
- alertParams,
- errors,
- alertInterval,
- alertThrottle,
- metadata,
- alertNotifyWhen,
- } = props;
+ const { setAlertParams, alertParams, errors, metadata } = props;
const { http, notifications } = useKibanaContextForPlugin().services;
const { source, createDerivedIndexPattern } = useSourceViaHttp({
sourceId: 'default',
@@ -256,11 +242,6 @@ export const Expressions: React.FC = (props) => {
[onFilterChange]
);
- const groupByPreviewDisplayName = useMemo(() => {
- if (Array.isArray(alertParams.groupBy)) return alertParams.groupBy.join(', ');
- return alertParams.groupBy;
- }, [alertParams.groupBy]);
-
const areAllAggsRate = useMemo(
() => alertParams.criteria?.every((c) => c.aggType === Aggregators.RATE),
[alertParams.criteria]
@@ -435,24 +416,6 @@ export const Expressions: React.FC = (props) => {
(props: Props) {
return (
<>
-
-
-
-
-
-
-
-
- {currentView
- ? currentView.name
- : i18n.translate('xpack.infra.savedView.unknownView', {
- defaultMessage: 'No view selected',
- })}
-
-
-
-
-
- }
- isOpen={isSavedViewMenuOpen}
- closePopover={hideSavedViewMenu}
- anchorPosition="upCenter"
- >
-
-
+ {currentView
+ ? currentView.name
+ : i18n.translate('xpack.infra.savedView.unknownView', {
+ defaultMessage: 'No view selected',
+ })}
+
+ }
+ isOpen={isSavedViewMenuOpen}
+ closePopover={hideSavedViewMenu}
+ anchorPosition="leftCenter"
+ >
+
+
-
-
+
-
{({ measureRef, bounds: { height = 0 } }) => (
@@ -221,9 +216,3 @@ const MainContainer = euiStyled.div`
const TopActionContainer = euiStyled.div`
padding: ${(props) => `12px ${props.theme.eui.paddingSizes.m}`};
`;
-
-const SavedViewContainer = euiStyled.div`
- position: relative;
- z-index: 1;
- padding-left: ${(props) => props.theme.eui.paddingSizes.m};
-`;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
index 7f6d592fce6e6..e2803629afd51 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
@@ -20,6 +20,7 @@ import { LogsTab } from './tabs/logs';
import { ProcessesTab } from './tabs/processes';
import { PropertiesTab } from './tabs/properties/index';
import { AnomaliesTab } from './tabs/anomalies/anomalies';
+import { OsqueryTab } from './tabs/osquery';
import { OVERLAY_Y_START, OVERLAY_BOTTOM_MARGIN } from './tabs/shared';
import { useLinkProps } from '../../../../../hooks/use_link_props';
import { getNodeDetailUrl } from '../../../../link_to';
@@ -45,7 +46,7 @@ export const NodeContextPopover = ({
openAlertFlyout,
}: Props) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
- const tabConfigs = [MetricsTab, LogsTab, ProcessesTab, PropertiesTab, AnomaliesTab];
+ const tabConfigs = [MetricsTab, LogsTab, ProcessesTab, PropertiesTab, AnomaliesTab, OsqueryTab];
const inventoryModel = findInventoryModel(nodeType);
const nodeDetailFrom = currentTime - inventoryModel.metrics.defaultTimeRangeInSeconds * 1000;
const uiCapabilities = useKibana().services.application?.capabilities;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/osquery/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/osquery/index.tsx
new file mode 100644
index 0000000000000..9932903ef9f19
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/osquery/index.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiLoadingContent } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React, { useContext, useMemo } from 'react';
+import { useKibanaContextForPlugin } from '../../../../../../../hooks/use_kibana';
+import { TabContent, TabProps } from '../shared';
+import { Source } from '../../../../../../../containers/metrics_source';
+import { findInventoryModel } from '../../../../../../../../common/inventory_models';
+import { InventoryItemType } from '../../../../../../../../common/inventory_models/types';
+import { useMetadata } from '../../../../../metric_detail/hooks/use_metadata';
+import { useWaffleTimeContext } from '../../../../hooks/use_waffle_time';
+
+const TabComponent = (props: TabProps) => {
+ const nodeId = props.node.id;
+ const nodeType = props.nodeType as InventoryItemType;
+ const inventoryModel = findInventoryModel(nodeType);
+ const { sourceId } = useContext(Source.Context);
+ const { currentTimeRange } = useWaffleTimeContext();
+ const { loading, metadata } = useMetadata(
+ nodeId,
+ nodeType,
+ inventoryModel.requiredMetrics,
+ sourceId,
+ currentTimeRange
+ );
+ const {
+ services: { osquery },
+ } = useKibanaContextForPlugin();
+ // @ts-expect-error
+ const OsqueryAction = osquery?.OsqueryAction;
+
+ // avoids component rerender when resizing the popover
+ const content = useMemo(() => {
+ // TODO: Add info when Osquery plugin is not available
+ if (loading || !OsqueryAction) {
+ return (
+
+
+ );
+ }
+
+ return (
+
+
+ );
+ }, [OsqueryAction, loading, metadata]);
+
+ return content;
+};
+
+export const OsqueryTab = {
+ id: 'osquery',
+ name: i18n.translate('xpack.infra.nodeDetails.tabs.osquery', {
+ defaultMessage: 'Osquery',
+ }),
+ content: TabComponent,
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
index 9671699dadbad..353997d5fe3ff 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
@@ -29,6 +29,7 @@ import { MetricsPageTemplate } from '../page_template';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
import { inventoryTitle } from '../../../translations';
+import { SavedViews } from './components/saved_views';
export const SnapshotPage = () => {
const uiCapabilities = useKibana().services.application?.capabilities;
@@ -72,23 +73,24 @@ export const SnapshotPage = () => {
) : metricIndicesExist ? (
<>
-
-
+
+
) : hasFailedLoadingSource ? (
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
index 1b33546d3b68f..64da554dee690 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
@@ -23,7 +23,6 @@ import { MetricsExplorerMetrics } from './metrics';
import { MetricsExplorerGroupBy } from './group_by';
import { MetricsExplorerAggregationPicker } from './aggregation';
import { MetricsExplorerChartOptions as MetricsExplorerChartOptionsComponent } from './chart_options';
-import { SavedViewsToolbarControls } from '../../../../components/saved_views/toolbar_control';
import { useKibanaUiSetting } from '../../../../utils/use_kibana_ui_setting';
import { mapKibanaQuickRangesToDatePickerRanges } from '../../../../utils/map_timepicker_quickranges_to_datepicker_ranges';
@@ -114,16 +113,6 @@ export const MetricsExplorerToolbar = ({
chartOptions={chartOptions}
/>
-
-
-
;
diff --git a/x-pack/plugins/infra/server/infra_server.ts b/x-pack/plugins/infra/server/infra_server.ts
index f42207e0ad142..d289cf339851d 100644
--- a/x-pack/plugins/infra/server/infra_server.ts
+++ b/x-pack/plugins/infra/server/infra_server.ts
@@ -34,7 +34,6 @@ import { initInventoryMetaRoute } from './routes/inventory_metadata';
import { initLogSourceConfigurationRoutes, initLogSourceStatusRoutes } from './routes/log_sources';
import { initMetricsSourceConfigurationRoutes } from './routes/metrics_sources';
import { initOverviewRoute } from './routes/overview';
-import { initAlertPreviewRoute } from './routes/alerting';
import { initGetLogAlertsChartPreviewDataRoute } from './routes/log_alerts';
import { initProcessListRoute } from './routes/process_list';
@@ -63,7 +62,6 @@ export const initInfraServer = (libs: InfraBackendLibs) => {
initInventoryMetaRoute(libs);
initLogSourceConfigurationRoutes(libs);
initLogSourceStatusRoutes(libs);
- initAlertPreviewRoute(libs);
initGetLogAlertsChartPreviewDataRoute(libs);
initProcessListRoute(libs);
initOverviewRoute(libs);
diff --git a/x-pack/plugins/infra/server/lib/alerting/common/types.ts b/x-pack/plugins/infra/server/lib/alerting/common/types.ts
index 0b809429de0d2..1d038cace14fe 100644
--- a/x-pack/plugins/infra/server/lib/alerting/common/types.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/common/types.ts
@@ -33,11 +33,3 @@ export enum AlertStates {
NO_DATA,
ERROR,
}
-
-export interface PreviewResult {
- fired: number;
- warning: number;
- noData: number;
- error: number;
- notifications: number;
-}
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
deleted file mode 100644
index 00d01b15750d1..0000000000000
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Unit } from '@elastic/datemath';
-import { first } from 'lodash';
-import { PreviewResult } from '../common/types';
-import { InventoryMetricConditions } from './types';
-import {
- TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
- isTooManyBucketsPreviewException,
-} from '../../../../common/alerting/metrics';
-import { ElasticsearchClient } from '../../../../../../../src/core/server';
-import { InfraSource } from '../../../../common/source_configuration/source_configuration';
-import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
-import { InventoryItemType } from '../../../../common/inventory_models/types';
-import { evaluateCondition } from './evaluate_condition';
-import { LogQueryFields } from '../../../services/log_queries/get_log_query_fields';
-
-interface InventoryMetricThresholdParams {
- criteria: InventoryMetricConditions[];
- filterQuery: string | undefined;
- nodeType: InventoryItemType;
- sourceId?: string;
-}
-
-interface PreviewInventoryMetricThresholdAlertParams {
- esClient: ElasticsearchClient;
- params: InventoryMetricThresholdParams;
- source: InfraSource;
- logQueryFields: LogQueryFields;
- compositeSize: number;
- lookback: Unit;
- alertInterval: string;
- alertThrottle: string;
- alertOnNoData: boolean;
- alertNotifyWhen: string;
-}
-
-export const previewInventoryMetricThresholdAlert: (
- params: PreviewInventoryMetricThresholdAlertParams
-) => Promise = async ({
- esClient,
- params,
- source,
- logQueryFields,
- compositeSize,
- lookback,
- alertInterval,
- alertThrottle,
- alertOnNoData,
- alertNotifyWhen,
-}: PreviewInventoryMetricThresholdAlertParams) => {
- const { criteria, filterQuery, nodeType } = params as InventoryMetricThresholdParams;
-
- if (criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
-
- const { timeSize, timeUnit } = criteria[0];
- const bucketInterval = `${timeSize}${timeUnit}`;
- const bucketIntervalInSeconds = getIntervalInSeconds(bucketInterval);
-
- const lookbackInterval = `1${lookback}`;
- const lookbackIntervalInSeconds = getIntervalInSeconds(lookbackInterval);
- const lookbackSize = Math.ceil(lookbackIntervalInSeconds / bucketIntervalInSeconds);
-
- const alertIntervalInSeconds = getIntervalInSeconds(alertInterval);
- const alertResultsPerExecution = alertIntervalInSeconds / bucketIntervalInSeconds;
- const throttleIntervalInSeconds = getIntervalInSeconds(alertThrottle);
-
- try {
- const results = await Promise.all(
- criteria.map((condition) =>
- evaluateCondition({
- condition,
- nodeType,
- source,
- logQueryFields,
- esClient,
- compositeSize,
- filterQuery,
- lookbackSize,
- })
- )
- );
-
- const inventoryItems = Object.keys(first(results)!);
- const previewResults = inventoryItems.map((item) => {
- const numberOfResultBuckets = lookbackSize;
- const numberOfExecutionBuckets = Math.floor(numberOfResultBuckets / alertResultsPerExecution);
- let numberOfTimesFired = 0;
- let numberOfTimesWarned = 0;
- let numberOfNoDataResults = 0;
- let numberOfErrors = 0;
- let numberOfNotifications = 0;
- let throttleTracker = 0;
- let previousActionGroup: string | null = null;
- const notifyWithThrottle = (actionGroup: string) => {
- if (alertNotifyWhen === 'onActionGroupChange') {
- if (previousActionGroup !== actionGroup) numberOfNotifications++;
- } else if (alertNotifyWhen === 'onThrottleInterval') {
- if (throttleTracker === 0) numberOfNotifications++;
- throttleTracker += alertIntervalInSeconds;
- } else {
- numberOfNotifications++;
- }
- previousActionGroup = actionGroup;
- };
- for (let i = 0; i < numberOfExecutionBuckets; i++) {
- const mappedBucketIndex = Math.floor(i * alertResultsPerExecution);
- const allConditionsFiredInMappedBucket = results.every((result) => {
- const shouldFire = result[item].shouldFire as boolean[];
- return shouldFire[mappedBucketIndex];
- });
- const allConditionsWarnInMappedBucket =
- !allConditionsFiredInMappedBucket &&
- results.every((result) => result[item].shouldWarn[mappedBucketIndex]);
- const someConditionsNoDataInMappedBucket = results.some((result) => {
- const hasNoData = result[item].isNoData as boolean[];
- return hasNoData[mappedBucketIndex];
- });
- const someConditionsErrorInMappedBucket = results.some((result) => {
- return result[item].isError;
- });
- if (someConditionsErrorInMappedBucket) {
- numberOfErrors++;
- if (alertOnNoData) {
- notifyWithThrottle('fired'); // TODO: Update this when No Data alerts move to an action group
- }
- } else if (someConditionsNoDataInMappedBucket) {
- numberOfNoDataResults++;
- if (alertOnNoData) {
- notifyWithThrottle('fired'); // TODO: Update this when No Data alerts move to an action group
- }
- } else if (allConditionsFiredInMappedBucket) {
- numberOfTimesFired++;
- notifyWithThrottle('fired');
- } else if (allConditionsWarnInMappedBucket) {
- numberOfTimesWarned++;
- notifyWithThrottle('warning');
- } else {
- previousActionGroup = 'recovered';
- if (throttleTracker > 0) {
- throttleTracker += alertIntervalInSeconds;
- }
- }
- if (throttleTracker >= throttleIntervalInSeconds) {
- throttleTracker = 0;
- }
- }
- return {
- fired: numberOfTimesFired,
- warning: numberOfTimesWarned,
- noData: numberOfNoDataResults,
- error: numberOfErrors,
- notifications: numberOfNotifications,
- };
- });
-
- return previewResults;
- } catch (e) {
- if (!isTooManyBucketsPreviewException(e)) throw e;
- const { maxBuckets } = e;
- throw new Error(`${TOO_MANY_BUCKETS_PREVIEW_EXCEPTION}:${maxBuckets}`);
- }
-};
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.test.ts
deleted file mode 100644
index e03b475191dff..0000000000000
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.test.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as mocks from './test_mocks';
-import { Comparator, Aggregators, MetricExpressionParams } from './types';
-import { alertsMock, AlertServicesMock } from '../../../../../alerting/server/mocks';
-import { previewMetricThresholdAlert } from './preview_metric_threshold_alert';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-
-describe('Previewing the metric threshold alert type', () => {
- describe('querying the entire infrastructure', () => {
- test('returns the expected results using a bucket interval equal to the alert interval', async () => {
- const [ungroupedResult] = await previewMetricThresholdAlert({
- ...baseParams,
- lookback: 'h',
- alertInterval: '1m',
- alertThrottle: '1m',
- alertOnNoData: true,
- alertNotifyWhen: 'onThrottleInterval',
- });
- const { fired, noData, error, notifications } = ungroupedResult;
- expect(fired).toBe(30);
- expect(noData).toBe(0);
- expect(error).toBe(0);
- expect(notifications).toBe(30);
- });
-
- test('returns the expected results using a bucket interval shorter than the alert interval', async () => {
- const [ungroupedResult] = await previewMetricThresholdAlert({
- ...baseParams,
- lookback: 'h',
- alertInterval: '3m',
- alertThrottle: '3m',
- alertOnNoData: true,
- alertNotifyWhen: 'onThrottleInterval',
- });
- const { fired, noData, error, notifications } = ungroupedResult;
- expect(fired).toBe(10);
- expect(noData).toBe(0);
- expect(error).toBe(0);
- expect(notifications).toBe(10);
- });
- test('returns the expected results using a bucket interval longer than the alert interval', async () => {
- const [ungroupedResult] = await previewMetricThresholdAlert({
- ...baseParams,
- lookback: 'h',
- alertInterval: '30s',
- alertThrottle: '30s',
- alertOnNoData: true,
- alertNotifyWhen: 'onThrottleInterval',
- });
- const { fired, noData, error, notifications } = ungroupedResult;
- expect(fired).toBe(60);
- expect(noData).toBe(0);
- expect(error).toBe(0);
- expect(notifications).toBe(60);
- });
- test('returns the expected results using a throttle interval longer than the alert interval', async () => {
- const [ungroupedResult] = await previewMetricThresholdAlert({
- ...baseParams,
- lookback: 'h',
- alertInterval: '1m',
- alertThrottle: '3m',
- alertOnNoData: true,
- alertNotifyWhen: 'onThrottleInterval',
- });
- const { fired, noData, error, notifications } = ungroupedResult;
- expect(fired).toBe(30);
- expect(noData).toBe(0);
- expect(error).toBe(0);
- expect(notifications).toBe(15);
- });
- test('returns the expected results using a notify setting of Only on Status Change', async () => {
- const [ungroupedResult] = await previewMetricThresholdAlert({
- ...baseParams,
- params: {
- ...baseParams.params,
- criteria: [
- {
- ...baseCriterion,
- metric: 'test.metric.3',
- } as MetricExpressionParams,
- ],
- },
- lookback: 'h',
- alertInterval: '1m',
- alertThrottle: '1m',
- alertOnNoData: true,
- alertNotifyWhen: 'onActionGroupChange',
- });
- const { fired, noData, error, notifications } = ungroupedResult;
- expect(fired).toBe(20);
- expect(noData).toBe(0);
- expect(error).toBe(0);
- expect(notifications).toBe(20);
- });
- });
- describe('querying with a groupBy parameter', () => {
- test('returns the expected results', async () => {
- const [resultA, resultB] = await previewMetricThresholdAlert({
- ...baseParams,
- params: {
- ...baseParams.params,
- groupBy: ['something'],
- },
- lookback: 'h',
- alertInterval: '1m',
- alertThrottle: '1m',
- alertOnNoData: true,
- alertNotifyWhen: 'onThrottleInterval',
- });
- const {
- fired: firedA,
- noData: noDataA,
- error: errorA,
- notifications: notificationsA,
- } = resultA;
- expect(firedA).toBe(30);
- expect(noDataA).toBe(0);
- expect(errorA).toBe(0);
- expect(notificationsA).toBe(30);
- const {
- fired: firedB,
- noData: noDataB,
- error: errorB,
- notifications: notificationsB,
- } = resultB;
- expect(firedB).toBe(60);
- expect(noDataB).toBe(0);
- expect(errorB).toBe(0);
- expect(notificationsB).toBe(60);
- });
- });
- describe('querying a data set with a period of No Data', () => {
- test('returns the expected results', async () => {
- const [ungroupedResult] = await previewMetricThresholdAlert({
- ...baseParams,
- params: {
- ...baseParams.params,
- criteria: [
- {
- ...baseCriterion,
- metric: 'test.metric.2',
- } as MetricExpressionParams,
- ],
- },
- lookback: 'h',
- alertInterval: '1m',
- alertThrottle: '1m',
- alertOnNoData: true,
- alertNotifyWhen: 'onThrottleInterval',
- });
- const { fired, noData, error, notifications } = ungroupedResult;
- expect(fired).toBe(25);
- expect(noData).toBe(10);
- expect(error).toBe(0);
- expect(notifications).toBe(35);
- });
- });
-});
-
-const services: AlertServicesMock = alertsMock.createAlertServices();
-
-services.scopedClusterClient.asCurrentUser.search.mockImplementation((params?: any): any => {
- const from = params?.body.query.bool.filter[0]?.range['@timestamp'].gte;
- const metric = params?.body.query.bool.filter[1]?.exists.field;
- if (params?.body.aggs.groupings) {
- if (params?.body.aggs.groupings.composite.after) {
- return elasticsearchClientMock.createSuccessTransportRequestPromise(
- mocks.compositeEndResponse
- );
- }
- return elasticsearchClientMock.createSuccessTransportRequestPromise(
- mocks.basicCompositePreviewResponse(from)
- );
- }
- if (metric === 'test.metric.2') {
- return elasticsearchClientMock.createSuccessTransportRequestPromise(
- mocks.alternateMetricPreviewResponse(from)
- );
- }
- if (metric === 'test.metric.3') {
- return elasticsearchClientMock.createSuccessTransportRequestPromise(
- mocks.repeatingMetricPreviewResponse(from)
- );
- }
- return elasticsearchClientMock.createSuccessTransportRequestPromise(
- mocks.basicMetricPreviewResponse(from)
- );
-});
-
-const baseCriterion = {
- aggType: Aggregators.AVERAGE,
- metric: 'test.metric.1',
- timeSize: 1,
- timeUnit: 'm',
- comparator: Comparator.GT,
- threshold: [0.75],
-} as MetricExpressionParams;
-
-const config = {
- metricAlias: 'metricbeat-*',
- fields: {
- timefield: '@timestamp',
- },
-} as any;
-
-const baseParams = {
- esClient: services.scopedClusterClient.asCurrentUser,
- params: {
- criteria: [baseCriterion],
- groupBy: undefined,
- filterQuery: undefined,
- },
- config,
-};
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
deleted file mode 100644
index 931b830875cdf..0000000000000
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { first, zip } from 'lodash';
-import { Unit } from '@elastic/datemath';
-import {
- TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
- isTooManyBucketsPreviewException,
-} from '../../../../common/alerting/metrics';
-import { ElasticsearchClient } from '../../../../../../../src/core/server';
-import { InfraSource } from '../../../../common/source_configuration/source_configuration';
-import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
-import { PreviewResult } from '../common/types';
-import { MetricExpressionParams } from './types';
-import { evaluateAlert } from './lib/evaluate_alert';
-
-const MAX_ITERATIONS = 50;
-
-interface PreviewMetricThresholdAlertParams {
- esClient: ElasticsearchClient;
- params: {
- criteria: MetricExpressionParams[];
- groupBy: string | undefined | string[];
- filterQuery: string | undefined;
- shouldDropPartialBuckets?: boolean;
- };
- config: InfraSource['configuration'];
- lookback: Unit;
- alertInterval: string;
- alertThrottle: string;
- alertNotifyWhen: string;
- alertOnNoData: boolean;
- end?: number;
- overrideLookbackIntervalInSeconds?: number;
-}
-
-export const previewMetricThresholdAlert: (
- params: PreviewMetricThresholdAlertParams,
- iterations?: number,
- precalculatedNumberOfGroups?: number
-) => Promise = async (
- {
- esClient,
- params,
- config,
- lookback,
- alertInterval,
- alertThrottle,
- alertNotifyWhen,
- alertOnNoData,
- end = Date.now(),
- overrideLookbackIntervalInSeconds,
- },
- iterations = 0,
- precalculatedNumberOfGroups
-) => {
- if (params.criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
-
- // There are three different "intervals" we're dealing with here, so to disambiguate:
- // - The lookback interval, which is how long of a period of time we want to examine to count
- // how many times the alert fired
- // - The interval in the alert params, which we'll call the bucket interval; this is how large of
- // a time bucket the alert uses to evaluate its result
- // - The alert interval, which is how often the alert fires
-
- const { timeSize, timeUnit } = params.criteria[0];
- const bucketInterval = `${timeSize}${timeUnit}`;
- const bucketIntervalInSeconds = getIntervalInSeconds(bucketInterval);
-
- const lookbackInterval = `1${lookback}`;
- const lookbackIntervalInSeconds =
- overrideLookbackIntervalInSeconds ?? getIntervalInSeconds(lookbackInterval);
-
- const start = end - lookbackIntervalInSeconds * 1000;
- const timeframe = { start, end };
-
- // Get a date histogram using the bucket interval and the lookback interval
- try {
- const alertResults = await evaluateAlert(esClient, params, config, timeframe);
- const groups = Object.keys(first(alertResults)!);
-
- // Now determine how to interpolate this histogram based on the alert interval
- const alertIntervalInSeconds = getIntervalInSeconds(alertInterval);
- const alertResultsPerExecution = alertIntervalInSeconds / bucketIntervalInSeconds;
- const throttleIntervalInSeconds = Math.max(
- getIntervalInSeconds(alertThrottle),
- alertIntervalInSeconds
- );
-
- const previewResults = await Promise.all(
- groups.map(async (group) => {
- // Interpolate the buckets returned by evaluateAlert and return a count of how many of these
- // buckets would have fired the alert. If the alert interval and bucket interval are the same,
- // this will be a 1:1 evaluation of the alert results. If these are different, the interpolation
- // will skip some buckets or read some buckets more than once, depending on the differential
- const numberOfResultBuckets = first(alertResults)![group].shouldFire.length;
- const numberOfExecutionBuckets = Math.floor(
- numberOfResultBuckets / alertResultsPerExecution
- );
- let numberOfTimesFired = 0;
- let numberOfTimesWarned = 0;
- let numberOfNoDataResults = 0;
- let numberOfErrors = 0;
- let numberOfNotifications = 0;
- let throttleTracker = 0;
- let previousActionGroup: string | null = null;
- const notifyWithThrottle = (actionGroup: string) => {
- if (alertNotifyWhen === 'onActionGroupChange') {
- if (previousActionGroup !== actionGroup) numberOfNotifications++;
- previousActionGroup = actionGroup;
- } else if (alertNotifyWhen === 'onThrottleInterval') {
- if (throttleTracker === 0) numberOfNotifications++;
- throttleTracker += alertIntervalInSeconds;
- } else {
- numberOfNotifications++;
- }
- };
- for (let i = 0; i < numberOfExecutionBuckets; i++) {
- const mappedBucketIndex = Math.floor(i * alertResultsPerExecution);
- const allConditionsFiredInMappedBucket = alertResults.every(
- (alertResult) => alertResult[group].shouldFire[mappedBucketIndex]
- );
- const allConditionsWarnInMappedBucket =
- !allConditionsFiredInMappedBucket &&
- alertResults.every((alertResult) => alertResult[group].shouldWarn[mappedBucketIndex]);
- const someConditionsNoDataInMappedBucket = alertResults.some((alertResult) => {
- const hasNoData = alertResult[group].isNoData as boolean[];
- return hasNoData[mappedBucketIndex];
- });
- const someConditionsErrorInMappedBucket = alertResults.some((alertResult) => {
- return alertResult[group].isError;
- });
- if (someConditionsErrorInMappedBucket) {
- numberOfErrors++;
- if (alertOnNoData) {
- notifyWithThrottle('fired'); // TODO: Update this when No Data alerts move to an action group
- }
- } else if (someConditionsNoDataInMappedBucket) {
- numberOfNoDataResults++;
- if (alertOnNoData) {
- notifyWithThrottle('fired'); // TODO: Update this when No Data alerts move to an action group
- }
- } else if (allConditionsFiredInMappedBucket) {
- numberOfTimesFired++;
- notifyWithThrottle('fired');
- } else if (allConditionsWarnInMappedBucket) {
- numberOfTimesWarned++;
- notifyWithThrottle('warning');
- } else {
- previousActionGroup = 'recovered';
- if (throttleTracker > 0) {
- throttleTracker += alertIntervalInSeconds;
- }
- }
- if (throttleTracker >= throttleIntervalInSeconds) {
- throttleTracker = 0;
- }
- }
- return {
- fired: numberOfTimesFired,
- warning: numberOfTimesWarned,
- noData: numberOfNoDataResults,
- error: numberOfErrors,
- notifications: numberOfNotifications,
- };
- })
- );
- return previewResults;
- } catch (e) {
- if (isTooManyBucketsPreviewException(e)) {
- // If there's too much data on the first request, recursively slice the lookback interval
- // until all the data can be retrieved
- const basePreviewParams = {
- esClient,
- params,
- config,
- lookback,
- alertInterval,
- alertThrottle,
- alertOnNoData,
- alertNotifyWhen,
- };
- const { maxBuckets } = e;
- // If this is still the first iteration, try to get the number of groups in order to
- // calculate max buckets. If this fails, just estimate based on 1 group
- const currentAlertResults = !precalculatedNumberOfGroups
- ? await evaluateAlert(esClient, params, config)
- : [];
- const numberOfGroups =
- precalculatedNumberOfGroups ?? Math.max(Object.keys(first(currentAlertResults)!).length, 1);
- const estimatedTotalBuckets =
- (lookbackIntervalInSeconds / bucketIntervalInSeconds) * numberOfGroups;
- // The minimum number of slices is 2. In case we underestimate the total number of buckets
- // in the first iteration, we can bisect the remaining buckets on further recursions to get
- // all the data needed
- const slices = Math.max(Math.ceil(estimatedTotalBuckets / maxBuckets), 2);
- const slicedLookback = Math.floor(lookbackIntervalInSeconds / slices);
-
- // Bail out if it looks like this is going to take too long
- if (slicedLookback <= 0 || iterations > MAX_ITERATIONS || slices > MAX_ITERATIONS) {
- throw new Error(`${TOO_MANY_BUCKETS_PREVIEW_EXCEPTION}:${maxBuckets * MAX_ITERATIONS}`);
- }
-
- const slicedRequests = [...Array(slices)].map((_, i) => {
- return previewMetricThresholdAlert(
- {
- ...basePreviewParams,
- end: Math.min(end, start + slicedLookback * (i + 1) * 1000),
- overrideLookbackIntervalInSeconds: slicedLookback,
- },
- iterations + slices,
- numberOfGroups
- );
- });
- const results = await Promise.all(slicedRequests);
- const zippedResult = zip(...results).map((result) =>
- result
- // `undefined` values occur if there is no data at all in a certain slice, and that slice
- // returns an empty array. This is different from an error or no data state,
- // so filter these results out entirely and only regard the resultA portion
- .filter(
- (value: Value): value is NonNullable => typeof value !== 'undefined'
- )
- .reduce((a, b) => {
- if (!a) return b;
- if (!b) return a;
- const res = { ...a };
- const entries = (Object.entries(b) as unknown) as Array<[keyof PreviewResult, number]>;
- for (const [key, value] of entries) {
- res[key] += value;
- }
- return res;
- })
- );
- return zippedResult;
- } else throw e;
- }
-};
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
index 5af14b3fbd17d..409a4329aa65c 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
@@ -4,7 +4,6 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { range } from 'lodash';
const bucketsA = (from: number) => [
{
doc_count: null,
@@ -104,61 +103,6 @@ const bucketsC = (from: number) => [
},
];
-const previewBucketsA = (from: number) =>
- range(from, from + 3600000, 60000).map((timestamp, i) => {
- return {
- doc_count: i % 2 ? 3 : 2,
- aggregatedValue: { value: i % 2 ? 16 : 0.5 },
- from_as_string: new Date(timestamp).toISOString(),
- };
- });
-
-const previewBucketsB = (from: number) =>
- range(from, from + 3600000, 60000).map((timestamp, i) => {
- const value = i % 2 ? 3.5 : 2.5;
- return {
- doc_count: i % 2 ? 3 : 2,
- aggregatedValue: { value, values: [{ key: 99.0, value }] },
- from_as_string: new Date(timestamp).toISOString(),
- };
- });
-
-const previewBucketsWithNulls = (from: number) => [
- // 25 Fired
- ...range(from, from + 1500000, 60000).map((timestamp) => {
- return {
- doc_count: 2,
- aggregatedValue: { value: 1, values: [{ key: 95.0, value: 1 }] },
- from_as_string: new Date(timestamp).toISOString(),
- };
- }),
- // 25 OK
- ...range(from + 2100000, from + 2940000, 60000).map((timestamp) => {
- return {
- doc_count: 2,
- aggregatedValue: { value: 0.5, values: [{ key: 95.0, value: 0.5 }] },
- from_as_string: new Date(timestamp).toISOString(),
- };
- }),
- // 10 No Data
- ...range(from + 3000000, from + 3600000, 60000).map((timestamp) => {
- return {
- doc_count: 0,
- aggregatedValue: { value: null, values: [{ key: 95.0, value: null }] },
- from_as_string: new Date(timestamp).toISOString(),
- };
- }),
-];
-
-const previewBucketsRepeat = (from: number) =>
- range(from, from + 3600000, 60000).map((timestamp, i) => {
- return {
- doc_count: i % 3 ? 3 : 2,
- aggregatedValue: { value: i % 3 ? 0.5 : 16 },
- from_as_string: new Date(timestamp).toISOString(),
- };
- });
-
export const basicMetricResponse = (from: number) => ({
aggregations: {
aggregatedIntervals: {
@@ -271,58 +215,3 @@ export const changedSourceIdResponse = (from: number) => ({
},
},
});
-
-export const basicMetricPreviewResponse = (from: number) => ({
- aggregations: {
- aggregatedIntervals: {
- buckets: previewBucketsA(from),
- },
- },
-});
-
-export const alternateMetricPreviewResponse = (from: number) => ({
- aggregations: {
- aggregatedIntervals: {
- buckets: previewBucketsWithNulls(from),
- },
- },
-});
-
-export const repeatingMetricPreviewResponse = (from: number) => ({
- aggregations: {
- aggregatedIntervals: {
- buckets: previewBucketsRepeat(from),
- },
- },
-});
-
-export const basicCompositePreviewResponse = (from: number) => ({
- aggregations: {
- groupings: {
- after_key: { groupBy0: 'foo' },
- buckets: [
- {
- key: {
- groupBy0: 'a',
- },
- aggregatedIntervals: {
- buckets: previewBucketsA(from),
- },
- },
- {
- key: {
- groupBy0: 'b',
- },
- aggregatedIntervals: {
- buckets: previewBucketsB(from),
- },
- },
- ],
- },
- },
- hits: {
- total: {
- value: 2,
- },
- },
-});
diff --git a/x-pack/plugins/infra/server/routes/alerting/preview.ts b/x-pack/plugins/infra/server/routes/alerting/preview.ts
deleted file mode 100644
index 4cafc743b1ecb..0000000000000
--- a/x-pack/plugins/infra/server/routes/alerting/preview.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { PreviewResult } from '../../lib/alerting/common/types';
-import {
- METRIC_THRESHOLD_ALERT_TYPE_ID,
- METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
- METRIC_ANOMALY_ALERT_TYPE_ID,
- INFRA_ALERT_PREVIEW_PATH,
- TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
- alertPreviewRequestParamsRT,
- alertPreviewSuccessResponsePayloadRT,
- MetricThresholdAlertPreviewRequestParams,
- InventoryAlertPreviewRequestParams,
- MetricAnomalyAlertPreviewRequestParams,
-} from '../../../common/alerting/metrics';
-import { createValidationFunction } from '../../../common/runtime_types';
-import { previewInventoryMetricThresholdAlert } from '../../lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert';
-import { previewMetricThresholdAlert } from '../../lib/alerting/metric_threshold/preview_metric_threshold_alert';
-import { previewMetricAnomalyAlert } from '../../lib/alerting/metric_anomaly/preview_metric_anomaly_alert';
-import { InfraBackendLibs } from '../../lib/infra_types';
-import { assertHasInfraMlPlugins } from '../../utils/request_context';
-
-export const initAlertPreviewRoute = ({
- framework,
- sources,
- getLogQueryFields,
- configuration,
-}: InfraBackendLibs) => {
- framework.registerRoute(
- {
- method: 'post',
- path: INFRA_ALERT_PREVIEW_PATH,
- validate: {
- body: createValidationFunction(alertPreviewRequestParamsRT),
- },
- },
- framework.router.handleLegacyErrors(async (requestContext, request, response) => {
- const {
- lookback,
- sourceId,
- alertType,
- alertInterval,
- alertThrottle,
- alertOnNoData,
- alertNotifyWhen,
- } = request.body;
-
- const esClient = requestContext.core.elasticsearch.client.asCurrentUser;
-
- const source = await sources.getSourceConfiguration(
- requestContext.core.savedObjects.client,
- sourceId || 'default'
- );
-
- const compositeSize = configuration.inventory.compositeSize;
-
- try {
- switch (alertType) {
- case METRIC_THRESHOLD_ALERT_TYPE_ID: {
- const {
- groupBy,
- criteria,
- filterQuery,
- } = request.body as MetricThresholdAlertPreviewRequestParams;
- const previewResult = await previewMetricThresholdAlert({
- esClient,
- params: { criteria, filterQuery, groupBy },
- lookback,
- config: source.configuration,
- alertInterval,
- alertThrottle,
- alertNotifyWhen,
- alertOnNoData,
- });
-
- const payload = processPreviewResults(previewResult);
- return response.ok({
- body: alertPreviewSuccessResponsePayloadRT.encode(payload),
- });
- }
- case METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID: {
- const logQueryFields = await getLogQueryFields(
- sourceId || 'default',
- requestContext.core.savedObjects.client,
- requestContext.core.elasticsearch.client.asCurrentUser
- );
- const {
- nodeType,
- criteria,
- filterQuery,
- } = request.body as InventoryAlertPreviewRequestParams;
- const previewResult = await previewInventoryMetricThresholdAlert({
- esClient,
- params: { criteria, filterQuery, nodeType },
- lookback,
- source,
- logQueryFields,
- compositeSize,
- alertInterval,
- alertThrottle,
- alertNotifyWhen,
- alertOnNoData,
- });
-
- const payload = processPreviewResults(previewResult);
-
- return response.ok({
- body: alertPreviewSuccessResponsePayloadRT.encode(payload),
- });
- }
- case METRIC_ANOMALY_ALERT_TYPE_ID: {
- assertHasInfraMlPlugins(requestContext);
- const {
- nodeType,
- metric,
- threshold,
- influencerFilter,
- } = request.body as MetricAnomalyAlertPreviewRequestParams;
- const { mlAnomalyDetectors, mlSystem, spaceId } = requestContext.infra;
-
- const previewResult = await previewMetricAnomalyAlert({
- mlAnomalyDetectors,
- mlSystem,
- spaceId,
- params: { nodeType, metric, threshold, influencerFilter },
- lookback,
- sourceId: source.id,
- alertInterval,
- alertThrottle,
- alertOnNoData,
- alertNotifyWhen,
- });
-
- return response.ok({
- body: alertPreviewSuccessResponsePayloadRT.encode({
- numberOfGroups: 1,
- resultTotals: {
- ...previewResult,
- error: 0,
- noData: 0,
- },
- }),
- });
- }
- default:
- throw new Error('Unknown alert type');
- }
- } catch (error) {
- if (error.message.includes(TOO_MANY_BUCKETS_PREVIEW_EXCEPTION)) {
- return response.customError({
- statusCode: 508,
- body: {
- message: error.message.split(':')[1], // Extract the max buckets from the error message
- },
- });
- }
- return response.customError({
- statusCode: error.statusCode ?? 500,
- body: {
- message: error.message ?? 'An unexpected error occurred',
- },
- });
- }
- })
- );
-};
-
-const processPreviewResults = (previewResult: PreviewResult[]) => {
- const numberOfGroups = previewResult.length;
- const resultTotals = previewResult.reduce(
- (totals, { fired, warning, noData, error, notifications }) => {
- return {
- ...totals,
- fired: totals.fired + fired,
- warning: totals.warning + warning,
- noData: totals.noData + noData,
- error: totals.error + error,
- notifications: totals.notifications + notifications,
- };
- },
- {
- fired: 0,
- warning: 0,
- noData: 0,
- error: 0,
- notifications: 0,
- }
- );
- return { numberOfGroups, resultTotals };
-};
diff --git a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
index f67837cff0df1..9b3f7edb97007 100644
--- a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
+++ b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
@@ -5,10 +5,8 @@
* 2.0.
*/
-import { once } from 'lodash';
import { CoreSetup, Logger } from 'src/core/server';
-import { TECHNICAL_COMPONENT_TEMPLATE_NAME } from '../../../../rule_registry/common/assets';
-import { RuleRegistryPluginSetupContract } from '../../../../rule_registry/server';
+import { Dataset, RuleRegistryPluginSetupContract } from '../../../../rule_registry/server';
import type { InfraFeatureId } from '../../../common/constants';
import { RuleRegistrationContext, RulesServiceStartDeps } from './types';
@@ -25,51 +23,20 @@ export const createRuleDataClient = ({
logger: Logger;
ruleDataService: RuleRegistryPluginSetupContract['ruleDataService'];
}) => {
- const initializeRuleDataTemplates = once(async () => {
- const componentTemplateName = ruleDataService.getFullAssetName(
- `${registrationContext}-mappings`
- );
-
- const indexNamePattern = ruleDataService.getFullAssetName(`${registrationContext}*`);
-
- if (!ruleDataService.isWriteEnabled()) {
- return;
- }
-
- await ruleDataService.createOrUpdateComponentTemplate({
- name: componentTemplateName,
- body: {
- template: {
- settings: {
- number_of_shards: 1,
- },
- mappings: {},
- },
- },
- });
-
- await ruleDataService.createOrUpdateIndexTemplate({
- name: ruleDataService.getFullAssetName(registrationContext),
- body: {
- index_patterns: [indexNamePattern],
- composed_of: [
- ruleDataService.getFullAssetName(TECHNICAL_COMPONENT_TEMPLATE_NAME),
- componentTemplateName,
- ],
+ return ruleDataService.initializeIndex({
+ feature: ownerFeatureId,
+ registrationContext,
+ dataset: Dataset.alerts,
+ componentTemplateRefs: [],
+ componentTemplates: [
+ {
+ name: 'mappings',
+ version: 0,
+ mappings: {},
},
- });
-
- await ruleDataService.updateIndexMappingsMatchingPattern(indexNamePattern);
- });
-
- // initialize eagerly
- const initializeRuleDataTemplatesPromise = initializeRuleDataTemplates().catch((err) => {
- logger.error(err);
+ ],
+ indexTemplate: {
+ version: 0,
+ },
});
-
- return ruleDataService.getRuleDataClient(
- ownerFeatureId,
- ruleDataService.getFullAssetName(registrationContext),
- () => initializeRuleDataTemplatesPromise
- );
};
diff --git a/x-pack/plugins/infra/server/services/rules/types.ts b/x-pack/plugins/infra/server/services/rules/types.ts
index b67b79ee5d3c2..daa44381650e0 100644
--- a/x-pack/plugins/infra/server/services/rules/types.ts
+++ b/x-pack/plugins/infra/server/services/rules/types.ts
@@ -8,7 +8,7 @@
import { PluginSetupContract as AlertingPluginSetup } from '../../../../alerting/server';
import {
createLifecycleExecutor,
- RuleDataClient,
+ IRuleDataClient,
RuleRegistryPluginSetupContract,
} from '../../../../rule_registry/server';
@@ -24,7 +24,7 @@ export interface RulesServiceStartDeps {}
export interface RulesServiceSetup {
createLifecycleRuleExecutor: LifecycleRuleExecutorCreator;
- ruleDataClient: RuleDataClient;
+ ruleDataClient: IRuleDataClient;
}
// eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
index 88e5c62a5b1d3..263a40a605d2d 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
@@ -10,11 +10,14 @@ import React from 'react';
import axios from 'axios';
import axiosXhrAdapter from 'axios/lib/adapters/xhr';
-/* eslint-disable @kbn/eslint/no-restricted-paths */
+/* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
import { registerTestBed, TestBed } from '@kbn/test/jest';
import { stubWebWorker } from '@kbn/test/jest';
+
+/* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
+import '../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
import { uiMetricService, apiService } from '../../../services';
import { Props } from '../';
import { initHttpRequests } from './http_requests.helpers';
@@ -24,6 +27,7 @@ stubWebWorker();
jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+
return {
...original,
// Mocking CodeEditor, which uses React Monaco under the hood
@@ -39,22 +43,6 @@ jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
};
});
-jest.mock('@elastic/eui', () => {
- const original = jest.requireActual('@elastic/eui');
- return {
- ...original,
- // Mocking EuiCodeEditor, which uses React Ace under the hood
- EuiCodeEditor: (props: any) => (
- {
- props.onChange(syntheticEvent.jsonString);
- }}
- />
- ),
- };
-});
-
jest.mock('react-virtualized', () => {
const original = jest.requireActual('react-virtualized');
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
index ccefac896fe7c..74b759fc80375 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
@@ -6,25 +6,9 @@
*/
import React from 'react';
+import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
import { ModalProvider, OnDoneLoadJsonHandler } from './modal_provider';
-jest.mock('@elastic/eui', () => {
- const original = jest.requireActual('@elastic/eui');
-
- return {
- ...original,
- // Mocking EuiCodeEditor, which uses React Ace under the hood
- EuiCodeEditor: (props: any) => (
- {
- props.onChange(syntheticEvent.jsonString);
- }}
- />
- ),
- };
-});
-
jest.mock('lodash', () => {
const original = jest.requireActual('lodash');
diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index c26cce3317cf6..a10b0f436010f 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -269,6 +269,52 @@ describe('Lens App', () => {
});
});
+ describe('TopNavMenu#showDatePicker', () => {
+ it('shows date picker if any used index pattern isTimeBased', async () => {
+ const customServices = makeDefaultServices(sessionIdSubject);
+ customServices.data.indexPatterns.get = jest
+ .fn()
+ .mockImplementation((id) =>
+ Promise.resolve({ id, isTimeBased: () => true } as IndexPattern)
+ );
+ const { services } = await mountWith({ services: customServices });
+ expect(services.navigation.ui.TopNavMenu).toHaveBeenCalledWith(
+ expect.objectContaining({ showDatePicker: true }),
+ {}
+ );
+ });
+ it('shows date picker if active datasource isTimeBased', async () => {
+ const customServices = makeDefaultServices(sessionIdSubject);
+ customServices.data.indexPatterns.get = jest
+ .fn()
+ .mockImplementation((id) =>
+ Promise.resolve({ id, isTimeBased: () => true } as IndexPattern)
+ );
+ const customProps = makeDefaultProps();
+ customProps.datasourceMap.testDatasource.isTimeBased = () => true;
+ const { services } = await mountWith({ props: customProps, services: customServices });
+ expect(services.navigation.ui.TopNavMenu).toHaveBeenCalledWith(
+ expect.objectContaining({ showDatePicker: true }),
+ {}
+ );
+ });
+ it('does not show date picker if index pattern nor active datasource is not time based', async () => {
+ const customServices = makeDefaultServices(sessionIdSubject);
+ customServices.data.indexPatterns.get = jest
+ .fn()
+ .mockImplementation((id) =>
+ Promise.resolve({ id, isTimeBased: () => true } as IndexPattern)
+ );
+ const customProps = makeDefaultProps();
+ customProps.datasourceMap.testDatasource.isTimeBased = () => false;
+ const { services } = await mountWith({ props: customProps, services: customServices });
+ expect(services.navigation.ui.TopNavMenu).toHaveBeenCalledWith(
+ expect.objectContaining({ showDatePicker: false }),
+ {}
+ );
+ });
+ });
+
describe('persistence', () => {
it('passes query and indexPatterns to TopNavMenu', async () => {
const { instance, lensStore, services } = await mountWith({ preloadedState: {} });
@@ -294,7 +340,7 @@ describe('Lens App', () => {
expect(services.navigation.ui.TopNavMenu).toHaveBeenCalledWith(
expect.objectContaining({
query: 'fake query',
- indexPatterns: [{ id: 'mockip' }],
+ indexPatterns: [{ id: 'mockip', isTimeBased: expect.any(Function) }],
}),
{}
);
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
index f777d053b314b..c4c2a7523e589 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -166,6 +166,7 @@ export const LensTopNavMenu = ({
activeDatasourceId,
datasourceStates,
} = useLensSelector((state) => state.lens);
+ const allLoaded = Object.values(datasourceStates).every(({ isLoading }) => isLoading === false);
useEffect(() => {
const activeDatasource =
@@ -390,7 +391,16 @@ export const LensTopNavMenu = ({
dateRangeTo={to}
indicateNoData={indicateNoData}
showSearchBar={true}
- showDatePicker={true}
+ showDatePicker={
+ indexPatterns.some((ip) => ip.isTimeBased()) ||
+ Boolean(
+ allLoaded &&
+ activeDatasourceId &&
+ datasourceMap[activeDatasourceId].isTimeBased(
+ datasourceStates[activeDatasourceId].state
+ )
+ )
+ }
showQueryBar={true}
showFilterBar={true}
data-test-subj="lnsApp_topNav"
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
index 4ecb86ac1069f..cae071a61c17f 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
@@ -104,6 +104,8 @@ export class Embeddable
implements ReferenceOrValueEmbeddable {
type = DOC_TYPE;
+ deferEmbeddableLoad = true;
+
private expressionRenderer: ReactExpressionRendererType;
private savedVis: Document | undefined;
private expression: string | undefined | null;
@@ -484,6 +486,9 @@ export class Embeddable
editUrl: this.deps.basePath.prepend(`/app/lens${getEditPath(savedObjectId)}`),
indexPatterns,
});
+
+ // deferred loading of this embeddable is complete
+ this.setInitializationFinished();
}
private getIsEditable() {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
index b3176dbcfe409..678644101d5ce 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -1544,4 +1544,83 @@ describe('IndexPattern Data Source', () => {
});
});
});
+ describe('#isTimeBased', () => {
+ it('should return true if date histogram exists in any layer', () => {
+ const state = enrichBaseState({
+ currentIndexPatternId: '1',
+ layers: {
+ first: {
+ indexPatternId: '1',
+ columnOrder: ['metric'],
+ columns: {
+ metric: {
+ label: 'Count of records2',
+ dataType: 'number',
+ isBucketed: false,
+ sourceField: 'Records',
+ operationType: 'count',
+ },
+ },
+ },
+ second: {
+ indexPatternId: '1',
+ columnOrder: ['bucket1', 'bucket2', 'metric2'],
+ columns: {
+ metric2: {
+ label: 'Count of records',
+ dataType: 'number',
+ isBucketed: false,
+ sourceField: 'Records',
+ operationType: 'count',
+ },
+ bucket1: {
+ label: 'Date',
+ dataType: 'date',
+ isBucketed: true,
+ operationType: 'date_histogram',
+ sourceField: 'timestamp',
+ params: {
+ interval: '1d',
+ },
+ },
+ bucket2: {
+ label: 'Terms',
+ dataType: 'string',
+ isBucketed: true,
+ operationType: 'terms',
+ sourceField: 'geo.src',
+ params: {
+ orderBy: { type: 'alphabetical' },
+ orderDirection: 'asc',
+ size: 10,
+ },
+ },
+ },
+ },
+ },
+ });
+ expect(indexPatternDatasource.isTimeBased(state)).toEqual(true);
+ });
+ it('should return false if date histogram does not exist in any layer', () => {
+ const state = enrichBaseState({
+ currentIndexPatternId: '1',
+ layers: {
+ first: {
+ indexPatternId: '1',
+ columnOrder: ['metric'],
+ columns: {
+ metric: {
+ label: 'Count of records',
+ dataType: 'number',
+ isBucketed: false,
+ sourceField: 'Records',
+ operationType: 'count',
+ },
+ },
+ },
+ },
+ });
+ expect(indexPatternDatasource.isTimeBased(state)).toEqual(false);
+ });
+ });
});
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
index 3a2d0df88a6cd..618cca418a8e7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -474,6 +474,16 @@ export function getIndexPatternDatasource({
const ids = Object.values(state.layers || {}).map(({ indexPatternId }) => indexPatternId);
return ids.filter((id) => !state.indexPatterns[id]);
},
+ isTimeBased: (state) => {
+ const { layers } = state;
+ return (
+ Boolean(layers) &&
+ Object.values(layers).some((layer) => {
+ const buckets = layer.columnOrder.filter((colId) => layer.columns[colId].isBucketed);
+ return buckets.some((colId) => layer.columns[colId].operationType === 'date_histogram');
+ })
+ );
+ },
};
return indexPatternDatasource;
diff --git a/x-pack/plugins/lens/public/mocks.tsx b/x-pack/plugins/lens/public/mocks.tsx
index 03f03e2f3826c..d4c058c124639 100644
--- a/x-pack/plugins/lens/public/mocks.tsx
+++ b/x-pack/plugins/lens/public/mocks.tsx
@@ -147,6 +147,7 @@ export function createMockDatasource(id: string): DatasourceMock {
publicAPIMock,
getErrorMessages: jest.fn((_state) => undefined),
checkIntegrity: jest.fn((_state) => []),
+ isTimeBased: jest.fn(),
};
}
@@ -309,9 +310,7 @@ export function mockDataPlugin(sessionIdSubject = new Subject()) {
state$: new Observable(),
},
indexPatterns: {
- get: jest.fn((id) => {
- return new Promise((resolve) => resolve({ id }));
- }),
+ get: jest.fn().mockImplementation((id) => Promise.resolve({ id, isTimeBased: () => true })),
},
search: createMockSearchService(),
nowProvider: {
diff --git a/x-pack/plugins/lens/public/state_management/time_range_middleware.test.ts b/x-pack/plugins/lens/public/state_management/time_range_middleware.test.ts
index a3a53a6d380ed..8718f79f94782 100644
--- a/x-pack/plugins/lens/public/state_management/time_range_middleware.test.ts
+++ b/x-pack/plugins/lens/public/state_management/time_range_middleware.test.ts
@@ -117,9 +117,7 @@ function makeDefaultData(): jest.Mocked {
state$: new Observable(),
},
indexPatterns: {
- get: jest.fn((id) => {
- return new Promise((resolve) => resolve({ id }));
- }),
+ get: jest.fn().mockImplementation((id) => Promise.resolve({ id, isTimeBased: () => true })),
},
search: createMockSearchService(),
nowProvider: {
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index bf576cb65c688..0a04e4fea932d 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -265,6 +265,10 @@ export interface Datasource {
* The frame calls this function to display warnings about visualization
*/
getWarningMessages?: (state: T, frame: FramePublicAPI) => React.ReactNode[] | undefined;
+ /**
+ * Checks if the visualization created is time based, for example date histogram
+ */
+ isTimeBased: (state: T) => boolean;
}
export interface DatasourceFixAction {
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.ts b/x-pack/plugins/lists/server/services/items/find_list_item.ts
index 29bfdf8bf1d13..4ab8c11cc5b2f 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.ts
@@ -76,7 +76,6 @@ export const findListItem = async ({
const { body: respose } = await esClient.count({
body: {
- // @ts-expect-error GetQueryFilterReturn is not assignable to QueryDslQueryContainer
query,
},
ignore_unavailable: true,
@@ -89,7 +88,6 @@ export const findListItem = async ({
// to explicitly define the type .
const { body: response } = await esClient.search({
body: {
- // @ts-expect-error GetQueryFilterReturn is not assignable to QueryDslQueryContainer
query,
search_after: scroll.searchAfter,
sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/lists/server/services/lists/find_list.ts b/x-pack/plugins/lists/server/services/lists/find_list.ts
index ae28428d80a5c..ed46c053cda9e 100644
--- a/x-pack/plugins/lists/server/services/lists/find_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/find_list.ts
@@ -65,7 +65,6 @@ export const findList = async ({
const { body: totalCount } = await esClient.count({
body: {
- // @ts-expect-error GetQueryFilterReturn is not compatible with QueryDslQueryContainer
query,
},
ignore_unavailable: true,
@@ -78,7 +77,6 @@ export const findList = async ({
// to explicitly define the type .
const { body: response } = await esClient.search({
body: {
- // @ts-expect-error GetQueryFilterReturn is not compatible with QueryDslQueryContainer
query,
search_after: scroll.searchAfter,
sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/lists/server/services/utils/get_query_filter.ts b/x-pack/plugins/lists/server/services/utils/get_query_filter.ts
index ff0e42870ab30..a467cbd9d60fe 100644
--- a/x-pack/plugins/lists/server/services/utils/get_query_filter.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_query_filter.ts
@@ -5,9 +5,7 @@
* 2.0.
*/
-import { DslQuery, EsQueryConfig } from '@kbn/es-query';
-
-import { Filter, Query, esQuery } from '../../../../../../src/plugins/data/server';
+import { BoolQuery, EsQueryConfig, Query, buildEsQuery } from '@kbn/es-query';
import { escapeQuotes } from './escape_query';
@@ -21,7 +19,7 @@ export interface GetQueryFilterWithListIdOptions {
}
export interface GetQueryFilterReturn {
- bool: { must: DslQuery[]; filter: Filter[]; should: never[]; must_not: Filter[] };
+ bool: BoolQuery;
}
export const getQueryFilter = ({ filter }: GetQueryFilterOptions): GetQueryFilterReturn => {
@@ -36,7 +34,7 @@ export const getQueryFilter = ({ filter }: GetQueryFilterOptions): GetQueryFilte
queryStringOptions: { analyze_wildcard: true },
};
- return esQuery.buildEsQuery(undefined, kqlQuery, [], config);
+ return buildEsQuery(undefined, kqlQuery, [], config);
};
export const getQueryFilterWithListId = ({
diff --git a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
index e34b3080dd33b..dbc83bb44e5fd 100644
--- a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
@@ -46,7 +46,6 @@ export const getSearchAfterScroll = async ({
const { body: response } = await esClient.search>({
body: {
_source: getSourceWithTieBreaker({ sortField }),
- // @ts-expect-error Filter is not assignale to QueryDslQueryContainer
query,
search_after: newSearchAfter,
sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/maps/public/actions/layer_actions.ts b/x-pack/plugins/maps/public/actions/layer_actions.ts
index eef325ca67cc5..edd21090143bf 100644
--- a/x-pack/plugins/maps/public/actions/layer_actions.ts
+++ b/x-pack/plugins/maps/public/actions/layer_actions.ts
@@ -246,6 +246,32 @@ export function toggleLayerVisible(layerId: string) {
};
}
+export function showThisLayerOnly(layerId: string) {
+ return (
+ dispatch: ThunkDispatch,
+ getState: () => MapStoreState
+ ) => {
+ getLayerList(getState()).forEach((layer: ILayer, index: number) => {
+ if (layer.isBasemap(index)) {
+ return;
+ }
+
+ // show target layer
+ if (layer.getId() === layerId) {
+ if (!layer.isVisible()) {
+ dispatch(setLayerVisibility(layerId, true));
+ }
+ return;
+ }
+
+ // hide all other layers
+ if (layer.isVisible()) {
+ dispatch(setLayerVisibility(layer.getId(), false));
+ }
+ });
+ };
+}
+
export function setSelectedLayer(layerId: string | null) {
return async (
dispatch: ThunkDispatch,
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index 5244882d41e03..472a796a6e7c9 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -106,6 +106,7 @@ export interface ILayer {
getDescriptor(): LayerDescriptor;
getGeoFieldNames(): string[];
getStyleMetaDescriptorFromLocalFeatures(): Promise;
+ isBasemap(order: number): boolean;
}
export type CustomIconAndTooltipContent = {
@@ -527,4 +528,8 @@ export class AbstractLayer implements ILayer {
async getStyleMetaDescriptorFromLocalFeatures(): Promise {
return null;
}
+
+ isBasemap(): boolean {
+ return false;
+ }
}
diff --git a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
index 0995d117aaa47..d26c71ee9e215 100644
--- a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
+++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
@@ -117,4 +117,8 @@ export class TileLayer extends AbstractLayer {
getLayerTypeIconName() {
return 'grid';
}
+
+ isBasemap(order) {
+ return order === 0;
+ }
}
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
index c7db60ae59ef9..6531b8a2f2501 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
@@ -555,3 +555,128 @@ exports[`TOCEntryActionsPopover should not show edit actions in read only mode 1
/>
`;
+
+exports[`TOCEntryActionsPopover should show "show this layer only" action when there are more then 2 layers 1`] = `
+ {
+ dispatch(showThisLayerOnly(layerId));
+ },
};
}
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
index 1610954399ae7..ae62b75400769 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
@@ -49,6 +49,8 @@ const defaultProps = {
enablePointEditing: () => {},
openLayerSettings: () => {},
editModeActiveForLayer: false,
+ numLayers: 2,
+ showThisLayerOnly: () => {},
};
describe('TOCEntryActionsPopover', () => {
@@ -114,4 +116,15 @@ describe('TOCEntryActionsPopover', () => {
expect(component).toMatchSnapshot();
});
+
+ test('should show "show this layer only" action when there are more then 2 layers', async () => {
+ const component = shallow( {
},
},
];
+ if (this.props.numLayers > 2) {
+ actionItems.push({
+ name: i18n.translate('xpack.maps.layerTocActions.showThisLayerOnlyTitle', {
+ defaultMessage: 'Show this layer only',
+ }),
+ icon:
implements ReferenceOrValueEmbeddable {
type = MAP_SAVED_OBJECT_TYPE;
+ deferEmbeddableLoad = true;
private _isActive: boolean;
private _savedMap: SavedMap;
@@ -148,6 +149,9 @@ export class MapEmbeddable
return;
}
+ // deferred loading of this embeddable is complete
+ this.setInitializationFinished();
+
this._isInitialized = true;
if (this._domNode) {
this.render(this._domNode);
diff --git a/x-pack/plugins/ml/common/constants/message_levels.js b/x-pack/plugins/ml/common/constants/message_levels.ts
similarity index 96%
rename from x-pack/plugins/ml/common/constants/message_levels.js
rename to x-pack/plugins/ml/common/constants/message_levels.ts
index 16269bbf755da..fd6cef75174ae 100644
--- a/x-pack/plugins/ml/common/constants/message_levels.js
+++ b/x-pack/plugins/ml/common/constants/message_levels.ts
@@ -10,4 +10,4 @@ export const MESSAGE_LEVEL = {
INFO: 'info',
SUCCESS: 'success',
WARNING: 'warning',
-};
+} as const;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts
index 28071f88da9d9..37dad58bfbd45 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts
@@ -42,10 +42,10 @@ export interface MlSummaryJob {
export interface AuditMessage {
job_id: string;
msgTime: number;
- level: string;
+ level?: string;
highestLevel: string;
highestLevelText: string;
- text: string;
+ text?: string;
cleared?: boolean;
}
diff --git a/x-pack/plugins/ml/common/types/es_client.ts b/x-pack/plugins/ml/common/types/es_client.ts
index b3d36283b5d5e..e9600a5465608 100644
--- a/x-pack/plugins/ml/common/types/es_client.ts
+++ b/x-pack/plugins/ml/common/types/es_client.ts
@@ -8,7 +8,7 @@
import { estypes } from '@elastic/elasticsearch';
import { JsonObject } from '@kbn/utility-types';
-import { buildEsQuery, DslQuery } from '@kbn/es-query';
+import { buildEsQuery } from '@kbn/es-query';
import { isPopulatedObject } from '../util/object_utils';
@@ -26,4 +26,7 @@ export const ES_CLIENT_TOTAL_HITS_RELATION: Record<
GTE: 'gte',
} as const;
-export type InfluencersFilterQuery = ReturnType | DslQuery | JsonObject;
+export type InfluencersFilterQuery =
+ | ReturnType
+ | estypes.QueryDslQueryContainer
+ | JsonObject;
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js
index 20e426ac37997..669a81ffd6248 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js
@@ -26,6 +26,7 @@ import {
EuiSpacer,
EuiTabbedContent,
EuiText,
+ EuiToolTip,
} from '@elastic/eui';
import { formatHumanReadableDateTimeSeconds } from '../../../../common/util/date_utils';
@@ -47,7 +48,7 @@ function getFilterEntity(entityName, entityValue, filter) {
return
+
+ {i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.recordScoreTitle', {
+ defaultMessage: 'Record score',
+ })}
+
+ ),
+ description: Math.floor(1000 * source.record_score) / 1000,
+ });
+
+ items.push({
+ title: (
+
+
+ {i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.initialRecordScoreTitle', {
+ defaultMessage: 'Initial record score',
+ })}
+
+ ),
+ description: Math.floor(1000 * source.initial_record_score) / 1000,
+ });
+
items.push({
title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.probabilityTitle', {
defaultMessage: 'Probability',
}),
- description: source.probability,
+ description:
+ source.probability !== undefined ? Number.parseFloat(source.probability).toPrecision(3) : '',
});
// If there was only one cause, the actual, typical and by_field
@@ -469,7 +514,7 @@ export class AnomalyDetails extends Component {
}
renderDetails() {
- const detailItems = getDetailsItems(this.props.anomaly, this.props.examples, this.props.filter);
+ const detailItems = getDetailsItems(this.props.anomaly, this.props.filter);
const isInterimResult = get(this.props.anomaly, 'source.is_interim', false);
return (
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.js
index 99683e90898f1..8cdfa4f6466aa 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.js
@@ -19,13 +19,13 @@ import { checkPermission } from '../../capabilities/check_capabilities';
import { getScopeFieldDefaults } from './utils';
import { FormattedMessage } from '@kbn/i18n/react';
import { ML_PAGES } from '../../../../common/constants/locator';
-import { useMlUrlGenerator, useNavigateToPath } from '../../contexts/kibana';
+import { useMlLocator, useNavigateToPath } from '../../contexts/kibana';
function NoFilterListsCallOut() {
- const mlUrlGenerator = useMlUrlGenerator();
+ const mlLocator = useMlLocator();
const navigateToPath = useNavigateToPath();
const redirectToFilterManagementPage = async () => {
- const path = await mlUrlGenerator.createUrl({
+ const path = await mlLocator.getUrl({
page: ML_PAGES.FILTER_LISTS_MANAGE,
});
await navigateToPath(path, true);
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
index 57e051e1b8417..45312011d7141 100644
--- a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -58,9 +58,9 @@ export function getKqlQueryValues({
influencersFilterQuery = esQuery.luceneStringToDsl(inputString);
}
- const clearSettings =
- influencersFilterQuery?.match_all && Object.keys(influencersFilterQuery.match_all).length === 0;
-
+ const clearSettings = Boolean(
+ influencersFilterQuery?.match_all && Object.keys(influencersFilterQuery.match_all).length === 0
+ );
return {
clearSettings,
settings: {
diff --git a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
index 8a152ab1cadc3..a06db20210c1b 100644
--- a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
+++ b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts
@@ -36,7 +36,7 @@ export interface ExplorerState {
filteredFields: any[];
filterPlaceHolder: any;
indexPattern: { title: string; fields: any[] };
- influencersFilterQuery: InfluencersFilterQuery;
+ influencersFilterQuery?: InfluencersFilterQuery;
influencers: Dictionary;
isAndOperator: boolean;
loading: boolean;
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index e1ed8ee75767e..064c6a038994d 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -241,7 +241,7 @@ export const JobsListPage: FC<{
description={
({
index: ML_NOTIFICATION_INDEX_PATTERN,
ignore_unavailable: true,
size: SIZE,
@@ -130,21 +156,21 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
},
});
- let messages = [];
- const notificationIndices = [];
+ let messages: JobMessage[] = [];
+ const notificationIndices: string[] = [];
- if (body.hits.total.value > 0) {
- let notificationIndex;
+ if ((body.hits.total as estypes.SearchTotalHits).value > 0) {
+ let notificationIndex: string;
body.hits.hits.forEach((hit) => {
if (notificationIndex !== hit._index && isClearable(hit._index)) {
notificationIndices.push(hit._index);
notificationIndex = hit._index;
}
- messages.push(hit._source);
+ messages.push(hit._source!);
});
}
- messages = await jobSavedObjectService.filterJobsForSpace(
+ messages = await jobSavedObjectService.filterJobsForSpace(
'anomaly-detector',
messages,
'job_id'
@@ -153,13 +179,14 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
}
// search highest, most recent audit messages for all jobs for the last 24hrs.
- async function getAuditMessagesSummary(jobIds) {
+ async function getAuditMessagesSummary(jobIds: string[]): Promise {
// TODO This is the current default value of the cluster setting `search.max_buckets`.
// This should possibly consider the real settings in a future update.
const maxBuckets = 10000;
- let levelsPerJobAggSize = maxBuckets;
+ const levelsPerJobAggSize =
+ Array.isArray(jobIds) && jobIds.length > 0 ? jobIds.length : maxBuckets;
- const query = {
+ const query: QueryDslQueryContainer = {
bool: {
filter: [
{
@@ -170,6 +197,15 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
},
},
anomalyDetectorTypeFilter,
+ ...(Array.isArray(jobIds) && jobIds.length > 0
+ ? [
+ {
+ terms: {
+ job_id: jobIds,
+ },
+ },
+ ]
+ : []),
],
must_not: {
term: {
@@ -179,17 +215,6 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
},
};
- // If the jobIds arg is supplied, add a query filter
- // to only include those jobIds in the aggregations.
- if (Array.isArray(jobIds) && jobIds.length > 0) {
- query.bool.filter.push({
- terms: {
- job_id: jobIds,
- },
- });
- levelsPerJobAggSize = jobIds.length;
- }
-
const { body } = await asInternalUser.search({
index: ML_NOTIFICATION_INDEX_PATTERN,
ignore_unavailable: true,
@@ -232,22 +257,39 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
},
});
- let messagesPerJob = [];
- const jobMessages = [];
+ interface LevelsPerJob {
+ key: string;
+ levels: estypes.AggregationsTermsAggregate<{
+ key: LevelName;
+ latestMessage: estypes.AggregationsTermsAggregate<{
+ key: string;
+ latestMessage: estypes.AggregationsValueAggregate;
+ }>;
+ }>;
+ }
+
+ let messagesPerJob: LevelsPerJob[] = [];
+
+ const jobMessages: AuditMessage[] = [];
+
+ const bodyAgg = body.aggregations as {
+ levelsPerJob?: estypes.AggregationsTermsAggregate;
+ };
+
if (
- body.hits.total.value > 0 &&
- body.aggregations &&
- body.aggregations.levelsPerJob &&
- body.aggregations.levelsPerJob.buckets &&
- body.aggregations.levelsPerJob.buckets.length
+ (body.hits.total as estypes.SearchTotalHits).value > 0 &&
+ bodyAgg &&
+ bodyAgg.levelsPerJob &&
+ bodyAgg.levelsPerJob.buckets &&
+ bodyAgg.levelsPerJob.buckets.length
) {
- messagesPerJob = body.aggregations.levelsPerJob.buckets;
+ messagesPerJob = bodyAgg.levelsPerJob.buckets;
}
messagesPerJob.forEach((job) => {
// ignore system messages (id==='')
if (job.key !== '' && job.levels && job.levels.buckets && job.levels.buckets.length) {
- let highestLevel = 0;
+ let highestLevel: LevelValue = 0;
let highestLevelText = '';
let msgTime = 0;
@@ -268,6 +310,7 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
// note the time in ms for the highest level
// so we can filter them out later if they're earlier than the
// job's create time.
+
if (msg.latestMessage && msg.latestMessage.value_as_string) {
const time = moment(msg.latestMessage.value_as_string);
msgTime = time.valueOf();
@@ -287,13 +330,17 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
}
}
});
+
return jobMessages;
}
const clearedTime = new Date().getTime();
// Sets 'cleared' to true for messages in the last 24hrs and index new message for clear action
- async function clearJobAuditMessages(jobId, notificationIndices) {
+ async function clearJobAuditMessages(
+ jobId: string,
+ notificationIndices: string[]
+ ): Promise<{ success: boolean; last_cleared: number }> {
const newClearedMessage = {
job_id: jobId,
job_type: 'anomaly_detection',
@@ -321,7 +368,7 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
},
};
- const promises = [
+ const promises: Array> = [
asInternalUser.updateByQuery({
index: notificationIndices.join(','),
ignore_unavailable: true,
@@ -349,8 +396,8 @@ export function jobAuditMessagesProvider({ asInternalUser }, mlClient) {
return { success: true, last_cleared: clearedTime };
}
- function levelToText(level) {
- return Object.keys(LEVEL)[Object.values(LEVEL).indexOf(level)];
+ function levelToText(level: LevelValue): LevelName {
+ return (Object.keys(LEVEL) as LevelName[])[Object.values(LEVEL).indexOf(level)];
}
return {
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js
deleted file mode 100644
index 1c20634c10220..0000000000000
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { get } from 'lodash';
-import { findReason } from './find_reason';
-
-export function handleResponse(response, isCloudEnabled) {
- const sources = ['persistent', 'transient', 'defaults'];
- for (const source of sources) {
- const monitoringSettings = get(response[source], 'xpack.monitoring');
- if (monitoringSettings !== undefined) {
- const check = findReason(
- monitoringSettings,
- {
- context: `cluster ${source}`,
- },
- isCloudEnabled
- );
-
- if (check.found) {
- return check;
- }
- }
- }
-
- return { found: false };
-}
-
-export async function checkClusterSettings(req) {
- const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
- const { cloud } = req.server.newPlatform.setup.plugins;
- const isCloudEnabled = !!(cloud && cloud.isCloudEnabled);
- const response = await callWithRequest(req, 'cluster.getSettings', { include_defaults: true });
- return handleResponse(response, isCloudEnabled);
-}
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.test.ts
similarity index 85%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.test.ts
index c94b2bd4b0447..966a327e3084c 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.test.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.test.ts
@@ -5,10 +5,15 @@
* 2.0.
*/
+import { ClusterGetSettingsResponse } from '@elastic/elasticsearch/api/types';
import { checkClusterSettings } from '.';
+import { LegacyRequest } from '../../types';
describe('Elasticsearch Cluster Settings', () => {
- const makeResponse = (property, response = {}) => {
+ const makeResponse = (
+ property: keyof ClusterGetSettingsResponse,
+ response: any = {}
+ ): ClusterGetSettingsResponse => {
const result = {
persistent: {},
transient: {},
@@ -18,8 +23,8 @@ describe('Elasticsearch Cluster Settings', () => {
return result;
};
- const getReq = (response) => {
- return {
+ const getReq = (response: ClusterGetSettingsResponse) => {
+ return ({
server: {
newPlatform: {
setup: {
@@ -40,20 +45,14 @@ describe('Elasticsearch Cluster Settings', () => {
},
},
},
- };
+ } as unknown) as LegacyRequest;
};
- it('should return { found: false } given no response from ES', async () => {
- const mockReq = getReq(makeResponse('ignore', {}));
- const result = await checkClusterSettings(mockReq);
- expect(result).toEqual({ found: false });
- });
-
it('should find default collection interval reason', async () => {
const setting = {
xpack: { monitoring: { collection: { interval: -1 } } },
};
- const makeExpected = (source) => ({
+ const makeExpected = (source: keyof ClusterGetSettingsResponse) => ({
found: true,
reason: {
context: `cluster ${source}`,
@@ -82,7 +81,7 @@ describe('Elasticsearch Cluster Settings', () => {
const setting = {
xpack: { monitoring: { exporters: { myCoolExporter: {} } } },
};
- const makeExpected = (source) => ({
+ const makeExpected = (source: keyof ClusterGetSettingsResponse) => ({
found: true,
reason: {
context: `cluster ${source}`,
@@ -111,7 +110,7 @@ describe('Elasticsearch Cluster Settings', () => {
const setting = {
xpack: { monitoring: { enabled: 'false' } },
};
- const makeExpected = (source) => ({
+ const makeExpected = (source: keyof ClusterGetSettingsResponse) => ({
found: true,
reason: {
context: `cluster ${source}`,
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.ts b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.ts
new file mode 100644
index 0000000000000..4f46f65591d62
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { get } from 'lodash';
+import { ClusterGetSettingsResponse } from '@elastic/elasticsearch/api/types';
+import { findReason } from './find_reason';
+import { ClusterSettingsReasonResponse, LegacyRequest } from '../../types';
+
+export function handleResponse(
+ response: ClusterGetSettingsResponse,
+ isCloudEnabled: boolean
+): ClusterSettingsReasonResponse {
+ let source: keyof ClusterGetSettingsResponse;
+ for (source in response) {
+ if (Object.prototype.hasOwnProperty.call(response, source)) {
+ const monitoringSettings = get(response[source], 'xpack.monitoring');
+ if (monitoringSettings !== undefined) {
+ const check = findReason(
+ monitoringSettings,
+ {
+ context: `cluster ${source}`,
+ },
+ isCloudEnabled
+ );
+
+ if (check.found) {
+ return check;
+ }
+ }
+ }
+ }
+
+ return { found: false };
+}
+
+export async function checkClusterSettings(req: LegacyRequest) {
+ const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
+ const { cloud } = req.server.newPlatform.setup.plugins;
+ const isCloudEnabled = !!(cloud && cloud.isCloudEnabled);
+ const response = await callWithRequest(req, 'cluster.getSettings', { include_defaults: true });
+ return handleResponse(response, isCloudEnabled);
+}
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.test.ts
similarity index 91%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.test.ts
index 6031e01776734..a984a3a220306 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.test.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.test.ts
@@ -19,7 +19,8 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
interval: -1,
},
},
- context
+ context,
+ false
);
expect(result).toEqual({
found: true,
@@ -39,7 +40,8 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
enabled: false,
},
},
- context
+ context,
+ false
);
expect(result).toEqual({
found: true,
@@ -61,7 +63,8 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
coolExporterToIgnore: {},
},
},
- context
+ context,
+ false
);
expect(result).toEqual({
found: true,
@@ -76,14 +79,14 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
describe('collection interval', () => {
it('should not flag collection interval if value is > 0', async () => {
- const result = await findReason({ collection: { interval: 1 } }, context);
+ const result = await findReason({ collection: { interval: 1 } }, context, false);
expect(result).toEqual({ found: false });
});
it('should flag collection interval for any invalid value', async () => {
let result;
- result = await findReason({ collection: { interval: 0 } }, context);
+ result = await findReason({ collection: { interval: 0 } }, context, false);
expect(result).toEqual({
found: true,
reason: {
@@ -93,7 +96,7 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
},
});
- result = await findReason({ collection: { interval: -10 } }, context);
+ result = await findReason({ collection: { interval: -10 } }, context, false);
expect(result).toEqual({
found: true,
reason: {
@@ -103,7 +106,7 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
},
});
- result = await findReason({ collection: { interval: null } }, context);
+ result = await findReason({ collection: { interval: null } }, context, false);
expect(result).toEqual({
found: true,
reason: {
@@ -116,16 +119,16 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
});
it('should not flag enabled if value is true', async () => {
- const result = await findReason({ enabled: true }, context);
+ const result = await findReason({ enabled: true }, context, false);
expect(result).toEqual({ found: false });
});
it('should not flag exporters if value is undefined/null', async () => {
let result;
- result = await findReason({ exporters: undefined }, context);
+ result = await findReason({ exporters: undefined }, context, false);
expect(result).toEqual({ found: false });
- result = await findReason({ exporters: null }, context);
+ result = await findReason({ exporters: null }, context, false);
expect(result).toEqual({ found: false });
});
@@ -151,7 +154,7 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
},
},
};
- const result = await findReason(input, context);
+ const result = await findReason(input, context, false);
expect(result).toEqual({
found: true,
reason: {
@@ -204,7 +207,7 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
},
},
};
- const result = await findReason(input, context);
+ const result = await findReason(input, context, false);
expect(result).toEqual({
found: true,
reason: {
@@ -236,7 +239,7 @@ describe('Elasticsearch Settings Find Reason for No Data', () => {
},
},
};
- const result = await findReason(input, context);
+ const result = await findReason(input, context, false);
expect(result).toEqual({ found: false });
});
});
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.ts
similarity index 92%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.ts
index 6d4469d591c90..2e01856c1ed8f 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.ts
@@ -6,17 +6,22 @@
*/
import { get } from 'lodash';
+import { ClusterSettingsReasonResponse } from '../../types';
/*
* Return true if the settings property is enabled or is using its default state of enabled
* Note: this assumes that a 0 corresponds to disabled
*/
-const isEnabledOrDefault = (property) => {
+const isEnabledOrDefault = (property: string) => {
return property === undefined || (Boolean(property) && property !== 'false');
};
-export function findReason(settingsSource, context, isCloudEnabled) {
- const iterateReasons = () => {
+export function findReason(
+ settingsSource: any,
+ context: { context: string },
+ isCloudEnabled: boolean
+) {
+ const iterateReasons = (): ClusterSettingsReasonResponse => {
// PluginEnabled: check for `monitoring.enabled: false`
const monitoringEnabled = get(settingsSource, 'enabled');
if (!isEnabledOrDefault(monitoringEnabled)) {
@@ -92,9 +97,8 @@ export function findReason(settingsSource, context, isCloudEnabled) {
return exporter.type !== 'local' && isEnabledOrDefault(exporter.enabled);
});
if (allEnabledRemote.length > 0 && allEnabledLocal.length === 0) {
- let ret = {};
if (isCloudEnabled) {
- ret = {
+ return {
found: true,
reason: {
property: 'xpack.monitoring.exporters.cloud_enabled',
@@ -102,7 +106,7 @@ export function findReason(settingsSource, context, isCloudEnabled) {
},
};
} else {
- ret = {
+ return {
found: true,
reason: {
property: 'xpack.monitoring.exporters',
@@ -112,11 +116,9 @@ export function findReason(settingsSource, context, isCloudEnabled) {
},
};
}
- return ret;
}
}
}
-
return { found: false };
};
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/index.ts
similarity index 100%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/index.ts
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.test.ts
similarity index 92%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.test.ts
index cc9707d2edf8b..7e1b93e50f5aa 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.test.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.test.ts
@@ -6,10 +6,11 @@
*/
import { checkNodesSettings } from '.';
+import { LegacyRequest } from '../../types';
describe('Elasticsearch Nodes Settings', () => {
- const getReq = (response) => {
- return {
+ const getReq = (response?: any) => {
+ return ({
server: {
newPlatform: {
setup: {
@@ -23,12 +24,14 @@ describe('Elasticsearch Nodes Settings', () => {
plugins: {
elasticsearch: {
getCluster() {
- return { callWithRequest: () => Promise.resolve(response) };
+ return {
+ callWithRequest: () => Promise.resolve(response),
+ };
},
},
},
},
- };
+ } as unknown) as LegacyRequest;
};
it('should return { found: false } given no response from ES', async () => {
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.ts
similarity index 91%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.ts
index bc01b2578986d..3e428b47d6174 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.ts
@@ -6,9 +6,10 @@
*/
import { get } from 'lodash';
+import { LegacyRequest } from '../../types';
import { findReason } from './find_reason';
-export function handleResponse({ nodes = {} } = {}, isCloudEnabled) {
+export function handleResponse({ nodes = {} } = {}, isCloudEnabled: boolean) {
const nodeIds = Object.keys(nodes);
for (const nodeId of nodeIds) {
const nodeSettings = get(nodes, [nodeId, 'settings']);
@@ -31,7 +32,7 @@ export function handleResponse({ nodes = {} } = {}, isCloudEnabled) {
return { found: false };
}
-export async function checkNodesSettings(req) {
+export async function checkNodesSettings(req: LegacyRequest) {
const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
const { cloud } = req.server.newPlatform.setup.plugins;
const isCloudEnabled = !!(cloud && cloud.isCloudEnabled);
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.ts
similarity index 87%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.ts
index 049762f903578..44ad2a3634188 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.ts
@@ -5,7 +5,9 @@
* 2.0.
*/
-export function setCollectionDisabled(req) {
+import { LegacyRequest } from '../../../types';
+
+export function setCollectionDisabled(req: LegacyRequest) {
const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
const params = {
body: {
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.ts
similarity index 87%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.ts
index 1208b95b085a6..a09dc6bb46ce9 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.ts
@@ -5,7 +5,9 @@
* 2.0.
*/
-export function setCollectionEnabled(req) {
+import { LegacyRequest } from '../../../types';
+
+export function setCollectionEnabled(req: LegacyRequest) {
const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
const params = {
body: {
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.ts
similarity index 87%
rename from x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.ts
index c6677c7cfe245..873c1106f1aac 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.ts
@@ -5,7 +5,9 @@
* 2.0.
*/
-export function setCollectionInterval(req) {
+import { LegacyRequest } from '../../../types';
+
+export function setCollectionInterval(req: LegacyRequest) {
const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
const params = {
body: {
diff --git a/x-pack/plugins/monitoring/server/types.ts b/x-pack/plugins/monitoring/server/types.ts
index 8120840aba03e..a0590c0f173fe 100644
--- a/x-pack/plugins/monitoring/server/types.ts
+++ b/x-pack/plugins/monitoring/server/types.ts
@@ -172,3 +172,10 @@ export interface Bucket {
export interface Aggregation {
buckets: Bucket[];
}
+export interface ClusterSettingsReasonResponse {
+ found: boolean;
+ reason?: {
+ property?: string;
+ data?: string;
+ };
+}
diff --git a/x-pack/plugins/observability/common/index.ts b/x-pack/plugins/observability/common/index.ts
index 114379719781a..baa3d92ffeeb3 100644
--- a/x-pack/plugins/observability/common/index.ts
+++ b/x-pack/plugins/observability/common/index.ts
@@ -5,6 +5,8 @@
* 2.0.
*/
+export type { AsDuration, AsPercent } from './utils/formatters';
+
export const casesFeatureId = 'observabilityCases';
// The ID of the observability app. Should more appropriately be called
diff --git a/x-pack/plugins/observability/public/components/shared/page_template/nav_name_with_badge.tsx b/x-pack/plugins/observability/public/components/shared/page_template/nav_name_with_badge.tsx
new file mode 100644
index 0000000000000..fc3d249dac9f8
--- /dev/null
+++ b/x-pack/plugins/observability/public/components/shared/page_template/nav_name_with_badge.tsx
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { EuiBadge } from '@elastic/eui';
+import React from 'react';
+import styled from 'styled-components';
+
+interface Props {
+ label: string;
+ badgeLabel: string;
+ localstorageId: string;
+}
+
+const LabelContainer = styled.span`
+ max-width: 72%;
+ float: left;
+ &:hover,
+ &:focus {
+ text-decoration: underline;
+ }
+`;
+
+const StyledBadge = styled(EuiBadge)`
+ margin-left: 8px;
+`;
+
+/**
+ * Gets current state from local storage to show or hide the badge.
+ * Default value: true
+ * @param localstorageId
+ */
+function getBadgeVisibility(localstorageId: string) {
+ const storedItem = window.localStorage.getItem(localstorageId);
+ if (storedItem) {
+ return JSON.parse(storedItem) as boolean;
+ }
+
+ return true;
+}
+
+/**
+ * Saves on local storage that this item should no longer be visible
+ * @param localstorageId
+ */
+export function hideBadge(localstorageId: string) {
+ window.localStorage.setItem(localstorageId, JSON.stringify(false));
+}
+
+export function NavNameWithBadge({ label, badgeLabel, localstorageId }: Props) {
+ const isBadgeVisible = getBadgeVisibility(localstorageId);
+ return (
+ <>
+
+ {label}
+
+ {isBadgeVisible && {badgeLabel} }
+
+ );
+}
diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
index 61feba83431f5..5a9b07a15d714 100644
--- a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
+++ b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
@@ -17,6 +17,7 @@ import {
KibanaPageTemplateProps,
} from '../../../../../../../src/plugins/kibana_react/public';
import type { NavigationSection } from '../../../services/navigation_registry';
+import { NavNameWithBadge, hideBadge } from './nav_name_with_badge';
export type WrappedPageTemplateProps = Pick<
KibanaPageTemplateProps,
@@ -71,10 +72,18 @@ export function ObservabilityPageTemplate({
exact: !!entry.matchFullPath,
strict: !entry.ignoreTrailingSlash,
}) != null;
-
+ const badgeLocalStorageId = `observability.nav_item_badge_visible_${entry.app}${entry.path}`;
return {
id: `${sectionIndex}.${entryIndex}`,
- name: entry.label,
+ name: entry.sideBadgeLabel ? (
+
- 5 hours ago
+ Oct 10, 2019, 08:06:40.123 (UTC-7)
`);
});
diff --git a/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.tsx b/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.tsx
index 784507fbfbcd8..7b82455ad5932 100644
--- a/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.tsx
@@ -7,7 +7,6 @@
import React from 'react';
import { EuiToolTip } from '@elastic/eui';
-import moment from 'moment-timezone';
import { asAbsoluteDateTime, TimeUnit } from '../../../../common/utils/formatters/datetime';
interface Props {
@@ -19,13 +18,11 @@ interface Props {
}
export function TimestampTooltip({ time, timeUnit = 'milliseconds' }: Props) {
- const momentTime = moment(time);
- const relativeTimeLabel = momentTime.fromNow();
const absoluteTimeLabel = asAbsoluteDateTime(time, timeUnit);
return (
- <>{relativeTimeLabel}
+ <>{absoluteTimeLabel}
);
}
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
deleted file mode 100644
index cf5d8ad2817fe..0000000000000
--- a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { StoryContext } from '@storybook/react';
-import React, { ComponentType } from 'react';
-import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
-import { MemoryRouter } from 'react-router-dom';
-import { AlertsPage } from '.';
-import { HttpSetup } from '../../../../../../src/core/public';
-import {
- KibanaContextProvider,
- KibanaPageTemplate,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { PluginContext, PluginContextValue } from '../../context/plugin_context';
-import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock';
-import { createCallObservabilityApi } from '../../services/call_observability_api';
-import type { ObservabilityAPIReturnType } from '../../services/call_observability_api/types';
-import { apmAlertResponseExample, dynamicIndexPattern } from './example_data';
-
-interface PageArgs {
- items: ObservabilityAPIReturnType<'GET /api/observability/rules/alerts/top'>;
-}
-
-export default {
- title: 'app/Alerts',
- component: AlertsPage,
- decorators: [
- (Story: ComponentType, { args: { items = [] } }: StoryContext) => {
- createCallObservabilityApi(({
- get: async (endpoint: string) => {
- if (endpoint === '/api/observability/rules/alerts/top') {
- return items;
- } else if (endpoint === '/api/observability/rules/alerts/dynamic_index_pattern') {
- return dynamicIndexPattern;
- }
- },
- } as unknown) as HttpSetup);
-
- return (
-
-
- '' },
- data: { autocomplete: { hasQuerySuggestions: () => false }, query: {} },
- chrome: { docTitle: { change: () => {} } },
- docLinks: { links: { query: {} } },
- storage: { get: () => {} },
- timelines: { getTGrid: () => <> },
- uiSettings: {
- get: (setting: string) => {
- if (setting === 'dateFormat') {
- return '';
- } else {
- return [];
- }
- },
- },
- }}
- >
- '' } },
- },
- observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(),
- ObservabilityPageTemplate: KibanaPageTemplate,
- } as unknown) as PluginContextValue
- }
- >
-
-
-
-
- );
- },
- ],
-};
-
-export function Example(_args: PageArgs) {
- return (
- >;
}
export default {
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
index 3d63f7bdaeaf7..90032419948ef 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
@@ -41,16 +41,16 @@ import {
} from '@kbn/rule-data-utils/target_node/technical_field_names';
import moment from 'moment-timezone';
import React, { useMemo } from 'react';
-import type { TopAlert, TopAlertResponse } from '../';
+import type { TopAlert } from '../';
import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
import { asDuration } from '../../../../common/utils/formatters';
import type { ObservabilityRuleTypeRegistry } from '../../../rules/create_observability_rule_type_registry';
-import { decorateResponse } from '../decorate_response';
+import { parseAlert } from '../parse_alert';
import { SeverityBadge } from '../severity_badge';
type AlertsFlyoutProps = {
alert?: TopAlert;
- alerts?: TopAlertResponse[];
+ alerts?: Array>;
isInApp?: boolean;
observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
selectedAlertId?: string;
@@ -77,7 +77,8 @@ export function AlertsFlyout({
const { http } = services;
const prepend = http?.basePath.prepend;
const decoratedAlerts = useMemo(() => {
- return decorateResponse(alerts ?? [], observabilityRuleTypeRegistry);
+ const parseObservabilityAlert = parseAlert(observabilityRuleTypeRegistry);
+ return (alerts ?? []).map(parseObservabilityAlert);
}, [alerts, observabilityRuleTypeRegistry]);
let alertData = alert;
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx
deleted file mode 100644
index 395c2a5253ec6..0000000000000
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
- CustomItemAction,
- EuiBasicTable,
- EuiBasicTableColumn,
- EuiButton,
- EuiIconTip,
- EuiLink,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { ALERT_DURATION, ALERT_SEVERITY_LEVEL, ALERT_UUID } from '@kbn/rule-data-utils';
-import React, { Suspense, useMemo, useState } from 'react';
-import { LazyAlertsFlyout } from '../..';
-import { asDuration } from '../../../common/utils/formatters';
-import { TimestampTooltip } from '../../components/shared/timestamp_tooltip';
-import { usePluginContext } from '../../hooks/use_plugin_context';
-import type { TopAlert, TopAlertResponse } from './';
-import { decorateResponse } from './decorate_response';
-import { SeverityBadge } from './severity_badge';
-
-const pagination = { pageIndex: 0, pageSize: 0, totalItemCount: 0 };
-
-interface AlertsTableProps {
- items: TopAlertResponse[];
-}
-
-export function AlertsTable(props: AlertsTableProps) {
- const [selectedAlertId, setSelectedAlertId] = useState(undefined);
- const handleFlyoutClose = () => setSelectedAlertId(undefined);
- const { core, observabilityRuleTypeRegistry } = usePluginContext();
- const { prepend } = core.http.basePath;
- const items = useMemo(() => decorateResponse(props.items, observabilityRuleTypeRegistry), [
- props.items,
- observabilityRuleTypeRegistry,
- ]);
-
- const actions: Array> = useMemo(
- () => [
- {
- render: (alert) =>
- alert.link ? (
-
- {i18n.translate('xpack.observability.alertsTable.viewInAppButtonLabel', {
- defaultMessage: 'View in app',
- })}
-
- ) : (
- <>
- ),
- isPrimary: true,
- },
- ],
- [prepend]
- );
-
- const columns: Array> = useMemo(
- () => [
- {
- field: 'active',
- name: i18n.translate('xpack.observability.alertsTable.statusColumnDescription', {
- defaultMessage: 'Status',
- }),
- align: 'center',
- render: (_, alert) => {
- const { active } = alert;
-
- return active ? (
- setSelectedAlertId(alert.fields[ALERT_UUID])}>
- {alert.reason}
-
- );
- },
- },
- {
- actions,
- name: i18n.translate('xpack.observability.alertsTable.actionsColumnDescription', {
- defaultMessage: 'Actions',
- }),
- },
- ],
- [actions, setSelectedAlertId]
- );
-
- return (
- <>
-
-
-
- columns={columns}
- items={items}
- tableLayout="auto"
- pagination={pagination}
- />
-
- );
-}
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
index f82446db2ebec..79ed63acd078e 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
@@ -5,30 +5,43 @@
* 2.0.
*/
+/**
+ * We need to produce types and code transpilation at different folders during the build of the package.
+ * We have types and code at different imports because we don't want to import the whole package in the resulting webpack bundle for the plugin.
+ * This way plugins can do targeted imports to reduce the final code bundle
+ */
import type {
AlertConsumers as AlertConsumersTyped,
ALERT_DURATION as ALERT_DURATION_TYPED,
ALERT_SEVERITY_LEVEL as ALERT_SEVERITY_LEVEL_TYPED,
ALERT_STATUS as ALERT_STATUS_TYPED,
- ALERT_START as ALERT_START_TYPED,
ALERT_RULE_NAME as ALERT_RULE_NAME_TYPED,
} from '@kbn/rule-data-utils';
import {
- AlertConsumers as AlertConsumersNonTyped,
ALERT_DURATION as ALERT_DURATION_NON_TYPED,
ALERT_SEVERITY_LEVEL as ALERT_SEVERITY_LEVEL_NON_TYPED,
ALERT_STATUS as ALERT_STATUS_NON_TYPED,
- ALERT_START as ALERT_START_NON_TYPED,
ALERT_RULE_NAME as ALERT_RULE_NAME_NON_TYPED,
- // @ts-expect-error
-} from '@kbn/rule-data-utils/target_node/alerts_as_data_rbac';
-import { EuiButtonIcon, EuiDataGridColumn } from '@elastic/eui';
+ TIMESTAMP,
+ // @ts-expect-error importing from a place other than root because we want to limit what we import from this package
+} from '@kbn/rule-data-utils/target_node/technical_field_names';
+
+// @ts-expect-error importing from a place other than root because we want to limit what we import from this package
+import { AlertConsumers as AlertConsumersNonTyped } from '@kbn/rule-data-utils/target_node/alerts_as_data_rbac';
+
+import {
+ EuiButtonIcon,
+ EuiDataGridColumn,
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiContextMenu,
+ EuiPopover,
+} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import styled from 'styled-components';
+import React, { Suspense, useMemo, useState, useCallback } from 'react';
-import React, { Suspense, useState } from 'react';
-
-import type { TimelinesUIStart } from '../../../../timelines/public';
+import type { TimelinesUIStart, TGridType, SortDirection } from '../../../../timelines/public';
import type { TopAlert } from './';
import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
import type {
@@ -39,16 +52,17 @@ import type {
} from '../../../../timelines/common';
import { getRenderCellValue } from './render_cell_value';
+import { observabilityFeatureId } from '../../../common';
+import { useGetUserCasesPermissions } from '../../hooks/use_get_user_cases_permissions';
import { usePluginContext } from '../../hooks/use_plugin_context';
-import { decorateResponse } from './decorate_response';
import { getDefaultCellActions } from './default_cell_actions';
import { LazyAlertsFlyout } from '../..';
+import { parseAlert } from './parse_alert';
const AlertConsumers: typeof AlertConsumersTyped = AlertConsumersNonTyped;
const ALERT_DURATION: typeof ALERT_DURATION_TYPED = ALERT_DURATION_NON_TYPED;
const ALERT_SEVERITY_LEVEL: typeof ALERT_SEVERITY_LEVEL_TYPED = ALERT_SEVERITY_LEVEL_NON_TYPED;
const ALERT_STATUS: typeof ALERT_STATUS_TYPED = ALERT_STATUS_NON_TYPED;
-const ALERT_START: typeof ALERT_START_TYPED = ALERT_START_NON_TYPED;
const ALERT_RULE_NAME: typeof ALERT_RULE_NAME_TYPED = ALERT_RULE_NAME_NON_TYPED;
interface AlertsTableTGridProps {
@@ -60,6 +74,11 @@ interface AlertsTableTGridProps {
setRefetch: (ref: () => void) => void;
}
+interface ObservabilityActionsProps extends ActionProps {
+ flyoutAlert: TopAlert | undefined;
+ setFlyoutAlert: React.Dispatch>;
+}
+
const EventsThContent = styled.div.attrs(({ className = '' }) => ({
className: `siemEventsTable__thContent ${className}`,
}))<{ textAlign?: string; width?: number }>`
@@ -96,11 +115,11 @@ export const columns: Array<
},
{
columnHeaderType: 'not-filtered',
- displayAsText: i18n.translate('xpack.observability.alertsTGrid.triggeredColumnDescription', {
- defaultMessage: 'Triggered',
+ displayAsText: i18n.translate('xpack.observability.alertsTGrid.lastUpdatedColumnDescription', {
+ defaultMessage: 'Last updated',
}),
- id: ALERT_START,
- initialWidth: 176,
+ id: TIMESTAMP,
+ initialWidth: 230,
},
{
columnHeaderType: 'not-filtered',
@@ -139,121 +158,214 @@ const OBSERVABILITY_ALERT_CONSUMERS = [
AlertConsumers.SYNTHETICS,
];
-export function AlertsTableTGrid(props: AlertsTableTGridProps) {
+function ObservabilityActions({
+ data,
+ eventId,
+ ecsData,
+ flyoutAlert,
+ setFlyoutAlert,
+}: ObservabilityActionsProps) {
const { core, observabilityRuleTypeRegistry } = usePluginContext();
- const { prepend } = core.http.basePath;
- const { indexName, rangeFrom, rangeTo, kuery, status, setRefetch } = props;
- const [flyoutAlert, setFlyoutAlert] = useState(undefined);
+ const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
const handleFlyoutClose = () => setFlyoutAlert(undefined);
+ const [openActionsPopoverId, setActionsPopover] = useState(null);
const { timelines } = useKibana<{ timelines: TimelinesUIStart }>().services;
+ const parseObservabilityAlert = useMemo(() => parseAlert(observabilityRuleTypeRegistry), [
+ observabilityRuleTypeRegistry,
+ ]);
+ const alert = parseObservabilityAlert(dataFieldEs);
+ const { prepend } = core.http.basePath;
+
+ const afterCaseSelection = useCallback(() => {
+ setActionsPopover(null);
+ }, []);
+
+ const closeActionsPopover = useCallback(() => {
+ setActionsPopover(null);
+ }, []);
+
+ const openActionsPopover = useCallback((id) => {
+ setActionsPopover(id);
+ }, []);
+ const casePermissions = useGetUserCasesPermissions();
+ const event = useMemo(() => {
+ return {
+ data,
+ _id: eventId,
+ ecs: ecsData,
+ };
+ }, [data, eventId, ecsData]);
- const leadingControlColumns = [
- {
- id: 'expand',
- width: 40,
- headerCellRender: () => {
- return (
-
- {i18n.translate('xpack.observability.alertsTable.actionsTextLabel', {
- defaultMessage: 'Actions',
+ const actionsPanels = useMemo(() => {
+ return [
+ {
+ id: 0,
+ content: [
+ <>
+ {timelines.getAddToExistingCaseButton({
+ event,
+ casePermissions,
+ appId: observabilityFeatureId,
+ onClose: afterCaseSelection,
})}
-
- );
+ ,
+ <>
+ {timelines.getAddToNewCaseButton({
+ event,
+ casePermissions,
+ appId: observabilityFeatureId,
+ onClose: afterCaseSelection,
+ })}
+ ,
+ ],
},
- rowCellRender: ({ data }: ActionProps) => {
- const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
- const decoratedAlerts = decorateResponse(
- [dataFieldEs] ?? [],
- observabilityRuleTypeRegistry
- );
- const alert = decoratedAlerts[0];
- return (
+ ];
+ }, [afterCaseSelection, casePermissions, timelines, event]);
+ return (
+ <>
+ {flyoutAlert && (
+
+
+ )}
+
+
setFlyoutAlert(alert)}
/>
- );
- },
- },
- {
- id: 'view_in_app',
- width: 40,
- headerCellRender: () => null,
- rowCellRender: ({ data }: ActionProps) => {
- const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
- const decoratedAlerts = decorateResponse(
- [dataFieldEs] ?? [],
- observabilityRuleTypeRegistry
- );
- const alert = decoratedAlerts[0];
- return (
+
+
+
+ openActionsPopover(eventId)}
+ />
+ }
+ isOpen={openActionsPopoverId === eventId}
+ closePopover={closeActionsPopover}
+ panelPaddingSize="none"
+ anchorPosition="downLeft"
+ >
+
+
+
+
+ );
+}
+
+export function AlertsTableTGrid(props: AlertsTableTGridProps) {
+ const { indexName, rangeFrom, rangeTo, kuery, status, setRefetch } = props;
+ const { timelines } = useKibana<{ timelines: TimelinesUIStart }>().services;
+
+ const [flyoutAlert, setFlyoutAlert] = useState(undefined);
+
+ const casePermissions = useGetUserCasesPermissions();
+
+ const leadingControlColumns = useMemo(() => {
+ return [
+ {
+ id: 'expand',
+ width: 96,
+ headerCellRender: () => {
+ return (
+
+ {i18n.translate('xpack.observability.alertsTable.actionsTextLabel', {
+ defaultMessage: 'Actions',
+ })}
+
+ );
+ },
+ rowCellRender: (actionProps: ActionProps) => {
+ return (
+
-
- )}
- {timelines.getTGrid<'standalone'>({
- alertConsumers: OBSERVABILITY_ALERT_CONSUMERS,
- type: 'standalone',
- columns,
- deletedEventIds: [],
- defaultCellActions: getDefaultCellActions({ enableFilterActions: false }),
- end: rangeTo,
- filters: [],
- indexNames: [indexName],
- itemsPerPage: 10,
- itemsPerPageOptions: [10, 25, 50],
- loadingText: i18n.translate('xpack.observability.alertsTable.loadingTextLabel', {
- defaultMessage: 'loading alerts',
- }),
- footerText: i18n.translate('xpack.observability.alertsTable.footerTextLabel', {
- defaultMessage: 'alerts',
- }),
- query: {
- query: `${ALERT_STATUS}: ${status}${kuery !== '' ? ` and ${kuery}` : ''}`,
- language: 'kuery',
+ const tGridProps = useMemo(() => {
+ const type: TGridType = 'standalone';
+ const sortDirection: SortDirection = 'desc';
+ return {
+ alertConsumers: OBSERVABILITY_ALERT_CONSUMERS,
+ appId: observabilityFeatureId,
+ casePermissions,
+ type,
+ columns,
+ deletedEventIds: [],
+ defaultCellActions: getDefaultCellActions({ enableFilterActions: false }),
+ end: rangeTo,
+ filters: [],
+ indexNames: [indexName],
+ itemsPerPage: 10,
+ itemsPerPageOptions: [10, 25, 50],
+ loadingText: i18n.translate('xpack.observability.alertsTable.loadingTextLabel', {
+ defaultMessage: 'loading alerts',
+ }),
+ footerText: i18n.translate('xpack.observability.alertsTable.footerTextLabel', {
+ defaultMessage: 'alerts',
+ }),
+ query: {
+ query: `${ALERT_STATUS}: ${status}${kuery !== '' ? ` and ${kuery}` : ''}`,
+ language: 'kuery',
+ },
+ renderCellValue: getRenderCellValue({ rangeFrom, rangeTo, setFlyoutAlert }),
+ rowRenderers: NO_ROW_RENDER,
+ start: rangeFrom,
+ setRefetch,
+ sort: [
+ {
+ columnId: '@timestamp',
+ columnType: 'date',
+ sortDirection,
},
- renderCellValue: getRenderCellValue({ rangeFrom, rangeTo, setFlyoutAlert }),
- rowRenderers: NO_ROW_RENDER,
- start: rangeFrom,
- setRefetch,
- sort: [
- {
- columnId: '@timestamp',
- columnType: 'date',
- sortDirection: 'desc',
- },
- ],
- filterStatus: status as AlertStatus,
- leadingControlColumns,
- trailingControlColumns,
- unit: (totalAlerts: number) =>
- i18n.translate('xpack.observability.alertsTable.showingAlertsTitle', {
- values: { totalAlerts },
- defaultMessage: '{totalAlerts, plural, =1 {alert} other {alerts}}',
- }),
- })}
-
- );
+ ],
+ filterStatus: status as AlertStatus,
+ leadingControlColumns,
+ trailingControlColumns,
+ unit: (totalAlerts: number) =>
+ i18n.translate('xpack.observability.alertsTable.showingAlertsTitle', {
+ values: { totalAlerts },
+ defaultMessage: '{totalAlerts, plural, =1 {alert} other {alerts}}',
+ }),
+ };
+ }, [
+ casePermissions,
+ indexName,
+ kuery,
+ leadingControlColumns,
+ rangeFrom,
+ rangeTo,
+ setRefetch,
+ status,
+ ]);
+
+ return <>{timelines.getTGrid<'standalone'>(tGridProps)};
}
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid_actions.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid_actions.tsx
deleted file mode 100644
index 3c31b8cfda87c..0000000000000
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid_actions.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
- EuiButtonEmpty,
- EuiButtonIcon,
- EuiFlexGroup,
- EuiFlexItem,
- EuiPopover,
- EuiPopoverTitle,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import type {
- ALERT_RULE_TYPE_ID as ALERT_RULE_TYPE_ID_TYPED,
- ALERT_RULE_NAME as ALERT_RULE_NAME_TYPED,
-} from '@kbn/rule-data-utils';
-import {
- ALERT_RULE_TYPE_ID as ALERT_RULE_TYPE_ID_NON_TYPED,
- ALERT_RULE_NAME as ALERT_RULE_NAME_NON_TYPED,
- // @ts-expect-error
-} from '@kbn/rule-data-utils/target_node/technical_field_names';
-import React, { useState } from 'react';
-import { format, parse } from 'url';
-
-import { parseTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields';
-import type { ActionProps } from '../../../../timelines/common';
-import { asDuration, asPercent } from '../../../common/utils/formatters';
-import { usePluginContext } from '../../hooks/use_plugin_context';
-
-const ALERT_RULE_TYPE_ID: typeof ALERT_RULE_TYPE_ID_TYPED = ALERT_RULE_TYPE_ID_NON_TYPED;
-const ALERT_RULE_NAME: typeof ALERT_RULE_NAME_TYPED = ALERT_RULE_NAME_NON_TYPED;
-
-export function RowCellActionsRender({ data }: ActionProps) {
- const { core, observabilityRuleTypeRegistry } = usePluginContext();
- const [isPopoverOpen, setIsPopoverOpen] = useState(false);
- const { prepend } = core.http.basePath;
- const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
- const parsedFields = parseTechnicalFields(dataFieldEs);
- const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[ALERT_RULE_TYPE_ID]!);
- const formatted = {
- link: undefined,
- reason: parsedFields[ALERT_RULE_NAME]!,
- ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
- };
-
- const parsedLink = formatted.link ? parse(formatted.link, true) : undefined;
- const link = parsedLink
- ? format({
- ...parsedLink,
- query: {
- ...parsedLink.query,
- rangeFrom: 'now-24h',
- rangeTo: 'now',
- },
- })
- : undefined;
- return (
-
+): TopAlert => {
+ const parsedFields = parseTechnicalFields(alert);
+ const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[ALERT_RULE_TYPE_ID]!);
+ const formatted = {
+ link: undefined,
+ reason: parsedFields[ALERT_RULE_NAME] ?? '',
+ ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
+ };
- return {
- ...formatted,
- fields: parsedFields,
- active: parsedFields[ALERT_STATUS] !== 'closed',
- start: new Date(parsedFields[ALERT_START]!).getTime(),
- };
- });
-}
+ return {
+ ...formatted,
+ fields: parsedFields,
+ active: parsedFields[ALERT_STATUS] !== 'closed',
+ start: new Date(parsedFields[ALERT_START] ?? 0).getTime(),
+ };
+};
diff --git a/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx b/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
index dde10b7a3f3e1..f6e1d41c2a6f9 100644
--- a/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
@@ -7,20 +7,24 @@
import { EuiIconTip, EuiLink } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useEffect } from 'react';
+/**
+ * We need to produce types and code transpilation at different folders during the build of the package.
+ * We have types and code at different imports because we don't want to import the whole package in the resulting webpack bundle for the plugin.
+ * This way plugins can do targeted imports to reduce the final code bundle
+ */
import type {
ALERT_DURATION as ALERT_DURATION_TYPED,
ALERT_SEVERITY_LEVEL as ALERT_SEVERITY_LEVEL_TYPED,
- ALERT_START as ALERT_START_TYPED,
ALERT_STATUS as ALERT_STATUS_TYPED,
ALERT_RULE_NAME as ALERT_RULE_NAME_TYPED,
} from '@kbn/rule-data-utils';
import {
ALERT_DURATION as ALERT_DURATION_NON_TYPED,
ALERT_SEVERITY_LEVEL as ALERT_SEVERITY_LEVEL_NON_TYPED,
- ALERT_START as ALERT_START_NON_TYPED,
ALERT_STATUS as ALERT_STATUS_NON_TYPED,
ALERT_RULE_NAME as ALERT_RULE_NAME_NON_TYPED,
- // @ts-expect-error
+ TIMESTAMP,
+ // @ts-expect-error importing from a place other than root because we want to limit what we import from this package
} from '@kbn/rule-data-utils/target_node/technical_field_names';
import type { CellValueElementProps, TimelineNonEcsData } from '../../../../timelines/common';
@@ -28,12 +32,11 @@ import { TimestampTooltip } from '../../components/shared/timestamp_tooltip';
import { asDuration } from '../../../common/utils/formatters';
import { SeverityBadge } from './severity_badge';
import { TopAlert } from '.';
-import { decorateResponse } from './decorate_response';
+import { parseAlert } from './parse_alert';
import { usePluginContext } from '../../hooks/use_plugin_context';
const ALERT_DURATION: typeof ALERT_DURATION_TYPED = ALERT_DURATION_NON_TYPED;
const ALERT_SEVERITY_LEVEL: typeof ALERT_SEVERITY_LEVEL_TYPED = ALERT_SEVERITY_LEVEL_NON_TYPED;
-const ALERT_START: typeof ALERT_START_TYPED = ALERT_START_NON_TYPED;
const ALERT_STATUS: typeof ALERT_STATUS_TYPED = ALERT_STATUS_NON_TYPED;
const ALERT_RULE_NAME: typeof ALERT_RULE_NAME_TYPED = ALERT_RULE_NAME_NON_TYPED;
@@ -101,7 +104,7 @@ export const getRenderCellValue = ({
type="check"
/>
);
- case ALERT_START:
+ case TIMESTAMP:
return
@@ -7865,7 +7902,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
"csv_contains_formulas": undefined,
"id": "k905zdw11d34cbae0c3y6tzh",
"index": ".reporting-2020.04.12",
- "isDeprecated": false,
+ "isDeprecated": true,
"jobtype": "printable_pdf",
"kibana_id": "5b2de169-2785-441b-ae8c-186a1936b17d",
"kibana_name": "spicy.local",
@@ -7911,7 +7948,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
"csv_contains_formulas": undefined,
"id": "k905zdw11d34cbae0c3y6tzh",
"index": ".reporting-2020.04.12",
- "isDeprecated": false,
+ "isDeprecated": true,
"jobtype": "printable_pdf",
"kibana_id": "5b2de169-2785-441b-ae8c-186a1936b17d",
"kibana_name": "spicy.local",
@@ -8083,7 +8120,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
"csv_contains_formulas": undefined,
"id": "k905zdw11d34cbae0c3y6tzh",
"index": ".reporting-2020.04.12",
- "isDeprecated": false,
+ "isDeprecated": true,
"jobtype": "printable_pdf",
"kibana_id": "5b2de169-2785-441b-ae8c-186a1936b17d",
"kibana_name": "spicy.local",
@@ -8145,7 +8182,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
= P extends CanvasServiceProvider
+ {columns[index].render(crawlRule)});
+ };
+
+ const onChange = jest.fn();
+ const renderColumnInEditingMode = (index: number) => {
+ const columns = wrapper.find(GenericEndpointInlineEditableTable).prop('columns');
+ return shallow(
+
+ {columns[index].editingRender(crawlRule, onChange, {
+ isInvalid: false,
+ isLoading: false,
+ })}
+
+ );
+ };
+
+ describe('policy column', () => {
+ it('shows the policy of a crawl rule', () => {
+ expect(renderColumn(0).html()).toContain('Allow');
+ });
+
+ it('can show the policy of a crawl rule as editable', () => {
+ const column = renderColumnInEditingMode(0);
+
+ const selectField = column.find(EuiSelect);
+ expect(selectField.props()).toEqual(
+ expect.objectContaining({
+ value: 'allow',
+ disabled: false,
+ isInvalid: false,
+ options: [
+ { text: 'Allow', value: 'allow' },
+ { text: 'Disallow', value: 'deny' },
+ ],
+ })
+ );
+
+ selectField.simulate('change', { target: { value: 'deny' } });
+ expect(onChange).toHaveBeenCalledWith('deny');
+ });
+ });
+
+ describe('rule column', () => {
+ it('shows the rule of a crawl rule', () => {
+ expect(renderColumn(1).html()).toContain('Begins with');
+ });
+
+ it('can show the rule of a crawl rule as editable', () => {
+ const column = renderColumnInEditingMode(1);
+
+ const selectField = column.find(EuiSelect);
+ expect(selectField.props()).toEqual(
+ expect.objectContaining({
+ value: 'begins',
+ disabled: false,
+ isInvalid: false,
+ options: [
+ { text: 'Begins with', value: 'begins' },
+ { text: 'Ends with', value: 'ends' },
+ { text: 'Contains', value: 'contains' },
+ { text: 'Regex', value: 'regex' },
+ ],
+ })
+ );
+
+ selectField.simulate('change', { target: { value: 'ends' } });
+ expect(onChange).toHaveBeenCalledWith('ends');
+ });
+ });
+
+ describe('pattern column', () => {
+ it('shows the pattern of a crawl rule', () => {
+ expect(renderColumn(2).html()).toContain('*');
+ });
+
+ it('can show the pattern of a crawl rule as editable', () => {
+ const column = renderColumnInEditingMode(2);
+
+ const field = column.find(EuiFieldText);
+ expect(field.props()).toEqual(
+ expect.objectContaining({
+ value: '*',
+ disabled: false,
+ isInvalid: false,
+ })
+ );
+
+ field.simulate('change', { target: { value: 'foo' } });
+ expect(onChange).toHaveBeenCalledWith('foo');
+ });
+ });
+ });
+
+ describe('routes', () => {
+ it('can calculate an update and delete route correctly', () => {
+ const wrapper = shallow(
+ {columns[0].render(entryPoint)});
+ expect(column.html()).toContain('/whatever');
+ });
+
+ it('can show the value of an entry point as editable', () => {
+ const entryPoint = { id: '1', value: '/whatever' };
+ const onChange = jest.fn();
+
+ const wrapper = shallow(
+
+ {columns[0].editingRender(entryPoint, onChange, { isInvalid: false, isLoading: false })}
+
+ );
+
+ const textField = column.find(EuiFieldText);
+ expect(textField.props()).toEqual(
+ expect.objectContaining({
+ value: '/whatever',
+ disabled: false, // It would be disabled if isLoading is true
+ isInvalid: false,
+ prepend: 'https://www.elastic.co',
+ })
+ );
+
+ textField.simulate('change', { target: { value: '/foo' } });
+ expect(onChange).toHaveBeenCalledWith('/foo');
+ });
+ });
+
+ describe('routes', () => {
+ it('can calculate an update and delete route correctly', () => {
+ const wrapper = shallow(
+ {table.prop('noItemsMessage')!(editNewItems)});
+ expect(message.html()).toContain('There are no existing entry points.');
+ });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/entry_points_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/entry_points_table.tsx
new file mode 100644
index 0000000000000..7657a23ce4789
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/entry_points_table.tsx
@@ -0,0 +1,150 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { useActions } from 'kea';
+
+import { EuiFieldText, EuiLink, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { GenericEndpointInlineEditableTable } from '../../../../shared/tables/generic_endpoint_inline_editable_table';
+import { InlineEditableTableColumn } from '../../../../shared/tables/inline_editable_table/types';
+import { ItemWithAnID } from '../../../../shared/tables/types';
+import { DOCS_PREFIX } from '../../../routes';
+import { CrawlerDomain, EntryPoint } from '../types';
+
+import { EntryPointsTableLogic } from './entry_points_table_logic';
+
+interface EntryPointsTableProps {
+ domain: CrawlerDomain;
+ engineName: string;
+ items: EntryPoint[];
+}
+
+export const EntryPointsTable: React.FC
+ {i18n.translate( + 'xpack.enterpriseSearch.appSearch.crawler.entryPointsTable.emptyMessageTitle', + { + defaultMessage: 'There are no existing entry points.', + } + )} +
+{columns[0].render(sitemap)}
);
+ expect(column.html()).toContain('http://www.example.com/sitemap.xml');
+ });
+
+ it('can show the url of a sitemap as editable', () => {
+ const sitemap = { id: '1', url: 'http://www.example.com/sitemap.xml' };
+ const onChange = jest.fn();
+
+ const wrapper = shallow(
+
+ {columns[0].editingRender(sitemap, onChange, { isInvalid: false, isLoading: false })}
+
+ );
+
+ const textField = column.find(EuiFieldText);
+ expect(textField.props()).toEqual(
+ expect.objectContaining({
+ value: 'http://www.example.com/sitemap.xml',
+ disabled: false, // It would be disabled if isLoading is true
+ isInvalid: false,
+ })
+ );
+
+ textField.simulate('change', { target: { value: '/foo' } });
+ expect(onChange).toHaveBeenCalledWith('/foo');
+ });
+ });
+
+ describe('routes', () => {
+ it('can calculate an update and delete route correctly', () => {
+ const wrapper = shallow(
+ {table.prop('noItemsMessage')!(editNewItems)}
);
+ expect(message.find(EuiEmptyPrompt).exists()).toBe(true);
+ });
+
+ describe('when a sitemap is added', () => {
+ it('should update the sitemaps for the current domain, and clear flash messages', () => {
+ const updateSitemaps = jest.fn();
+ setMockActions({
+ updateSitemaps,
+ });
+ const wrapper = shallow(
+ {i18n.translate('xpack.enterpriseSearch.appSearch.engine.crawler.landingPage.title', { - defaultMessage: 'Setup the Web Crawler', + defaultMessage: 'Set up the Web Crawler', })}
{i18n.translate(
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts
index f6c3b2c87ab8c..492bd363a5f2d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.test.ts
@@ -16,7 +16,7 @@ import '../../__mocks__/engine_logic.mock';
import { nextTick } from '@kbn/test/jest';
import { CrawlerSingleDomainLogic, CrawlerSingleDomainValues } from './crawler_single_domain_logic';
-import { CrawlerDomain } from './types';
+import { CrawlerDomain, CrawlerPolicies, CrawlerRules } from './types';
const DEFAULT_VALUES: CrawlerSingleDomainValues = {
dataLoading: true,
@@ -51,6 +51,100 @@ describe('CrawlerSingleDomainLogic', () => {
expect(CrawlerSingleDomainLogic.values.domain).toEqual(domain);
});
});
+
+ describe('updateEntryPoints', () => {
+ beforeEach(() => {
+ mount({
+ domain: {
+ id: '507f1f77bcf86cd799439011',
+ entryPoints: [],
+ },
+ });
+
+ CrawlerSingleDomainLogic.actions.updateEntryPoints([
+ {
+ id: '1234',
+ value: '/',
+ },
+ ]);
+ });
+
+ it('should update the entry points on the domain', () => {
+ expect(CrawlerSingleDomainLogic.values.domain).toEqual({
+ id: '507f1f77bcf86cd799439011',
+ entryPoints: [
+ {
+ id: '1234',
+ value: '/',
+ },
+ ],
+ });
+ });
+ });
+
+ describe('updateSitemaps', () => {
+ beforeEach(() => {
+ mount({
+ domain: {
+ id: '507f1f77bcf86cd799439011',
+ sitemaps: [],
+ },
+ });
+
+ CrawlerSingleDomainLogic.actions.updateSitemaps([
+ {
+ id: '1234',
+ url: 'http://www.example.com/sitemap.xml',
+ },
+ ]);
+ });
+
+ it('should update the sitemaps on the domain', () => {
+ expect(CrawlerSingleDomainLogic.values.domain).toEqual({
+ id: '507f1f77bcf86cd799439011',
+ sitemaps: [
+ {
+ id: '1234',
+ url: 'http://www.example.com/sitemap.xml',
+ },
+ ],
+ });
+ });
+ });
+
+ describe('updateCrawlRules', () => {
+ beforeEach(() => {
+ mount({
+ domain: {
+ id: '507f1f77bcf86cd799439011',
+ crawlRules: [],
+ },
+ });
+
+ CrawlerSingleDomainLogic.actions.updateCrawlRules([
+ {
+ id: '1234',
+ policy: CrawlerPolicies.allow,
+ rule: CrawlerRules.beginsWith,
+ pattern: 'foo',
+ },
+ ]);
+ });
+
+ it('should update the crawl rules on the domain', () => {
+ expect(CrawlerSingleDomainLogic.values.domain).toEqual({
+ id: '507f1f77bcf86cd799439011',
+ crawlRules: [
+ {
+ id: '1234',
+ policy: CrawlerPolicies.allow,
+ rule: CrawlerRules.beginsWith,
+ pattern: 'foo',
+ },
+ ],
+ });
+ });
+ });
});
describe('listeners', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts
index 7b5ba6984f106..78912f736926d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_single_domain_logic.ts
@@ -14,7 +14,7 @@ import { KibanaLogic } from '../../../shared/kibana';
import { ENGINE_CRAWLER_PATH } from '../../routes';
import { EngineLogic, generateEnginePath } from '../engine';
-import { CrawlerDomain } from './types';
+import { CrawlerDomain, EntryPoint, Sitemap, CrawlRule } from './types';
import { crawlerDomainServerToClient, getDeleteDomainSuccessMessage } from './utils';
export interface CrawlerSingleDomainValues {
@@ -26,6 +26,9 @@ interface CrawlerSingleDomainActions {
deleteDomain(domain: CrawlerDomain): { domain: CrawlerDomain };
fetchDomainData(domainId: string): { domainId: string };
onReceiveDomainData(domain: CrawlerDomain): { domain: CrawlerDomain };
+ updateCrawlRules(crawlRules: CrawlRule[]): { crawlRules: CrawlRule[] };
+ updateEntryPoints(entryPoints: EntryPoint[]): { entryPoints: EntryPoint[] };
+ updateSitemaps(entryPoints: Sitemap[]): { sitemaps: Sitemap[] };
}
export const CrawlerSingleDomainLogic = kea<
@@ -36,6 +39,9 @@ export const CrawlerSingleDomainLogic = kea<
deleteDomain: (domain) => ({ domain }),
fetchDomainData: (domainId) => ({ domainId }),
onReceiveDomainData: (domain) => ({ domain }),
+ updateCrawlRules: (crawlRules) => ({ crawlRules }),
+ updateEntryPoints: (entryPoints) => ({ entryPoints }),
+ updateSitemaps: (sitemaps) => ({ sitemaps }),
},
reducers: {
dataLoading: [
@@ -48,6 +54,12 @@ export const CrawlerSingleDomainLogic = kea<
null,
{
onReceiveDomainData: (_, { domain }) => domain,
+ updateCrawlRules: (currentDomain, { crawlRules }) =>
+ ({ ...currentDomain, crawlRules } as CrawlerDomain),
+ updateEntryPoints: (currentDomain, { entryPoints }) =>
+ ({ ...currentDomain, entryPoints } as CrawlerDomain),
+ updateSitemaps: (currentDomain, { sitemaps }) =>
+ ({ ...currentDomain, sitemaps } as CrawlerDomain),
},
],
},
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
index 0902499feb4ed..1b46e21dbcb72 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
@@ -12,6 +12,25 @@ export enum CrawlerPolicies {
deny = 'deny',
}
+export const getReadableCrawlerPolicy = (policy: CrawlerPolicies) => {
+ switch (policy) {
+ case CrawlerPolicies.allow:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesPolicies.allowLabel',
+ {
+ defaultMessage: 'Allow',
+ }
+ );
+ case CrawlerPolicies.deny:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesPolicies.disallowLabel',
+ {
+ defaultMessage: 'Disallow',
+ }
+ );
+ }
+};
+
export enum CrawlerRules {
beginsWith = 'begins',
endsWith = 'ends',
@@ -19,6 +38,39 @@ export enum CrawlerRules {
regex = 'regex',
}
+export const getReadableCrawlerRule = (rule: CrawlerRules) => {
+ switch (rule) {
+ case CrawlerRules.beginsWith:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.beginsWithLabel',
+ {
+ defaultMessage: 'Begins with',
+ }
+ );
+ case CrawlerRules.endsWith:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.endsWithLabel',
+ {
+ defaultMessage: 'Ends with',
+ }
+ );
+ case CrawlerRules.contains:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.containsLabel',
+ {
+ defaultMessage: 'Contains',
+ }
+ );
+ case CrawlerRules.regex:
+ return i18n.translate(
+ 'xpack.enterpriseSearch.appSearch.crawler.crawlRulesCrawlerRules.regexLabel',
+ {
+ defaultMessage: 'Regex',
+ }
+ );
+ }
+};
+
export interface CrawlRule {
id: string;
policy: CrawlerPolicies;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx
index f81d8d64737df..f777278190db2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx
@@ -91,7 +91,7 @@ export const Credentials: React.FC = () => {
{i18n.translate('xpack.enterpriseSearch.appSearch.credentials.apiKeys', {
- defaultMessage: 'API Keys',
+ defaultMessage: 'API keys',
})}
@@ -105,7 +105,7 @@ export const Credentials: React.FC = () => {
onClick={() => showCredentialsForm()}
>
{i18n.translate('xpack.enterpriseSearch.appSearch.credentials.createKey', {
- defaultMessage: 'Create a key',
+ defaultMessage: 'Create key',
})}
)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.tsx
index 765c8c5ea847a..040f313b12205 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.tsx
@@ -9,12 +9,19 @@ import React, { useMemo } from 'react';
import { useActions, useValues } from 'kea';
-import { EuiBasicTable, EuiBasicTableColumn, EuiCopy, EuiEmptyPrompt } from '@elastic/eui';
+import {
+ EuiBasicTable,
+ EuiBasicTableColumn,
+ EuiButton,
+ EuiCopy,
+ EuiEmptyPrompt,
+} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { EDIT_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../../../../shared/constants';
import { HiddenText } from '../../../../shared/hidden_text';
import { convertMetaToPagination, handlePageChange } from '../../../../shared/table_pagination';
+import { DOCS_PREFIX } from '../../../routes';
import { TOKEN_TYPE_DISPLAY_NAMES } from '../constants';
import { CredentialsLogic } from '../credentials_logic';
import { ApiToken } from '../types';
@@ -131,8 +138,20 @@ export const CredentialsList: React.FC = () => {
}
body={i18n.translate('xpack.enterpriseSearch.appSearch.credentials.empty.body', {
- defaultMessage: 'Click the "Create a key" button to make your first one.',
+ defaultMessage: 'Allow applications to access Elastic App Search on your behalf.',
})}
+ actions={
+ {i18n.translate('xpack.enterpriseSearch.appSearch.credentials.apiKeys', { - defaultMessage: 'API Keys', + defaultMessage: 'API keys', })}
{i18n.translate('xpack.enterpriseSearch.appSearch.settings.logRetention.title', { - defaultMessage: 'Log Retention', + defaultMessage: 'Log retention', })}
- {i18n.translate('xpack.enterpriseSearch.appSearch.settings.logRetention.description', {
- defaultMessage: 'Manage the default write settings for API Logs and Analytics.',
- })}{' '}
-
+ {i18n.translate('xpack.enterpriseSearch.appSearch.settings.logRetention.description', {
+ defaultMessage: 'Log retention is determined by the ILM policies for your deployment.',
+ })}
+
+
+ {i18n.translate('xpack.enterpriseSearch.overview.heading', { + defaultMessage: 'Welcome to Elastic Enterprise Search', + })} +
++ {config.host + ? i18n.translate('xpack.enterpriseSearch.overview.subheading', { + defaultMessage: 'Add search to your app or organization.', + }) + : i18n.translate('xpack.enterpriseSearch.overview.setupHeading', { + defaultMessage: 'Choose a product to set up and get started.', + })} +
+- {i18n.translate('xpack.enterpriseSearch.overview.heading', { - defaultMessage: 'Welcome to Elastic Enterprise Search', - })} -
-- {config.host - ? i18n.translate('xpack.enterpriseSearch.overview.subheading', { - defaultMessage: 'Select a product to get started.', - }) - : i18n.translate('xpack.enterpriseSearch.overview.setupHeading', { - defaultMessage: 'Choose a product to set up and get started.', - })} -
-{PRODUCT_SELECTOR_CALLOUT_HEADING}
- setIsPopoverOpen(!isPopoverOpen)}
- />
- }
- closePopover={() => setIsPopoverOpen(false)}
- >
-
- {i18n.translate('xpack.observability.alertsTable.actionsTextLabel', {
- defaultMessage: 'Actions',
- })}
-
-
-
- );
-}
diff --git a/x-pack/plugins/observability/public/pages/alerts/index.tsx b/x-pack/plugins/observability/public/pages/alerts/index.tsx
index a4bd9db5584ee..fb23856dcd5a3 100644
--- a/x-pack/plugins/observability/public/pages/alerts/index.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/index.tsx
@@ -22,15 +22,12 @@ import { ExperimentalBadge } from '../../components/shared/experimental_badge';
import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
import { usePluginContext } from '../../hooks/use_plugin_context';
import { RouteParams } from '../../routes';
-import type { ObservabilityAPIReturnType } from '../../services/call_observability_api/types';
import { AlertsSearchBar } from './alerts_search_bar';
import { AlertsTableTGrid } from './alerts_table_t_grid';
import { StatusFilter } from './status_filter';
import { useFetcher } from '../../hooks/use_fetcher';
import { callObservabilityApi } from '../../services/call_observability_api';
-export type TopAlertResponse = ObservabilityAPIReturnType<'GET /api/observability/rules/alerts/top'>[number];
-
export interface TopAlert {
fields: ParsedTechnicalFields;
start: number;
diff --git a/x-pack/plugins/observability/public/pages/alerts/decorate_response.ts b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
similarity index 63%
rename from x-pack/plugins/observability/public/pages/alerts/decorate_response.ts
rename to x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
index 7eb6d785779b7..4e99bdb0ee32d 100644
--- a/x-pack/plugins/observability/public/pages/alerts/decorate_response.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
@@ -18,7 +18,7 @@ import {
ALERT_RULE_NAME as ALERT_RULE_NAME_NON_TYPED,
// @ts-expect-error
} from '@kbn/rule-data-utils/target_node/technical_field_names';
-import type { TopAlertResponse, TopAlert } from '.';
+import type { TopAlert } from '.';
import { parseTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields';
import { asDuration, asPercent } from '../../../common/utils/formatters';
import { ObservabilityRuleTypeRegistry } from '../../rules/create_observability_rule_type_registry';
@@ -28,24 +28,21 @@ const ALERT_STATUS: typeof ALERT_STATUS_TYPED = ALERT_STATUS_NON_TYPED;
const ALERT_RULE_TYPE_ID: typeof ALERT_RULE_TYPE_ID_TYPED = ALERT_RULE_TYPE_ID_NON_TYPED;
const ALERT_RULE_NAME: typeof ALERT_RULE_NAME_TYPED = ALERT_RULE_NAME_NON_TYPED;
-export function decorateResponse(
- alerts: TopAlertResponse[],
- observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry
-): TopAlert[] {
- return alerts.map((alert) => {
- const parsedFields = parseTechnicalFields(alert);
- const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[ALERT_RULE_TYPE_ID]!);
- const formatted = {
- link: undefined,
- reason: parsedFields[ALERT_RULE_NAME]!,
- ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
- };
+export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry) => (
+ alert: Record
-
-
-
-
-
- {i18n.translate('xpack.observability.alertsTable.viewInAppButtonLabel', {
- defaultMessage: 'View in app',
- })}
-
-
-
-
-