diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9a4f2b71da1ff..acfb7307f49c4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -132,6 +132,9 @@
/x-pack/test/alerting_api_integration @elastic/kibana-alerting-services
/x-pack/test/plugin_api_integration/plugins/task_manager @elastic/kibana-alerting-services
/x-pack/test/plugin_api_integration/test_suites/task_manager @elastic/kibana-alerting-services
+/x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
+/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
+/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
# Design
**/*.scss @elastic/kibana-design
diff --git a/docs/development/core/server/kibana-plugin-server.basepath.get.md b/docs/development/core/server/kibana-plugin-server.basepath.get.md
index 6ef7022f10e62..a20bc1a4e3174 100644
--- a/docs/development/core/server/kibana-plugin-server.basepath.get.md
+++ b/docs/development/core/server/kibana-plugin-server.basepath.get.md
@@ -9,5 +9,5 @@ returns `basePath` value, specific for an incoming request.
Signature:
```typescript
-get: (request: KibanaRequest | LegacyRequest) => string;
+get: (request: LegacyRequest | KibanaRequest) => string;
```
diff --git a/docs/development/core/server/kibana-plugin-server.basepath.md b/docs/development/core/server/kibana-plugin-server.basepath.md
index 50a30f7c43fe6..63aeb7f711d97 100644
--- a/docs/development/core/server/kibana-plugin-server.basepath.md
+++ b/docs/development/core/server/kibana-plugin-server.basepath.md
@@ -20,9 +20,9 @@ The constructor for this class is marked as internal. Third-party code should no
| Property | Modifiers | Type | Description |
| --- | --- | --- | --- |
-| [get](./kibana-plugin-server.basepath.get.md) | | (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest) => string | returns basePath value, specific for an incoming request. |
+| [get](./kibana-plugin-server.basepath.get.md) | | (request: LegacyRequest | KibanaRequest<unknown, unknown, unknown, any>) => string | returns basePath value, specific for an incoming request. |
| [prepend](./kibana-plugin-server.basepath.prepend.md) | | (path: string) => string | Prepends path with the basePath. |
| [remove](./kibana-plugin-server.basepath.remove.md) | | (path: string) => string | Removes the prepended basePath from the path. |
| [serverBasePath](./kibana-plugin-server.basepath.serverbasepath.md) | | string | returns the server's basePathSee [BasePath.get](./kibana-plugin-server.basepath.get.md) for getting the basePath value for a specific request |
-| [set](./kibana-plugin-server.basepath.set.md) | | (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest, requestSpecificBasePath: string) => void | sets basePath value, specific for an incoming request. |
+| [set](./kibana-plugin-server.basepath.set.md) | | (request: LegacyRequest | KibanaRequest<unknown, unknown, unknown, any>, requestSpecificBasePath: string) => void | sets basePath value, specific for an incoming request. |
diff --git a/docs/development/core/server/kibana-plugin-server.basepath.set.md b/docs/development/core/server/kibana-plugin-server.basepath.set.md
index 56a7f644d34cc..ac08baa0bb99e 100644
--- a/docs/development/core/server/kibana-plugin-server.basepath.set.md
+++ b/docs/development/core/server/kibana-plugin-server.basepath.set.md
@@ -9,5 +9,5 @@ sets `basePath` value, specific for an incoming request.
Signature:
```typescript
-set: (request: KibanaRequest | LegacyRequest, requestSpecificBasePath: string) => void;
+set: (request: LegacyRequest | KibanaRequest, requestSpecificBasePath: string) => void;
```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.deprecation.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.deprecation.md
new file mode 100644
index 0000000000000..7ad26b85bf81c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.deprecation.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) > [deprecation](./kibana-plugin-server.uisettingsparams.deprecation.md)
+
+## UiSettingsParams.deprecation property
+
+optional deprecation information. Used to generate a deprecation warning.
+
+Signature:
+
+```typescript
+deprecation?: DeprecationSettings;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.md
index a38499e8f37dd..fc2f8038f973f 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.md
@@ -17,6 +17,7 @@ export interface UiSettingsParams
| Property | Type | Description |
| --- | --- | --- |
| [category](./kibana-plugin-server.uisettingsparams.category.md) | string[] | used to group the configured setting in the UI |
+| [deprecation](./kibana-plugin-server.uisettingsparams.deprecation.md) | DeprecationSettings | optional deprecation information. Used to generate a deprecation warning. |
| [description](./kibana-plugin-server.uisettingsparams.description.md) | string | description provided to a user in UI |
| [name](./kibana-plugin-server.uisettingsparams.name.md) | string | title in the UI |
| [optionLabels](./kibana-plugin-server.uisettingsparams.optionlabels.md) | Record<string, string> | text labels for 'select' type UI element |
@@ -24,5 +25,6 @@ export interface UiSettingsParams
| [readonly](./kibana-plugin-server.uisettingsparams.readonly.md) | boolean | a flag indicating that value cannot be changed |
| [requiresPageReload](./kibana-plugin-server.uisettingsparams.requirespagereload.md) | boolean | a flag indicating whether new value applying requires page reloading |
| [type](./kibana-plugin-server.uisettingsparams.type.md) | UiSettingsType | defines a type of UI element [UiSettingsType](./kibana-plugin-server.uisettingstype.md) |
+| [validation](./kibana-plugin-server.uisettingsparams.validation.md) | ImageValidation | StringValidation | |
| [value](./kibana-plugin-server.uisettingsparams.value.md) | SavedObjectAttribute | default value to fall back to if a user doesn't provide any |
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.validation.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.validation.md
new file mode 100644
index 0000000000000..f097f36e999ba
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.validation.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) > [validation](./kibana-plugin-server.uisettingsparams.validation.md)
+
+## UiSettingsParams.validation property
+
+Signature:
+
+```typescript
+validation?: ImageValidation | StringValidation;
+```
diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index 977a65f62202d..757c6f10f2a99 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -187,7 +187,8 @@ Refresh the page to apply the changes.
=== Search settings
[horizontal]
-`courier:batchSearches`:: When disabled, dashboard panels will load individually, and search requests will terminate when
+`courier:batchSearches`:: **Deprecated in 7.6. Starting in 8.0, this setting will be optimized internally.**
+When disabled, dashboard panels will load individually, and search requests will terminate when
users navigate away or update the query. When enabled, dashboard panels will load together when all of the data is loaded,
and searches will not terminate.
`courier:customRequestPreference`:: {ref}/search-request-body.html#request-body-search-preference[Request preference]
diff --git a/docs/setup/production.asciidoc b/docs/setup/production.asciidoc
index fed4ba4886bf9..eef2b11e53d85 100644
--- a/docs/setup/production.asciidoc
+++ b/docs/setup/production.asciidoc
@@ -4,7 +4,8 @@
* <>
* <>
* <>
-* <>
+* <>
+* <>
* <>
* <>
@@ -18,7 +19,7 @@ While Kibana isn't terribly resource intensive, we still recommend running Kiban
separate from your Elasticsearch data or master nodes. To distribute Kibana
traffic across the nodes in your Elasticsearch cluster, you can run Kibana
and an Elasticsearch client node on the same machine. For more information, see
-<>.
+<>.
[float]
[[configuring-kibana-shield]]
@@ -63,7 +64,7 @@ csp.strict: true
See <>.
[float]
-[[load-balancing]]
+[[load-balancing-es]]
=== Load Balancing Across Multiple Elasticsearch Nodes
If you have multiple nodes in your Elasticsearch cluster, the easiest way to distribute Kibana requests
across the nodes is to run an Elasticsearch _Coordinating only_ node on the same machine as Kibana.
@@ -110,9 +111,40 @@ transport.tcp.port: 9300 - 9400
elasticsearch.hosts: ["http://localhost:9200"]
--------
+[float]
+[[load-balancing-kibana]]
+=== Load balancing across multiple Kibana instances
+To serve multiple Kibana installations behind a load balancer, you must change the configuration. See {kibana-ref}/settings.html[Configuring Kibana] for details on each setting.
+
+Settings unique across each Kibana instance:
+--------
+server.uuid
+server.name
+--------
+
+Settings unique across each host (for example, running multiple installations on the same virtual machine):
+--------
+logging.dest
+path.data
+pid.file
+server.port
+--------
+
+Settings that must be the same:
+--------
+xpack.security.encryptionKey //decrypting session cookies
+xpack.reporting.encryptionKey //decrypting reports stored in Elasticsearch
+--------
+
+Separate configuration files can be used from the command line by using the `-c` flag:
+--------
+bin/kibana -c config/instance1.yml
+bin/kibana -c config/instance2.yml
+--------
+
[float]
[[high-availability]]
-=== High Availability Across Multiple Elasticsearch Nodes
+=== High availability across multiple Elasticsearch nodes
Kibana can be configured to connect to multiple Elasticsearch nodes in the same cluster. In situations where a node becomes unavailable,
Kibana will transparently connect to an available node and continue operating. Requests to available hosts will be routed in a round robin fashion.
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index c2ed295e83ce9..5f5d85fe8d3be 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -125,23 +125,33 @@ the {reporting} endpoints to authorized users. This requires that you:
. Enable {security} on your {es} cluster. For more information,
see {ref}/security-getting-started.html[Getting Started with Security].
-. Configure an SSL certificate for Kibana. For more information, see
-<>.
-. Configure {watcher} to trust the Kibana server's certificate by adding it to
-the {watcher} truststore on each node:
-.. Import the {kib} server certificate into the {watcher} truststore using
-Java Keytool:
+. Configure TLS/SSL encryption for the {kib} server. For more information, see
+<>.
+. Specify the {kib} server's CA certificate chain in `elasticsearch.yml`:
+
-[source,shell]
----------------------------------------------------------
-keytool -importcert -keystore watcher-truststore.jks -file server.crt
----------------------------------------------------------
-+
-NOTE: If the truststore doesn't already exist, it is created.
+--
+If you are using your own CA to sign the {kib} server certificate, then you need
+to specify the CA certificate chain in {es} to properly establish trust in TLS
+connections between {watcher} and {kib}. If your CA certificate chain is
+contained in a PKCS #12 trust store, specify it like so:
+
+[source,yaml]
+--------------------------------------------------------------------------------
+xpack.http.ssl.truststore.path: "/path/to/your/truststore.p12"
+xpack.http.ssl.truststore.type: "PKCS12"
+xpack.http.ssl.truststore.password: "optional decryption password"
+--------------------------------------------------------------------------------
+
+Otherwise, if your CA certificate chain is in PEM format, specify it like so:
+
+[source,yaml]
+--------------------------------------------------------------------------------
+xpack.http.ssl.certificate_authorities: ["/path/to/your/cacert1.pem", "/path/to/your/cacert2.pem"]
+--------------------------------------------------------------------------------
+
+For more information, see {ref}/notification-settings.html#ssl-notification-settings[the {watcher} HTTP TLS/SSL Settings].
+--
-.. Make sure the `xpack.http.ssl.truststore.path` setting in
-`elasticsearch.yml` specifies the location of the {watcher}
-truststore.
. Add one or more users who have the permissions
necessary to use {kib} and {reporting}. For more information, see
<>.
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index a674b49a8e134..09ea1afe35766 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -127,7 +127,7 @@ export class ChromeService {
)
)
);
- this.isVisible$ = combineLatest(this.appHidden$, this.toggleHidden$).pipe(
+ this.isVisible$ = combineLatest([this.appHidden$, this.toggleHidden$]).pipe(
map(([appHidden, toggleHidden]) => !(appHidden || toggleHidden)),
takeUntil(this.stop$)
);
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 0447add491788..d05a6bb53405c 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -57,7 +57,7 @@ import {
} from '../..';
import { HttpStart } from '../../../http';
import { ChromeHelpExtension } from '../../chrome_service';
-import { ApplicationStart, InternalApplicationStart } from '../../../application/types';
+import { InternalApplicationStart } from '../../../application/types';
// Providing a buffer between the limit and the cut off index
// protects from truncating just the last couple (6) characters
@@ -108,7 +108,7 @@ function extendRecentlyAccessedHistoryItem(
};
}
-function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['getUrlForApp']) {
+function extendNavLink(navLink: ChromeNavLink) {
if (navLink.legacy) {
return {
...navLink,
@@ -118,7 +118,7 @@ function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['getU
return {
...navLink,
- href: urlForApp(navLink.id),
+ href: navLink.baseUrl,
};
}
@@ -229,9 +229,7 @@ class HeaderUI extends Component {
appTitle,
isVisible,
forceNavigation,
- navLinks: navLinks.map(navLink =>
- extendNavLink(navLink, this.props.application.getUrlForApp)
- ),
+ navLinks: navLinks.map(extendNavLink),
recentlyAccessed: recentlyAccessed.map(ra =>
extendRecentlyAccessedHistoryItem(navLinks, ra, this.props.basePath)
),
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 44dc76bfe6e32..36b220f16f395 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -115,6 +115,9 @@ export class DocLinksService {
date: {
dateMath: `${ELASTICSEARCH_DOCS}common-options.html#date-math`,
},
+ management: {
+ kibanaSearchSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-search-settings`,
+ },
},
});
}
diff --git a/src/core/public/rendering/app_containers.test.tsx b/src/core/public/rendering/app_containers.test.tsx
new file mode 100644
index 0000000000000..746e37b1214d9
--- /dev/null
+++ b/src/core/public/rendering/app_containers.test.tsx
@@ -0,0 +1,105 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { BehaviorSubject } from 'rxjs';
+import { act } from 'react-dom/test-utils';
+import { mount } from 'enzyme';
+import React from 'react';
+
+import { AppWrapper, AppContainer } from './app_containers';
+
+describe('AppWrapper', () => {
+ it('toggles the `hidden-chrome` class depending on the chrome visibility state', () => {
+ const chromeVisible$ = new BehaviorSubject(true);
+
+ const component = mount(app-content);
+ expect(component.getDOMNode()).toMatchInlineSnapshot(`
+
+ `);
+ });
+});
diff --git a/src/core/public/rendering/app_containers.tsx b/src/core/public/rendering/app_containers.tsx
new file mode 100644
index 0000000000000..72faaeac588be
--- /dev/null
+++ b/src/core/public/rendering/app_containers.tsx
@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { Observable } from 'rxjs';
+import useObservable from 'react-use/lib/useObservable';
+import classNames from 'classnames';
+
+export const AppWrapper: React.FunctionComponent<{
+ chromeVisible$: Observable;
+}> = ({ chromeVisible$, children }) => {
+ const visible = useObservable(chromeVisible$);
+ return
{
});
it('returns a div for the legacy service to render into', () => {
- const {
- start: { legacyTargetDomElement },
- targetDomElement,
- } = getService({ legacyMode: true });
+ const { legacyTargetDomElement } = startService();
+
expect(targetDomElement.contains(legacyTargetDomElement!)).toBe(true);
});
});
diff --git a/src/core/public/rendering/rendering_service.tsx b/src/core/public/rendering/rendering_service.tsx
index 7a747faa2673f..58b8c1921e333 100644
--- a/src/core/public/rendering/rendering_service.tsx
+++ b/src/core/public/rendering/rendering_service.tsx
@@ -25,6 +25,7 @@ import { InternalChromeStart } from '../chrome';
import { InternalApplicationStart } from '../application';
import { InjectedMetadataStart } from '../injected_metadata';
import { OverlayStart } from '../overlays';
+import { AppWrapper, AppContainer } from './app_containers';
interface StartDeps {
application: InternalApplicationStart;
@@ -65,12 +66,12 @@ export class RenderingService {
{chromeUi}
{!legacyMode && (
-
+
{bannerUi}
-
{appUi}
+ {appUi}
-
+
)}
{legacyMode && }
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index 608392e4943f9..af4db68ee95e1 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -424,7 +424,7 @@ describe('#discoverPlugins()', () => {
await legacyService.discoverPlugins();
expect(findLegacyPluginSpecs).toHaveBeenCalledTimes(1);
- expect(findLegacyPluginSpecs).toHaveBeenCalledWith(expect.any(Object), logger);
+ expect(findLegacyPluginSpecs).toHaveBeenCalledWith(expect.any(Object), logger, env.packageInfo);
});
it(`register legacy plugin's deprecation providers`, async () => {
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index cc36b90ec526d..7a03cefc38c1a 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -125,7 +125,11 @@ export class LegacyService implements CoreService {
disabledPluginSpecs,
uiExports,
navLinks,
- } = await findLegacyPluginSpecs(this.settings, this.coreContext.logger);
+ } = await findLegacyPluginSpecs(
+ this.settings,
+ this.coreContext.logger,
+ this.coreContext.env.packageInfo
+ );
this.legacyPlugins = {
pluginSpecs,
diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
index d2e7a39236d0a..9867274d224bd 100644
--- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
+++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -29,6 +29,8 @@ import {
import { collectUiExports as collectLegacyUiExports } from '../../../../legacy/ui/ui_exports/collect_ui_exports';
import { LoggerFactory } from '../../logging';
+import { PackageInfo } from '../../config';
+
import {
LegacyUiExports,
LegacyNavLink,
@@ -92,7 +94,11 @@ function getNavLinks(uiExports: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]
.sort((a, b) => a.order - b.order);
}
-export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: LoggerFactory) {
+export async function findLegacyPluginSpecs(
+ settings: unknown,
+ loggerFactory: LoggerFactory,
+ packageInfo: PackageInfo
+) {
const configToMutate: LegacyConfig = defaultConfig(settings);
const {
pack$,
@@ -152,8 +158,7 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo
map(spec => {
const name = spec.getId();
const pluginVersion = spec.getExpectedKibanaVersion();
- // @ts-ignore
- const kibanaVersion = settings.pkg.version;
+ const kibanaVersion = packageInfo.version;
return `Plugin "${name}" was disabled because it expected Kibana version "${pluginVersion}", and found "${kibanaVersion}".`;
}),
distinct(),
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 073d380d3aa67..c7082d46313ae 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -37,6 +37,7 @@ export { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.
export { httpServiceMock } from './http/http_service.mock';
export { loggingServiceMock } from './logging/logging_service.mock';
export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
+export { savedObjectsRepositoryMock } from './saved_objects/service/lib/repository.mock';
export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
import { uuidServiceMock } from './uuid/uuid_service.mock';
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index bf7dc14c73265..7f3a960571012 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1928,6 +1928,8 @@ export type SharedGlobalConfig = RecursiveReadonly_2<{
// @public
export interface UiSettingsParams {
category?: string[];
+ // Warning: (ae-forgotten-export) The symbol "DeprecationSettings" needs to be exported by the entry point index.d.ts
+ deprecation?: DeprecationSettings;
description?: string;
name?: string;
optionLabels?: Record;
@@ -1935,6 +1937,11 @@ export interface UiSettingsParams {
readonly?: boolean;
requiresPageReload?: boolean;
type?: UiSettingsType;
+ // Warning: (ae-forgotten-export) The symbol "ImageValidation" needs to be exported by the entry point index.d.ts
+ // Warning: (ae-forgotten-export) The symbol "StringValidation" needs to be exported by the entry point index.d.ts
+ //
+ // (undocumented)
+ validation?: ImageValidation | StringValidation;
value?: SavedObjectAttribute;
}
diff --git a/src/core/server/types.ts b/src/core/server/types.ts
index 9919c7f0386b5..2433aad1a2be5 100644
--- a/src/core/server/types.ts
+++ b/src/core/server/types.ts
@@ -23,4 +23,3 @@ export * from './saved_objects/types';
export * from './ui_settings/types';
export * from './legacy/types';
export { EnvironmentMode, PackageInfo } from './config/types';
-export { ICspConfig } from './csp';
diff --git a/src/core/server/ui_settings/types.ts b/src/core/server/ui_settings/types.ts
index 5e3f0a4fbb6bd..14eb71a22cefc 100644
--- a/src/core/server/ui_settings/types.ts
+++ b/src/core/server/ui_settings/types.ts
@@ -73,6 +73,15 @@ export interface UserProvidedValues {
isOverridden?: boolean;
}
+/**
+ * UiSettings deprecation field options.
+ * @public
+ * */
+export interface DeprecationSettings {
+ message: string;
+ docLinksKey: string;
+}
+
/**
* UI element type to represent the settings.
* @public
@@ -102,6 +111,25 @@ export interface UiSettingsParams {
readonly?: boolean;
/** defines a type of UI element {@link UiSettingsType} */
type?: UiSettingsType;
+ /** optional deprecation information. Used to generate a deprecation warning. */
+ deprecation?: DeprecationSettings;
+ /*
+ * Allows defining a custom validation applicable to value change on the client.
+ * @deprecated
+ */
+ validation?: ImageValidation | StringValidation;
+}
+
+export interface StringValidation {
+ regexString: string;
+ message: string;
+}
+
+export interface ImageValidation {
+ maxSize: {
+ length: number;
+ description: string;
+ };
}
/** @internal */
diff --git a/src/core/utils/merge.test.ts b/src/core/utils/merge.test.ts
index aa98f51067411..c857e980dec21 100644
--- a/src/core/utils/merge.test.ts
+++ b/src/core/utils/merge.test.ts
@@ -61,4 +61,15 @@ describe('merge', () => {
expect(merge({ a: 0 }, {}, {})).toEqual({ a: 0 });
expect(merge({ a: 0 }, { a: 1 }, {})).toEqual({ a: 1 });
});
+
+ test(`doesn't pollute prototypes`, () => {
+ merge({}, JSON.parse('{ "__proto__": { "foo": "bar" } }'));
+ merge({}, JSON.parse('{ "constructor": { "prototype": { "foo": "bar" } } }'));
+ merge(
+ {},
+ JSON.parse('{ "__proto__": { "foo": "bar" } }'),
+ JSON.parse('{ "constructor": { "prototype": { "foo": "bar" } } }')
+ );
+ expect(({} as any).foo).toBe(undefined);
+ });
});
diff --git a/src/dev/sass/build_sass.js b/src/dev/sass/build_sass.js
index 14f03a7a116a6..1ff7c700d0386 100644
--- a/src/dev/sass/build_sass.js
+++ b/src/dev/sass/build_sass.js
@@ -19,6 +19,7 @@
import { resolve } from 'path';
+import * as Rx from 'rxjs';
import { toArray } from 'rxjs/operators';
import { createFailError } from '@kbn/dev-utils';
@@ -61,9 +62,11 @@ export async function buildSass({ log, kibanaDir, watch }) {
const scanDirs = [resolve(kibanaDir, 'src/legacy/core_plugins')];
const paths = [resolve(kibanaDir, 'x-pack')];
- const { spec$ } = findPluginSpecs({ plugins: { scanDirs, paths } });
- const enabledPlugins = await spec$.pipe(toArray()).toPromise();
- const uiExports = collectUiExports(enabledPlugins);
+ const { spec$, disabledSpec$ } = findPluginSpecs({ plugins: { scanDirs, paths } });
+ const allPlugins = await Rx.merge(spec$, disabledSpec$)
+ .pipe(toArray())
+ .toPromise();
+ const uiExports = collectUiExports(allPlugins);
const { styleSheetPaths } = uiExports;
log.info('%s %d styleSheetPaths', watch ? 'watching' : 'found', styleSheetPaths.length);
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
index 6262c304e307b..8301daa675b5c 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
@@ -303,7 +303,9 @@ export class LegacyCoreEditor implements CoreEditor {
const maxLineLength = this.getWrapLimit() - 5;
const isWrapping = firstLine.length > maxLineLength;
const getScreenCoords = (line: number) =>
- this.editor.renderer.textToScreenCoordinates(line - 1, startColumn).pageY - offsetFromPage;
+ this.editor.renderer.textToScreenCoordinates(line - 1, startColumn).pageY -
+ offsetFromPage +
+ (window.pageYOffset || 0);
const topOfReq = getScreenCoords(startLine);
if (topOfReq >= 0) {
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
index 276e765ae7fe6..947c7ae7e6e36 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
@@ -48,6 +48,10 @@ function ColorRanges({
const validateRange = useCallback(
({ from, to }, index) => {
+ if (!colorsRange[index]) {
+ return [false, false];
+ }
+
const leftBound = index === 0 ? -Infinity : colorsRange[index - 1].to || 0;
const isFromValid = from >= leftBound;
const isToValid = to >= from;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/url_helper.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/url_helper.test.ts
new file mode 100644
index 0000000000000..16773c02f5a7b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/url_helper.test.ts
@@ -0,0 +1,117 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+jest.mock('../', () => ({
+ DashboardConstants: {
+ ADD_EMBEDDABLE_ID: 'addEmbeddableId',
+ ADD_EMBEDDABLE_TYPE: 'addEmbeddableType',
+ },
+}));
+
+jest.mock('../legacy_imports', () => {
+ return {
+ absoluteToParsedUrl: jest.fn(() => {
+ return {
+ basePath: '/pep',
+ appId: 'kibana',
+ appPath: '/dashboard?addEmbeddableType=lens&addEmbeddableId=123eb456cd&x=1&y=2&z=3',
+ hostname: 'localhost',
+ port: 5601,
+ protocol: 'http:',
+ addQueryParameter: () => {},
+ getAbsoluteUrl: () => {
+ return 'http://localhost:5601/pep/app/kibana#/dashboard?addEmbeddableType=lens&addEmbeddableId=123eb456cd&x=1&y=2&z=3';
+ },
+ };
+ }),
+ };
+});
+
+import {
+ addEmbeddableToDashboardUrl,
+ getLensUrlFromDashboardAbsoluteUrl,
+ getUrlVars,
+} from '../np_ready/url_helper';
+
+describe('Dashboard URL Helper', () => {
+ beforeEach(() => {
+ jest.resetModules();
+ });
+
+ it('addEmbeddableToDashboardUrl', () => {
+ const id = '123eb456cd';
+ const type = 'lens';
+ const urlVars = {
+ x: '1',
+ y: '2',
+ z: '3',
+ };
+ const basePath = '/pep';
+ const url =
+ "http://localhost:5601/pep/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(addEmbeddableToDashboardUrl(url, basePath, id, urlVars, type)).toEqual(
+ `http://localhost:5601/pep/app/kibana#/dashboard?addEmbeddableType=${type}&addEmbeddableId=${id}&x=1&y=2&z=3`
+ );
+ });
+
+ it('getUrlVars', () => {
+ let url =
+ "http://localhost:5601/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(getUrlVars(url)).toEqual({
+ _g: '(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))',
+ _a: "(description:'',filters:!()",
+ });
+ url = 'http://mybusiness.mydomain.com/app/kibana#/dashboard?x=y&y=z';
+ expect(getUrlVars(url)).toEqual({
+ x: 'y',
+ y: 'z',
+ });
+ url = 'http://notDashboardUrl';
+ expect(getUrlVars(url)).toEqual({});
+ url = 'http://localhost:5601/app/kibana#/dashboard/777182';
+ expect(getUrlVars(url)).toEqual({});
+ });
+
+ it('getLensUrlFromDashboardAbsoluteUrl', () => {
+ const id = '1244';
+ const basePath = '/wev';
+ let url =
+ "http://localhost:5601/wev/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, basePath, id)).toEqual(
+ 'http://localhost:5601/wev/app/kibana#/lens/edit/1244'
+ );
+
+ url =
+ "http://localhost:5601/wev/app/kibana#/dashboard/625357282?_a=(description:'',filters:!()&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))";
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, basePath, id)).toEqual(
+ 'http://localhost:5601/wev/app/kibana#/lens/edit/1244'
+ );
+
+ url = 'http://myserver.mydomain.com:5601/wev/app/kibana#/dashboard/777182';
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, basePath, id)).toEqual(
+ 'http://myserver.mydomain.com:5601/wev/app/kibana#/lens/edit/1244'
+ );
+
+ url =
+ "http://localhost:5601/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, '', id)).toEqual(
+ 'http://localhost:5601/app/kibana#/lens/edit/1244'
+ );
+ });
+});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index ec0913e5fb3e7..ba01919431080 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -67,3 +67,4 @@ export { IInjector } from 'ui/chrome';
export { SavedObjectLoader } from 'ui/saved_objects';
export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
+export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 2523d1e60a741..2706b588a2ec4 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -37,7 +37,6 @@ import {
KbnUrl,
SavedObjectSaveOpts,
unhashUrl,
- VISUALIZE_EMBEDDABLE_TYPE,
} from '../legacy_imports';
import { FilterStateManager } from '../../../../data/public';
import {
@@ -334,13 +333,12 @@ export class DashboardAppController {
// This code needs to be replaced with a better mechanism for adding new embeddables of
// any type from the add panel. Likely this will happen via creating a visualization "inline",
// without navigating away from the UX.
- if ($routeParams[DashboardConstants.NEW_VISUALIZATION_ID_PARAM]) {
- container.addSavedObjectEmbeddable(
- VISUALIZE_EMBEDDABLE_TYPE,
- $routeParams[DashboardConstants.NEW_VISUALIZATION_ID_PARAM]
- );
- kbnUrl.removeParam(DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM);
- kbnUrl.removeParam(DashboardConstants.NEW_VISUALIZATION_ID_PARAM);
+ if ($routeParams[DashboardConstants.ADD_EMBEDDABLE_TYPE]) {
+ const type = $routeParams[DashboardConstants.ADD_EMBEDDABLE_TYPE];
+ const id = $routeParams[DashboardConstants.ADD_EMBEDDABLE_ID];
+ container.addSavedObjectEmbeddable(type, id);
+ kbnUrl.removeParam(DashboardConstants.ADD_EMBEDDABLE_TYPE);
+ kbnUrl.removeParam(DashboardConstants.ADD_EMBEDDABLE_ID);
}
}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
index b76b3f309874a..fe42e07912799 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
@@ -19,9 +19,10 @@
export const DashboardConstants = {
ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM: 'addToDashboard',
- NEW_VISUALIZATION_ID_PARAM: 'addVisualization',
LANDING_PAGE_PATH: '/dashboards',
CREATE_NEW_DASHBOARD_URL: '/dashboard',
+ ADD_EMBEDDABLE_ID: 'addEmbeddableId',
+ ADD_EMBEDDABLE_TYPE: 'addEmbeddableType',
};
export function createDashboardEditUrl(id: string) {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/url_helper.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/url_helper.ts
new file mode 100644
index 0000000000000..ee9e3c4ef4781
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/url_helper.ts
@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { parse } from 'url';
+import { absoluteToParsedUrl } from '../legacy_imports';
+import { DashboardConstants } from './dashboard_constants';
+/**
+ * Return query params from URL
+ * @param url given url
+ */
+export function getUrlVars(url: string): Record {
+ const vars: Record = {};
+ // @ts-ignore
+ url.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(_, key, value) {
+ // @ts-ignore
+ vars[key] = value;
+ });
+ return vars;
+}
+
+/** *
+ * Returns dashboard URL with added embeddableType and embeddableId query params
+ * eg.
+ * input: url: http://localhost:5601/lib/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now)), embeddableId: 12345, embeddableType: 'lens'
+ * output: http://localhost:5601/lib/app/kibana#dashboard?addEmbeddableType=lens&addEmbeddableId=12345&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))
+ * @param url dasbhoard absolute url
+ * @param embeddableId id of the saved visualization
+ * @param basePath current base path
+ * @param urlVars url query params (optional)
+ * @param embeddableType 'lens' or 'visualization' (optional, default is 'lens')
+ */
+export function addEmbeddableToDashboardUrl(
+ url: string | undefined,
+ basePath: string,
+ embeddableId: string,
+ urlVars?: Record,
+ embeddableType?: string
+): string | null {
+ if (!url) {
+ return null;
+ }
+ const dashboardUrl = getUrlWithoutQueryParams(url);
+ const dashboardParsedUrl = absoluteToParsedUrl(dashboardUrl, basePath);
+ if (urlVars) {
+ const keys = Object.keys(urlVars).sort();
+ keys.forEach(key => {
+ dashboardParsedUrl.addQueryParameter(key, urlVars[key]);
+ });
+ }
+ dashboardParsedUrl.addQueryParameter(
+ DashboardConstants.ADD_EMBEDDABLE_TYPE,
+ embeddableType || 'lens'
+ );
+ dashboardParsedUrl.addQueryParameter(DashboardConstants.ADD_EMBEDDABLE_ID, embeddableId);
+ return dashboardParsedUrl.getAbsoluteUrl();
+}
+
+/**
+ * Return Lens URL from dashboard absolute URL
+ * @param dashboardAbsoluteUrl
+ * @param basePath current base path
+ * @param id Lens id
+ */
+export function getLensUrlFromDashboardAbsoluteUrl(
+ dashboardAbsoluteUrl: string | undefined | null,
+ basePath: string | null | undefined,
+ id: string
+): string | null {
+ if (!dashboardAbsoluteUrl || basePath === null || basePath === undefined) {
+ return null;
+ }
+ const { host, protocol } = parse(dashboardAbsoluteUrl);
+ return `${protocol}//${host}${basePath}/app/kibana#/lens/edit/${id}`;
+}
+
+/**
+ * Returns the portion of the URL without query params
+ * eg.
+ * input: http://localhost:5601/lib/app/kibana#/dashboard?param1=x¶m2=y¶m3=z
+ * output:http://localhost:5601/lib/app/kibana#/dashboard
+ * input: http://localhost:5601/lib/app/kibana#/dashboard/39292992?param1=x¶m2=y¶m3=z
+ * output: http://localhost:5601/lib/app/kibana#/dashboard/39292992
+ * @param url url to parse
+ */
+function getUrlWithoutQueryParams(url: string): string {
+ return url.split('?')[0];
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
index a6c6d91084625..6054b9f8d03c5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
@@ -74,9 +74,9 @@ function fetchContextProvider(indexPatterns: IndexPatternsContract) {
const searchSource = await createSearchSource(indexPattern, filters);
const sortDirToApply = type === 'successors' ? sortDir : reverseSortDir(sortDir);
- const nanos = indexPattern.isTimeNanosBased() ? extractNanos(anchor._source[timeField]) : '';
+ const nanos = indexPattern.isTimeNanosBased() ? extractNanos(anchor.fields[timeField][0]) : '';
const timeValueMillis =
- nanos !== '' ? convertIsoToMillis(anchor._source[timeField]) : anchor.sort[0];
+ nanos !== '' ? convertIsoToMillis(anchor.fields[timeField][0]) : anchor.sort[0];
const intervals = generateIntervals(LOOKUP_OFFSETS, timeValueMillis, type, sortDir);
let documents: EsHitRecordList = [];
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
index 3f9bf255aefa9..d4ee9e0e0f287 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
@@ -39,14 +39,14 @@ export function getEsQuerySearchAfter(
const afterTimeRecIdx = type === 'successors' && documents.length ? documents.length - 1 : 0;
const afterTimeDoc = documents[afterTimeRecIdx];
const afterTimeValue = nanoSeconds
- ? convertIsoToNanosAsStr(afterTimeDoc._source[timeFieldName])
+ ? convertIsoToNanosAsStr(afterTimeDoc.fields[timeFieldName][0])
: afterTimeDoc.sort[0];
return [afterTimeValue, afterTimeDoc.sort[1]];
}
// if data_nanos adapt timestamp value for sorting, since numeric value was rounded by browser
// ES search_after also works when number is provided as string
return [
- nanoSeconds ? convertIsoToNanosAsStr(anchor._source[timeFieldName]) : anchor.sort[0],
+ nanoSeconds ? convertIsoToNanosAsStr(anchor.fields[timeFieldName][0]) : anchor.sort[0],
anchor.sort[1],
];
}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap
index 10d165d0d69c4..eef8f3fc93d90 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap
@@ -60,6 +60,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"defVal": Array [
"default_value",
],
+ "deprecation": undefined,
"description": "Description for Test array setting",
"displayName": "Test array setting",
"isCustom": undefined,
@@ -79,6 +80,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"elasticsearch",
],
"defVal": true,
+ "deprecation": undefined,
"description": "Description for Test boolean setting",
"displayName": "Test boolean setting",
"isCustom": undefined,
@@ -100,6 +102,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test custom string setting",
"displayName": "Test custom string setting",
"isCustom": undefined,
@@ -119,6 +122,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test image setting",
"displayName": "Test image setting",
"isCustom": undefined,
@@ -140,6 +144,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"defVal": "{
\\"foo\\": \\"bar\\"
}",
+ "deprecation": undefined,
"description": "Description for overridden json",
"displayName": "An overridden json",
"isCustom": undefined,
@@ -159,6 +164,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": 1234,
+ "deprecation": undefined,
"description": "Description for overridden number",
"displayName": "An overridden number",
"isCustom": undefined,
@@ -178,6 +184,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "orange",
+ "deprecation": undefined,
"description": "Description for overridden select setting",
"displayName": "Test overridden select setting",
"isCustom": undefined,
@@ -201,6 +208,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "foo",
+ "deprecation": undefined,
"description": "Description for overridden string",
"displayName": "An overridden string",
"isCustom": undefined,
@@ -220,6 +228,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "{\\"foo\\": \\"bar\\"}",
+ "deprecation": undefined,
"description": "Description for Test json setting",
"displayName": "Test json setting",
"isCustom": undefined,
@@ -239,6 +248,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "",
+ "deprecation": undefined,
"description": "Description for Test markdown setting",
"displayName": "Test markdown setting",
"isCustom": undefined,
@@ -258,6 +268,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": 5,
+ "deprecation": undefined,
"description": "Description for Test number setting",
"displayName": "Test number setting",
"isCustom": undefined,
@@ -277,6 +288,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "orange",
+ "deprecation": undefined,
"description": "Description for Test select setting",
"displayName": "Test select setting",
"isCustom": undefined,
@@ -300,6 +312,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test string setting",
"displayName": "Test string setting",
"isCustom": undefined,
@@ -345,6 +358,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"defVal": Array [
"default_value",
],
+ "deprecation": undefined,
"description": "Description for Test array setting",
"displayName": "Test array setting",
"isCustom": undefined,
@@ -364,6 +378,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"elasticsearch",
],
"defVal": true,
+ "deprecation": undefined,
"description": "Description for Test boolean setting",
"displayName": "Test boolean setting",
"isCustom": undefined,
@@ -385,6 +400,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test custom string setting",
"displayName": "Test custom string setting",
"isCustom": undefined,
@@ -404,6 +420,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test image setting",
"displayName": "Test image setting",
"isCustom": undefined,
@@ -425,6 +442,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"defVal": "{
\\"foo\\": \\"bar\\"
}",
+ "deprecation": undefined,
"description": "Description for overridden json",
"displayName": "An overridden json",
"isCustom": undefined,
@@ -444,6 +462,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": 1234,
+ "deprecation": undefined,
"description": "Description for overridden number",
"displayName": "An overridden number",
"isCustom": undefined,
@@ -463,6 +482,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "orange",
+ "deprecation": undefined,
"description": "Description for overridden select setting",
"displayName": "Test overridden select setting",
"isCustom": undefined,
@@ -486,6 +506,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "foo",
+ "deprecation": undefined,
"description": "Description for overridden string",
"displayName": "An overridden string",
"isCustom": undefined,
@@ -505,6 +526,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "{\\"foo\\": \\"bar\\"}",
+ "deprecation": undefined,
"description": "Description for Test json setting",
"displayName": "Test json setting",
"isCustom": undefined,
@@ -524,6 +546,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "",
+ "deprecation": undefined,
"description": "Description for Test markdown setting",
"displayName": "Test markdown setting",
"isCustom": undefined,
@@ -543,6 +566,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": 5,
+ "deprecation": undefined,
"description": "Description for Test number setting",
"displayName": "Test number setting",
"isCustom": undefined,
@@ -562,6 +586,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": "orange",
+ "deprecation": undefined,
"description": "Description for Test select setting",
"displayName": "Test select setting",
"isCustom": undefined,
@@ -585,6 +610,7 @@ exports[`AdvancedSettings should render normally 1`] = `
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test string setting",
"displayName": "Test string setting",
"isCustom": undefined,
@@ -705,6 +731,7 @@ exports[`AdvancedSettings should render read-only when saving is disabled 1`] =
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test string setting",
"displayName": "Test string setting",
"isCustom": undefined,
@@ -748,6 +775,7 @@ exports[`AdvancedSettings should render read-only when saving is disabled 1`] =
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test string setting",
"displayName": "Test string setting",
"isCustom": undefined,
@@ -886,6 +914,7 @@ exports[`AdvancedSettings should render specific setting if given setting key 1`
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test string setting",
"displayName": "Test string setting",
"isCustom": undefined,
@@ -929,6 +958,7 @@ exports[`AdvancedSettings should render specific setting if given setting key 1`
"general",
],
"defVal": null,
+ "deprecation": undefined,
"description": "Description for Test string setting",
"displayName": "Test string setting",
"isCustom": undefined,
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
index 939dc8c20e465..a2f201cf757f5 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
@@ -19,12 +19,14 @@
import React, { PureComponent, Fragment } from 'react';
import PropTypes from 'prop-types';
+import { npStart } from 'ui/new_platform';
import 'brace/theme/textmate';
import 'brace/mode/markdown';
import { toastNotifications } from 'ui/notify';
import {
+ EuiBadge,
EuiButton,
EuiButtonEmpty,
EuiCode,
@@ -41,6 +43,7 @@ import {
EuiImage,
EuiLink,
EuiSpacer,
+ EuiToolTip,
EuiText,
EuiSelect,
EuiSwitch,
@@ -224,7 +227,7 @@ export class Field extends PureComponent {
}
const file = files[0];
- const { maxSize } = this.props.setting.options;
+ const { maxSize } = this.props.setting.validation;
try {
const base64Image = await this.getImageAsBase64(file);
const isInvalid = !!(maxSize && maxSize.length && base64Image.length > maxSize.length);
@@ -565,6 +568,36 @@ export class Field extends PureComponent {
renderDescription(setting) {
let description;
+ let deprecation;
+
+ if (setting.deprecation) {
+ const { links } = npStart.core.docLinks;
+
+ deprecation = (
+ <>
+
+ {
+ window.open(links.management[setting.deprecation.docLinksKey], '_blank');
+ }}
+ onClickAriaLabel={i18n.translate(
+ 'kbn.management.settings.field.deprecationClickAreaLabel',
+ {
+ defaultMessage: 'Click to view deprecation documentation for {settingName}.',
+ values: {
+ settingName: setting.name,
+ },
+ }
+ )}
+ >
+ Deprecated
+
+
+
+
+ );
+ }
if (React.isValidElement(setting.description)) {
description = setting.description;
@@ -582,6 +615,7 @@ export class Field extends PureComponent {
return (
+ {deprecation}
{description}
{this.renderDefaultValue(setting)}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.test.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.test.js
index 74bb0e25ff52e..07ce6f84d2bb6 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.test.js
@@ -72,10 +72,9 @@ const settings = {
defVal: null,
isCustom: false,
isOverridden: false,
- options: {
+ validation: {
maxSize: {
length: 1000,
- displayName: '1 kB',
description: 'Description for 1 kB',
},
},
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
index 791f9e400b407..6efb89cfba2b2 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
@@ -43,12 +43,14 @@ export function toEditableConfig({ def, name, value, isCustom, isOverridden }) {
defVal: def.value,
type: getValType(def, value),
description: def.description,
- validation: def.validation
- ? {
- regex: new RegExp(def.validation.regexString),
- message: def.validation.message,
- }
- : undefined,
+ deprecation: def.deprecation,
+ validation:
+ def.validation && def.validation.regexString
+ ? {
+ regex: new RegExp(def.validation.regexString),
+ message: def.validation.message,
+ }
+ : def.validation,
options: def.options,
optionLabels: def.optionLabels,
requiresPageReload: !!def.requiresPageReload,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index ed9bec9db4112..64653730473cd 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -35,8 +35,8 @@ import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
import { initVisEditorDirective } from './visualization_editor';
import { initVisualizationDirective } from './visualization';
-
import {
+ VISUALIZE_EMBEDDABLE_TYPE,
subscribeWithScope,
absoluteToParsedUrl,
KibanaParsedUrl,
@@ -588,7 +588,11 @@ function VisualizeAppController(
getBasePath()
);
dashboardParsedUrl.addQueryParameter(
- DashboardConstants.NEW_VISUALIZATION_ID_PARAM,
+ DashboardConstants.ADD_EMBEDDABLE_TYPE,
+ VISUALIZE_EMBEDDABLE_TYPE
+ );
+ dashboardParsedUrl.addQueryParameter(
+ DashboardConstants.ADD_EMBEDDABLE_ID,
savedVis.id
);
kbnUrl.change(dashboardParsedUrl.appPath);
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index 0b44c7dc4e860..f0905cf0dce82 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -1594,7 +1594,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
/>
@@ -3218,7 +3218,7 @@ exports[`NewVisModal should render as expected 1`] = `
/>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
index 2005133e6d03e..0ef1b711eafc8 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
@@ -144,7 +144,7 @@ describe('NewVisModal', () => {
expect(window.location.assign).toBeCalledWith('#/visualize/create?type=vis&foo=true&bar=42');
});
- it('closes if visualization with aliasUrl and addToDashboard in editorParams', () => {
+ it('closes and redirects properly if visualization with aliasUrl and addToDashboard in editorParams', () => {
const onClose = jest.fn();
window.location.assign = jest.fn();
const wrapper = mountWithIntl(
@@ -160,7 +160,7 @@ describe('NewVisModal', () => {
);
const visButton = wrapper.find('button[data-test-subj="visType-visWithAliasUrl"]');
visButton.simulate('click');
- expect(window.location.assign).toBeCalledWith('testbasepath/aliasUrl');
+ expect(window.location.assign).toBeCalledWith('testbasepath/aliasUrl?addToDashboard');
expect(onClose).toHaveBeenCalled();
});
});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
index 9e8f46407f591..082fc3bc36b6b 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
@@ -143,15 +143,18 @@ class NewVisModal extends React.Component {
stage: 'production',
},
]}
- addBasePath={(url: string) => `testbasepath${url}`}
+ onPromotionClicked={() => {}}
/>
)
).toMatchInlineSnapshot(`
@@ -60,9 +60,9 @@ describe('NewVisHelp', () => {
Do it now!
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx
index 107cbc0e754b5..2f7effb7a33c8 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx
@@ -21,10 +21,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
import React, { Fragment } from 'react';
import { EuiText, EuiButton } from '@elastic/eui';
import { VisTypeAliasListEntry } from './type_selection';
+import { VisTypeAlias } from '../../../../../../visualizations/public';
interface Props {
promotedTypes: VisTypeAliasListEntry[];
- addBasePath: (path: string) => string;
+ onPromotionClicked: (visType: VisTypeAlias) => void;
}
export function NewVisHelp(props: Props) {
@@ -42,7 +43,7 @@ export function NewVisHelp(props: Props) {
{t.promotion!.description} props.onPromotionClicked(t)}
fill
size="s"
iconType="popout"
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
index 28cafde45a714..44da7cc8f2c45 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
@@ -154,7 +154,7 @@ class TypeSelection extends React.Component t.promotion)}
- addBasePath={this.props.addBasePath}
+ onPromotionClicked={this.props.onVisTypeSelected}
/>
)}
diff --git a/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
index fc91742c53cca..b7a3a0f000d72 100644
--- a/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
@@ -379,6 +379,7 @@ export class VisualizeEmbeddable extends Embeddable ({}),
+ mappings: {
+ 'tsvb-validation-telemetry': {
+ properties: {
+ failedRequests: {
+ type: 'long',
+ },
+ },
+ },
+ },
+ savedObjectSchemas: {
+ 'tsvb-validation-telemetry': {
+ isNamespaceAgnostic: true,
+ },
+ },
},
init: (server: Legacy.Server) => {
const visTypeTimeSeriesPlugin = server.newPlatform.setup.plugins
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_fn.ts b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_fn.ts
index 8740f84dab3b9..225d81b71b8e0 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_fn.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_fn.ts
@@ -31,6 +31,7 @@ type Context = KibanaContext | null;
interface Arguments {
params: string;
uiState: string;
+ savedObjectId: string | null;
}
type VisParams = Required;
@@ -64,10 +65,16 @@ export const createMetricsFn = (): ExpressionFunction {
+export const metricsRequestHandler = async ({
+ uiState,
+ timeRange,
+ filters,
+ query,
+ visParams,
+ savedObjectId,
+}) => {
const config = getUISettings();
const timezone = timezoneProvider(config)();
const uiStateObj = uiState.get(visParams.type, {});
@@ -49,6 +56,7 @@ export const metricsRequestHandler = async ({ uiState, timeRange, filters, query
filters,
panels: [visParams],
state: uiStateObj,
+ savedObjectId: savedObjectId || 'unsaved',
}),
});
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts b/src/legacy/core_plugins/vis_type_timeseries/server/init.ts
index 7b42ae8098016..ae6eebc00fc1b 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/init.ts
@@ -26,12 +26,17 @@ import { SearchStrategiesRegister } from './lib/search_strategies/search_strateg
// @ts-ignore
import { getVisData } from './lib/get_vis_data';
import { Framework } from '../../../../plugins/vis_type_timeseries/server';
+import { ValidationTelemetryServiceSetup } from '../../../../plugins/vis_type_timeseries/server';
-export const init = async (framework: Framework, __LEGACY: any) => {
+export const init = async (
+ framework: Framework,
+ __LEGACY: any,
+ validationTelemetry: ValidationTelemetryServiceSetup
+) => {
const { core } = framework;
const router = core.http.createRouter();
- visDataRoutes(router, framework);
+ visDataRoutes(router, framework, validationTelemetry);
// [LEGACY_TODO]
fieldsRoutes(__LEGACY.server);
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts b/src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts
new file mode 100644
index 0000000000000..3aca50b5b4710
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts
@@ -0,0 +1,247 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Joi from 'joi';
+const stringOptionalNullable = Joi.string()
+ .allow('', null)
+ .optional();
+const stringRequired = Joi.string()
+ .allow('')
+ .required();
+const arrayNullable = Joi.array().allow(null);
+const numberIntegerOptional = Joi.number()
+ .integer()
+ .optional();
+const numberIntegerRequired = Joi.number()
+ .integer()
+ .required();
+const numberOptional = Joi.number().optional();
+const numberRequired = Joi.number().required();
+const queryObject = Joi.object({
+ language: Joi.string().allow(''),
+ query: Joi.string().allow(''),
+});
+
+const annotationsItems = Joi.object({
+ color: stringOptionalNullable,
+ fields: stringOptionalNullable,
+ hidden: Joi.boolean().optional(),
+ icon: stringOptionalNullable,
+ id: stringOptionalNullable,
+ ignore_global_filters: numberIntegerOptional,
+ ignore_panel_filters: numberIntegerOptional,
+ index_pattern: stringOptionalNullable,
+ query_string: queryObject.optional(),
+ template: stringOptionalNullable,
+ time_field: stringOptionalNullable,
+});
+
+const backgroundColorRulesItems = Joi.object({
+ value: Joi.number()
+ .allow(null)
+ .optional(),
+ id: stringOptionalNullable,
+ background_color: stringOptionalNullable,
+ color: stringOptionalNullable,
+});
+
+const gaugeColorRulesItems = Joi.object({
+ gauge: stringOptionalNullable,
+ id: stringOptionalNullable,
+ operator: stringOptionalNullable,
+ value: Joi.number(),
+});
+const metricsItems = Joi.object({
+ field: stringOptionalNullable,
+ id: stringRequired,
+ metric_agg: stringOptionalNullable,
+ numerator: stringOptionalNullable,
+ denominator: stringOptionalNullable,
+ sigma: stringOptionalNullable,
+ function: stringOptionalNullable,
+ script: stringOptionalNullable,
+ variables: Joi.array()
+ .items(
+ Joi.object({
+ field: stringOptionalNullable,
+ id: stringRequired,
+ name: stringOptionalNullable,
+ })
+ )
+ .optional(),
+ type: stringRequired,
+ value: stringOptionalNullable,
+ values: Joi.array()
+ .items(Joi.string().allow('', null))
+ .allow(null)
+ .optional(),
+});
+
+const splitFiltersItems = Joi.object({
+ id: stringOptionalNullable,
+ color: stringOptionalNullable,
+ filter: Joi.object({
+ language: Joi.string().allow(''),
+ query: Joi.string().allow(''),
+ }).optional(),
+ label: stringOptionalNullable,
+});
+
+const seriesItems = Joi.object({
+ aggregate_by: stringOptionalNullable,
+ aggregate_function: stringOptionalNullable,
+ axis_position: stringRequired,
+ axis_max: stringOptionalNullable,
+ axis_min: stringOptionalNullable,
+ chart_type: stringRequired,
+ color: stringRequired,
+ color_rules: Joi.array()
+ .items(
+ Joi.object({
+ value: numberOptional,
+ id: stringRequired,
+ text: stringOptionalNullable,
+ operator: stringOptionalNullable,
+ })
+ )
+ .optional(),
+ fill: numberOptional,
+ filter: Joi.object({
+ query: stringRequired,
+ language: stringOptionalNullable,
+ }).optional(),
+ formatter: stringRequired,
+ hide_in_legend: numberIntegerOptional,
+ hidden: Joi.boolean().optional(),
+ id: stringRequired,
+ label: stringOptionalNullable,
+ line_width: numberOptional,
+ metrics: Joi.array().items(metricsItems),
+ offset_time: stringOptionalNullable,
+ override_index_pattern: numberOptional,
+ point_size: numberRequired,
+ separate_axis: numberIntegerOptional,
+ seperate_axis: numberIntegerOptional,
+ series_index_pattern: stringOptionalNullable,
+ series_time_field: stringOptionalNullable,
+ series_interval: stringOptionalNullable,
+ series_drop_last_bucket: numberIntegerOptional,
+ split_color_mode: stringOptionalNullable,
+ split_filters: Joi.array()
+ .items(splitFiltersItems)
+ .optional(),
+ split_mode: stringRequired,
+ stacked: stringRequired,
+ steps: numberIntegerOptional,
+ terms_field: stringOptionalNullable,
+ terms_order_by: stringOptionalNullable,
+ terms_size: stringOptionalNullable,
+ terms_direction: stringOptionalNullable,
+ terms_include: stringOptionalNullable,
+ terms_exclude: stringOptionalNullable,
+ time_range_mode: stringOptionalNullable,
+ trend_arrows: numberOptional,
+ type: stringOptionalNullable,
+ value_template: stringOptionalNullable,
+ var_name: stringOptionalNullable,
+});
+
+export const visPayloadSchema = Joi.object({
+ filters: arrayNullable,
+ panels: Joi.array().items(
+ Joi.object({
+ annotations: Joi.array()
+ .items(annotationsItems)
+ .optional(),
+ axis_formatter: stringRequired,
+ axis_position: stringRequired,
+ axis_scale: stringRequired,
+ axis_min: stringOptionalNullable,
+ axis_max: stringOptionalNullable,
+ bar_color_rules: arrayNullable.optional(),
+ background_color: stringOptionalNullable,
+ background_color_rules: Joi.array()
+ .items(backgroundColorRulesItems)
+ .optional(),
+ default_index_pattern: stringOptionalNullable,
+ default_timefield: stringOptionalNullable,
+ drilldown_url: stringOptionalNullable,
+ drop_last_bucket: numberIntegerOptional,
+ filter: Joi.alternatives(
+ stringOptionalNullable,
+ Joi.object({
+ language: stringOptionalNullable,
+ query: stringOptionalNullable,
+ })
+ ),
+ gauge_color_rules: Joi.array()
+ .items(gaugeColorRulesItems)
+ .optional(),
+ gauge_width: [stringOptionalNullable, numberOptional],
+ gauge_inner_color: stringOptionalNullable,
+ gauge_inner_width: Joi.alternatives(stringOptionalNullable, numberIntegerOptional),
+ gauge_style: stringOptionalNullable,
+ gauge_max: stringOptionalNullable,
+ id: stringRequired,
+ ignore_global_filters: numberOptional,
+ ignore_global_filter: numberOptional,
+ index_pattern: stringRequired,
+ interval: stringRequired,
+ isModelInvalid: Joi.boolean().optional(),
+ legend_position: stringOptionalNullable,
+ markdown: stringOptionalNullable,
+ markdown_scrollbars: numberIntegerOptional,
+ markdown_openLinksInNewTab: numberIntegerOptional,
+ markdown_vertical_align: stringOptionalNullable,
+ markdown_less: stringOptionalNullable,
+ markdown_css: stringOptionalNullable,
+ pivot_id: stringOptionalNullable,
+ pivot_label: stringOptionalNullable,
+ pivot_type: stringOptionalNullable,
+ pivot_rows: stringOptionalNullable,
+ series: Joi.array()
+ .items(seriesItems)
+ .required(),
+ show_grid: numberIntegerRequired,
+ show_legend: numberIntegerRequired,
+ time_field: stringOptionalNullable,
+ time_range_mode: stringOptionalNullable,
+ type: stringRequired,
+ })
+ ),
+ // general
+ query: Joi.array()
+ .items(queryObject)
+ .allow(null)
+ .required(),
+ state: Joi.object({
+ sort: Joi.object({
+ column: stringRequired,
+ order: Joi.string()
+ .valid(['asc', 'desc'])
+ .required(),
+ }).optional(),
+ }).required(),
+ savedObjectId: Joi.string().optional(),
+ timerange: Joi.object({
+ timezone: stringRequired,
+ min: stringRequired,
+ max: stringRequired,
+ }).required(),
+});
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js b/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts
similarity index 59%
rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js
rename to src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts
index d2ded81309ffa..32e87f5a3f666 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts
@@ -17,12 +17,22 @@
* under the License.
*/
+import { IRouter } from 'kibana/server';
import { schema } from '@kbn/config-schema';
import { getVisData } from '../lib/get_vis_data';
+import { visPayloadSchema } from './post_vis_schema';
+import {
+ Framework,
+ ValidationTelemetryServiceSetup,
+} from '../../../../../plugins/vis_type_timeseries/server';
const escapeHatch = schema.object({}, { allowUnknowns: true });
-export const visDataRoutes = (router, framework) => {
+export const visDataRoutes = (
+ router: IRouter,
+ framework: Framework,
+ { logFailedValidation }: ValidationTelemetryServiceSetup
+) => {
router.post(
{
path: '/api/metrics/vis/data',
@@ -31,6 +41,16 @@ export const visDataRoutes = (router, framework) => {
},
},
async (requestContext, request, response) => {
+ const { error: validationError } = visPayloadSchema.validate(request.body);
+ if (validationError) {
+ logFailedValidation();
+ const savedObjectId =
+ (typeof request.body === 'object' && (request.body as any).savedObjectId) ||
+ 'unavailable';
+ framework.logger.warn(
+ `Request validation error: ${validationError.message} (saved object id: ${savedObjectId}). This most likely means your TSVB visualization contains outdated configuration. You can report this problem under https://github.com/elastic/kibana/issues/new?template=Bug_report.md`
+ );
+ }
try {
const results = await getVisData(requestContext, request.body, framework);
return response.ok({ body: results });
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index cc2ab133941db..ab1664d612b35 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -59,7 +59,12 @@ export interface Schemas {
[key: string]: any[] | undefined;
}
-type buildVisFunction = (visState: VisState, schemas: Schemas, uiState: any) => string;
+type buildVisFunction = (
+ visState: VisState,
+ schemas: Schemas,
+ uiState: any,
+ meta?: { savedObjectId?: string }
+) => string;
type buildVisConfigFunction = (schemas: Schemas, visParams?: VisParams) => VisParams;
interface BuildPipelineVisFunction {
@@ -248,11 +253,13 @@ export const buildPipelineVisFunction: BuildPipelineVisFunction = {
input_control_vis: visState => {
return `input_control_vis ${prepareJson('visConfig', visState.params)}`;
},
- metrics: (visState, schemas, uiState = {}) => {
+ metrics: (visState, schemas, uiState = {}, meta) => {
const paramsJson = prepareJson('params', visState.params);
const uiStateJson = prepareJson('uiState', uiState);
+ const savedObjectIdParam = prepareString('savedObjectId', meta?.savedObjectId);
- return `tsvb ${paramsJson} ${uiStateJson}`;
+ const params = [paramsJson, uiStateJson, savedObjectIdParam].filter(param => Boolean(param));
+ return `tsvb ${params.join(' ')}`;
},
timelion: visState => {
const expression = prepareString('expression', visState.params.expression);
@@ -488,6 +495,7 @@ export const buildPipeline = async (
params: {
searchSource: ISearchSource;
timeRange?: any;
+ savedObjectId?: string;
}
) => {
const { searchSource } = params;
@@ -521,7 +529,9 @@ export const buildPipeline = async (
const schemas = getSchemas(vis, params.timeRange);
if (buildPipelineVisFunction[vis.type.name]) {
- pipeline += buildPipelineVisFunction[vis.type.name](visState, schemas, uiState);
+ pipeline += buildPipelineVisFunction[vis.type.name](visState, schemas, uiState, {
+ savedObjectId: params.savedObjectId,
+ });
} else if (vislibCharts.includes(vis.type.name)) {
const visConfig = visState.params;
visConfig.dimensions = await buildVislibDimensions(vis, params);
diff --git a/src/plugins/data/public/ui/query_string_input/__snapshots__/language_switcher.test.tsx.snap b/src/plugins/data/public/ui/query_string_input/__snapshots__/language_switcher.test.tsx.snap
index 7ab7d7653eb5e..4ec29ca409b80 100644
--- a/src/plugins/data/public/ui/query_string_input/__snapshots__/language_switcher.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_string_input/__snapshots__/language_switcher.test.tsx.snap
@@ -170,6 +170,9 @@ exports[`LanguageSwitcher should toggle off if language is lucene 1`] = `
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
@@ -460,6 +463,9 @@ exports[`LanguageSwitcher should toggle on if language is kuery 1`] = `
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
diff --git a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
index 6f5f9b3956187..15e74e98920e2 100644
--- a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
@@ -276,6 +276,9 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
@@ -896,6 +899,9 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
@@ -1504,6 +1510,9 @@ exports[`QueryStringInput Should pass the query language to the language switche
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
@@ -2121,6 +2130,9 @@ exports[`QueryStringInput Should pass the query language to the language switche
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
@@ -2729,6 +2741,9 @@ exports[`QueryStringInput Should render the given query 1`] = `
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
@@ -3346,6 +3361,9 @@ exports[`QueryStringInput Should render the given query 1`] = `
"logstash": Object {
"base": "https://www.elastic.co/guide/en/logstash/mocked-test-branch",
},
+ "management": Object {
+ "kibanaSearchSettings": "https://www.elastic.co/guide/en/kibana/mocked-test-branch/advanced-options.html#kibana-search-settings",
+ },
"metricbeat": Object {
"base": "https://www.elastic.co/guide/en/beats/metricbeat/mocked-test-branch",
},
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
index bd2beaf77a305..1522c6b42824c 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
@@ -346,6 +346,9 @@ class SavedObjectFinderUi extends React.Component<
placeholder={i18n.translate('kibana-react.savedObjects.finder.searchPlaceholder', {
defaultMessage: 'Search…',
})}
+ aria-label={i18n.translate('kibana-react.savedObjects.finder.searchPlaceholder', {
+ defaultMessage: 'Search…',
+ })}
fullWidth
value={this.state.query}
onChange={e => {
diff --git a/src/plugins/vis_type_timeseries/kibana.json b/src/plugins/vis_type_timeseries/kibana.json
index f9a368e85ed49..d77f4ac92da16 100644
--- a/src/plugins/vis_type_timeseries/kibana.json
+++ b/src/plugins/vis_type_timeseries/kibana.json
@@ -2,5 +2,6 @@
"id": "metrics",
"version": "8.0.0",
"kibanaVersion": "kibana",
- "server": true
-}
\ No newline at end of file
+ "server": true,
+ "optionalPlugins": ["usageCollection"]
+}
diff --git a/src/plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/index.ts
index 599726612a936..dfb2394af237b 100644
--- a/src/plugins/vis_type_timeseries/server/index.ts
+++ b/src/plugins/vis_type_timeseries/server/index.ts
@@ -30,6 +30,8 @@ export const config = {
export type VisTypeTimeseriesConfig = TypeOf;
+export { ValidationTelemetryServiceSetup } from './validation_telemetry';
+
export function plugin(initializerContext: PluginInitializerContext) {
return new VisTypeTimeseriesPlugin(initializerContext);
}
diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
index f508aa250454f..dcd0cd500bbc3 100644
--- a/src/plugins/vis_type_timeseries/server/plugin.ts
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -35,11 +35,17 @@ import {
GetVisData,
GetVisDataOptions,
} from '../../../legacy/core_plugins/vis_type_timeseries/server';
+import { ValidationTelemetryService } from './validation_telemetry/validation_telemetry_service';
+import { UsageCollectionSetup } from '../../usage_collection/server';
export interface LegacySetup {
server: Server;
}
+interface VisTypeTimeseriesPluginSetupDependencies {
+ usageCollection?: UsageCollectionSetup;
+}
+
export interface VisTypeTimeseriesSetup {
/** @deprecated */
__legacy: {
@@ -61,11 +67,14 @@ export interface Framework {
}
export class VisTypeTimeseriesPlugin implements Plugin {
+ private validationTelementryService: ValidationTelemetryService;
+
constructor(private readonly initializerContext: PluginInitializerContext) {
this.initializerContext = initializerContext;
+ this.validationTelementryService = new ValidationTelemetryService();
}
- public setup(core: CoreSetup, plugins: any) {
+ public setup(core: CoreSetup, plugins: VisTypeTimeseriesPluginSetupDependencies) {
const logger = this.initializerContext.logger.get('visTypeTimeseries');
const config$ = this.initializerContext.config.create();
// Global config contains things like the ES shard timeout
@@ -82,8 +91,13 @@ export class VisTypeTimeseriesPlugin implements Plugin {
return {
__legacy: {
config$,
- registerLegacyAPI: once((__LEGACY: LegacySetup) => {
- init(framework, __LEGACY);
+ registerLegacyAPI: once(async (__LEGACY: LegacySetup) => {
+ const validationTelemetrySetup = await this.validationTelementryService.setup(core, {
+ ...plugins,
+ globalConfig$,
+ });
+
+ await init(framework, __LEGACY, validationTelemetrySetup);
}),
},
getVisData: async (requestContext: RequestHandlerContext, options: GetVisDataOptions) => {
diff --git a/src/plugins/vis_type_timeseries/server/validation_telemetry/index.ts b/src/plugins/vis_type_timeseries/server/validation_telemetry/index.ts
new file mode 100644
index 0000000000000..140f61fa2f3fd
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/validation_telemetry/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './validation_telemetry_service';
diff --git a/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts b/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts
new file mode 100644
index 0000000000000..136f5b9e5cfad
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts
@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { APICaller, CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { UsageCollectionSetup } from '../../../usage_collection/server';
+
+export interface ValidationTelemetryServiceSetup {
+ logFailedValidation: () => void;
+}
+
+export class ValidationTelemetryService implements Plugin {
+ private kibanaIndex: string = '';
+ async setup(
+ core: CoreSetup,
+ {
+ usageCollection,
+ globalConfig$,
+ }: {
+ usageCollection?: UsageCollectionSetup;
+ globalConfig$: PluginInitializerContext['config']['legacy']['globalConfig$'];
+ }
+ ) {
+ globalConfig$.subscribe(config => {
+ this.kibanaIndex = config.kibana.index;
+ });
+ if (usageCollection) {
+ usageCollection.registerCollector(
+ usageCollection.makeUsageCollector({
+ type: 'tsvb-validation',
+ isReady: () => this.kibanaIndex !== '',
+ fetch: async (callCluster: APICaller) => {
+ try {
+ const response = await callCluster('get', {
+ index: this.kibanaIndex,
+ id: 'tsvb-validation-telemetry:tsvb-validation-telemetry',
+ ignore: [404],
+ });
+ return {
+ failed_validations:
+ response?._source?.['tsvb-validation-telemetry']?.failedRequests || 0,
+ };
+ } catch (err) {
+ return {
+ failed_validations: 0,
+ };
+ }
+ },
+ })
+ );
+ }
+ const internalRepository = core.savedObjects.createInternalRepository();
+
+ return {
+ logFailedValidation: async () => {
+ try {
+ await internalRepository.incrementCounter(
+ 'tsvb-validation-telemetry',
+ 'tsvb-validation-telemetry',
+ 'failedRequests'
+ );
+ } catch (e) {
+ // swallow error, validation telemetry shouldn't fail anything else
+ }
+ },
+ };
+ }
+ start() {}
+}
diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts
index 38ee5b7db39c4..e25d295515971 100644
--- a/test/accessibility/apps/discover.ts
+++ b/test/accessibility/apps/discover.ts
@@ -20,10 +20,12 @@
import { FtrProviderContext } from '../ftr_provider_context';
export default function({ getService, getPageObjects }: FtrProviderContext) {
- const PageObjects = getPageObjects(['common', 'timePicker']);
+ const PageObjects = getPageObjects(['common', 'discover', 'header', 'share', 'timePicker']);
const a11y = getService('a11y');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
+ const inspector = getService('inspector');
+ const filterBar = getService('filterBar');
describe('Discover', () => {
before(async () => {
@@ -39,5 +41,73 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
it('main view', async () => {
await a11y.testAppSnapshot();
});
+
+ it('Click save button', async () => {
+ await PageObjects.discover.clickSaveSearchButton();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Save search panel', async () => {
+ await PageObjects.discover.inputSavedSearchTitle('a11ySearch');
+ await a11y.testAppSnapshot();
+ });
+
+ it('Confirm saved search', async () => {
+ await PageObjects.discover.clickConfirmSavedSearch();
+ await a11y.testAppSnapshot();
+ });
+
+ // skipping the test for new because we can't fix it right now
+ it.skip('Click on new to clear the search', async () => {
+ await PageObjects.discover.clickNewSearchButton();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Open load saved search panel', async () => {
+ await PageObjects.discover.openLoadSavedSearchPanel();
+ await a11y.testAppSnapshot();
+ await PageObjects.discover.closeLoadSavedSearchPanel();
+ });
+
+ it('Open inspector panel', async () => {
+ await inspector.open();
+ await a11y.testAppSnapshot();
+ await inspector.close();
+ });
+
+ it('Open add filter', async () => {
+ await PageObjects.discover.openAddFilterPanel();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Select values for a filter', async () => {
+ await filterBar.addFilter('extension.raw', 'is one of', 'jpg');
+ await a11y.testAppSnapshot();
+ });
+
+ it('Load a new search from the panel', async () => {
+ await PageObjects.discover.clickSaveSearchButton();
+ await PageObjects.discover.inputSavedSearchTitle('filterSearch');
+ await PageObjects.discover.clickConfirmSavedSearch();
+ await PageObjects.discover.openLoadSavedSearchPanel();
+ await PageObjects.discover.loadSavedSearch('filterSearch');
+ await a11y.testAppSnapshot();
+ });
+
+ // unable to validate on EUI pop-over
+ it('click share button', async () => {
+ await PageObjects.share.clickShareTopNavButton();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Open sidebar filter', async () => {
+ await PageObjects.discover.openSidebarFieldFilter();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Close sidebar filter', async () => {
+ await PageObjects.discover.closeSidebarFieldFilter();
+ await a11y.testAppSnapshot();
+ });
});
}
diff --git a/test/accessibility/services/a11y/a11y.ts b/test/accessibility/services/a11y/a11y.ts
index 7adfe7ebfcc7d..72440b648e538 100644
--- a/test/accessibility/services/a11y/a11y.ts
+++ b/test/accessibility/services/a11y/a11y.ts
@@ -45,7 +45,6 @@ export const normalizeResult = (report: any) => {
export function A11yProvider({ getService }: FtrProviderContext) {
const browser = getService('browser');
const Wd = getService('__webdriver__');
- const log = getService('log');
/**
* Accessibility testing service using the Axe (https://www.deque.com/axe/)
@@ -78,11 +77,6 @@ export function A11yProvider({ getService }: FtrProviderContext) {
private testAxeReport(report: AxeReport) {
const errorMsgs = [];
- for (const result of report.incomplete) {
- // these items require human review and can't be definitively validated
- log.warning(printResult(chalk.yellow('UNABLE TO VALIDATE'), result));
- }
-
for (const result of report.violations) {
errorMsgs.push(printResult(chalk.red('VIOLATION'), result));
}
diff --git a/test/functional/apps/context/_date_nanos_custom_timestamp.js b/test/functional/apps/context/_date_nanos_custom_timestamp.js
new file mode 100644
index 0000000000000..3901fa936e719
--- /dev/null
+++ b/test/functional/apps/context/_date_nanos_custom_timestamp.js
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+
+const TEST_INDEX_PATTERN = 'date_nanos_custom_timestamp';
+const TEST_DEFAULT_CONTEXT_SIZE = 1;
+const TEST_STEP_SIZE = 3;
+
+export default function({ getService, getPageObjects }) {
+ const kibanaServer = getService('kibanaServer');
+ const docTable = getService('docTable');
+ const PageObjects = getPageObjects(['common', 'context', 'timePicker', 'discover']);
+ const esArchiver = getService('esArchiver');
+
+ describe('context view for date_nanos with custom timestamp', () => {
+ before(async function() {
+ await esArchiver.loadIfNeeded('date_nanos_custom');
+ await kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN });
+ await kibanaServer.uiSettings.update({
+ 'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`,
+ 'context:step': `${TEST_STEP_SIZE}`,
+ });
+ });
+
+ after(function unloadMakelogs() {
+ return esArchiver.unload('date_nanos_custom');
+ });
+
+ it('displays predessors - anchor - successors in right order ', async function() {
+ await PageObjects.context.navigateTo(TEST_INDEX_PATTERN, '1');
+ const actualRowsText = await docTable.getRowsText();
+ const expectedRowsText = [
+ 'Oct 21, 2019 @ 08:30:04.828733000 -',
+ 'Oct 21, 2019 @ 00:30:04.828740000 -',
+ 'Oct 21, 2019 @ 00:30:04.828723000 -',
+ ];
+ expect(actualRowsText).to.eql(expectedRowsText);
+ });
+ });
+}
diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js
index 9e1b04ad45874..c3c938c623731 100644
--- a/test/functional/apps/context/index.js
+++ b/test/functional/apps/context/index.js
@@ -42,5 +42,6 @@ export default function({ getService, getPageObjects, loadTestFile }) {
loadTestFile(require.resolve('./_filters'));
loadTestFile(require.resolve('./_size'));
loadTestFile(require.resolve('./_date_nanos'));
+ loadTestFile(require.resolve('./_date_nanos_custom_timestamp'));
});
}
diff --git a/test/functional/apps/dashboard/dashboard_clone.js b/test/functional/apps/dashboard/dashboard_clone.js
index 2a955a2dc90b1..f5485c1db206e 100644
--- a/test/functional/apps/dashboard/dashboard_clone.js
+++ b/test/functional/apps/dashboard/dashboard_clone.js
@@ -21,6 +21,7 @@ import expect from '@kbn/expect';
export default function({ getService, getPageObjects }) {
const retry = getService('retry');
+ const listingTable = getService('listingTable');
const PageObjects = getPageObjects(['dashboard', 'header', 'common']);
describe('dashboard clone', function describeIndexTests() {
@@ -40,10 +41,12 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.clickClone();
await PageObjects.dashboard.confirmClone();
-
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ await PageObjects.dashboard.gotoDashboardLandingPage();
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
clonedDashboardName
);
+
expect(countOfDashboards).to.equal(1);
});
@@ -70,8 +73,10 @@ export default function({ getService, getPageObjects }) {
it("and doesn't save", async () => {
await PageObjects.dashboard.cancelClone();
+ await PageObjects.dashboard.gotoDashboardLandingPage();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName
);
expect(countOfDashboards).to.equal(1);
@@ -85,8 +90,10 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.expectDuplicateTitleWarningDisplayed({ displayed: true });
await PageObjects.dashboard.confirmClone();
await PageObjects.dashboard.waitForRenderComplete();
+ await PageObjects.dashboard.gotoDashboardLandingPage();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName + ' Copy'
);
expect(countOfDashboards).to.equal(2);
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
index 5dcb18374c51f..6d2a30fa85325 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.js
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.js
@@ -27,7 +27,7 @@ export default function({ getService, getPageObjects }) {
const pieChart = getService('pieChart');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
- const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize']);
+ const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
describe('dashboard filter bar', () => {
before(async () => {
@@ -91,7 +91,7 @@ export default function({ getService, getPageObjects }) {
await filterBar.ensureFieldEditorModalIsClosed();
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInDataRange();
+ await PageObjects.timePicker.setDefaultDataRange();
});
it('are not selected by default', async function() {
@@ -136,7 +136,7 @@ export default function({ getService, getPageObjects }) {
await filterBar.ensureFieldEditorModalIsClosed();
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInDataRange();
+ await PageObjects.timePicker.setDefaultDataRange();
});
it('are added when a cell magnifying glass is clicked', async function() {
diff --git a/test/functional/apps/dashboard/dashboard_filtering.js b/test/functional/apps/dashboard/dashboard_filtering.js
index bd31bb010f260..1cb9f1490d442 100644
--- a/test/functional/apps/dashboard/dashboard_filtering.js
+++ b/test/functional/apps/dashboard/dashboard_filtering.js
@@ -34,7 +34,7 @@ export default function({ getService, getPageObjects }) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const dashboardPanelActions = getService('dashboardPanelActions');
- const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize']);
+ const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
describe('dashboard filtering', function() {
this.tags('smoke');
@@ -52,7 +52,7 @@ export default function({ getService, getPageObjects }) {
describe('adding a filter that excludes all data', () => {
before(async () => {
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInDataRange();
+ await PageObjects.timePicker.setDefaultDataRange();
await dashboardAddPanel.addEveryVisualization('"Filter Bytes Test"');
await dashboardAddPanel.addEverySavedSearch('"Filter Bytes Test"');
@@ -234,7 +234,7 @@ export default function({ getService, getPageObjects }) {
it('visualization saved with a query filters data', async () => {
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInDataRange();
+ await PageObjects.timePicker.setDefaultDataRange();
await dashboardAddPanel.addVisualization('Rendering-Test:-animal-sounds-pie');
await PageObjects.header.waitUntilLoadingHasFinished();
diff --git a/test/functional/apps/dashboard/dashboard_listing.js b/test/functional/apps/dashboard/dashboard_listing.js
index 179f10223afb2..e3e835109da2c 100644
--- a/test/functional/apps/dashboard/dashboard_listing.js
+++ b/test/functional/apps/dashboard/dashboard_listing.js
@@ -22,6 +22,7 @@ import expect from '@kbn/expect';
export default function({ getService, getPageObjects }) {
const PageObjects = getPageObjects(['dashboard', 'header', 'common']);
const browser = getService('browser');
+ const listingTable = getService('listingTable');
describe('dashboard listing page', function describeIndexTests() {
const dashboardName = 'Dashboard Listing Test';
@@ -41,7 +42,8 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.saveDashboard(dashboardName);
await PageObjects.dashboard.gotoDashboardLandingPage();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName
);
expect(countOfDashboards).to.equal(1);
@@ -53,7 +55,8 @@ export default function({ getService, getPageObjects }) {
});
it('is not shown when there are no dashboards shown during a search', async function() {
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
'gobeldeguck'
);
expect(countOfDashboards).to.equal(0);
@@ -65,9 +68,9 @@ export default function({ getService, getPageObjects }) {
describe('delete', function() {
it('default confirm action is cancel', async function() {
- await PageObjects.dashboard.searchForDashboardWithName(dashboardName);
- await PageObjects.dashboard.checkDashboardListingSelectAllCheckbox();
- await PageObjects.dashboard.clickDeleteSelectedDashboards();
+ await listingTable.searchForItemWithName(dashboardName);
+ await listingTable.checkListingSelectAllCheckbox();
+ await listingTable.clickDeleteSelected();
await PageObjects.common.expectConfirmModalOpenState(true);
@@ -75,19 +78,21 @@ export default function({ getService, getPageObjects }) {
await PageObjects.common.expectConfirmModalOpenState(false);
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName
);
expect(countOfDashboards).to.equal(1);
});
it('succeeds on confirmation press', async function() {
- await PageObjects.dashboard.checkDashboardListingSelectAllCheckbox();
- await PageObjects.dashboard.clickDeleteSelectedDashboards();
+ await listingTable.checkListingSelectAllCheckbox();
+ await listingTable.clickDeleteSelected();
await PageObjects.common.clickConfirmOnModal();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName
);
expect(countOfDashboards).to.equal(0);
@@ -96,44 +101,45 @@ export default function({ getService, getPageObjects }) {
describe('search', function() {
before(async () => {
- await PageObjects.dashboard.clearSearchValue();
+ await listingTable.clearSearchFilter();
await PageObjects.dashboard.clickNewDashboard();
await PageObjects.dashboard.saveDashboard('Two Words');
+ await PageObjects.dashboard.gotoDashboardLandingPage();
});
it('matches on the first word', async function() {
- await PageObjects.dashboard.searchForDashboardWithName('Two');
- const countOfDashboards = await PageObjects.dashboard.getCountOfDashboardsInListingTable();
+ await listingTable.searchForItemWithName('Two');
+ const countOfDashboards = await listingTable.getItemsCount('dashboard');
expect(countOfDashboards).to.equal(1);
});
it('matches the second word', async function() {
- await PageObjects.dashboard.searchForDashboardWithName('Words');
- const countOfDashboards = await PageObjects.dashboard.getCountOfDashboardsInListingTable();
+ await listingTable.searchForItemWithName('Words');
+ const countOfDashboards = await listingTable.getItemsCount('dashboard');
expect(countOfDashboards).to.equal(1);
});
it('matches the second word prefix', async function() {
- await PageObjects.dashboard.searchForDashboardWithName('Wor');
- const countOfDashboards = await PageObjects.dashboard.getCountOfDashboardsInListingTable();
+ await listingTable.searchForItemWithName('Wor');
+ const countOfDashboards = await listingTable.getItemsCount('dashboard');
expect(countOfDashboards).to.equal(1);
});
it('does not match mid word', async function() {
- await PageObjects.dashboard.searchForDashboardWithName('ords');
- const countOfDashboards = await PageObjects.dashboard.getCountOfDashboardsInListingTable();
+ await listingTable.searchForItemWithName('ords');
+ const countOfDashboards = await listingTable.getItemsCount('dashboard');
expect(countOfDashboards).to.equal(0);
});
it('is case insensitive', async function() {
- await PageObjects.dashboard.searchForDashboardWithName('two words');
- const countOfDashboards = await PageObjects.dashboard.getCountOfDashboardsInListingTable();
+ await listingTable.searchForItemWithName('two words');
+ const countOfDashboards = await listingTable.getItemsCount('dashboard');
expect(countOfDashboards).to.equal(1);
});
it('is using AND operator', async function() {
- await PageObjects.dashboard.searchForDashboardWithName('three words');
- const countOfDashboards = await PageObjects.dashboard.getCountOfDashboardsInListingTable();
+ await listingTable.searchForItemWithName('three words');
+ const countOfDashboards = await listingTable.getItemsCount('dashboard');
expect(countOfDashboards).to.equal(0);
});
});
@@ -176,7 +182,7 @@ export default function({ getService, getPageObjects }) {
});
it('preloads search filter bar when there is no match', async function() {
- const searchFilter = await PageObjects.dashboard.getSearchFilterValue();
+ const searchFilter = await listingTable.getSearchFilterValue();
expect(searchFilter).to.equal('"nodashboardsnamedme"');
});
@@ -196,7 +202,7 @@ export default function({ getService, getPageObjects }) {
});
it('preloads search filter bar when there is more than one match', async function() {
- const searchFilter = await PageObjects.dashboard.getSearchFilterValue();
+ const searchFilter = await listingTable.getSearchFilterValue();
expect(searchFilter).to.equal('"two words"');
});
diff --git a/test/functional/apps/dashboard/dashboard_save.js b/test/functional/apps/dashboard/dashboard_save.js
index 23bb784c79cd0..2ea1389b89ad4 100644
--- a/test/functional/apps/dashboard/dashboard_save.js
+++ b/test/functional/apps/dashboard/dashboard_save.js
@@ -19,8 +19,9 @@
import expect from '@kbn/expect';
-export default function({ getPageObjects }) {
+export default function({ getPageObjects, getService }) {
const PageObjects = getPageObjects(['dashboard', 'header']);
+ const listingTable = getService('listingTable');
describe('dashboard save', function describeIndexTests() {
this.tags('smoke');
@@ -47,8 +48,10 @@ export default function({ getPageObjects }) {
it('does not save on reject confirmation', async function() {
await PageObjects.dashboard.cancelSave();
+ await PageObjects.dashboard.gotoDashboardLandingPage();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName
);
expect(countOfDashboards).to.equal(1);
@@ -68,15 +71,17 @@ export default function({ getPageObjects }) {
// wait till it finishes reloading or it might reload the url after simulating the
// dashboard landing page click.
await PageObjects.header.waitUntilLoadingHasFinished();
+ await PageObjects.dashboard.gotoDashboardLandingPage();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardName
);
expect(countOfDashboards).to.equal(2);
});
it('Does not warn when you save an existing dashboard with the title it already has, and that title is a duplicate', async function() {
- await PageObjects.dashboard.selectDashboard(dashboardName);
+ await listingTable.clickItemLink('dashboard', dashboardName);
await PageObjects.header.awaitGlobalLoadingIndicatorHidden();
await PageObjects.dashboard.switchToEditMode();
await PageObjects.dashboard.saveDashboard(dashboardName);
@@ -121,8 +126,10 @@ export default function({ getPageObjects }) {
// wait till it finishes reloading or it might reload the url after simulating the
// dashboard landing page click.
await PageObjects.header.waitUntilLoadingHasFinished();
+ await PageObjects.dashboard.gotoDashboardLandingPage();
- const countOfDashboards = await PageObjects.dashboard.getDashboardCountWithName(
+ const countOfDashboards = await listingTable.searchAndGetItemsCount(
+ 'dashboard',
dashboardNameEnterKey
);
expect(countOfDashboards).to.equal(1);
diff --git a/test/functional/apps/dashboard/dashboard_snapshots.js b/test/functional/apps/dashboard/dashboard_snapshots.js
index 9900881e4690d..3a09b46a713cc 100644
--- a/test/functional/apps/dashboard/dashboard_snapshots.js
+++ b/test/functional/apps/dashboard/dashboard_snapshots.js
@@ -20,7 +20,7 @@
import expect from '@kbn/expect';
export default function({ getService, getPageObjects, updateBaselines }) {
- const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'common']);
+ const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'common', 'timePicker']);
const screenshot = getService('screenshots');
const browser = getService('browser');
const esArchiver = getService('esArchiver');
@@ -48,7 +48,7 @@ export default function({ getService, getPageObjects, updateBaselines }) {
it('compare TSVB snapshot', async () => {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInLogstashDataRange();
+ await PageObjects.timePicker.setLogstashDataRange();
await dashboardAddPanel.addVisualization('Rendering Test: tsvb-ts');
await PageObjects.common.closeToast();
@@ -71,7 +71,7 @@ export default function({ getService, getPageObjects, updateBaselines }) {
it('compare area chart snapshot', async () => {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInLogstashDataRange();
+ await PageObjects.timePicker.setLogstashDataRange();
await dashboardAddPanel.addVisualization('Rendering Test: area with not filter');
await PageObjects.common.closeToast();
diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
index 3b9e404e9b94d..b9172990c501d 100644
--- a/test/functional/apps/dashboard/dashboard_state.js
+++ b/test/functional/apps/dashboard/dashboard_state.js
@@ -34,6 +34,7 @@ export default function({ getService, getPageObjects }) {
'discover',
'tileMap',
'visChart',
+ 'timePicker',
]);
const testSubjects = getService('testSubjects');
const browser = getService('browser');
@@ -58,7 +59,7 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
await dashboardAddPanel.addVisualization(AREA_CHART_VIS_NAME);
await PageObjects.dashboard.saveDashboard('Overridden colors');
@@ -83,7 +84,7 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.header.clickDiscover();
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
await PageObjects.discover.clickFieldListItemAdd('bytes');
await PageObjects.discover.saveSearch('my search');
await PageObjects.header.waitUntilLoadingHasFinished();
@@ -147,7 +148,7 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
await dashboardAddPanel.addVisualization('Visualization TileMap');
await PageObjects.dashboard.saveDashboard('No local edits');
diff --git a/test/functional/apps/dashboard/dashboard_time_picker.js b/test/functional/apps/dashboard/dashboard_time_picker.js
index 0b73bc224ab74..b99de9fee6db1 100644
--- a/test/functional/apps/dashboard/dashboard_time_picker.js
+++ b/test/functional/apps/dashboard/dashboard_time_picker.js
@@ -44,7 +44,7 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.addVisualizations([PIE_CHART_VIS_NAME]);
await pieChart.expectPieSliceCount(0);
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
await pieChart.expectPieSliceCount(10);
});
@@ -95,7 +95,7 @@ export default function({ getService, getPageObjects }) {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.clickNewDashboard();
await PageObjects.dashboard.addVisualizations([PIE_CHART_VIS_NAME]);
- // Same date range as `setTimepickerInHistoricalDataRange`
+ // Same date range as `timePicker.setHistoricalDataRange()`
await PageObjects.timePicker.setAbsoluteRange(
'2015-09-19 06:31:44.000',
'2015-09-23 18:31:44.000'
diff --git a/test/functional/apps/dashboard/panel_controls.js b/test/functional/apps/dashboard/panel_controls.js
index 683f3683e65e5..f30f58913bd97 100644
--- a/test/functional/apps/dashboard/panel_controls.js
+++ b/test/functional/apps/dashboard/panel_controls.js
@@ -33,7 +33,13 @@ export default function({ getService, getPageObjects }) {
const dashboardReplacePanel = getService('dashboardReplacePanel');
const dashboardVisualizations = getService('dashboardVisualizations');
const renderable = getService('renderable');
- const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'discover']);
+ const PageObjects = getPageObjects([
+ 'dashboard',
+ 'header',
+ 'visualize',
+ 'discover',
+ 'timePicker',
+ ]);
const dashboardName = 'Dashboard Panel Controls Test';
describe('dashboard panel controls', function viewEditModeTests() {
@@ -52,7 +58,7 @@ export default function({ getService, getPageObjects }) {
let intialDimensions;
before(async () => {
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
await dashboardAddPanel.addVisualization(LINE_CHART_VIS_NAME);
intialDimensions = await PageObjects.dashboard.getPanelDimensions();
@@ -110,7 +116,7 @@ export default function({ getService, getPageObjects }) {
describe('panel edit controls', function() {
before(async () => {
await PageObjects.dashboard.clickNewDashboard();
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
});
diff --git a/test/functional/apps/dashboard/view_edit.js b/test/functional/apps/dashboard/view_edit.js
index 212044d898251..a0b972f3ab63c 100644
--- a/test/functional/apps/dashboard/view_edit.js
+++ b/test/functional/apps/dashboard/view_edit.js
@@ -68,7 +68,7 @@ export default function({ getService, getPageObjects }) {
});
it('when time changed is stored with dashboard', async function() {
- await PageObjects.dashboard.setTimepickerInDataRange();
+ await PageObjects.timePicker.setDefaultDataRange();
const originalTime = await PageObjects.timePicker.getTimeConfig();
@@ -196,7 +196,7 @@ export default function({ getService, getPageObjects }) {
describe('and preserves edits on cancel', function() {
it('when time changed is stored with dashboard', async function() {
await PageObjects.dashboard.gotoDashboardEditMode(dashboardName);
- await PageObjects.dashboard.setTimepickerInDataRange();
+ await PageObjects.timePicker.setDefaultDataRange();
await PageObjects.dashboard.saveDashboard(dashboardName, true);
await PageObjects.dashboard.switchToEditMode();
await PageObjects.timePicker.setAbsoluteRange(
diff --git a/test/functional/apps/home/_sample_data.js b/test/functional/apps/home/_sample_data.ts
similarity index 94%
rename from test/functional/apps/home/_sample_data.js
rename to test/functional/apps/home/_sample_data.ts
index 4aa862a4a0384..8088b5a0f9da9 100644
--- a/test/functional/apps/home/_sample_data.js
+++ b/test/functional/apps/home/_sample_data.ts
@@ -19,8 +19,9 @@
import expect from '@kbn/expect';
import moment from 'moment';
+import { FtrProviderContext } from '../../ftr_provider_context';
-export default function({ getService, getPageObjects }) {
+export default function({ getService, getPageObjects }: FtrProviderContext) {
const retry = getService('retry');
const find = getService('find');
const log = getService('log');
@@ -76,9 +77,8 @@ export default function({ getService, getPageObjects }) {
expect(isInstalled).to.be(true);
});
- // FLAKY: https://github.com/elastic/kibana/issues/40670
- describe.skip('dashboard', () => {
- afterEach(async () => {
+ describe('dashboard', () => {
+ beforeEach(async () => {
await PageObjects.common.navigateToUrl('home', 'tutorial_directory/sampleData');
await PageObjects.header.waitUntilLoadingHasFinished();
});
@@ -99,7 +99,6 @@ export default function({ getService, getPageObjects }) {
await PageObjects.home.launchSampleDataSet('flights');
await PageObjects.header.waitUntilLoadingHasFinished();
await renderable.waitForRender();
-
log.debug('Checking pie charts rendered');
await pieChart.expectPieSliceCount(4);
log.debug('Checking area, bar and heatmap charts rendered');
@@ -142,6 +141,11 @@ export default function({ getService, getPageObjects }) {
// needs to be in describe block so it is run after 'dashboard describe block'
describe('uninstall', () => {
+ beforeEach(async () => {
+ await PageObjects.common.navigateToUrl('home', 'tutorial_directory/sampleData');
+ await PageObjects.header.waitUntilLoadingHasFinished();
+ });
+
it('should uninstall flights sample data set', async () => {
await PageObjects.home.removeSampleDataSet('flights');
const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
diff --git a/test/functional/fixtures/es_archiver/date_nanos_custom/data.json b/test/functional/fixtures/es_archiver/date_nanos_custom/data.json
new file mode 100644
index 0000000000000..73cba70a8b93d
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/date_nanos_custom/data.json
@@ -0,0 +1,56 @@
+{
+ "type": "doc",
+ "value": {
+ "id": "index-pattern:date_nanos_custom_timestamp",
+ "index": ".kibana",
+ "source": {
+ "index-pattern": {
+ "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"test\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"test.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"test\"}}},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date_nanos\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+ "timeFieldName": "timestamp",
+ "title": "date_nanos_custom_timestamp"
+ },
+ "references": [
+ ],
+ "type": "index-pattern",
+ "updated_at": "2020-01-09T21:43:20.283Z"
+ }
+ }
+}
+
+{
+ "type": "doc",
+ "value": {
+ "id": "1",
+ "index": "date_nanos_custom_timestamp",
+ "source": {
+ "test": "1",
+ "timestamp": "2019-10-21 00:30:04.828740"
+ }
+ }
+}
+
+{
+ "type": "doc",
+ "value": {
+ "id": "2",
+ "index": "date_nanos_custom_timestamp",
+ "source": {
+ "test": "1",
+ "timestamp": "2019-10-21 08:30:04.828733"
+ }
+ }
+}
+
+{
+ "type": "doc",
+ "value": {
+ "id": "3",
+ "index": "date_nanos_custom_timestamp",
+ "source": {
+ "test": "1",
+ "timestamp": "2019-10-21 00:30:04.828723"
+ }
+ }
+}
+
+
diff --git a/test/functional/fixtures/es_archiver/date_nanos_custom/mappings.json b/test/functional/fixtures/es_archiver/date_nanos_custom/mappings.json
new file mode 100644
index 0000000000000..98af509c4e6f2
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/date_nanos_custom/mappings.json
@@ -0,0 +1,31 @@
+{
+ "type": "index",
+ "value": {
+ "aliases": {
+ },
+ "index": "date_nanos_custom_timestamp",
+ "mappings": {
+ "properties": {
+ "test": {
+ "fields": {
+ "keyword": {
+ "ignore_above": 256,
+ "type": "keyword"
+ }
+ },
+ "type": "text"
+ },
+ "timestamp": {
+ "format": "yyyy-MM-dd HH:mm:ss.SSSSSS",
+ "type": "date_nanos"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_replicas": "1",
+ "number_of_shards": "1"
+ }
+ }
+ }
+}
diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.ts
similarity index 60%
rename from test/functional/page_objects/dashboard_page.js
rename to test/functional/page_objects/dashboard_page.ts
index b0f1a3304a9b8..af0a0160a81d8 100644
--- a/test/functional/page_objects/dashboard_page.js
+++ b/test/functional/page_objects/dashboard_page.ts
@@ -17,89 +17,85 @@
* under the License.
*/
-import _ from 'lodash';
import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants';
export const PIE_CHART_VIS_NAME = 'Visualization PieChart';
export const AREA_CHART_VIS_NAME = 'Visualization漢字 AreaChart';
export const LINE_CHART_VIS_NAME = 'Visualization漢字 LineChart';
+import { FtrProviderContext } from '../ftr_provider_context';
-export function DashboardPageProvider({ getService, getPageObjects }) {
+export function DashboardPageProvider({ getService, getPageObjects }: FtrProviderContext) {
const log = getService('log');
const find = getService('find');
const retry = getService('retry');
- const config = getService('config');
const browser = getService('browser');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const testSubjects = getService('testSubjects');
const dashboardAddPanel = getService('dashboardAddPanel');
const renderable = getService('renderable');
- const PageObjects = getPageObjects(['common', 'header', 'settings', 'visualize', 'timePicker']);
-
- const defaultFindTimeout = config.get('timeouts.find');
+ const listingTable = getService('listingTable');
+ const PageObjects = getPageObjects(['common', 'header', 'visualize']);
+
+ interface SaveDashboardOptions {
+ waitDialogIsClosed: boolean;
+ needsConfirm?: boolean;
+ storeTimeWithDashboard?: boolean;
+ saveAsNew?: boolean;
+ }
class DashboardPage {
async initTests({ kibanaIndex = 'dashboard/legacy', defaultIndex = 'logstash-*' } = {}) {
log.debug('load kibana index with visualizations and log data');
await esArchiver.load(kibanaIndex);
- await kibanaServer.uiSettings.replace({
- defaultIndex: defaultIndex,
- });
+ await kibanaServer.uiSettings.replace({ defaultIndex });
await PageObjects.common.navigateToApp('dashboard');
}
- async preserveCrossAppState() {
+ public async preserveCrossAppState() {
const url = await browser.getCurrentUrl();
await browser.get(url, false);
await PageObjects.header.waitUntilLoadingHasFinished();
}
- async selectDefaultIndex(indexName) {
- await PageObjects.settings.navigateTo();
- await PageObjects.settings.clickKibanaIndexPatterns();
- await find.clickByPartialLinkText(indexName);
- await PageObjects.settings.clickDefaultIndexButton();
- }
-
- async clickFullScreenMode() {
+ public async clickFullScreenMode() {
log.debug(`clickFullScreenMode`);
await testSubjects.click('dashboardFullScreenMode');
await testSubjects.exists('exitFullScreenModeLogo');
await this.waitForRenderComplete();
}
- async fullScreenModeMenuItemExists() {
+ public async fullScreenModeMenuItemExists() {
return await testSubjects.exists('dashboardFullScreenMode');
}
- async exitFullScreenTextButtonExists() {
+ public async exitFullScreenTextButtonExists() {
return await testSubjects.exists('exitFullScreenModeText');
}
- async getExitFullScreenTextButton() {
+ public async getExitFullScreenTextButton() {
return await testSubjects.find('exitFullScreenModeText');
}
- async exitFullScreenLogoButtonExists() {
+ public async exitFullScreenLogoButtonExists() {
return await testSubjects.exists('exitFullScreenModeLogo');
}
- async getExitFullScreenLogoButton() {
+ public async getExitFullScreenLogoButton() {
return await testSubjects.find('exitFullScreenModeLogo');
}
- async clickExitFullScreenLogoButton() {
+ public async clickExitFullScreenLogoButton() {
await testSubjects.click('exitFullScreenModeLogo');
await this.waitForRenderComplete();
}
- async clickExitFullScreenTextButton() {
+ public async clickExitFullScreenTextButton() {
await testSubjects.click('exitFullScreenModeText');
await this.waitForRenderComplete();
}
- async getDashboardIdFromCurrentUrl() {
+ public async getDashboardIdFromCurrentUrl() {
const currentUrl = await browser.getCurrentUrl();
const urlSubstring = 'kibana#/dashboard/';
const startOfIdIndex = currentUrl.indexOf(urlSubstring) + urlSubstring.length;
@@ -115,25 +111,25 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
* Returns true if already on the dashboard landing page (that page doesn't have a link to itself).
* @returns {Promise}
*/
- async onDashboardLandingPage() {
+ public async onDashboardLandingPage() {
log.debug(`onDashboardLandingPage`);
return await testSubjects.exists('dashboardLandingPage', {
timeout: 5000,
});
}
- async expectExistsDashboardLandingPage() {
+ public async expectExistsDashboardLandingPage() {
log.debug(`expectExistsDashboardLandingPage`);
await testSubjects.existOrFail('dashboardLandingPage');
}
- async clickDashboardBreadcrumbLink() {
+ public async clickDashboardBreadcrumbLink() {
log.debug('clickDashboardBreadcrumbLink');
await find.clickByCssSelector(`a[href="#${DashboardConstants.LANDING_PAGE_PATH}"]`);
await this.expectExistsDashboardLandingPage();
}
- async gotoDashboardLandingPage() {
+ public async gotoDashboardLandingPage() {
log.debug('gotoDashboardLandingPage');
const onPage = await this.onDashboardLandingPage();
if (!onPage) {
@@ -141,26 +137,26 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
}
}
- async clickClone() {
+ public async clickClone() {
log.debug('Clicking clone');
await testSubjects.click('dashboardClone');
}
- async getCloneTitle() {
+ public async getCloneTitle() {
return await testSubjects.getAttribute('clonedDashboardTitle', 'value');
}
- async confirmClone() {
+ public async confirmClone() {
log.debug('Confirming clone');
await testSubjects.click('cloneConfirmButton');
}
- async cancelClone() {
+ public async cancelClone() {
log.debug('Canceling clone');
await testSubjects.click('cloneCancelButton');
}
- async setClonedDashboardTitle(title) {
+ public async setClonedDashboardTitle(title: string) {
await testSubjects.setValue('clonedDashboardTitle', title);
}
@@ -168,7 +164,7 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
* Asserts that the duplicate title warning is either displayed or not displayed.
* @param { displayed: boolean }
*/
- async expectDuplicateTitleWarningDisplayed({ displayed }) {
+ public async expectDuplicateTitleWarningDisplayed({ displayed = true }) {
if (displayed) {
await testSubjects.existOrFail('titleDupicateWarnMsg');
} else {
@@ -180,18 +176,16 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
* Asserts that the toolbar pagination (count and arrows) is either displayed or not displayed.
* @param { displayed: boolean }
*/
- async expectToolbarPaginationDisplayed({ displayed }) {
+ public async expectToolbarPaginationDisplayed({ displayed = true }) {
const subjects = ['btnPrevPage', 'btnNextPage', 'toolBarPagerText'];
if (displayed) {
- return await Promise.all(subjects.map(async subj => await testSubjects.existOrFail(subj)));
+ await Promise.all(subjects.map(async subj => await testSubjects.existOrFail(subj)));
} else {
- return await Promise.all(
- subjects.map(async subj => await testSubjects.missingOrFail(subj))
- );
+ await Promise.all(subjects.map(async subj => await testSubjects.missingOrFail(subj)));
}
}
- async switchToEditMode() {
+ public async switchToEditMode() {
log.debug('Switching to edit mode');
await testSubjects.click('dashboardEditMode');
// wait until the count of dashboard panels equals the count of toggle menu icons
@@ -204,66 +198,34 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
});
}
- async getIsInViewMode() {
+ public async getIsInViewMode() {
log.debug('getIsInViewMode');
return await testSubjects.exists('dashboardEditMode');
}
- async clickCancelOutOfEditMode() {
+ public async clickCancelOutOfEditMode() {
log.debug('clickCancelOutOfEditMode');
- return await testSubjects.click('dashboardViewOnlyMode');
+ await testSubjects.click('dashboardViewOnlyMode');
}
- async clickNewDashboard() {
- // One or the other will eventually show up on the landing page, depending on whether there are
- // dashboards.
- await retry.try(async () => {
- const createNewItemButtonExists = await testSubjects.exists('newItemButton');
- if (createNewItemButtonExists) {
- return await testSubjects.click('newItemButton');
- }
- const createNewItemPromptExists = await this.getCreateDashboardPromptExists();
- if (createNewItemPromptExists) {
- return await this.clickCreateDashboardPrompt();
- }
-
- throw new Error(
- 'Page is still loading... waiting for create new prompt or button to appear'
- );
- });
+ public async clickNewDashboard() {
+ await listingTable.clickNewButton('createDashboardPromptButton');
}
- async clickCreateDashboardPrompt() {
+ public async clickCreateDashboardPrompt() {
await testSubjects.click('createDashboardPromptButton');
}
- async getCreateDashboardPromptExists() {
+ public async getCreateDashboardPromptExists() {
return await testSubjects.exists('createDashboardPromptButton');
}
- async checkDashboardListingRow(id) {
- await testSubjects.click(`checkboxSelectRow-${id}`);
- }
-
- async checkDashboardListingSelectAllCheckbox() {
- const element = await testSubjects.find('checkboxSelectAll');
- const isSelected = await element.isSelected();
- if (!isSelected) {
- log.debug(`checking checkbox "checkboxSelectAll"`);
- await testSubjects.click('checkboxSelectAll');
- }
- }
-
- async clickDeleteSelectedDashboards() {
- await testSubjects.click('deleteSelectedItems');
- }
-
- async isOptionsOpen() {
+ public async isOptionsOpen() {
log.debug('isOptionsOpen');
return await testSubjects.exists('dashboardOptionsMenu');
}
- async openOptions() {
+ public async openOptions() {
log.debug('openOptions');
const isOpen = await this.isOptionsOpen();
if (!isOpen) {
@@ -272,36 +234,36 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
}
// avoids any 'Object with id x not found' errors when switching tests.
- async clearSavedObjectsFromAppLinks() {
+ public async clearSavedObjectsFromAppLinks() {
await PageObjects.header.clickVisualize();
await PageObjects.visualize.gotoLandingPage();
await PageObjects.header.clickDashboard();
await this.gotoDashboardLandingPage();
}
- async isMarginsOn() {
+ public async isMarginsOn() {
log.debug('isMarginsOn');
await this.openOptions();
return await testSubjects.getAttribute('dashboardMarginsCheckbox', 'checked');
}
- async useMargins(on = true) {
+ public async useMargins(on = true) {
await this.openOptions();
const isMarginsOn = await this.isMarginsOn();
- if (isMarginsOn !== on) {
+ if (isMarginsOn !== 'on') {
return await testSubjects.click('dashboardMarginsCheckbox');
}
}
- async gotoDashboardEditMode(dashboardName) {
+ public async gotoDashboardEditMode(dashboardName: string) {
await this.loadSavedDashboard(dashboardName);
await this.switchToEditMode();
}
- async renameDashboard(dashName) {
- log.debug(`Naming dashboard ` + dashName);
+ public async renameDashboard(dashboardName: string) {
+ log.debug(`Naming dashboard ` + dashboardName);
await testSubjects.click('dashboardRenameButton');
- await testSubjects.setValue('savedObjectTitle', dashName);
+ await testSubjects.setValue('savedObjectTitle', dashboardName);
}
/**
@@ -309,11 +271,14 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
* verify that the save was successful, close the toast and return the
* toast message
*
- * @param dashName {String}
+ * @param dashboardName {String}
* @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, needsConfirm: false, waitDialogIsClosed: boolean }}
*/
- async saveDashboard(dashName, saveOptions = { waitDialogIsClosed: true }) {
- await this.enterDashboardTitleAndClickSave(dashName, saveOptions);
+ public async saveDashboard(
+ dashboardName: string,
+ saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true }
+ ) {
+ await this.enterDashboardTitleAndClickSave(dashboardName, saveOptions);
if (saveOptions.needsConfirm) {
await this.clickSave();
@@ -328,37 +293,24 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
return message;
}
- async deleteDashboard(dashboardName, dashboardId) {
- await this.gotoDashboardLandingPage();
- await this.searchForDashboardWithName(dashboardName);
- await this.checkDashboardListingRow(dashboardId);
- await this.clickDeleteSelectedDashboards();
- await PageObjects.common.clickConfirmOnModal();
- }
-
- async cancelSave() {
+ public async cancelSave() {
log.debug('Canceling save');
await testSubjects.click('saveCancelButton');
}
- async clickSave() {
+ public async clickSave() {
log.debug('DashboardPage.clickSave');
await testSubjects.click('confirmSaveSavedObjectButton');
}
- async pressEnterKey() {
- log.debug('DashboardPage.pressEnterKey');
- await PageObjects.common.pressEnterKey();
- }
-
/**
*
* @param dashboardTitle {String}
* @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, waitDialogIsClosed: boolean}}
*/
- async enterDashboardTitleAndClickSave(
- dashboardTitle,
- saveOptions = { waitDialogIsClosed: true }
+ public async enterDashboardTitleAndClickSave(
+ dashboardTitle: string,
+ saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true }
) {
await testSubjects.click('dashboardSaveMenuItem');
const modalDialog = await testSubjects.find('savedObjectSaveModal');
@@ -380,128 +332,66 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
}
}
- async ensureDuplicateTitleCallout() {
+ public async ensureDuplicateTitleCallout() {
await testSubjects.existOrFail('titleDupicateWarnMsg');
}
/**
* @param dashboardTitle {String}
*/
- async enterDashboardTitleAndPressEnter(dashboardTitle) {
+ public async enterDashboardTitleAndPressEnter(dashboardTitle: string) {
await testSubjects.click('dashboardSaveMenuItem');
const modalDialog = await testSubjects.find('savedObjectSaveModal');
log.debug('entering new title');
await testSubjects.setValue('savedObjectTitle', dashboardTitle);
- await this.pressEnterKey();
+ await PageObjects.common.pressEnterKey();
await testSubjects.waitForDeleted(modalDialog);
}
- async selectDashboard(dashName) {
- await testSubjects.click(`dashboardListingTitleLink-${dashName.split(' ').join('-')}`);
- }
-
- async clearSearchValue() {
- log.debug(`clearSearchValue`);
-
- await this.gotoDashboardLandingPage();
-
- await retry.try(async () => {
- const searchFilter = await this.getSearchFilter();
- await searchFilter.clearValue();
- await PageObjects.common.pressEnterKey();
- });
- }
-
- async getSearchFilterValue() {
- const searchFilter = await this.getSearchFilter();
- return await searchFilter.getAttribute('value');
- }
-
- async getSearchFilter() {
- const searchFilter = await find.allByCssSelector('.euiFieldSearch');
- return searchFilter[0];
- }
-
- async searchForDashboardWithName(dashName) {
- log.debug(`searchForDashboardWithName: ${dashName}`);
-
- await this.gotoDashboardLandingPage();
-
- await retry.try(async () => {
- const searchFilter = await this.getSearchFilter();
- await searchFilter.clearValue();
- await searchFilter.click();
- // Note: this replacement of - to space is to preserve original logic but I'm not sure why or if it's needed.
- await searchFilter.type(dashName.replace('-', ' '));
- await PageObjects.common.pressEnterKey();
- await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000);
- });
-
- await PageObjects.header.waitUntilLoadingHasFinished();
- }
-
- async getCountOfDashboardsInListingTable() {
- const dashboardTitles = await find.allByCssSelector(
- '[data-test-subj^="dashboardListingTitleLink"]'
- );
- return dashboardTitles.length;
- }
-
- async getDashboardCountWithName(dashName) {
- log.debug(`getDashboardCountWithName: ${dashName}`);
-
- await this.searchForDashboardWithName(dashName);
- const links = await testSubjects.findAll(
- `dashboardListingTitleLink-${dashName.replace(/ /g, '-')}`
- );
- return links.length;
- }
-
// use the search filter box to narrow the results down to a single
// entry, or at least to a single page of results
- async loadSavedDashboard(dashName) {
- log.debug(`Load Saved Dashboard ${dashName}`);
+ public async loadSavedDashboard(dashboardName: string) {
+ log.debug(`Load Saved Dashboard ${dashboardName}`);
await this.gotoDashboardLandingPage();
- await this.searchForDashboardWithName(dashName);
+ await listingTable.searchForItemWithName(dashboardName);
await retry.try(async () => {
- await this.selectDashboard(dashName);
+ await listingTable.clickItemLink('dashboard', dashboardName);
await PageObjects.header.waitUntilLoadingHasFinished();
// check Dashboard landing page is not present
await testSubjects.missingOrFail('dashboardLandingPage', { timeout: 10000 });
});
}
- async getPanelTitles() {
+ public async getPanelTitles() {
log.debug('in getPanelTitles');
const titleObjects = await testSubjects.findAll('dashboardPanelTitle');
return await Promise.all(titleObjects.map(async title => await title.getVisibleText()));
}
- async getPanelDimensions() {
+ public async getPanelDimensions() {
const panels = await find.allByCssSelector('.react-grid-item'); // These are gridster-defined elements and classes
- async function getPanelDimensions(panel) {
- const size = await panel.getSize();
- return {
- width: size.width,
- height: size.height,
- };
- }
-
- const getDimensionsPromises = _.map(panels, getPanelDimensions);
- return await Promise.all(getDimensionsPromises);
+ return await Promise.all(
+ panels.map(async panel => {
+ const size = await panel.getSize();
+ return {
+ width: size.width,
+ height: size.height,
+ };
+ })
+ );
}
- async getPanelCount() {
+ public async getPanelCount() {
log.debug('getPanelCount');
const panels = await testSubjects.findAll('embeddablePanel');
return panels.length;
}
- getTestVisualizations() {
+ public getTestVisualizations() {
return [
{ name: PIE_CHART_VIS_NAME, description: 'PieChart' },
{ name: 'Visualization☺ VerticalBarChart', description: 'VerticalBarChart' },
@@ -513,69 +403,45 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
];
}
- getTestVisualizationNames() {
+ public getTestVisualizationNames() {
return this.getTestVisualizations().map(visualization => visualization.name);
}
- getTestVisualizationDescriptions() {
+ public getTestVisualizationDescriptions() {
return this.getTestVisualizations().map(visualization => visualization.description);
}
- async getDashboardPanels() {
+ public async getDashboardPanels() {
return await testSubjects.findAll('embeddablePanel');
}
- async addVisualizations(visualizations) {
+ public async addVisualizations(visualizations: string[]) {
await dashboardAddPanel.addVisualizations(visualizations);
}
- async setTimepickerInHistoricalDataRange() {
- await PageObjects.timePicker.setDefaultAbsoluteRange();
- }
-
- async setTimepickerInDataRange() {
- const fromTime = 'Jan 1, 2018 @ 00:00:00.000';
- const toTime = 'Apr 13, 2018 @ 00:00:00.000';
- await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
- }
-
- async setTimepickerInLogstashDataRange() {
- const fromTime = 'Apr 9, 2018 @ 00:00:00.000';
- const toTime = 'Apr 13, 2018 @ 00:00:00.000';
- await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
- }
-
- async setSaveAsNewCheckBox(checked) {
+ public async setSaveAsNewCheckBox(checked: boolean) {
log.debug('saveAsNewCheckbox: ' + checked);
- const saveAsNewCheckbox = await testSubjects.find('saveAsNewCheckbox');
+ let saveAsNewCheckbox = await testSubjects.find('saveAsNewCheckbox');
const isAlreadyChecked = (await saveAsNewCheckbox.getAttribute('aria-checked')) === 'true';
if (isAlreadyChecked !== checked) {
log.debug('Flipping save as new checkbox');
- const saveAsNewCheckbox = await testSubjects.find('saveAsNewCheckbox');
+ saveAsNewCheckbox = await testSubjects.find('saveAsNewCheckbox');
await retry.try(() => saveAsNewCheckbox.click());
}
}
- async setStoreTimeWithDashboard(checked) {
+ public async setStoreTimeWithDashboard(checked: boolean) {
log.debug('Storing time with dashboard: ' + checked);
- const storeTimeCheckbox = await testSubjects.find('storeTimeWithDashboard');
+ let storeTimeCheckbox = await testSubjects.find('storeTimeWithDashboard');
const isAlreadyChecked = (await storeTimeCheckbox.getAttribute('aria-checked')) === 'true';
if (isAlreadyChecked !== checked) {
log.debug('Flipping store time checkbox');
- const storeTimeCheckbox = await testSubjects.find('storeTimeWithDashboard');
+ storeTimeCheckbox = await testSubjects.find('storeTimeWithDashboard');
await retry.try(() => storeTimeCheckbox.click());
}
}
- async getFilterDescriptions(timeout = defaultFindTimeout) {
- const filters = await find.allByCssSelector(
- '.filter-bar > .filter > .filter-description',
- timeout
- );
- return _.map(filters, async filter => await filter.getVisibleText());
- }
-
- async getSharedItemsCount() {
+ public async getSharedItemsCount() {
log.debug('in getSharedItemsCount');
const attributeName = 'data-shared-items-count';
const element = await find.byCssSelector(`[${attributeName}]`);
@@ -586,13 +452,14 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
throw new Error('no element');
}
- async waitForRenderComplete() {
+ public async waitForRenderComplete() {
log.debug('waitForRenderComplete');
const count = await this.getSharedItemsCount();
+ // eslint-disable-next-line radix
await renderable.waitForRender(parseInt(count));
}
- async getSharedContainerData() {
+ public async getSharedContainerData() {
log.debug('getSharedContainerData');
const sharedContainer = await find.byCssSelector('[data-shared-items-container]');
return {
@@ -602,7 +469,7 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
};
}
- async getPanelSharedItemData() {
+ public async getPanelSharedItemData() {
log.debug('in getPanelSharedItemData');
const sharedItems = await find.allByCssSelector('[data-shared-item]');
return await Promise.all(
@@ -615,17 +482,17 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
);
}
- async checkHideTitle() {
+ public async checkHideTitle() {
log.debug('ensure that you can click on hide title checkbox');
await this.openOptions();
return await testSubjects.click('dashboardPanelTitlesCheckbox');
}
- async expectMissingSaveOption() {
+ public async expectMissingSaveOption() {
await testSubjects.missingOrFail('dashboardSaveMenuItem');
}
- async getNotLoadedVisualizations(vizList) {
+ public async getNotLoadedVisualizations(vizList: string[]) {
const checkList = [];
for (const name of vizList) {
const isPresent = await testSubjects.exists(
diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
index 3ba0f217813f2..85d8cff675f2d 100644
--- a/test/functional/page_objects/discover_page.js
+++ b/test/functional/page_objects/discover_page.js
@@ -63,6 +63,18 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
});
}
+ async inputSavedSearchTitle(searchName) {
+ await testSubjects.setValue('savedObjectTitle', searchName);
+ }
+
+ async clickConfirmSavedSearch() {
+ await testSubjects.click('confirmSaveSavedObjectButton');
+ }
+
+ async openAddFilterPanel() {
+ await testSubjects.click('addFilter');
+ }
+
async waitUntilSearchingHasFinished() {
const spinner = await testSubjects.find('loadingSpinner');
await find.waitForElementHidden(spinner, defaultFindTimeout * 10);
@@ -117,6 +129,10 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
await testSubjects.click('discoverOpenButton');
}
+ async closeLoadSavedSearchPanel() {
+ await testSubjects.click('euiFlyoutCloseButton');
+ }
+
async getChartCanvas() {
return await find.byCssSelector('.echChart canvas:last-of-type');
}
diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts
index cf9eb4332c3e1..a641fbda023c3 100644
--- a/test/functional/page_objects/home_page.ts
+++ b/test/functional/page_objects/home_page.ts
@@ -22,7 +22,6 @@ import { FtrProviderContext } from '../ftr_provider_context';
export function HomePageProvider({ getService }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const retry = getService('retry');
- const find = getService('find');
class HomePage {
async clickSynopsis(title: string) {
@@ -38,12 +37,15 @@ export function HomePageProvider({ getService }: FtrProviderContext) {
}
async isSampleDataSetInstalled(id: string) {
- return await testSubjects.exists(`removeSampleDataSet${id}`);
+ return !(await testSubjects.exists(`addSampleDataSet${id}`));
}
async addSampleDataSet(id: string) {
- await testSubjects.click(`addSampleDataSet${id}`);
- await this._waitForSampleDataLoadingAction(id);
+ const isInstalled = await this.isSampleDataSetInstalled(id);
+ if (!isInstalled) {
+ await testSubjects.click(`addSampleDataSet${id}`);
+ await this._waitForSampleDataLoadingAction(id);
+ }
}
async removeSampleDataSet(id: string) {
@@ -62,13 +64,8 @@ export function HomePageProvider({ getService }: FtrProviderContext) {
}
async launchSampleDataSet(id: string) {
- if (await find.existsByCssSelector(`#sampleDataLinks${id}`)) {
- // omits cloud test failures
- await find.clickByCssSelectorWhenNotDisabled(`#sampleDataLinks${id}`);
- await find.clickByCssSelector('.euiContextMenuItem:nth-of-type(1)');
- } else {
- await testSubjects.click(`launchSampleDataSet${id}`);
- }
+ await this.addSampleDataSet(id);
+ await testSubjects.click(`launchSampleDataSet${id}`);
}
async loadSavedObjects() {
diff --git a/test/functional/page_objects/index.ts b/test/functional/page_objects/index.ts
index 5526243ea2bbd..4ba8ddb035913 100644
--- a/test/functional/page_objects/index.ts
+++ b/test/functional/page_objects/index.ts
@@ -22,7 +22,6 @@ import { CommonPageProvider } from './common_page';
import { ConsolePageProvider } from './console_page';
// @ts-ignore not TS yet
import { ContextPageProvider } from './context_page';
-// @ts-ignore not TS yet
import { DashboardPageProvider } from './dashboard_page';
// @ts-ignore not TS yet
import { DiscoverPageProvider } from './discover_page';
diff --git a/test/functional/page_objects/time_picker.js b/test/functional/page_objects/time_picker.js
index 8717517f44864..7c67678429478 100644
--- a/test/functional/page_objects/time_picker.js
+++ b/test/functional/page_objects/time_picker.js
@@ -264,6 +264,22 @@ export function TimePickerPageProvider({ getService, getPageObjects }) {
await this.closeQuickSelectTimeMenu();
}
+
+ async setHistoricalDataRange() {
+ await this.setDefaultAbsoluteRange();
+ }
+
+ async setDefaultDataRange() {
+ const fromTime = 'Jan 1, 2018 @ 00:00:00.000';
+ const toTime = 'Apr 13, 2018 @ 00:00:00.000';
+ await this.setAbsoluteRange(fromTime, toTime);
+ }
+
+ async setLogstashDataRange() {
+ const fromTime = 'Apr 9, 2018 @ 00:00:00.000';
+ const toTime = 'Apr 13, 2018 @ 00:00:00.000';
+ await this.setAbsoluteRange(fromTime, toTime);
+ }
}
return new TimePickerPage();
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index 1562cf9745f2d..0071b8d993f70 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -44,15 +44,7 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
}
public async clickNewVisualization() {
- // newItemButton button is only visible when there are items in the listing table is displayed.
- let exists = await testSubjects.exists('newItemButton');
- if (exists) {
- return await testSubjects.click('newItemButton');
- }
-
- exists = await testSubjects.exists('createVisualizationPromptButton');
- // no viz exist, click createVisualizationPromptButton to create new dashboard
- return await this.createVisualizationPromptButton();
+ await listingTable.clickNewButton('createVisualizationPromptButton');
}
public async createVisualizationPromptButton() {
@@ -322,6 +314,10 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
async () => (await globalNav.getLastBreadcrumb()) === vizName
);
}
+
+ public async clickLensWidget() {
+ await this.clickVisType('lens');
+ }
}
return new VisualizePage();
diff --git a/test/functional/services/dashboard/visualizations.js b/test/functional/services/dashboard/visualizations.js
index 5e722ccce8970..f7a6fb7d2f694 100644
--- a/test/functional/services/dashboard/visualizations.js
+++ b/test/functional/services/dashboard/visualizations.js
@@ -24,7 +24,14 @@ export function DashboardVisualizationProvider({ getService, getPageObjects }) {
const queryBar = getService('queryBar');
const testSubjects = getService('testSubjects');
const dashboardAddPanel = getService('dashboardAddPanel');
- const PageObjects = getPageObjects(['dashboard', 'visualize', 'visEditor', 'header', 'discover']);
+ const PageObjects = getPageObjects([
+ 'dashboard',
+ 'visualize',
+ 'visEditor',
+ 'header',
+ 'discover',
+ 'timePicker',
+ ]);
return new (class DashboardVisualizations {
async createAndAddTSVBVisualization(name) {
@@ -43,7 +50,7 @@ export function DashboardVisualizationProvider({ getService, getPageObjects }) {
log.debug(`createSavedSearch(${name})`);
await PageObjects.header.clickDiscover();
- await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+ await PageObjects.timePicker.setHistoricalDataRange();
if (query) {
await queryBar.setQuery(query);
diff --git a/test/functional/services/listing_table.ts b/test/functional/services/listing_table.ts
index ec886cf694f2e..c7667ae7b4049 100644
--- a/test/functional/services/listing_table.ts
+++ b/test/functional/services/listing_table.ts
@@ -25,20 +25,35 @@ export function ListingTableProvider({ getService, getPageObjects }: FtrProvider
const log = getService('log');
const retry = getService('retry');
const { common, header } = getPageObjects(['common', 'header']);
+ const prefixMap = { visualize: 'vis', dashboard: 'dashboard' };
+ /**
+ * This class provides functions for dashboard and visualize landing pages
+ */
class ListingTable {
- public async getSearchFilter() {
+ private async getSearchFilter() {
const searchFilter = await find.allByCssSelector('.euiFieldSearch');
return searchFilter[0];
}
- public async clearFilter() {
+ /**
+ * Returns search input value on landing page
+ */
+ public async getSearchFilterValue() {
+ const searchFilter = await this.getSearchFilter();
+ return await searchFilter.getAttribute('value');
+ }
+
+ /**
+ * Clears search input on landing page
+ */
+ public async clearSearchFilter() {
const searchFilter = await this.getSearchFilter();
await searchFilter.clearValue();
await searchFilter.click();
}
- public async getAllVisualizationNamesOnCurrentPage(): Promise {
+ private async getAllItemsNamesOnCurrentPage(): Promise {
const visualizationNames = [];
const links = await find.allByCssSelector('.kuiLink');
for (let i = 0; i < links.length; i++) {
@@ -48,14 +63,39 @@ export function ListingTableProvider({ getService, getPageObjects }: FtrProvider
return visualizationNames;
}
+ /**
+ * Navigates through all pages on Landing page and returns array of items names
+ */
+ public async getAllItemsNames(): Promise {
+ log.debug('ListingTable.getAllItemsNames');
+ let morePages = true;
+ let visualizationNames: string[] = [];
+ while (morePages) {
+ visualizationNames = visualizationNames.concat(await this.getAllItemsNamesOnCurrentPage());
+ morePages = !((await testSubjects.getAttribute('pagerNextButton', 'disabled')) === 'true');
+ if (morePages) {
+ await testSubjects.click('pagerNextButton');
+ await header.waitUntilLoadingHasFinished();
+ }
+ }
+ return visualizationNames;
+ }
+
+ /**
+ * Returns items count on landing page
+ * @param appName 'visualize' | 'dashboard'
+ */
public async getItemsCount(appName: 'visualize' | 'dashboard'): Promise {
- const prefixMap = { visualize: 'vis', dashboard: 'dashboard' };
const elements = await find.allByCssSelector(
`[data-test-subj^="${prefixMap[appName]}ListingTitleLink"]`
);
return elements.length;
}
+ /**
+ * Types name into search field on Landing page and waits till search completed
+ * @param name item name
+ */
public async searchForItemWithName(name: string) {
log.debug(`searchForItemWithName: ${name}`);
@@ -71,10 +111,51 @@ export function ListingTableProvider({ getService, getPageObjects }: FtrProvider
await header.waitUntilLoadingHasFinished();
}
+ /**
+ * Searches for item on Landing page and retruns items count that match `ListingTitleLink-${name}` pattern
+ * @param appName 'visualize' | 'dashboard'
+ * @param name item name
+ */
+ public async searchAndGetItemsCount(appName: 'visualize' | 'dashboard', name: string) {
+ await this.searchForItemWithName(name);
+ const links = await testSubjects.findAll(
+ `${prefixMap[appName]}ListingTitleLink-${name.replace(/ /g, '-')}`
+ );
+ return links.length;
+ }
+
public async clickDeleteSelected() {
await testSubjects.click('deleteSelectedItems');
}
+ public async clickItemCheckbox(id: string) {
+ await testSubjects.click(`checkboxSelectRow-${id}`);
+ }
+
+ /**
+ * Searches for item by name, selects checbox and deletes it
+ * @param name item name
+ * @param id row id
+ */
+ public async deleteItem(name: string, id: string) {
+ await this.searchForItemWithName(name);
+ await this.clickItemCheckbox(id);
+ await this.clickDeleteSelected();
+ await common.clickConfirmOnModal();
+ }
+
+ /**
+ * Clicks item on Landing page by link name if it is present
+ * @param appName 'dashboard' | 'visualize'
+ * @param name item name
+ */
+ public async clickItemLink(appName: 'dashboard' | 'visualize', name: string) {
+ await testSubjects.click(`${appName}ListingTitleLink-${name.split(' ').join('-')}`);
+ }
+
+ /**
+ * Checks 'SelectAll' checkbox on
+ */
public async checkListingSelectAllCheckbox() {
const element = await testSubjects.find('checkboxSelectAll');
const isSelected = await element.isSelected();
@@ -84,21 +165,20 @@ export function ListingTableProvider({ getService, getPageObjects }: FtrProvider
}
}
- public async getAllVisualizationNames(): Promise {
- log.debug('ListingTable.getAllVisualizationNames');
- let morePages = true;
- let visualizationNames: string[] = [];
- while (morePages) {
- visualizationNames = visualizationNames.concat(
- await this.getAllVisualizationNamesOnCurrentPage()
- );
- morePages = !((await testSubjects.getAttribute('pagerNextButton', 'disabled')) === 'true');
- if (morePages) {
- await testSubjects.click('pagerNextButton');
- await header.waitUntilLoadingHasFinished();
+ /**
+ * Clicks NewItem button on Landing page
+ * @param promptBtnTestSubj testSubj locator for Prompt button
+ */
+ public async clickNewButton(promptBtnTestSubj: string): Promise {
+ await retry.try(async () => {
+ // newItemButton button is only visible when there are items in the listing table is displayed.
+ if (await testSubjects.exists('newItemButton')) {
+ await testSubjects.click('newItemButton');
+ } else {
+ // no items exist, click createPromptButton to create new dashboard/visualization
+ await testSubjects.click(promptBtnTestSubj);
}
- }
- return visualizationNames;
+ });
}
}
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts
index a3c9d9d63e353..231458fad155b 100644
--- a/test/plugin_functional/test_suites/core_plugins/applications.ts
+++ b/test/plugin_functional/test_suites/core_plugins/applications.ts
@@ -27,12 +27,18 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
const browser = getService('browser');
const appsMenu = getService('appsMenu');
const testSubjects = getService('testSubjects');
+ const find = getService('find');
const loadingScreenNotShown = async () =>
expect(await testSubjects.exists('kbnLoadingMessage')).to.be(false);
const loadingScreenShown = () => testSubjects.existOrFail('kbnLoadingMessage');
+ const getAppWrapperWidth = async () => {
+ const wrapper = await find.byClassName('app-wrapper');
+ return (await wrapper.getSize()).width;
+ };
+
const getKibanaUrl = (pathname?: string, search?: string) =>
url.format({
protocol: 'http:',
@@ -99,12 +105,20 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
await PageObjects.common.navigateToApp('chromeless');
await loadingScreenNotShown();
expect(await testSubjects.exists('headerGlobalNav')).to.be(false);
+
+ const wrapperWidth = await getAppWrapperWidth();
+ const windowWidth = (await browser.getWindowSize()).width;
+ expect(wrapperWidth).to.eql(windowWidth);
});
it('navigating away from chromeless application shows chrome', async () => {
await PageObjects.common.navigateToApp('foo');
await loadingScreenNotShown();
expect(await testSubjects.exists('headerGlobalNav')).to.be(true);
+
+ const wrapperWidth = await getAppWrapperWidth();
+ const windowWidth = (await browser.getWindowSize()).width;
+ expect(wrapperWidth).to.be.below(windowWidth);
});
it.skip('can navigate from NP apps to legacy apps', async () => {
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 7e86d2f1dc435..71e3bdd6c8c84 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -4,6 +4,7 @@
"xpack.actions": "legacy/plugins/actions",
"xpack.advancedUiActions": "plugins/advanced_ui_actions",
"xpack.alerting": "legacy/plugins/alerting",
+ "xpack.triggersActionsUI": "legacy/plugins/triggers_actions_ui",
"xpack.apm": "legacy/plugins/apm",
"xpack.beatsManagement": "legacy/plugins/beats_management",
"xpack.canvas": "legacy/plugins/canvas",
diff --git a/x-pack/index.js b/x-pack/index.js
index 56547f89b1e90..83a7b5540334f 100644
--- a/x-pack/index.js
+++ b/x-pack/index.js
@@ -42,6 +42,7 @@ import { transform } from './legacy/plugins/transform';
import { actions } from './legacy/plugins/actions';
import { alerting } from './legacy/plugins/alerting';
import { lens } from './legacy/plugins/lens';
+import { triggersActionsUI } from './legacy/plugins/triggers_actions_ui';
module.exports = function(kibana) {
return [
@@ -83,5 +84,6 @@ module.exports = function(kibana) {
snapshotRestore(kibana),
actions(kibana),
alerting(kibana),
+ triggersActionsUI(kibana),
];
};
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
index 2f15ae1c0a2b3..63f1b545179c7 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
@@ -4,13 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
import { ActionTypeRegistry } from './action_type_registry';
import { ExecutorType } from './types';
import { ActionExecutor, ExecutorError, TaskRunnerFactory } from './lib';
import { configUtilsMock } from './actions_config.mock';
-const mockTaskManager = taskManagerMock.create();
+const mockTaskManager = taskManagerMock.setup();
const actionTypeRegistryParams = {
taskManager: mockTaskManager,
taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.ts
index f66d1947c2b8b..351c1add7b451 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.ts
@@ -6,11 +6,11 @@
import Boom from 'boom';
import { i18n } from '@kbn/i18n';
-import { TaskManagerSetupContract } from './shim';
-import { RunContext } from '../../task_manager/server';
+import { RunContext, TaskManagerSetupContract } from '../../../../plugins/task_manager/server';
import { ExecutorError, TaskRunnerFactory } from './lib';
import { ActionType } from './types';
import { ActionsConfigurationUtilities } from './actions_config';
+
interface ConstructorOptions {
taskManager: TaskManagerSetupContract;
taskRunnerFactory: TaskRunnerFactory;
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.test.ts b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
index 9e75248c56cae..dfbd2db4b6842 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
@@ -10,7 +10,7 @@ import { ActionTypeRegistry } from './action_type_registry';
import { ActionsClient } from './actions_client';
import { ExecutorType } from './types';
import { ActionExecutor, TaskRunnerFactory } from './lib';
-import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
import { configUtilsMock } from './actions_config.mock';
import { getActionsConfigurationUtilities } from './actions_config';
@@ -23,7 +23,7 @@ const defaultKibanaIndex = '.kibana';
const savedObjectsClient = savedObjectsClientMock.create();
const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
-const mockTaskManager = taskManagerMock.create();
+const mockTaskManager = taskManagerMock.setup();
const actionTypeRegistryParams = {
taskManager: mockTaskManager,
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
index 4aaecc8e9d7df..74263c603c11e 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
@@ -49,7 +49,7 @@ beforeEach(() => {
describe('actionTypeRegistry.get() works', () => {
test('action type static data is as expected', () => {
expect(actionType.id).toEqual(ACTION_TYPE_ID);
- expect(actionType.name).toEqual('email');
+ expect(actionType.name).toEqual('Email');
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
index dd2bd328ce53f..94d7852e76fad 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
@@ -118,7 +118,9 @@ export function getActionType(params: GetActionTypeParams): ActionType {
const { logger, configurationUtilities } = params;
return {
id: '.email',
- name: 'email',
+ name: i18n.translate('xpack.actions.builtin.emailTitle', {
+ defaultMessage: 'Email',
+ }),
validate: {
config: schema.object(ConfigSchemaProps, {
validate: curry(validateConfig)(configurationUtilities),
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
index 1da8b06e1587a..dbac84ef681f1 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -37,7 +37,7 @@ beforeEach(() => {
describe('actionTypeRegistry.get() works', () => {
test('action type static data is as expected', () => {
expect(actionType.id).toEqual(ACTION_TYPE_ID);
- expect(actionType.name).toEqual('index');
+ expect(actionType.name).toEqual('Index');
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
index 0e9fe0483ee1e..ddf33ba63f71a 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
@@ -38,7 +38,9 @@ const ParamsSchema = schema.object({
export function getActionType({ logger }: { logger: Logger }): ActionType {
return {
id: '.index',
- name: 'index',
+ name: i18n.translate('xpack.actions.builtin.esIndexTitle', {
+ defaultMessage: 'Index',
+ }),
validate: {
config: ConfigSchema,
params: ParamsSchema,
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts
index 3a0c9f415cc2b..5fcf39c2e8fdd 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts
@@ -6,7 +6,7 @@
import { ActionExecutor, TaskRunnerFactory } from '../lib';
import { ActionTypeRegistry } from '../action_type_registry';
-import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
+import { taskManagerMock } from '../../../../../plugins/task_manager/server/task_manager.mock';
import { registerBuiltInActionTypes } from './index';
import { Logger } from '../../../../../../src/core/server';
import { loggingServiceMock } from '../../../../../../src/core/server/mocks';
@@ -20,7 +20,7 @@ export function createActionTypeRegistry(): {
} {
const logger = loggingServiceMock.create().get() as jest.Mocked;
const actionTypeRegistry = new ActionTypeRegistry({
- taskManager: taskManagerMock.create(),
+ taskManager: taskManagerMock.setup(),
taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
actionsConfigUtils: configUtilsMock,
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index cb3548524ebbb..f60fdf7fef95e 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -38,7 +38,7 @@ beforeAll(() => {
describe('get()', () => {
test('should return correct action type', () => {
expect(actionType.id).toEqual(ACTION_TYPE_ID);
- expect(actionType.name).toEqual('pagerduty');
+ expect(actionType.name).toEqual('PagerDuty');
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
index 250c169278c57..b26621702cf5b 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -96,7 +96,9 @@ export function getActionType({
}): ActionType {
return {
id: '.pagerduty',
- name: 'pagerduty',
+ name: i18n.translate('xpack.actions.builtin.pagerdutyTitle', {
+ defaultMessage: 'PagerDuty',
+ }),
validate: {
config: schema.object(configSchemaProps, {
validate: curry(valdiateActionTypeConfig)(configurationUtilities),
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
index c59ddf97017fd..8f28b9e8f5125 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
@@ -25,7 +25,7 @@ beforeAll(() => {
describe('get()', () => {
test('returns action type', () => {
expect(actionType.id).toEqual(ACTION_TYPE_ID);
- expect(actionType.name).toEqual('server-log');
+ expect(actionType.name).toEqual('Server log');
});
});
@@ -98,6 +98,6 @@ describe('execute()', () => {
config: {},
secrets: {},
});
- expect(mockedLogger.info).toHaveBeenCalledWith('server-log: message text here');
+ expect(mockedLogger.info).toHaveBeenCalledWith('Server log: message text here');
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
index 0edf409e4d46c..34b8602eeba36 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
@@ -12,7 +12,7 @@ import { Logger } from '../../../../../../src/core/server';
import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
import { withoutControlCharacters } from './lib/string_utils';
-const ACTION_NAME = 'server-log';
+const ACTION_NAME = 'Server log';
// params definition
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
index a2b0db8bdb70f..aebc9c4993599 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -29,7 +29,7 @@ beforeAll(() => {
describe('action registeration', () => {
test('returns action type', () => {
expect(actionType.id).toEqual(ACTION_TYPE_ID);
- expect(actionType.name).toEqual('slack');
+ expect(actionType.name).toEqual('Slack');
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
index 92611d6f162ff..b8989e59a2257 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
@@ -49,7 +49,9 @@ export function getActionType({
}): ActionType {
return {
id: '.slack',
- name: 'slack',
+ name: i18n.translate('xpack.actions.builtin.slackTitle', {
+ defaultMessage: 'Slack',
+ }),
validate: {
secrets: schema.object(secretsSchemaProps, {
validate: curry(valdiateActionTypeConfig)(configurationUtilities),
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts
index 64dd3a485f8e2..b95fef97ac7b9 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -25,7 +25,7 @@ beforeAll(() => {
describe('actionType', () => {
test('exposes the action as `webhook` on its Id and Name', () => {
expect(actionType.id).toEqual('.webhook');
- expect(actionType.name).toEqual('webhook');
+ expect(actionType.name).toEqual('Webhook');
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts
index 06fe2fb0e591c..fa88d3c72c163 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts
@@ -56,7 +56,9 @@ export function getActionType({
}): ActionType {
return {
id: '.webhook',
- name: 'webhook',
+ name: i18n.translate('xpack.actions.builtin.webhookTitle', {
+ defaultMessage: 'Webhook',
+ }),
validate: {
config: schema.object(configSchemaProps, {
validate: curry(valdiateActionTypeConfig)(configurationUtilities),
diff --git a/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts b/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
index 6de446ee2da76..7dbcfce5ee335 100644
--- a/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
+++ b/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
@@ -4,11 +4,11 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
import { createExecuteFunction } from './create_execute_function';
import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
-const mockTaskManager = taskManagerMock.create();
+const mockTaskManager = taskManagerMock.start();
const savedObjectsClient = savedObjectsClientMock.create();
const getBasePath = jest.fn();
diff --git a/x-pack/legacy/plugins/actions/server/create_execute_function.ts b/x-pack/legacy/plugins/actions/server/create_execute_function.ts
index 8ff12b8c3fa4b..ddd8b1df2327b 100644
--- a/x-pack/legacy/plugins/actions/server/create_execute_function.ts
+++ b/x-pack/legacy/plugins/actions/server/create_execute_function.ts
@@ -5,7 +5,7 @@
*/
import { SavedObjectsClientContract } from 'src/core/server';
-import { TaskManagerStartContract } from './shim';
+import { TaskManagerStartContract } from '../../../../plugins/task_manager/server';
import { GetBasePathFunction } from './types';
interface CreateExecuteFunctionOptions {
diff --git a/x-pack/legacy/plugins/actions/server/init.ts b/x-pack/legacy/plugins/actions/server/init.ts
index 5eab3418467bc..6f221b08c4bc5 100644
--- a/x-pack/legacy/plugins/actions/server/init.ts
+++ b/x-pack/legacy/plugins/actions/server/init.ts
@@ -4,11 +4,12 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { Legacy } from 'kibana';
import { Plugin } from './plugin';
-import { shim, Server } from './shim';
+import { shim } from './shim';
import { ActionsPlugin } from './types';
-export async function init(server: Server) {
+export async function init(server: Legacy.Server) {
const { initializerContext, coreSetup, coreStart, pluginsSetup, pluginsStart } = shim(server);
const plugin = new Plugin(initializerContext);
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
index 5b60696c42d52..ad2b74da0d7d4 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -7,7 +7,7 @@
import sinon from 'sinon';
import { ExecutorError } from './executor_error';
import { ActionExecutor } from './action_executor';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '../../../../../plugins/task_manager/server';
import { TaskRunnerFactory } from './task_runner_factory';
import { actionTypeRegistryMock } from '../action_type_registry.mock';
import { actionExecutorMock } from './action_executor.mock';
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
index ca6a726f40e14..2dc3d1161399e 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
@@ -6,7 +6,7 @@
import { ActionExecutorContract } from './action_executor';
import { ExecutorError } from './executor_error';
-import { RunContext } from '../../../task_manager/server';
+import { RunContext } from '../../../../../plugins/task_manager/server';
import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts
index 48f99ba5135b7..ffc4a9cf90e54 100644
--- a/x-pack/legacy/plugins/actions/server/plugin.ts
+++ b/x-pack/legacy/plugins/actions/server/plugin.ts
@@ -93,7 +93,7 @@ export class Plugin {
const actionsConfigUtils = getActionsConfigurationUtilities(config as ActionsConfigType);
const actionTypeRegistry = new ActionTypeRegistry({
taskRunnerFactory,
- taskManager: plugins.task_manager,
+ taskManager: plugins.taskManager,
actionsConfigUtils,
});
this.taskRunnerFactory = taskRunnerFactory;
@@ -164,7 +164,7 @@ export class Plugin {
});
const executeFn = createExecuteFunction({
- taskManager: plugins.task_manager,
+ taskManager: plugins.taskManager,
getScopedSavedObjectsClient: core.savedObjects.getScopedSavedObjectsClient,
getBasePath,
});
diff --git a/x-pack/legacy/plugins/actions/server/shim.ts b/x-pack/legacy/plugins/actions/server/shim.ts
index f8aa9b8d7a25c..8077dc67c92c4 100644
--- a/x-pack/legacy/plugins/actions/server/shim.ts
+++ b/x-pack/legacy/plugins/actions/server/shim.ts
@@ -8,7 +8,11 @@ import Hapi from 'hapi';
import { Legacy } from 'kibana';
import * as Rx from 'rxjs';
import { ActionsConfigType } from './types';
-import { TaskManager } from '../../task_manager/server';
+import {
+ TaskManagerStartContract,
+ TaskManagerSetupContract,
+} from '../../../../plugins/task_manager/server';
+import { getTaskManagerSetup, getTaskManagerStart } from '../../task_manager/server';
import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
import KbnServer from '../../../../../src/legacy/server/kbn_server';
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
@@ -24,16 +28,6 @@ import {
} from '../../../../../src/core/server';
import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
-// Extend PluginProperties to indicate which plugins are guaranteed to exist
-// due to being marked as dependencies
-interface Plugins extends Hapi.PluginProperties {
- task_manager: TaskManager;
-}
-
-export interface Server extends Legacy.Server {
- plugins: Plugins;
-}
-
export interface KibanaConfig {
index: string;
}
@@ -41,14 +35,9 @@ export interface KibanaConfig {
/**
* Shim what we're thinking setup and start contracts will look like
*/
-export type TaskManagerStartContract = Pick;
export type XPackMainPluginSetupContract = Pick;
export type SecurityPluginSetupContract = Pick;
export type SecurityPluginStartContract = Pick;
-export type TaskManagerSetupContract = Pick<
- TaskManager,
- 'addMiddleware' | 'registerTaskDefinitions'
->;
/**
* New platform interfaces
@@ -74,7 +63,7 @@ export interface ActionsCoreStart {
}
export interface ActionsPluginsSetup {
security?: SecurityPluginSetupContract;
- task_manager: TaskManagerSetupContract;
+ taskManager: TaskManagerSetupContract;
xpack_main: XPackMainPluginSetupContract;
encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
licensing: LicensingPluginSetup;
@@ -83,7 +72,7 @@ export interface ActionsPluginsStart {
security?: SecurityPluginStartContract;
spaces: () => SpacesPluginStartContract | undefined;
encryptedSavedObjects: EncryptedSavedObjectsStartContract;
- task_manager: TaskManagerStartContract;
+ taskManager: TaskManagerStartContract;
}
/**
@@ -92,7 +81,7 @@ export interface ActionsPluginsStart {
* @param server Hapi server instance
*/
export function shim(
- server: Server
+ server: Legacy.Server
): {
initializerContext: ActionsPluginInitializerContext;
coreSetup: ActionsCoreSetup;
@@ -132,7 +121,7 @@ export function shim(
const pluginsSetup: ActionsPluginsSetup = {
security: newPlatform.setup.plugins.security as SecurityPluginSetupContract | undefined,
- task_manager: server.plugins.task_manager,
+ taskManager: getTaskManagerSetup(server)!,
xpack_main: server.plugins.xpack_main,
encryptedSavedObjects: newPlatform.setup.plugins
.encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
@@ -146,7 +135,7 @@ export function shim(
spaces: () => server.plugins.spaces,
encryptedSavedObjects: newPlatform.start.plugins
.encryptedSavedObjects as EncryptedSavedObjectsStartContract,
- task_manager: server.plugins.task_manager,
+ taskManager: getTaskManagerStart(server)!,
};
return {
diff --git a/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts b/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
index 8e96ad8dae31c..e1a05d6460e25 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
@@ -6,10 +6,9 @@
import { TaskRunnerFactory } from './task_runner';
import { AlertTypeRegistry } from './alert_type_registry';
-import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
-
-const taskManager = taskManagerMock.create();
+import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
+const taskManager = taskManagerMock.setup();
const alertTypeRegistryParams = {
taskManager,
taskRunnerFactory: new TaskRunnerFactory(),
diff --git a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
index 2003e810a05b5..1e9007202c452 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
@@ -6,9 +6,8 @@
import Boom from 'boom';
import { i18n } from '@kbn/i18n';
+import { RunContext, TaskManagerSetupContract } from '../../../../plugins/task_manager/server';
import { TaskRunnerFactory } from './task_runner';
-import { RunContext } from '../../task_manager';
-import { TaskManagerSetupContract } from './shim';
import { AlertType } from './types';
interface ConstructorOptions {
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
index 32293d9755a2a..2af66059d9fed 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -7,14 +7,14 @@ import uuid from 'uuid';
import { schema } from '@kbn/config-schema';
import { AlertsClient } from './alerts_client';
import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
import { alertTypeRegistryMock } from './alert_type_registry.mock';
-import { TaskStatus } from '../../task_manager/server';
+import { TaskStatus } from '../../../../plugins/task_manager/server';
import { IntervalSchedule } from './types';
import { resolvable } from './test_utils';
import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
-const taskManager = taskManagerMock.create();
+const taskManager = taskManagerMock.start();
const alertTypeRegistry = alertTypeRegistryMock.create();
const savedObjectsClient = savedObjectsClientMock.create();
const encryptedSavedObjects = encryptedSavedObjectsMock.createStart();
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
index 33a6b716e9b8a..fe96a233b8663 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -22,7 +22,6 @@ import {
AlertType,
IntervalSchedule,
} from './types';
-import { TaskManagerStartContract } from './shim';
import { validateAlertTypeParams } from './lib';
import {
InvalidateAPIKeyParams,
@@ -30,6 +29,7 @@ import {
InvalidateAPIKeyResult as SecurityPluginInvalidateAPIKeyResult,
} from '../../../../plugins/security/server';
import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../plugins/encrypted_saved_objects/server';
+import { TaskManagerStartContract } from '../../../../plugins/task_manager/server';
type NormalizedAlertAction = Omit;
export type CreateAPIKeyResult =
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
index 519001d07e089..754e02a3f1e5e 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
@@ -7,7 +7,7 @@
import { Request } from 'hapi';
import { AlertsClientFactory, ConstructorOpts } from './alerts_client_factory';
import { alertTypeRegistryMock } from './alert_type_registry.mock';
-import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { taskManagerMock } from '../../../../plugins/task_manager/server/task_manager.mock';
import { KibanaRequest } from '../../../../../src/core/server';
import { loggingServiceMock } from '../../../../../src/core/server/mocks';
import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
@@ -23,7 +23,7 @@ const securityPluginSetup = {
};
const alertsClientFactoryParams: jest.Mocked = {
logger: loggingServiceMock.create().get(),
- taskManager: taskManagerMock.create(),
+ taskManager: taskManagerMock.start(),
alertTypeRegistry: alertTypeRegistryMock.create(),
getSpaceId: jest.fn(),
spaceIdToNamespace: jest.fn(),
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
index 94a396fbaa806..eab1cc3ce627b 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
@@ -8,10 +8,11 @@ import Hapi from 'hapi';
import uuid from 'uuid';
import { AlertsClient } from './alerts_client';
import { AlertTypeRegistry, SpaceIdToNamespaceFunction } from './types';
-import { SecurityPluginStartContract, TaskManagerStartContract } from './shim';
+import { SecurityPluginStartContract } from './shim';
import { KibanaRequest, Logger } from '../../../../../src/core/server';
import { InvalidateAPIKeyParams } from '../../../../plugins/security/server';
import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../plugins/encrypted_saved_objects/server';
+import { TaskManagerStartContract } from '../../../../plugins/task_manager/server';
export interface ConstructorOpts {
logger: Logger;
diff --git a/x-pack/legacy/plugins/alerting/server/lib/result_type.ts b/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
index 644ae51292249..52843f6362303 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
@@ -15,6 +15,10 @@ export interface Err {
}
export type Result = Ok | Err;
+export type Resultable = {
+ [P in keyof T]: Result;
+};
+
export function asOk(value: T): Ok {
return {
tag: 'ok',
@@ -52,3 +56,7 @@ export function map(
): Resolution {
return isOk(result) ? onOk(result.value) : onErr(result.error);
}
+
+export function resolveErr(result: Result, onErr: (error: E) => T): T {
+ return isOk(result) ? result.value : onErr(result.error);
+}
diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts
index fb16f579d4c70..357db9e3df97e 100644
--- a/x-pack/legacy/plugins/alerting/server/plugin.ts
+++ b/x-pack/legacy/plugins/alerting/server/plugin.ts
@@ -79,7 +79,7 @@ export class Plugin {
});
const alertTypeRegistry = new AlertTypeRegistry({
- taskManager: plugins.task_manager,
+ taskManager: plugins.taskManager,
taskRunnerFactory: this.taskRunnerFactory,
});
this.alertTypeRegistry = alertTypeRegistry;
@@ -116,7 +116,7 @@ export class Plugin {
const alertsClientFactory = new AlertsClientFactory({
alertTypeRegistry: this.alertTypeRegistry!,
logger: this.logger,
- taskManager: plugins.task_manager,
+ taskManager: plugins.taskManager,
securityPluginSetup: plugins.security,
encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
spaceIdToNamespace,
diff --git a/x-pack/legacy/plugins/alerting/server/shim.ts b/x-pack/legacy/plugins/alerting/server/shim.ts
index ae29048d83dd9..ccc10f929e123 100644
--- a/x-pack/legacy/plugins/alerting/server/shim.ts
+++ b/x-pack/legacy/plugins/alerting/server/shim.ts
@@ -7,7 +7,11 @@
import Hapi from 'hapi';
import { Legacy } from 'kibana';
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
-import { TaskManager } from '../../task_manager/server';
+import {
+ TaskManagerStartContract,
+ TaskManagerSetupContract,
+} from '../../../../plugins/task_manager/server';
+import { getTaskManagerSetup, getTaskManagerStart } from '../../task_manager/server';
import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
import KbnServer from '../../../../../src/legacy/server/kbn_server';
import {
@@ -31,7 +35,6 @@ import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
// due to being marked as dependencies
interface Plugins extends Hapi.PluginProperties {
actions: ActionsPlugin;
- task_manager: TaskManager;
}
export interface Server extends Legacy.Server {
@@ -41,17 +44,9 @@ export interface Server extends Legacy.Server {
/**
* Shim what we're thinking setup and start contracts will look like
*/
-export type TaskManagerStartContract = Pick<
- TaskManager,
- 'schedule' | 'fetch' | 'remove' | 'runNow'
->;
export type SecurityPluginSetupContract = Pick;
export type SecurityPluginStartContract = Pick;
export type XPackMainPluginSetupContract = Pick;
-export type TaskManagerSetupContract = Pick<
- TaskManager,
- 'addMiddleware' | 'registerTaskDefinitions'
->;
/**
* New platform interfaces
@@ -73,7 +68,7 @@ export interface AlertingCoreStart {
}
export interface AlertingPluginsSetup {
security?: SecurityPluginSetupContract;
- task_manager: TaskManagerSetupContract;
+ taskManager: TaskManagerSetupContract;
actions: ActionsPluginSetupContract;
xpack_main: XPackMainPluginSetupContract;
encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
@@ -84,7 +79,7 @@ export interface AlertingPluginsStart {
security?: SecurityPluginStartContract;
spaces: () => SpacesPluginStartContract | undefined;
encryptedSavedObjects: EncryptedSavedObjectsStartContract;
- task_manager: TaskManagerStartContract;
+ taskManager: TaskManagerStartContract;
}
/**
@@ -121,7 +116,7 @@ export function shim(
const pluginsSetup: AlertingPluginsSetup = {
security: newPlatform.setup.plugins.security as SecurityPluginSetupContract | undefined,
- task_manager: server.plugins.task_manager,
+ taskManager: getTaskManagerSetup(server)!,
actions: server.plugins.actions.setup,
xpack_main: server.plugins.xpack_main,
encryptedSavedObjects: newPlatform.setup.plugins
@@ -137,7 +132,7 @@ export function shim(
spaces: () => server.plugins.spaces,
encryptedSavedObjects: newPlatform.start.plugins
.encryptedSavedObjects as EncryptedSavedObjectsStartContract,
- task_manager: server.plugins.task_manager,
+ taskManager: getTaskManagerStart(server)!,
};
return {
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
index 87fa33a9cea58..394c13e1bd24f 100644
--- a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -7,7 +7,7 @@
import sinon from 'sinon';
import { schema } from '@kbn/config-schema';
import { AlertExecutorOptions } from '../types';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { ConcreteTaskInstance, TaskStatus } from '../../../../../plugins/task_manager/server';
import { TaskRunnerContext } from './task_runner_factory';
import { TaskRunner } from './task_runner';
import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
@@ -38,9 +38,7 @@ describe('Task Runner', () => {
scheduledAt: new Date(),
startedAt: new Date(),
retryAt: new Date(Date.now() + 5 * 60 * 1000),
- state: {
- startedAt: new Date(Date.now() - 5 * 60 * 1000),
- },
+ state: {},
taskType: 'alerting:test',
params: {
alertId: '1',
@@ -110,7 +108,13 @@ describe('Task Runner', () => {
test('successfully executes the task', async () => {
const taskRunner = new TaskRunner(
alertType,
- mockedTaskInstance,
+ {
+ ...mockedTaskInstance,
+ state: {
+ ...mockedTaskInstance.state,
+ previousStartedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
+ },
+ },
taskRunnerFactoryInitializerParams
);
savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
@@ -141,6 +145,7 @@ describe('Task Runner', () => {
}
`);
expect(call.startedAt).toMatchInlineSnapshot(`1970-01-01T00:00:00.000Z`);
+ expect(call.previousStartedAt).toMatchInlineSnapshot(`1969-12-31T23:55:00.000Z`);
expect(call.state).toMatchInlineSnapshot(`Object {}`);
expect(call.name).toBe('alert-name');
expect(call.tags).toEqual(['alert-', '-tags']);
@@ -261,7 +266,6 @@ describe('Task Runner', () => {
"runAt": 1970-01-01T00:00:10.000Z,
"state": Object {
"previousStartedAt": 1970-01-01T00:00:00.000Z,
- "startedAt": 1969-12-31T23:55:00.000Z,
},
}
`);
@@ -293,7 +297,6 @@ describe('Task Runner', () => {
"runAt": 1970-01-01T00:00:10.000Z,
"state": Object {
"previousStartedAt": 1970-01-01T00:00:00.000Z,
- "startedAt": 1969-12-31T23:55:00.000Z,
},
}
`);
@@ -400,7 +403,96 @@ describe('Task Runner', () => {
"runAt": 1970-01-01T00:00:10.000Z,
"state": Object {
"previousStartedAt": 1970-01-01T00:00:00.000Z,
- "startedAt": 1969-12-31T23:55:00.000Z,
+ },
+ }
+ `);
+ });
+
+ test('recovers gracefully when the Alert Task Runner throws an exception when fetching the encrypted attributes', async () => {
+ encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockImplementation(() => {
+ throw new Error('OMG');
+ });
+
+ const taskRunner = new TaskRunner(
+ alertType,
+ mockedTaskInstance,
+ taskRunnerFactoryInitializerParams
+ );
+
+ savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+
+ const runnerResult = await taskRunner.run();
+
+ expect(runnerResult).toMatchInlineSnapshot(`
+ Object {
+ "runAt": 1970-01-01T00:05:00.000Z,
+ "state": Object {
+ "previousStartedAt": 1970-01-01T00:00:00.000Z,
+ },
+ }
+ `);
+ });
+
+ test('recovers gracefully when the Alert Task Runner throws an exception when getting internal Services', async () => {
+ taskRunnerFactoryInitializerParams.getServices.mockImplementation(() => {
+ throw new Error('OMG');
+ });
+
+ const taskRunner = new TaskRunner(
+ alertType,
+ mockedTaskInstance,
+ taskRunnerFactoryInitializerParams
+ );
+
+ savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+ encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+ id: '1',
+ type: 'alert',
+ attributes: {
+ apiKey: Buffer.from('123:abc').toString('base64'),
+ },
+ references: [],
+ });
+
+ const runnerResult = await taskRunner.run();
+
+ expect(runnerResult).toMatchInlineSnapshot(`
+ Object {
+ "runAt": 1970-01-01T00:05:00.000Z,
+ "state": Object {
+ "previousStartedAt": 1970-01-01T00:00:00.000Z,
+ },
+ }
+ `);
+ });
+
+ test('recovers gracefully when the Alert Task Runner throws an exception when fetching attributes', async () => {
+ savedObjectsClient.get.mockImplementation(() => {
+ throw new Error('OMG');
+ });
+
+ const taskRunner = new TaskRunner(
+ alertType,
+ mockedTaskInstance,
+ taskRunnerFactoryInitializerParams
+ );
+
+ encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+ id: '1',
+ type: 'alert',
+ attributes: {
+ apiKey: Buffer.from('123:abc').toString('base64'),
+ },
+ references: [],
+ });
+
+ const runnerResult = await taskRunner.run();
+
+ expect(runnerResult).toMatchInlineSnapshot(`
+ Object {
+ "runAt": 1970-01-01T00:05:00.000Z,
+ "state": Object {
+ "previousStartedAt": 1970-01-01T00:00:00.000Z,
},
}
`);
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
index 42c332e82e034..0f643e3d3121c 100644
--- a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
@@ -8,16 +8,23 @@ import { pick, mapValues, omit } from 'lodash';
import { Logger } from '../../../../../../src/core/server';
import { SavedObject } from '../../../../../../src/core/server';
import { TaskRunnerContext } from './task_runner_factory';
-import { ConcreteTaskInstance } from '../../../task_manager';
+import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
import { createExecutionHandler } from './create_execution_handler';
import { AlertInstance, createAlertInstanceFactory } from '../alert_instance';
import { getNextRunAt } from './get_next_run_at';
import { validateAlertTypeParams } from '../lib';
import { AlertType, RawAlert, IntervalSchedule, Services, State, AlertInfoParams } from '../types';
-import { promiseResult, map } from '../lib/result_type';
+import { promiseResult, map, Resultable, asOk, asErr, resolveErr } from '../lib/result_type';
type AlertInstances = Record;
+const FALLBACK_RETRY_INTERVAL: IntervalSchedule = { interval: '5m' };
+
+interface AlertTaskRunResult {
+ state: State;
+ runAt: Date;
+}
+
export class TaskRunner {
private context: TaskRunnerContext;
private logger: Logger;
@@ -152,7 +159,7 @@ export class TaskRunner {
params,
state: alertTypeState,
startedAt: this.taskInstance.startedAt!,
- previousStartedAt,
+ previousStartedAt: previousStartedAt && new Date(previousStartedAt),
spaceId,
namespace,
name,
@@ -190,7 +197,7 @@ export class TaskRunner {
};
}
- async validateAndRunAlert(
+ async validateAndExecuteAlert(
services: Services,
apiKey: string | null,
attributes: RawAlert,
@@ -217,11 +224,9 @@ export class TaskRunner {
);
}
- async run() {
+ async loadAlertAttributesAndRun(): Promise> {
const {
params: { alertId, spaceId },
- startedAt: previousStartedAt,
- state: originalState,
} = this.taskInstance;
const apiKey = await this.getApiKeyForAlertPermissions(alertId, spaceId);
@@ -233,11 +238,34 @@ export class TaskRunner {
alertId
);
+ return {
+ state: await promiseResult(
+ this.validateAndExecuteAlert(services, apiKey, attributes, references)
+ ),
+ runAt: asOk(
+ getNextRunAt(
+ new Date(this.taskInstance.startedAt!),
+ // we do not currently have a good way of returning the type
+ // from SavedObjectsClient, and as we currenrtly require a schedule
+ // and we only support `interval`, we can cast this safely
+ attributes.schedule as IntervalSchedule
+ )
+ ),
+ };
+ }
+
+ async run(): Promise {
+ const {
+ params: { alertId },
+ startedAt: previousStartedAt,
+ state: originalState,
+ } = this.taskInstance;
+
+ const { state, runAt } = await errorAsAlertTaskRunResult(this.loadAlertAttributesAndRun());
+
return {
state: map(
- await promiseResult(
- this.validateAndRunAlert(services, apiKey, attributes, references)
- ),
+ state,
(stateUpdates: State) => {
return {
...stateUpdates,
@@ -252,13 +280,32 @@ export class TaskRunner {
};
}
),
- runAt: getNextRunAt(
- new Date(this.taskInstance.startedAt!),
- // we do not currently have a good way of returning the type
- // from SavedObjectsClient, and as we currenrtly require a schedule
- // and we only support `interval`, we can cast this safely
- attributes.schedule as IntervalSchedule
+ runAt: resolveErr(runAt, () =>
+ getNextRunAt(
+ new Date(),
+ // if we fail at this point we wish to recover but don't have access to the Alert's
+ // attributes, so we'll use a default interval to prevent the underlying task from
+ // falling into a failed state
+ FALLBACK_RETRY_INTERVAL
+ )
),
};
}
}
+
+/**
+ * If an error is thrown, wrap it in an AlertTaskRunResult
+ * so that we can treat each field independantly
+ */
+async function errorAsAlertTaskRunResult(
+ future: Promise>
+): Promise> {
+ try {
+ return await future;
+ } catch (e) {
+ return {
+ state: asErr(e),
+ runAt: asErr(e),
+ };
+ }
+}
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
index 2ea1256352bec..543b9e7d32e12 100644
--- a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -5,7 +5,7 @@
*/
import sinon from 'sinon';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { ConcreteTaskInstance, TaskStatus } from '../../../../../plugins/task_manager/server';
import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
import {
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts
index 7186e1e729bda..7178fa4f01282 100644
--- a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { Logger } from '../../../../../../src/core/server';
-import { RunContext } from '../../../task_manager';
+import { RunContext } from '../../../../../plugins/task_manager/server';
import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
import {
diff --git a/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
index e345ca3552e5a..8f87b3473b2e4 100644
--- a/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
@@ -4,6 +4,8 @@ exports[`Error CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
exports[`Error CONTAINER_ID 1`] = `undefined`;
+exports[`Error DESTINATION_ADDRESS 1`] = `undefined`;
+
exports[`Error ERROR_CULPRIT 1`] = `"handleOopsie"`;
exports[`Error ERROR_EXC_HANDLED 1`] = `undefined`;
@@ -112,6 +114,8 @@ exports[`Span CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
exports[`Span CONTAINER_ID 1`] = `undefined`;
+exports[`Span DESTINATION_ADDRESS 1`] = `undefined`;
+
exports[`Span ERROR_CULPRIT 1`] = `undefined`;
exports[`Span ERROR_EXC_HANDLED 1`] = `undefined`;
@@ -220,6 +224,8 @@ exports[`Transaction CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
exports[`Transaction CONTAINER_ID 1`] = `"container1234567890abcdef"`;
+exports[`Transaction DESTINATION_ADDRESS 1`] = `undefined`;
+
exports[`Transaction ERROR_CULPRIT 1`] = `undefined`;
exports[`Transaction ERROR_EXC_HANDLED 1`] = `undefined`;
diff --git a/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts
index 0d7ff3114e73f..ce2db4964a412 100644
--- a/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -14,6 +14,8 @@ export const HTTP_REQUEST_METHOD = 'http.request.method';
export const USER_ID = 'user.id';
export const USER_AGENT_NAME = 'user_agent.name';
+export const DESTINATION_ADDRESS = 'destination.address';
+
export const OBSERVER_VERSION_MAJOR = 'observer.version_major';
export const OBSERVER_LISTENING = 'observer.listening';
export const PROCESSOR_EVENT = 'processor.event';
diff --git a/x-pack/legacy/plugins/apm/common/service_map.ts b/x-pack/legacy/plugins/apm/common/service_map.ts
new file mode 100644
index 0000000000000..fbaa489c45039
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/common/service_map.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface ServiceConnectionNode {
+ 'service.name': string;
+ 'service.environment': string | null;
+ 'agent.name': string;
+}
+export interface ExternalConnectionNode {
+ 'destination.address': string;
+ 'span.type': string;
+ 'span.subtype': string;
+}
+
+export type ConnectionNode = ServiceConnectionNode | ExternalConnectionNode;
+
+export interface Connection {
+ source: ConnectionNode;
+ destination: ConnectionNode;
+}
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index cf2cbd2507215..0934cb0019f44 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -71,7 +71,8 @@ export const apm: LegacyPluginInitializer = kibana => {
autocreateApmIndexPattern: Joi.boolean().default(true),
// service map
- serviceMapEnabled: Joi.boolean().default(false)
+ serviceMapEnabled: Joi.boolean().default(false),
+ serviceMapInitialTimeRange: Joi.number().default(60 * 1000 * 60) // last 1 hour
}).default();
},
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
index 238158c5bf224..bc020815cc9cb 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
@@ -73,6 +73,7 @@ export function Cytoscape({
cy.on('data', event => {
// Add the "primary" class to the node if its id matches the serviceName.
if (cy.nodes().length > 0 && serviceName) {
+ cy.nodes().removeClass('primary');
cy.getElementById(serviceName).addClass('primary');
}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx
new file mode 100644
index 0000000000000..efafdbcecd41c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import { EuiProgress, EuiText, EuiSpacer } from '@elastic/eui';
+import styled from 'styled-components';
+import { i18n } from '@kbn/i18n';
+
+const Container = styled.div`
+ position: relative;
+`;
+
+const Overlay = styled.div`
+ position: absolute;
+ top: 0;
+ z-index: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 100%;
+ padding: ${theme.gutterTypes.gutterMedium};
+`;
+
+const ProgressBarContainer = styled.div`
+ width: 50%;
+ max-width: 600px;
+`;
+
+interface Props {
+ children: React.ReactNode;
+ isLoading: boolean;
+ percentageLoaded: number;
+}
+
+export const LoadingOverlay = ({
+ children,
+ isLoading,
+ percentageLoaded
+}: Props) => (
+
+ {isLoading && (
+
+
+
+
+
+
+ {i18n.translate('xpack.apm.loadingServiceMap', {
+ defaultMessage:
+ 'Loading service map... This might take a short while.'
+ })}
+
+
+ )}
+ {children}
+
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
index 03ae9d0c287e5..d4e792ccf761b 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
@@ -8,17 +8,13 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
import { icons, defaultIcon } from './icons';
const layout = {
- animate: true,
- animationEasing: theme.euiAnimSlightBounce as cytoscape.Css.TransitionTimingFunction,
- animationDuration: parseInt(theme.euiAnimSpeedFast, 10),
name: 'dagre',
nodeDimensionsIncludeLabels: true,
- rankDir: 'LR',
- spacingFactor: 2
+ rankDir: 'LR'
};
function isDatabaseOrExternal(agentName: string) {
- return agentName === 'database' || agentName === 'external';
+ return !agentName;
}
const style: cytoscape.Stylesheet[] = [
@@ -47,7 +43,7 @@ const style: cytoscape.Stylesheet[] = [
'font-family': 'Inter UI, Segoe UI, Helvetica, Arial, sans-serif',
'font-size': theme.euiFontSizeXS,
height: theme.avatarSizing.l.size,
- label: 'data(id)',
+ label: 'data(label)',
'min-zoomed-font-size': theme.euiSizeL,
'overlay-opacity': 0,
shape: (el: cytoscape.NodeSingular) =>
@@ -76,7 +72,18 @@ const style: cytoscape.Stylesheet[] = [
//
// @ts-ignore
'target-distance-from-node': theme.paddingSizes.xs,
- width: 2
+ width: 1,
+ 'source-arrow-shape': 'none'
+ }
+ },
+ {
+ selector: 'edge[bidirectional]',
+ style: {
+ 'source-arrow-shape': 'triangle',
+ 'target-arrow-shape': 'triangle',
+ // @ts-ignore
+ 'source-distance-from-node': theme.paddingSizes.xs,
+ 'target-distance-from-node': theme.paddingSizes.xs
}
}
];
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts
new file mode 100644
index 0000000000000..c9caa27af41c5
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts
@@ -0,0 +1,158 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { ValuesType } from 'utility-types';
+import { sortBy, isEqual } from 'lodash';
+import { Connection, ConnectionNode } from '../../../../common/service_map';
+import { ServiceMapAPIResponse } from '../../../../server/lib/service_map/get_service_map';
+import { getAPMHref } from '../../shared/Links/apm/APMLink';
+
+function getConnectionNodeId(node: ConnectionNode): string {
+ if ('destination.address' in node) {
+ // use a prefix to distinguish exernal destination ids from services
+ return `>${node['destination.address']}`;
+ }
+ return node['service.name'];
+}
+
+function getConnectionId(connection: Connection) {
+ return `${getConnectionNodeId(connection.source)}~${getConnectionNodeId(
+ connection.destination
+ )}`;
+}
+export function getCytoscapeElements(
+ responses: ServiceMapAPIResponse[],
+ search: string
+) {
+ const discoveredServices = responses.flatMap(
+ response => response.discoveredServices
+ );
+
+ const serviceNodes = responses
+ .flatMap(response => response.services)
+ .map(service => ({
+ ...service,
+ id: service['service.name']
+ }));
+
+ // maps destination.address to service.name if possible
+ function getConnectionNode(node: ConnectionNode) {
+ let mappedNode: ConnectionNode | undefined;
+
+ if ('destination.address' in node) {
+ mappedNode = discoveredServices.find(map => isEqual(map.from, node))?.to;
+ }
+
+ if (!mappedNode) {
+ mappedNode = node;
+ }
+
+ return {
+ ...mappedNode,
+ id: getConnectionNodeId(mappedNode)
+ };
+ }
+
+ // build connections with mapped nodes
+ const connections = responses
+ .flatMap(response => response.connections)
+ .map(connection => {
+ const source = getConnectionNode(connection.source);
+ const destination = getConnectionNode(connection.destination);
+
+ return {
+ source,
+ destination,
+ id: getConnectionId({ source, destination })
+ };
+ })
+ .filter(connection => connection.source.id !== connection.destination.id);
+
+ const nodes = connections
+ .flatMap(connection => [connection.source, connection.destination])
+ .concat(serviceNodes);
+
+ type ConnectionWithId = ValuesType;
+ type ConnectionNodeWithId = ValuesType;
+
+ const connectionsById = connections.reduce((connectionMap, connection) => {
+ return {
+ ...connectionMap,
+ [connection.id]: connection
+ };
+ }, {} as Record);
+
+ const nodesById = nodes.reduce((nodeMap, node) => {
+ return {
+ ...nodeMap,
+ [node.id]: node
+ };
+ }, {} as Record);
+
+ const cyNodes = (Object.values(nodesById) as ConnectionNodeWithId[]).map(
+ node => {
+ let data = {};
+
+ if ('service.name' in node) {
+ data = {
+ href: getAPMHref(
+ `/services/${node['service.name']}/service-map`,
+ search
+ ),
+ agentName: node['agent.name'] || node['agent.name']
+ };
+ }
+
+ return {
+ group: 'nodes' as const,
+ data: {
+ id: node.id,
+ label:
+ 'service.name' in node
+ ? node['service.name']
+ : node['destination.address'],
+ ...data
+ }
+ };
+ }
+ );
+
+ // instead of adding connections in two directions,
+ // we add a `bidirectional` flag to use in styling
+ const dedupedConnections = (sortBy(
+ Object.values(connectionsById),
+ // make sure that order is stable
+ 'id'
+ ) as ConnectionWithId[]).reduce<
+ Array
+ >((prev, connection) => {
+ const reversedConnection = prev.find(
+ c =>
+ c.destination.id === connection.source.id &&
+ c.source.id === connection.destination.id
+ );
+
+ if (reversedConnection) {
+ reversedConnection.bidirectional = true;
+ return prev;
+ }
+
+ return prev.concat(connection);
+ }, []);
+
+ const cyEdges = dedupedConnections.map(connection => {
+ return {
+ group: 'edges' as const,
+ data: {
+ id: connection.id,
+ source: connection.source.id,
+ target: connection.destination.id,
+ bidirectional: connection.bidirectional ? true : undefined
+ }
+ };
+ }, []);
+
+ return [...cyNodes, ...cyEdges];
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
index cc09975a344b5..d3cc2b14e2c68 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
@@ -5,13 +5,30 @@
*/
import theme from '@elastic/eui/dist/eui_theme_light.json';
-import React from 'react';
-import { useFetcher } from '../../../hooks/useFetcher';
+import React, {
+ useMemo,
+ useEffect,
+ useState,
+ useRef,
+ useCallback
+} from 'react';
+import { find, isEqual } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import { EuiButton } from '@elastic/eui';
+import { ElementDefinition } from 'cytoscape';
+import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { ServiceMapAPIResponse } from '../../../../server/lib/service_map/get_service_map';
import { useLicense } from '../../../hooks/useLicense';
import { useUrlParams } from '../../../hooks/useUrlParams';
import { Controls } from './Controls';
import { Cytoscape } from './Cytoscape';
import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
+import { useCallApmApi } from '../../../hooks/useCallApmApi';
+import { useDeepObjectIdentity } from '../../../hooks/useDeepObjectIdentity';
+import { useLocation } from '../../../hooks/useLocation';
+import { LoadingOverlay } from './LoadingOverlay';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { getCytoscapeElements } from './get_cytoscape_elements';
interface ServiceMapProps {
serviceName?: string;
@@ -37,37 +54,159 @@ ${theme.euiColorLightShade}`,
margin: `-${theme.gutterTypes.gutterLarge}`
};
+const MAX_REQUESTS = 5;
+
export function ServiceMap({ serviceName }: ServiceMapProps) {
- const {
- urlParams: { start, end }
- } = useUrlParams();
+ const callApmApi = useCallApmApi();
+ const license = useLicense();
+ const { search } = useLocation();
+ const { urlParams, uiFilters } = useUrlParams();
+ const { notifications } = useApmPluginContext().core;
+ const params = useDeepObjectIdentity({
+ start: urlParams.start,
+ end: urlParams.end,
+ environment: urlParams.environment,
+ serviceName,
+ uiFilters: {
+ ...uiFilters,
+ environment: undefined
+ }
+ });
+
+ const renderedElements = useRef([]);
+ const openToast = useRef(null);
+
+ const [responses, setResponses] = useState([]);
+ const [isLoading, setIsLoading] = useState(true);
+ const [percentageLoaded, setPercentageLoaded] = useState(0);
+ const [, _setUnusedState] = useState(false);
+
+ const elements = useMemo(() => getCytoscapeElements(responses, search), [
+ responses,
+ search
+ ]);
+
+ const forceUpdate = useCallback(() => _setUnusedState(value => !value), []);
+
+ const getNext = useCallback(
+ async (input: { reset?: boolean; after?: string | undefined }) => {
+ const { start, end, uiFilters: strippedUiFilters, ...query } = params;
+
+ if (input.reset) {
+ renderedElements.current = [];
+ setResponses([]);
+ }
- const { data } = useFetcher(
- callApmApi => {
if (start && end) {
- return callApmApi({
- pathname: '/api/apm/service-map',
- params: { query: { start, end } }
- });
+ setIsLoading(true);
+ try {
+ const data = await callApmApi({
+ pathname: '/api/apm/service-map',
+ params: {
+ query: {
+ ...query,
+ start,
+ end,
+ uiFilters: JSON.stringify(strippedUiFilters),
+ after: input.after
+ }
+ }
+ });
+ setResponses(resp => resp.concat(data));
+ setIsLoading(false);
+
+ const shouldGetNext =
+ responses.length + 1 < MAX_REQUESTS && data.after;
+
+ if (shouldGetNext) {
+ setPercentageLoaded(value => value + 30); // increase loading bar 30%
+ await getNext({ after: data.after });
+ }
+ } catch (error) {
+ setIsLoading(false);
+ notifications.toasts.addError(error, {
+ title: i18n.translate('xpack.apm.errorServiceMapData', {
+ defaultMessage: `Error loading service connections`
+ })
+ });
+ }
}
},
- [start, end]
+ [callApmApi, params, responses.length, notifications.toasts]
);
- const elements = Array.isArray(data) ? data : [];
- const license = useLicense();
+ useEffect(() => {
+ const loadServiceMaps = async () => {
+ setPercentageLoaded(5);
+ await getNext({ reset: true });
+ setPercentageLoaded(100);
+ };
+
+ loadServiceMaps();
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [params]);
+
+ useEffect(() => {
+ if (renderedElements.current.length === 0) {
+ renderedElements.current = elements;
+ return;
+ }
+
+ const newElements = elements.filter(element => {
+ return !find(renderedElements.current, el => isEqual(el, element));
+ });
+
+ const updateMap = () => {
+ renderedElements.current = elements;
+ if (openToast.current) {
+ notifications.toasts.remove(openToast.current);
+ }
+ forceUpdate();
+ };
+
+ if (newElements.length > 0 && percentageLoaded === 100) {
+ openToast.current = notifications.toasts.add({
+ title: i18n.translate('xpack.apm.newServiceMapData', {
+ defaultMessage: `Newly discovered connections are available.`
+ }),
+ onClose: () => {
+ openToast.current = null;
+ },
+ toastLifeTimeMs: 24 * 60 * 60 * 1000,
+ text: toMountPoint(
+
+ {i18n.translate('xpack.apm.updateServiceMap', {
+ defaultMessage: 'Update map'
+ })}
+
+ )
+ }).id;
+ }
+
+ return () => {
+ if (openToast.current) {
+ notifications.toasts.remove(openToast.current);
+ }
+ };
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [elements, percentageLoaded]);
+
const isValidPlatinumLicense =
license?.isActive &&
(license?.type === 'platinum' || license?.type === 'trial');
return isValidPlatinumLicense ? (
-
-
-
+
+
+
+
+
) : (
);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
index 84c2801a45049..51056fae50360 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
@@ -35,9 +35,13 @@ const FrameHeading: React.FC = ({ stackframe, isLibraryFrame }) => {
? LibraryFrameFileDetail
: AppFrameFileDetail;
const lineNumber = stackframe.line.number;
+
+ const name =
+ 'filename' in stackframe ? stackframe.filename : stackframe.classname;
+
return (
- {stackframe.filename} in{' '}
+ {name} in{' '}
{stackframe.function}
{lineNumber > 0 && (
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
index aeeb39733b5db..737eeac95516e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
@@ -11,7 +11,7 @@ import {
IndicesDeleteParams,
IndicesCreateParams
} from 'elasticsearch';
-import { merge } from 'lodash';
+import { merge, uniqueId } from 'lodash';
import { cloneDeep, isString } from 'lodash';
import { KibanaRequest } from 'src/core/server';
import { OBSERVER_VERSION_MAJOR } from '../../../common/elasticsearch_fieldnames';
@@ -127,6 +127,23 @@ export function getESClient(
? callAsInternalUser
: callAsCurrentUser;
+ const debug = context.params.query._debug;
+
+ function withTime(
+ fn: (log: typeof console.log) => Promise
+ ): Promise {
+ const log = console.log.bind(console, uniqueId());
+ if (!debug) {
+ return fn(log);
+ }
+ const time = process.hrtime();
+ return fn(log).then(data => {
+ const now = process.hrtime(time);
+ log(`took: ${Math.round(now[0] * 1000 + now[1] / 1e6)}ms`);
+ return data;
+ });
+ }
+
return {
search: async <
TDocument = unknown,
@@ -141,27 +158,29 @@ export function getESClient(
apmOptions
);
- if (context.params.query._debug) {
- console.log(`--DEBUG ES QUERY--`);
- console.log(
- `${request.url.pathname} ${JSON.stringify(context.params.query)}`
- );
- console.log(`GET ${nextParams.index}/_search`);
- console.log(JSON.stringify(nextParams.body, null, 2));
- }
+ return withTime(log => {
+ if (context.params.query._debug) {
+ log(`--DEBUG ES QUERY--`);
+ log(
+ `${request.url.pathname} ${JSON.stringify(context.params.query)}`
+ );
+ log(`GET ${nextParams.index}/_search`);
+ log(JSON.stringify(nextParams.body, null, 2));
+ }
- return (callMethod('search', nextParams) as unknown) as Promise<
- ESSearchResponse
- >;
+ return (callMethod('search', nextParams) as unknown) as Promise<
+ ESSearchResponse
+ >;
+ });
},
index: (params: APMIndexDocumentParams) => {
- return callMethod('index', params);
+ return withTime(() => callMethod('index', params));
},
delete: (params: IndicesDeleteParams) => {
- return callMethod('delete', params);
+ return withTime(() => callMethod('delete', params));
},
indicesCreate: (params: IndicesCreateParams) => {
- return callMethod('indices.create', params);
+ return withTime(() => callMethod('indices.create', params));
}
};
}
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map.ts
new file mode 100644
index 0000000000000..04e2a43a4b8f1
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PromiseReturnType } from '../../../typings/common';
+import {
+ Setup,
+ SetupTimeRange,
+ SetupUIFilters
+} from '../helpers/setup_request';
+import { getServiceMapFromTraceIds } from './get_service_map_from_trace_ids';
+import { getTraceSampleIds } from './get_trace_sample_ids';
+import { getServicesProjection } from '../../../common/projections/services';
+import { mergeProjection } from '../../../common/projections/util/merge_projection';
+import {
+ SERVICE_AGENT_NAME,
+ SERVICE_NAME
+} from '../../../common/elasticsearch_fieldnames';
+
+export interface IEnvOptions {
+ setup: Setup & SetupTimeRange & SetupUIFilters;
+ serviceName?: string;
+ environment?: string;
+ after?: string;
+}
+
+async function getConnectionData({
+ setup,
+ serviceName,
+ environment,
+ after
+}: IEnvOptions) {
+ const { traceIds, after: nextAfter } = await getTraceSampleIds({
+ setup,
+ serviceName,
+ environment,
+ after
+ });
+
+ const serviceMapData = traceIds.length
+ ? await getServiceMapFromTraceIds({
+ setup,
+ serviceName,
+ environment,
+ traceIds
+ })
+ : { connections: [], discoveredServices: [] };
+
+ return {
+ after: nextAfter,
+ ...serviceMapData
+ };
+}
+
+async function getServicesData(options: IEnvOptions) {
+ // only return services on the first request for the global service map
+ if (options.after) {
+ return [];
+ }
+
+ const { setup } = options;
+
+ const projection = getServicesProjection({ setup });
+
+ const { filter } = projection.body.query.bool;
+
+ const params = mergeProjection(projection, {
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ ...projection.body.query.bool,
+ filter: options.serviceName
+ ? filter.concat({
+ term: {
+ [SERVICE_NAME]: options.serviceName
+ }
+ })
+ : filter
+ }
+ },
+ aggs: {
+ services: {
+ terms: {
+ field: projection.body.aggs.services.terms.field,
+ size: 500
+ },
+ aggs: {
+ agent_name: {
+ terms: {
+ field: SERVICE_AGENT_NAME
+ }
+ }
+ }
+ }
+ }
+ }
+ });
+
+ const { client } = setup;
+
+ const response = await client.search(params);
+
+ return (
+ response.aggregations?.services.buckets.map(bucket => {
+ return {
+ 'service.name': bucket.key as string,
+ 'agent.name':
+ (bucket.agent_name.buckets[0]?.key as string | undefined) || '',
+ 'service.environment': options.environment || null
+ };
+ }) || []
+ );
+}
+
+export type ServiceMapAPIResponse = PromiseReturnType;
+export async function getServiceMap(options: IEnvOptions) {
+ const [connectionData, servicesData] = await Promise.all([
+ getConnectionData(options),
+ getServicesData(options)
+ ]);
+
+ return {
+ ...connectionData,
+ services: servicesData
+ };
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts b/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
new file mode 100644
index 0000000000000..ea9af12ac7f9a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
@@ -0,0 +1,280 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { uniq, find } from 'lodash';
+import { Setup } from '../helpers/setup_request';
+import {
+ TRACE_ID,
+ PROCESSOR_EVENT
+} from '../../../common/elasticsearch_fieldnames';
+import {
+ Connection,
+ ServiceConnectionNode,
+ ConnectionNode,
+ ExternalConnectionNode
+} from '../../../common/service_map';
+
+export async function getServiceMapFromTraceIds({
+ setup,
+ traceIds,
+ serviceName,
+ environment
+}: {
+ setup: Setup;
+ traceIds: string[];
+ serviceName?: string;
+ environment?: string;
+}) {
+ const { indices, client } = setup;
+
+ const serviceMapParams = {
+ index: [
+ indices['apm_oss.spanIndices'],
+ indices['apm_oss.transactionIndices']
+ ],
+ body: {
+ size: 0,
+ query: {
+ bool: {
+ filter: [
+ {
+ terms: {
+ [PROCESSOR_EVENT]: ['span', 'transaction']
+ }
+ },
+ {
+ terms: {
+ [TRACE_ID]: traceIds
+ }
+ }
+ ]
+ }
+ },
+ aggs: {
+ service_map: {
+ scripted_metric: {
+ init_script: {
+ lang: 'painless',
+ source: `state.eventsById = new HashMap();
+
+ String[] fieldsToCopy = new String[] {
+ 'parent.id',
+ 'service.name',
+ 'service.environment',
+ 'destination.address',
+ 'trace.id',
+ 'processor.event',
+ 'span.type',
+ 'span.subtype',
+ 'agent.name'
+ };
+ state.fieldsToCopy = fieldsToCopy;`
+ },
+ map_script: {
+ lang: 'painless',
+ source: `def id;
+ if (!doc['span.id'].empty) {
+ id = doc['span.id'].value;
+ } else {
+ id = doc['transaction.id'].value;
+ }
+
+ def copy = new HashMap();
+ copy.id = id;
+
+ for(key in state.fieldsToCopy) {
+ if (!doc[key].empty) {
+ copy[key] = doc[key].value;
+ }
+ }
+
+ state.eventsById[id] = copy`
+ },
+ combine_script: {
+ lang: 'painless',
+ source: `return state.eventsById;`
+ },
+ reduce_script: {
+ lang: 'painless',
+ source: `
+ def getDestination ( def event ) {
+ def destination = new HashMap();
+ destination['destination.address'] = event['destination.address'];
+ destination['span.type'] = event['span.type'];
+ destination['span.subtype'] = event['span.subtype'];
+ return destination;
+ }
+
+ def processAndReturnEvent(def context, def eventId) {
+ if (context.processedEvents[eventId] != null) {
+ return context.processedEvents[eventId];
+ }
+
+ def event = context.eventsById[eventId];
+
+ if (event == null) {
+ return null;
+ }
+
+ def service = new HashMap();
+ service['service.name'] = event['service.name'];
+ service['service.environment'] = event['service.environment'];
+ service['agent.name'] = event['agent.name'];
+
+ def basePath = new ArrayList();
+
+ def parentId = event['parent.id'];
+ def parent;
+
+ if (parentId != null && parentId != event['id']) {
+ parent = processAndReturnEvent(context, parentId);
+ if (parent != null) {
+ /* copy the path from the parent */
+ basePath.addAll(parent.path);
+ /* flag parent path for removal, as it has children */
+ context.locationsToRemove.add(parent.path);
+
+ /* if the parent has 'destination.address' set, and the service is different,
+ we've discovered a service */
+
+ if (parent['destination.address'] != null
+ && parent['destination.address'] != ""
+ && (parent['span.type'] == 'external'
+ || parent['span.type'] == 'messaging')
+ && (parent['service.name'] != event['service.name']
+ || parent['service.environment'] != event['service.environment']
+ )
+ ) {
+ def parentDestination = getDestination(parent);
+ context.externalToServiceMap.put(parentDestination, service);
+ }
+ }
+ }
+
+ def lastLocation = basePath.size() > 0 ? basePath[basePath.size() - 1] : null;
+
+ def currentLocation = service;
+
+ /* only add the current location to the path if it's different from the last one*/
+ if (lastLocation == null || !lastLocation.equals(currentLocation)) {
+ basePath.add(currentLocation);
+ }
+
+ /* if there is an outgoing span, create a new path */
+ if (event['span.type'] == 'external' || event['span.type'] == 'messaging') {
+ def outgoingLocation = getDestination(event);
+ def outgoingPath = new ArrayList(basePath);
+ outgoingPath.add(outgoingLocation);
+ context.paths.add(outgoingPath);
+ }
+
+ event.path = basePath;
+
+ context.processedEvents[eventId] = event;
+ return event;
+ }
+
+ def context = new HashMap();
+
+ context.processedEvents = new HashMap();
+ context.eventsById = new HashMap();
+
+ context.paths = new HashSet();
+ context.externalToServiceMap = new HashMap();
+ context.locationsToRemove = new HashSet();
+
+ for (state in states) {
+ context.eventsById.putAll(state);
+ }
+
+ for (entry in context.eventsById.entrySet()) {
+ processAndReturnEvent(context, entry.getKey());
+ }
+
+ def paths = new HashSet();
+
+ for(foundPath in context.paths) {
+ if (!context.locationsToRemove.contains(foundPath)) {
+ paths.add(foundPath);
+ }
+ }
+
+ def response = new HashMap();
+ response.paths = paths;
+
+ def discoveredServices = new HashSet();
+
+ for(entry in context.externalToServiceMap.entrySet()) {
+ def map = new HashMap();
+ map.from = entry.getKey();
+ map.to = entry.getValue();
+ discoveredServices.add(map);
+ }
+ response.discoveredServices = discoveredServices;
+
+ return response;`
+ }
+ }
+ }
+ }
+ }
+ };
+
+ const serviceMapResponse = await client.search(serviceMapParams);
+
+ const scriptResponse = serviceMapResponse.aggregations?.service_map.value as {
+ paths: ConnectionNode[][];
+ discoveredServices: Array<{
+ from: ExternalConnectionNode;
+ to: ServiceConnectionNode;
+ }>;
+ };
+
+ let paths = scriptResponse.paths;
+
+ if (serviceName || environment) {
+ paths = paths.filter(path => {
+ return path.some(node => {
+ let matches = true;
+ if (serviceName) {
+ matches =
+ matches &&
+ 'service.name' in node &&
+ node['service.name'] === serviceName;
+ }
+ if (environment) {
+ matches =
+ matches &&
+ 'service.environment' in node &&
+ node['service.environment'] === environment;
+ }
+ return matches;
+ });
+ });
+ }
+
+ const connections = uniq(
+ paths.flatMap(path => {
+ return path.reduce((conns, location, index) => {
+ const prev = path[index - 1];
+ if (prev) {
+ return conns.concat({
+ source: prev,
+ destination: location
+ });
+ }
+ return conns;
+ }, [] as Connection[]);
+ }, [] as Connection[]),
+ (value, index, array) => {
+ return find(array, value);
+ }
+ );
+
+ return {
+ connections,
+ discoveredServices: scriptResponse.discoveredServices
+ };
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
new file mode 100644
index 0000000000000..acf113b426608
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
@@ -0,0 +1,177 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { uniq, take, sortBy } from 'lodash';
+import {
+ Setup,
+ SetupUIFilters,
+ SetupTimeRange
+} from '../helpers/setup_request';
+import { rangeFilter } from '../helpers/range_filter';
+import { ESFilter } from '../../../typings/elasticsearch';
+import {
+ PROCESSOR_EVENT,
+ SERVICE_NAME,
+ SERVICE_ENVIRONMENT,
+ SPAN_TYPE,
+ SPAN_SUBTYPE,
+ DESTINATION_ADDRESS,
+ TRACE_ID
+} from '../../../common/elasticsearch_fieldnames';
+
+const MAX_TRACES_TO_INSPECT = 1000;
+
+export async function getTraceSampleIds({
+ after,
+ serviceName,
+ environment,
+ setup
+}: {
+ after?: string;
+ serviceName?: string;
+ environment?: string;
+ setup: Setup & SetupTimeRange & SetupUIFilters;
+}) {
+ const isTop = !after;
+
+ const { start, end, client, indices, config } = setup;
+
+ const rangeEnd = end;
+ const rangeStart = isTop
+ ? rangeEnd - config['xpack.apm.serviceMapInitialTimeRange']
+ : start;
+
+ const rangeQuery = { range: rangeFilter(rangeStart, rangeEnd) };
+
+ const query = {
+ bool: {
+ filter: [
+ {
+ term: {
+ [PROCESSOR_EVENT]: 'span'
+ }
+ },
+ {
+ exists: {
+ field: DESTINATION_ADDRESS
+ }
+ },
+ rangeQuery
+ ] as ESFilter[]
+ }
+ } as { bool: { filter: ESFilter[]; must_not?: ESFilter[] | ESFilter } };
+
+ if (serviceName) {
+ query.bool.filter.push({ term: { [SERVICE_NAME]: serviceName } });
+ }
+
+ if (environment) {
+ query.bool.filter.push({ term: { [SERVICE_ENVIRONMENT]: environment } });
+ }
+
+ const afterObj =
+ after && after !== 'top'
+ ? { after: JSON.parse(Buffer.from(after, 'base64').toString()) }
+ : {};
+
+ const params = {
+ index: [indices['apm_oss.spanIndices']],
+ body: {
+ size: 0,
+ query,
+ aggs: {
+ connections: {
+ composite: {
+ size: 1000,
+ ...afterObj,
+ sources: [
+ { [SERVICE_NAME]: { terms: { field: SERVICE_NAME } } },
+ {
+ [SERVICE_ENVIRONMENT]: {
+ terms: { field: SERVICE_ENVIRONMENT, missing_bucket: true }
+ }
+ },
+ {
+ [SPAN_TYPE]: {
+ terms: { field: SPAN_TYPE, missing_bucket: true }
+ }
+ },
+ {
+ [SPAN_SUBTYPE]: {
+ terms: { field: SPAN_SUBTYPE, missing_bucket: true }
+ }
+ },
+ {
+ [DESTINATION_ADDRESS]: {
+ terms: { field: DESTINATION_ADDRESS }
+ }
+ }
+ ]
+ },
+ aggs: {
+ sample: {
+ sampler: {
+ shard_size: 30
+ },
+ aggs: {
+ trace_ids: {
+ terms: {
+ field: TRACE_ID,
+ execution_hint: 'map' as const,
+ // remove bias towards large traces by sorting on trace.id
+ // which will be random-esque
+ order: {
+ _key: 'desc' as const
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ };
+
+ const tracesSampleResponse = await client.search<
+ { trace: { id: string } },
+ typeof params
+ >(params);
+
+ let nextAfter: string | undefined;
+
+ const receivedAfterKey =
+ tracesSampleResponse.aggregations?.connections.after_key;
+
+ if (!after) {
+ nextAfter = 'top';
+ } else if (receivedAfterKey) {
+ nextAfter = Buffer.from(JSON.stringify(receivedAfterKey)).toString(
+ 'base64'
+ );
+ }
+
+ // make sure at least one trace per composite/connection bucket
+ // is queried
+ const traceIdsWithPriority =
+ tracesSampleResponse.aggregations?.connections.buckets.flatMap(bucket =>
+ bucket.sample.trace_ids.buckets.map((sampleDocBucket, index) => ({
+ traceId: sampleDocBucket.key as string,
+ priority: index
+ }))
+ ) || [];
+
+ const traceIds = take(
+ uniq(
+ sortBy(traceIdsWithPriority, 'priority').map(({ traceId }) => traceId)
+ ),
+ MAX_TRACES_TO_INSPECT
+ );
+
+ return {
+ after: nextAfter,
+ traceIds
+ };
+}
diff --git a/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts b/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts
index e98842151da84..a9a8241da39d1 100644
--- a/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts
@@ -58,7 +58,7 @@ import {
uiFiltersEnvironmentsRoute
} from './ui_filters';
import { createApi } from './create_api';
-import { serviceMapRoute } from './services';
+import { serviceMapRoute } from './service_map';
const createApmApi = () => {
const api = createApi()
@@ -118,10 +118,12 @@ const createApmApi = () => {
.add(transactionsLocalFiltersRoute)
.add(serviceNodesLocalFiltersRoute)
.add(uiFiltersEnvironmentsRoute)
- .add(serviceMapRoute)
// Transaction
- .add(transactionByTraceIdRoute);
+ .add(transactionByTraceIdRoute)
+
+ // Service map
+ .add(serviceMapRoute);
return api;
};
diff --git a/x-pack/legacy/plugins/apm/server/routes/service_map.ts b/x-pack/legacy/plugins/apm/server/routes/service_map.ts
new file mode 100644
index 0000000000000..94b176147f7a1
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/routes/service_map.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+import Boom from 'boom';
+import { setupRequest } from '../lib/helpers/setup_request';
+import { createRoute } from './create_route';
+import { uiFiltersRt, rangeRt } from './default_api_types';
+import { getServiceMap } from '../lib/service_map/get_service_map';
+
+export const serviceMapRoute = createRoute(() => ({
+ path: '/api/apm/service-map',
+ params: {
+ query: t.intersection([
+ t.partial({ environment: t.string, serviceName: t.string }),
+ uiFiltersRt,
+ rangeRt,
+ t.partial({ after: t.string })
+ ])
+ },
+ handler: async ({ context, request }) => {
+ if (!context.config['xpack.apm.serviceMapEnabled']) {
+ throw Boom.notFound();
+ }
+ const setup = await setupRequest(context, request);
+ const {
+ query: { serviceName, environment, after }
+ } = context.params;
+ return getServiceMap({ setup, serviceName, environment, after });
+ }
+}));
diff --git a/x-pack/legacy/plugins/apm/server/routes/services.ts b/x-pack/legacy/plugins/apm/server/routes/services.ts
index 78cb092b85db6..18777183ea1de 100644
--- a/x-pack/legacy/plugins/apm/server/routes/services.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/services.ts
@@ -5,7 +5,6 @@
*/
import * as t from 'io-ts';
-import Boom from 'boom';
import { AgentName } from '../../typings/es_schemas/ui/fields/Agent';
import {
createApmTelementry,
@@ -18,7 +17,6 @@ import { getServiceTransactionTypes } from '../lib/services/get_service_transact
import { getServiceNodeMetadata } from '../lib/services/get_service_node_metadata';
import { createRoute } from './create_route';
import { uiFiltersRt, rangeRt } from './default_api_types';
-import { getServiceMap } from '../lib/services/map';
import { getServiceAnnotations } from '../lib/services/annotations';
export const servicesRoute = createRoute(() => ({
@@ -87,19 +85,6 @@ export const serviceNodeMetadataRoute = createRoute(() => ({
}
}));
-export const serviceMapRoute = createRoute(() => ({
- path: '/api/apm/service-map',
- params: {
- query: rangeRt
- },
- handler: async ({ context }) => {
- if (context.config['xpack.apm.serviceMapEnabled']) {
- return getServiceMap();
- }
- return new Boom('Not found', { statusCode: 404 });
- }
-}));
-
export const serviceAnnotationsRoute = createRoute(() => ({
path: '/api/apm/services/{serviceName}/annotations',
params: {
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
index 74a9436d7a4bc..6d3620f11a87b 100644
--- a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -36,6 +36,19 @@ interface MetricsAggregationResponsePart {
value: number | null;
}
+type GetCompositeKeys<
+ TAggregationOptionsMap extends AggregationOptionsMap
+> = TAggregationOptionsMap extends {
+ composite: { sources: Array };
+}
+ ? keyof Source
+ : never;
+
+type CompositeOptionsSource = Record<
+ string,
+ { terms: { field: string; missing_bucket?: boolean } } | undefined
+>;
+
export interface AggregationOptionsByType {
terms: {
field: string;
@@ -97,6 +110,22 @@ export interface AggregationOptionsByType {
buckets_path: BucketsPath;
script?: Script;
};
+ composite: {
+ size?: number;
+ sources: CompositeOptionsSource[];
+ after?: Record;
+ };
+ diversified_sampler: {
+ shard_size?: number;
+ max_docs_per_value?: number;
+ } & ({ script: Script } | { field: string }); // TODO use MetricsAggregationOptions if possible
+ scripted_metric: {
+ params?: Record;
+ init_script?: Script;
+ map_script: Script;
+ combine_script: Script;
+ reduce_script: Script;
+ };
}
type AggregationType = keyof AggregationOptionsByType;
@@ -229,6 +258,24 @@ interface AggregationResponsePart<
value: number | null;
}
| undefined;
+ composite: {
+ after_key: Record, number>;
+ buckets: Array<
+ {
+ key: Record, number>;
+ doc_count: number;
+ } & BucketSubAggregationResponse<
+ TAggregationOptionsMap['aggs'],
+ TDocument
+ >
+ >;
+ };
+ diversified_sampler: {
+ doc_count: number;
+ } & AggregationResponseMap;
+ scripted_metric: {
+ value: unknown;
+ };
}
// Type for debugging purposes. If you see an error in AggregationResponseMap
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
index eff39838bd957..064b684cf9aa6 100644
--- a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
+++ b/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
@@ -56,6 +56,7 @@ export interface ESFilter {
| string
| string[]
| number
+ | boolean
| Record
| ESFilter[];
};
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Stackframe.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Stackframe.ts
index a1b1a8198bb35..993fac46ad7cb 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Stackframe.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Stackframe.ts
@@ -4,8 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-interface IStackframeBase {
- filename: string;
+type IStackframeBase = {
function?: string;
library_frame?: boolean;
exclude_from_grouping?: boolean;
@@ -19,13 +18,13 @@ interface IStackframeBase {
line: {
number: number;
};
-}
+} & ({ classname: string } | { filename: string });
-export interface IStackframeWithLineContext extends IStackframeBase {
+export type IStackframeWithLineContext = IStackframeBase & {
line: {
number: number;
context: string;
};
-}
+};
export type IStackframe = IStackframeBase | IStackframeWithLineContext;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
index 063e69d1d2141..e728ea25f5504 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -5,11 +5,11 @@
*/
import { ExpressionType } from 'src/plugins/expressions/public';
-import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
+import { EmbeddableInput } from '../../../../../../src/plugins/embeddable/public';
import { EmbeddableTypes } from './embeddable_types';
export const EmbeddableExpressionType = 'embeddable';
-export { EmbeddableTypes };
+export { EmbeddableTypes, EmbeddableInput };
export interface EmbeddableExpression {
type: typeof EmbeddableExpressionType;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
index 3669bd3e08201..8f5ad859d28ba 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
@@ -9,7 +9,7 @@ import { MAP_SAVED_OBJECT_TYPE } from '../../../maps/common/constants';
import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize_embeddable/constants';
import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants';
-export const EmbeddableTypes = {
+export const EmbeddableTypes: { map: string; search: string; visualization: string } = {
map: MAP_SAVED_OBJECT_TYPE,
search: SEARCH_EMBEDDABLE_TYPE,
visualization: VISUALIZE_EMBEDDABLE_TYPE,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts
index 097aef69d4b4c..48b50930d563e 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts
@@ -32,6 +32,7 @@ import { image } from './image';
import { joinRows } from './join_rows';
import { lt } from './lt';
import { lte } from './lte';
+import { mapCenter } from './map_center';
import { mapColumn } from './mapColumn';
import { math } from './math';
import { metric } from './metric';
@@ -57,6 +58,7 @@ import { staticColumn } from './staticColumn';
import { string } from './string';
import { table } from './table';
import { tail } from './tail';
+import { timerange } from './time_range';
import { timefilter } from './timefilter';
import { timefilterControl } from './timefilterControl';
import { switchFn } from './switch';
@@ -91,6 +93,7 @@ export const functions = [
lt,
lte,
joinRows,
+ mapCenter,
mapColumn,
math,
metric,
@@ -118,6 +121,7 @@ export const functions = [
tail,
timefilter,
timefilterControl,
+ timerange,
switchFn,
caseFn,
];
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
new file mode 100644
index 0000000000000..21f9e9fe3148d
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ExpressionFunction } from 'src/plugins/expressions/common';
+import { getFunctionHelp } from '../../../i18n/functions';
+import { MapCenter } from '../../../types';
+
+interface Args {
+ lat: number;
+ lon: number;
+ zoom: number;
+}
+
+export function mapCenter(): ExpressionFunction<'mapCenter', null, Args, MapCenter> {
+ const { help, args: argHelp } = getFunctionHelp().mapCenter;
+ return {
+ name: 'mapCenter',
+ help,
+ type: 'mapCenter',
+ context: {
+ types: ['null'],
+ },
+ args: {
+ lat: {
+ types: ['number'],
+ required: true,
+ help: argHelp.lat,
+ },
+ lon: {
+ types: ['number'],
+ required: true,
+ help: argHelp.lon,
+ },
+ zoom: {
+ types: ['number'],
+ required: true,
+ help: argHelp.zoom,
+ },
+ },
+ fn: (context, args) => {
+ return {
+ type: 'mapCenter',
+ ...args,
+ };
+ },
+ };
+}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts
index 25f035bbb6d8c..5b95886faa13d 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts
@@ -5,7 +5,7 @@
*/
jest.mock('ui/new_platform');
import { savedMap } from './saved_map';
-import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters';
+import { getQueryFilters } from '../../../server/lib/build_embeddable_filters';
const filterContext = {
and: [
@@ -24,20 +24,22 @@ describe('savedMap', () => {
const fn = savedMap().fn;
const args = {
id: 'some-id',
+ center: null,
+ title: null,
+ timerange: null,
+ hideLayer: [],
};
it('accepts null context', () => {
const expression = fn(null, args, {});
expect(expression.input.filters).toEqual([]);
- expect(expression.input.timeRange).toBeUndefined();
});
it('accepts filter context', () => {
const expression = fn(filterContext, args, {});
- const embeddableFilters = buildEmbeddableFilters(filterContext.and);
+ const embeddableFilters = getQueryFilters(filterContext.and);
- expect(expression.input.filters).toEqual(embeddableFilters.filters);
- expect(expression.input.timeRange).toEqual(embeddableFilters.timeRange);
+ expect(expression.input.filters).toEqual(embeddableFilters);
});
});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
index 460cb9c34efff..b6d88c06ed06d 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
@@ -7,8 +7,8 @@
import { ExpressionFunction } from 'src/plugins/expressions/common/types';
import { TimeRange } from 'src/plugins/data/public';
import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters';
-import { Filter } from '../../../types';
+import { getQueryFilters } from '../../../server/lib/build_embeddable_filters';
+import { Filter, MapCenter, TimeRange as TimeRangeArg } from '../../../types';
import {
EmbeddableTypes,
EmbeddableExpressionType,
@@ -19,19 +19,36 @@ import { esFilters } from '../../../../../../../src/plugins/data/public';
interface Arguments {
id: string;
+ center: MapCenter | null;
+ hideLayer: string[];
+ title: string | null;
+ timerange: TimeRangeArg | null;
}
// Map embeddable is missing proper typings, so type is just to document what we
// are expecting to pass to the embeddable
-interface SavedMapInput extends EmbeddableInput {
+export type SavedMapInput = EmbeddableInput & {
id: string;
+ isLayerTOCOpen: boolean;
timeRange?: TimeRange;
refreshConfig: {
isPaused: boolean;
interval: number;
};
+ hideFilterActions: true;
filters: esFilters.Filter[];
-}
+ mapCenter?: {
+ lat: number;
+ lon: number;
+ zoom: number;
+ };
+ hiddenLayers?: string[];
+};
+
+const defaultTimeRange = {
+ from: 'now-15m',
+ to: 'now',
+};
type Return = EmbeddableExpression;
@@ -46,21 +63,56 @@ export function savedMap(): ExpressionFunction<'savedMap', Filter | null, Argume
required: false,
help: argHelp.id,
},
+ center: {
+ types: ['mapCenter'],
+ help: argHelp.center,
+ required: false,
+ },
+ hideLayer: {
+ types: ['string'],
+ help: argHelp.hideLayer,
+ required: false,
+ multi: true,
+ },
+ timerange: {
+ types: ['timerange'],
+ help: argHelp.timerange,
+ required: false,
+ },
+ title: {
+ types: ['string'],
+ help: argHelp.title,
+ required: false,
+ },
},
type: EmbeddableExpressionType,
- fn: (context, { id }) => {
+ fn: (context, args) => {
const filters = context ? context.and : [];
+ const center = args.center
+ ? {
+ lat: args.center.lat,
+ lon: args.center.lon,
+ zoom: args.center.zoom,
+ }
+ : undefined;
+
return {
type: EmbeddableExpressionType,
input: {
- id,
- ...buildEmbeddableFilters(filters),
-
+ id: args.id,
+ filters: getQueryFilters(filters),
+ timeRange: args.timerange || defaultTimeRange,
refreshConfig: {
isPaused: false,
interval: 0,
},
+
+ mapCenter: center,
+ hideFilterActions: true,
+ title: args.title ? args.title : undefined,
+ isLayerTOCOpen: false,
+ hiddenLayers: args.hideLayer || [],
},
embeddableType: EmbeddableTypes.map,
};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
new file mode 100644
index 0000000000000..716026279ccea
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ExpressionFunction } from 'src/plugins/expressions/common';
+import { getFunctionHelp } from '../../../i18n/functions';
+import { TimeRange } from '../../../types';
+
+interface Args {
+ from: string;
+ to: string;
+}
+
+export function timerange(): ExpressionFunction<'timerange', null, Args, TimeRange> {
+ const { help, args: argHelp } = getFunctionHelp().timerange;
+ return {
+ name: 'timerange',
+ help,
+ type: 'timerange',
+ context: {
+ types: ['null'],
+ },
+ args: {
+ from: {
+ types: ['string'],
+ required: true,
+ help: argHelp.from,
+ },
+ to: {
+ types: ['string'],
+ required: true,
+ help: argHelp.to,
+ },
+ },
+ fn: (context, args) => {
+ return {
+ type: 'timerange',
+ ...args,
+ };
+ },
+ };
+}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
similarity index 74%
rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx
rename to x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index 5c7ef1a8c1799..8642ebd901bb4 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -10,32 +10,27 @@ import { I18nContext } from 'ui/i18n';
import { npStart } from 'ui/new_platform';
import {
IEmbeddable,
+ EmbeddableFactory,
EmbeddablePanel,
EmbeddableFactoryNotFoundError,
- EmbeddableInput,
-} from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-import { start } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
-import { EmbeddableExpression } from '../expression_types/embeddable';
-import { RendererStrings } from '../../i18n';
+} from '../../../../../../../src/plugins/embeddable/public';
+import { start } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
+import { EmbeddableExpression } from '../../expression_types/embeddable';
+import { RendererStrings } from '../../../i18n';
import {
SavedObjectFinderProps,
SavedObjectFinderUi,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '../../../../../../../src/plugins/kibana_react/public';
const { embeddable: strings } = RendererStrings;
+import { embeddableInputToExpression } from './embeddable_input_to_expression';
+import { EmbeddableInput } from '../../expression_types';
+import { RendererHandlers } from '../../../types';
const embeddablesRegistry: {
[key: string]: IEmbeddable;
} = {};
-interface Handlers {
- setFilter: (text: string) => void;
- getFilter: () => string | null;
- done: () => void;
- onResize: (fn: () => void) => void;
- onDestroy: (fn: () => void) => void;
-}
-
const renderEmbeddable = (embeddableObject: IEmbeddable, domNode: HTMLElement) => {
const SavedObjectFinder = (props: SavedObjectFinderProps) => (
({
render: async (
domNode: HTMLElement,
{ input, embeddableType }: EmbeddableExpression,
- handlers: Handlers
+ handlers: RendererHandlers
) => {
if (!embeddablesRegistry[input.id]) {
const factory = Array.from(start.getEmbeddableFactories()).find(
embeddableFactory => embeddableFactory.type === embeddableType
- );
+ ) as EmbeddableFactory;
if (!factory) {
handlers.done();
@@ -86,8 +81,13 @@ const embeddable = () => ({
}
const embeddableObject = await factory.createFromSavedObject(input.id, input);
+
embeddablesRegistry[input.id] = embeddableObject;
+ ReactDOM.unmountComponentAtNode(domNode);
+ const subscription = embeddableObject.getInput$().subscribe(function(updatedInput) {
+ handlers.onEmbeddableInputChange(embeddableInputToExpression(updatedInput, embeddableType));
+ });
ReactDOM.render(renderEmbeddable(embeddableObject, domNode), domNode, () => handlers.done());
handlers.onResize(() => {
@@ -97,7 +97,11 @@ const embeddable = () => ({
});
handlers.onDestroy(() => {
+ subscription.unsubscribe();
+ handlers.onEmbeddableDestroyed();
+
delete embeddablesRegistry[input.id];
+
return ReactDOM.unmountComponentAtNode(domNode);
});
} else {
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
new file mode 100644
index 0000000000000..93d747537c34c
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { embeddableInputToExpression } from './embeddable_input_to_expression';
+import { SavedMapInput } from '../../functions/common/saved_map';
+import { EmbeddableTypes } from '../../expression_types';
+import { fromExpression, Ast } from '@kbn/interpreter/common';
+
+const baseSavedMapInput = {
+ id: 'embeddableId',
+ filters: [],
+ isLayerTOCOpen: false,
+ refreshConfig: {
+ isPaused: true,
+ interval: 0,
+ },
+ hideFilterActions: true as true,
+};
+
+describe('input to expression', () => {
+ describe('Map Embeddable', () => {
+ it('converts to a savedMap expression', () => {
+ const input: SavedMapInput = {
+ ...baseSavedMapInput,
+ };
+
+ const expression = embeddableInputToExpression(input, EmbeddableTypes.map);
+ const ast = fromExpression(expression);
+
+ expect(ast.type).toBe('expression');
+ expect(ast.chain[0].function).toBe('savedMap');
+
+ expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+
+ expect(ast.chain[0].arguments).not.toHaveProperty('title');
+ expect(ast.chain[0].arguments).not.toHaveProperty('center');
+ expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
+ });
+
+ it('includes optional input values', () => {
+ const input: SavedMapInput = {
+ ...baseSavedMapInput,
+ mapCenter: {
+ lat: 1,
+ lon: 2,
+ zoom: 3,
+ },
+ title: 'title',
+ timeRange: {
+ from: 'now-1h',
+ to: 'now',
+ },
+ };
+
+ const expression = embeddableInputToExpression(input, EmbeddableTypes.map);
+ const ast = fromExpression(expression);
+
+ const centerExpression = ast.chain[0].arguments.center[0] as Ast;
+
+ expect(centerExpression.chain[0].function).toBe('mapCenter');
+ expect(centerExpression.chain[0].arguments.lat[0]).toEqual(input.mapCenter?.lat);
+ expect(centerExpression.chain[0].arguments.lon[0]).toEqual(input.mapCenter?.lon);
+ expect(centerExpression.chain[0].arguments.zoom[0]).toEqual(input.mapCenter?.zoom);
+
+ const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;
+
+ expect(timerangeExpression.chain[0].function).toBe('timerange');
+ expect(timerangeExpression.chain[0].arguments.from[0]).toEqual(input.timeRange?.from);
+ expect(timerangeExpression.chain[0].arguments.to[0]).toEqual(input.timeRange?.to);
+ });
+ });
+});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
new file mode 100644
index 0000000000000..a3cb53acebed2
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EmbeddableTypes, EmbeddableInput } from '../../expression_types';
+import { SavedMapInput } from '../../functions/common/saved_map';
+
+/*
+ Take the input from an embeddable and the type of embeddable and convert it into an expression
+*/
+export function embeddableInputToExpression(
+ input: EmbeddableInput,
+ embeddableType: string
+): string {
+ const expressionParts: string[] = [];
+
+ if (embeddableType === EmbeddableTypes.map) {
+ const mapInput = input as SavedMapInput;
+
+ expressionParts.push('savedMap');
+
+ expressionParts.push(`id="${input.id}"`);
+
+ if (input.title) {
+ expressionParts.push(`title="${input.title}"`);
+ }
+
+ if (mapInput.mapCenter) {
+ expressionParts.push(
+ `center={mapCenter lat=${mapInput.mapCenter.lat} lon=${mapInput.mapCenter.lon} zoom=${mapInput.mapCenter.zoom}}`
+ );
+ }
+
+ if (mapInput.timeRange) {
+ expressionParts.push(
+ `timerange={timerange from="${mapInput.timeRange.from}" to="${mapInput.timeRange.to}"}`
+ );
+ }
+
+ if (mapInput.hiddenLayers && mapInput.hiddenLayers.length) {
+ for (const layerId of mapInput.hiddenLayers) {
+ expressionParts.push(`hideLayer="${layerId}"`);
+ }
+ }
+ }
+
+ return expressionParts.join(' ');
+}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/index.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/index.js
index 50fa6943fc74a..48364be06e539 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/index.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/index.js
@@ -7,7 +7,7 @@
import { advancedFilter } from './advanced_filter';
import { debug } from './debug';
import { dropdownFilter } from './dropdown_filter';
-import { embeddable } from './embeddable';
+import { embeddable } from './embeddable/embeddable';
import { error } from './error';
import { image } from './image';
import { markdown } from './markdown';
diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_center.ts b/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_center.ts
new file mode 100644
index 0000000000000..3022ad07089d2
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_center.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { mapCenter } from '../../../canvas_plugin_src/functions/common/map_center';
+import { FunctionHelp } from '../';
+import { FunctionFactory } from '../../../types';
+
+export const help: FunctionHelp> = {
+ help: i18n.translate('xpack.canvas.functions.mapCenterHelpText', {
+ defaultMessage: `Returns an object with the center coordinates and zoom level of the map`,
+ }),
+ args: {
+ lat: i18n.translate('xpack.canvas.functions.mapCenter.args.latHelpText', {
+ defaultMessage: `Latitude for the center of the map`,
+ }),
+ lon: i18n.translate('xpack.canvas.functions.savedMap.args.lonHelpText', {
+ defaultMessage: `Longitude for the center of the map`,
+ }),
+ zoom: i18n.translate('xpack.canvas.functions.savedMap.args.zoomHelpText', {
+ defaultMessage: `The zoom level of the map`,
+ }),
+ },
+};
diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_map.ts b/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_map.ts
index d01b77e1cfd51..53bcd481f185f 100644
--- a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_map.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_map.ts
@@ -14,6 +14,20 @@ export const help: FunctionHelp> = {
defaultMessage: `Returns an embeddable for a saved map object`,
}),
args: {
- id: 'The id of the saved map object',
+ id: i18n.translate('xpack.canvas.functions.savedMap.args.idHelpText', {
+ defaultMessage: `The ID of the Saved Map Object`,
+ }),
+ center: i18n.translate('xpack.canvas.functions.savedMap.args.centerHelpText', {
+ defaultMessage: `The center and zoom level the map should have`,
+ }),
+ hideLayer: i18n.translate('xpack.canvas.functions.savedMap.args.hideLayer', {
+ defaultMessage: `The IDs of map layers that should be hidden`,
+ }),
+ timerange: i18n.translate('xpack.canvas.functions.savedMap.args.timerangeHelpText', {
+ defaultMessage: `The timerange of data that should be included`,
+ }),
+ title: i18n.translate('xpack.canvas.functions.savedMap.args.titleHelpText', {
+ defaultMessage: `The title for the map`,
+ }),
},
};
diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/time_range.ts b/x-pack/legacy/plugins/canvas/i18n/functions/dict/time_range.ts
new file mode 100644
index 0000000000000..476a9978800df
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/dict/time_range.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { timerange } from '../../../canvas_plugin_src/functions/common/time_range';
+import { FunctionHelp } from '../function_help';
+import { FunctionFactory } from '../../../types';
+
+export const help: FunctionHelp> = {
+ help: i18n.translate('xpack.canvas.functions.timerangeHelpText', {
+ defaultMessage: `An object that represents a span of time`,
+ }),
+ args: {
+ from: i18n.translate('xpack.canvas.functions.timerange.args.fromHelpText', {
+ defaultMessage: `The start of the time range`,
+ }),
+ to: i18n.translate('xpack.canvas.functions.timerange.args.toHelpText', {
+ defaultMessage: `The end of the time range`,
+ }),
+ },
+};
diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/function_help.ts b/x-pack/legacy/plugins/canvas/i18n/functions/function_help.ts
index f6b3c451c6fbb..94d7e6f43326f 100644
--- a/x-pack/legacy/plugins/canvas/i18n/functions/function_help.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/function_help.ts
@@ -44,6 +44,7 @@ import { help as joinRows } from './dict/join_rows';
import { help as location } from './dict/location';
import { help as lt } from './dict/lt';
import { help as lte } from './dict/lte';
+import { help as mapCenter } from './dict/map_center';
import { help as mapColumn } from './dict/map_column';
import { help as markdown } from './dict/markdown';
import { help as math } from './dict/math';
@@ -75,6 +76,7 @@ import { help as tail } from './dict/tail';
import { help as timefilter } from './dict/timefilter';
import { help as timefilterControl } from './dict/timefilter_control';
import { help as timelion } from './dict/timelion';
+import { help as timerange } from './dict/time_range';
import { help as to } from './dict/to';
import { help as urlparam } from './dict/urlparam';
@@ -196,6 +198,7 @@ export const getFunctionHelp = (): FunctionHelpDict => ({
location,
lt,
lte,
+ mapCenter,
mapColumn,
markdown,
math,
@@ -227,6 +230,7 @@ export const getFunctionHelp = (): FunctionHelpDict => ({
timefilter,
timefilterControl,
timelion,
+ timerange,
to,
urlparam,
});
diff --git a/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts b/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts
index 261f67067cfaf..5ab6a908641de 100644
--- a/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts
@@ -42,7 +42,7 @@ export const getTemplateStrings = (): TemplateStringDict => ({
defaultMessage: 'Pitch',
}),
help: i18n.translate('xpack.canvas.templates.pitchHelp', {
- defaultMessage: 'Branded presentation with large photos"',
+ defaultMessage: 'Branded presentation with large photos',
}),
},
Status: {
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js b/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js
index 89c0b5b21c581..1926fb4aaa5eb 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js
+++ b/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js
@@ -47,7 +47,14 @@ export const ElementContent = compose(
pure,
...branches
)(({ renderable, renderFunction, size, handlers }) => {
- const { getFilter, setFilter, done, onComplete } = handlers;
+ const {
+ getFilter,
+ setFilter,
+ done,
+ onComplete,
+ onEmbeddableInputChange,
+ onEmbeddableDestroyed,
+ } = handlers;
return Style.it(
renderable.css,
@@ -69,7 +76,7 @@ export const ElementContent = compose(
config={renderable.value}
css={renderable.css} // This is an actual CSS stylesheet string, it will be scoped by RenderElement
size={size} // Size is only passed for the purpose of triggering the resize event, it isn't really used otherwise
- handlers={{ getFilter, setFilter, done }}
+ handlers={{ getFilter, setFilter, done, onEmbeddableInputChange, onEmbeddableDestroyed }}
/>
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js b/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
index ce6791f2f88b6..e93cea597901f 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
+++ b/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
@@ -6,6 +6,10 @@
import { isEqual } from 'lodash';
import { setFilter } from '../../../state/actions/elements';
+import {
+ updateEmbeddableExpression,
+ fetchEmbeddableRenderable,
+} from '../../../state/actions/embeddable';
export const createHandlers = dispatch => {
let isComplete = false;
@@ -32,6 +36,14 @@ export const createHandlers = dispatch => {
completeFn = fn;
},
+ onEmbeddableInputChange(embeddableExpression) {
+ dispatch(updateEmbeddableExpression({ elementId: element.id, embeddableExpression }));
+ },
+
+ onEmbeddableDestroyed() {
+ dispatch(fetchEmbeddableRenderable(element.id));
+ },
+
done() {
// don't emit if the element is already done
if (isComplete) {
diff --git a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx b/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx
index c54c56e1561ca..565ca5fa5bbd6 100644
--- a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx
@@ -19,14 +19,15 @@ import { withKibana } from '../../../../../../../src/plugins/kibana_react/public
const allowedEmbeddables = {
[EmbeddableTypes.map]: (id: string) => {
- return `filters | savedMap id="${id}" | render`;
+ return `savedMap id="${id}" | render`;
},
- [EmbeddableTypes.visualization]: (id: string) => {
+ // FIX: Only currently allow Map embeddables
+ /* [EmbeddableTypes.visualization]: (id: string) => {
return `filters | savedVisualization id="${id}" | render`;
},
[EmbeddableTypes.search]: (id: string) => {
return `filters | savedSearch id="${id}" | render`;
- },
+ },*/
};
interface StateProps {
diff --git a/x-pack/legacy/plugins/canvas/public/components/expression/index.js b/x-pack/legacy/plugins/canvas/public/components/expression/index.js
index 806ef388bc4f6..d6eefca4e1461 100644
--- a/x-pack/legacy/plugins/canvas/public/components/expression/index.js
+++ b/x-pack/legacy/plugins/canvas/public/components/expression/index.js
@@ -55,6 +55,17 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
};
const expressionLifecycle = lifecycle({
+ componentDidUpdate({ expression }) {
+ if (
+ this.props.expression !== expression &&
+ this.props.expression !== this.props.formState.expression
+ ) {
+ this.props.setFormState({
+ expression: this.props.expression,
+ dirty: false,
+ });
+ }
+ },
componentDidMount() {
const { functionDefinitionsPromise, setFunctionDefinitions } = this.props;
functionDefinitionsPromise.then(defs => setFunctionDefinitions(defs));
diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx b/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx
index da3475eceb18d..089f021ccdc32 100644
--- a/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx
@@ -97,7 +97,7 @@ export const Toolbar = (props: Props) => {
const trays = {
pageManager: ,
- expression: !elementIsSelected ? null : ,
+ expression: !elementIsSelected ? null : ,
};
return (
@@ -141,6 +141,7 @@ export const Toolbar = (props: Props) => {
color="text"
iconType="editorCodeBlock"
onClick={() => showHideTray(TrayType.expression)}
+ data-test-subj="canvasExpressionEditorButton"
>
{strings.getEditorButtonLabel()}
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js b/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js
index 4ee3a65172a2e..b775524acf639 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js
@@ -73,6 +73,32 @@ function closest(s) {
return null;
}
+// If you interact with an embeddable panel, only the header should be draggable
+// This function will determine if an element is an embeddable body or not
+const isEmbeddableBody = element => {
+ const hasClosest = typeof element.closest === 'function';
+
+ if (hasClosest) {
+ return element.closest('.embeddable') && !element.closest('.embPanel__header');
+ } else {
+ return closest.call(element, '.embeddable') && !closest.call(element, '.embPanel__header');
+ }
+};
+
+// Some elements in an embeddable may be portaled out of the embeddable container.
+// We do not want clicks on those to trigger drags, etc, in the workpad. This function
+// will check to make sure the clicked item is actually in the container
+const isInWorkpad = element => {
+ const hasClosest = typeof element.closest === 'function';
+ const workpadContainerSelector = '.canvasWorkpadContainer';
+
+ if (hasClosest) {
+ return !!element.closest(workpadContainerSelector);
+ } else {
+ return !!closest.call(element, workpadContainerSelector);
+ }
+};
+
const componentLayoutState = ({
aeroStore,
setAeroStore,
@@ -209,6 +235,8 @@ export const InteractivePage = compose(
withProps((...props) => ({
...props,
canDragElement: element => {
+ return !isEmbeddableBody(element) && isInWorkpad(element);
+
const hasClosest = typeof element.closest === 'function';
if (hasClosest) {
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js b/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js
index cf07d1ed229f0..139d0f283bf1a 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js
@@ -24,7 +24,10 @@ export const WorkpadTemplates = compose(
cloneWorkpad: props => workpad => {
workpad.id = getId('workpad');
workpad.name = `My Canvas Workpad - ${workpad.name}`;
+ // Remove unneeded fields
workpad.tags = undefined;
+ workpad.displayName = undefined;
+ workpad.help = undefined;
return workpadService
.create(workpad)
.then(() => props.router.navigateTo('loadWorkpad', { id: workpad.id, page: 1 }))
diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/embeddable.ts b/x-pack/legacy/plugins/canvas/public/state/actions/embeddable.ts
new file mode 100644
index 0000000000000..3604d7e3c2141
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/state/actions/embeddable.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Dispatch } from 'redux';
+import { createAction } from 'redux-actions';
+// @ts-ignore Untyped
+import { createThunk } from 'redux-thunks';
+// @ts-ignore Untyped Local
+import { fetchRenderable } from './elements';
+import { State } from '../../../types';
+
+export const UpdateEmbeddableExpressionActionType = 'updateEmbeddableExpression';
+export interface UpdateEmbeddableExpressionPayload {
+ embeddableExpression: string;
+ elementId: string;
+}
+export const updateEmbeddableExpression = createAction(
+ UpdateEmbeddableExpressionActionType
+);
+
+export const fetchEmbeddableRenderable = createThunk(
+ 'fetchEmbeddableRenderable',
+ ({ dispatch, getState }: { dispatch: Dispatch; getState: () => State }, elementId: string) => {
+ const pageWithElement = getState().persistent.workpad.pages.find(page => {
+ return page.elements.find(element => element.id === elementId) !== undefined;
+ });
+
+ if (pageWithElement) {
+ const element = pageWithElement.elements.find(el => el.id === elementId);
+ dispatch(fetchRenderable(element));
+ }
+ }
+);
diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/elements.js b/x-pack/legacy/plugins/canvas/public/state/reducers/elements.js
index 10a5bdb5998ea..c7e8a5c2ff2d8 100644
--- a/x-pack/legacy/plugins/canvas/public/state/reducers/elements.js
+++ b/x-pack/legacy/plugins/canvas/public/state/reducers/elements.js
@@ -28,7 +28,7 @@ function getNodeIndexById(page, nodeId, location) {
return page[location].findIndex(node => node.id === nodeId);
}
-function assignNodeProperties(workpadState, pageId, nodeId, props) {
+export function assignNodeProperties(workpadState, pageId, nodeId, props) {
const pageIndex = getPageIndexById(workpadState, pageId);
const location = getLocationFromIds(workpadState, pageId, nodeId);
const nodesPath = `pages.${pageIndex}.${location}`;
diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/embeddable.ts b/x-pack/legacy/plugins/canvas/public/state/reducers/embeddable.ts
new file mode 100644
index 0000000000000..9969c38cfa767
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/state/reducers/embeddable.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { fromExpression, toExpression } from '@kbn/interpreter/common';
+import { handleActions } from 'redux-actions';
+import { State } from '../../../types';
+
+import {
+ UpdateEmbeddableExpressionActionType,
+ UpdateEmbeddableExpressionPayload,
+} from '../actions/embeddable';
+
+// @ts-ignore untyped local
+import { assignNodeProperties } from './elements';
+
+export const embeddableReducer = handleActions<
+ State['persistent']['workpad'],
+ UpdateEmbeddableExpressionPayload
+>(
+ {
+ [UpdateEmbeddableExpressionActionType]: (workpadState, { payload }) => {
+ if (!payload) {
+ return workpadState;
+ }
+
+ const { elementId, embeddableExpression } = payload;
+
+ // Find the element
+ const pageWithElement = workpadState.pages.find(page => {
+ return page.elements.find(element => element.id === elementId) !== undefined;
+ });
+
+ if (!pageWithElement) {
+ return workpadState;
+ }
+
+ const element = pageWithElement.elements.find(elem => elem.id === elementId);
+
+ if (!element) {
+ return workpadState;
+ }
+
+ const existingAst = fromExpression(element.expression);
+ const newAst = fromExpression(embeddableExpression);
+ const searchForFunction = newAst.chain[0].function;
+
+ // Find the first matching function in the existing ASt
+ const existingAstFunction = existingAst.chain.find(f => f.function === searchForFunction);
+
+ if (!existingAstFunction) {
+ return workpadState;
+ }
+
+ existingAstFunction.arguments = newAst.chain[0].arguments;
+
+ const updatedExpression = toExpression(existingAst);
+
+ return assignNodeProperties(workpadState, pageWithElement.id, elementId, {
+ expression: updatedExpression,
+ });
+ },
+ },
+ {} as State['persistent']['workpad']
+);
diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/embeddables.test.ts b/x-pack/legacy/plugins/canvas/public/state/reducers/embeddables.test.ts
new file mode 100644
index 0000000000000..5b1192630897a
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/state/reducers/embeddables.test.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+jest.mock('ui/new_platform');
+import { State } from '../../../types';
+import { updateEmbeddableExpression } from '../actions/embeddable';
+import { embeddableReducer } from './embeddable';
+
+const elementId = 'element-1111';
+const embeddableId = '1234';
+const mockWorkpadState = {
+ pages: [
+ {
+ elements: [
+ {
+ id: elementId,
+ expression: `function1 | function2 id="${embeddableId}" change="start value" remove="remove"`,
+ },
+ ],
+ },
+ ],
+} as State['persistent']['workpad'];
+
+describe('embeddables reducer', () => {
+ it('updates the functions expression', () => {
+ const updatedValue = 'updated value';
+
+ const action = updateEmbeddableExpression({
+ elementId,
+ embeddableExpression: `function2 id="${embeddableId}" change="${updatedValue}" add="add"`,
+ });
+
+ const newState = embeddableReducer(mockWorkpadState, action);
+
+ expect(newState.pages[0].elements[0].expression.replace(/\s/g, '')).toBe(
+ `function1 | ${action.payload!.embeddableExpression}`.replace(/\s/g, '')
+ );
+ });
+});
diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/index.js b/x-pack/legacy/plugins/canvas/public/state/reducers/index.js
index b60a0a3b32656..cec6f9dceef6d 100644
--- a/x-pack/legacy/plugins/canvas/public/state/reducers/index.js
+++ b/x-pack/legacy/plugins/canvas/public/state/reducers/index.js
@@ -16,6 +16,7 @@ import { pagesReducer } from './pages';
import { elementsReducer } from './elements';
import { assetsReducer } from './assets';
import { historyReducer } from './history';
+import { embeddableReducer } from './embeddable';
export function getRootReducer(initialState) {
return combineReducers({
@@ -25,7 +26,7 @@ export function getRootReducer(initialState) {
persistent: reduceReducers(
historyReducer,
combineReducers({
- workpad: reduceReducers(workpadReducer, pagesReducer, elementsReducer),
+ workpad: reduceReducers(workpadReducer, pagesReducer, elementsReducer, embeddableReducer),
schemaVersion: (state = get(initialState, 'persistent.schemaVersion')) => state,
})
),
diff --git a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.test.ts b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.test.ts
index d1632fc3eef28..b422a9451293f 100644
--- a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.test.ts
+++ b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.test.ts
@@ -23,10 +23,10 @@ const timeFilter: Filter = {
};
describe('buildEmbeddableFilters', () => {
- it('converts non time Canvas Filters to ES Filters ', () => {
+ it('converts all Canvas Filters to ES Filters ', () => {
const filters = buildEmbeddableFilters([timeFilter, columnFilter, columnFilter]);
- expect(filters.filters).toHaveLength(2);
+ expect(filters.filters).toHaveLength(3);
});
it('converts time filter to time range', () => {
diff --git a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts
index 52fcc9813a93d..1a78a1e057016 100644
--- a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts
+++ b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts
@@ -35,10 +35,8 @@ function getTimeRangeFromFilters(filters: Filter[]): TimeRange | undefined {
: undefined;
}
-function getQueryFilters(filters: Filter[]): esFilters.Filter[] {
- return buildBoolArray(filters.filter(filter => filter.type !== 'time')).map(
- esFilters.buildQueryFilter
- );
+export function getQueryFilters(filters: Filter[]): esFilters.Filter[] {
+ return buildBoolArray(filters).map(esFilters.buildQueryFilter);
}
export function buildEmbeddableFilters(filters: Filter[]): EmbeddableFilterInput {
diff --git a/x-pack/legacy/plugins/canvas/server/lib/query_es_sql.js b/x-pack/legacy/plugins/canvas/server/lib/query_es_sql.js
index 15d3dc52ee311..f7907e2cffb26 100644
--- a/x-pack/legacy/plugins/canvas/server/lib/query_es_sql.js
+++ b/x-pack/legacy/plugins/canvas/server/lib/query_es_sql.js
@@ -30,6 +30,19 @@ export const queryEsSQL = (elasticsearchClient, { count, query, filter, timezone
});
const columnNames = map(columns, 'name');
const rows = res.rows.map(row => zipObject(columnNames, row));
+
+ if (!!res.cursor) {
+ elasticsearchClient('transport.request', {
+ path: '/_sql/close',
+ method: 'POST',
+ body: {
+ cursor: res.cursor,
+ },
+ }).catch(e => {
+ throw new Error(`Unexpected error from Elasticsearch: ${e.message}`);
+ });
+ }
+
return {
type: 'datatable',
columns,
diff --git a/x-pack/legacy/plugins/canvas/server/routes/es_fields/get_es_field_types.js b/x-pack/legacy/plugins/canvas/server/routes/es_fields/get_es_field_types.js
deleted file mode 100644
index 36f7399ecd031..0000000000000
--- a/x-pack/legacy/plugins/canvas/server/routes/es_fields/get_es_field_types.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;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { mapValues, keys } from 'lodash';
-import { normalizeType } from '../../lib/normalize_type';
-
-export function getESFieldTypes(index, fields, elasticsearchClient) {
- const config = {
- index: index,
- fields: fields || '*',
- };
-
- if (fields && fields.length === 0) {
- return Promise.resolve({});
- }
-
- return elasticsearchClient('fieldCaps', config).then(resp => {
- return mapValues(resp.fields, types => {
- if (keys(types).length > 1) {
- return 'conflict';
- }
-
- try {
- return normalizeType(keys(types)[0]);
- } catch (e) {
- return 'unsupported';
- }
- });
- });
-}
diff --git a/x-pack/legacy/plugins/canvas/server/routes/es_fields/index.ts b/x-pack/legacy/plugins/canvas/server/routes/es_fields/index.ts
deleted file mode 100644
index 6c1dd723299c6..0000000000000
--- a/x-pack/legacy/plugins/canvas/server/routes/es_fields/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { partial } from 'lodash';
-import { API_ROUTE } from '../../../common/lib/constants';
-import { CoreSetup } from '../../shim';
-// @ts-ignore untyped local
-import { getESFieldTypes } from './get_es_field_types';
-
-// TODO: Error handling, note: esErrors
-
-interface ESFieldsRequest {
- query: {
- index: string;
- fields: string[];
- };
-}
-
-export function esFields(
- route: CoreSetup['http']['route'],
- elasticsearch: CoreSetup['elasticsearch']
-) {
- const { callWithRequest } = elasticsearch.getCluster('data');
-
- route({
- method: 'GET',
- path: `${API_ROUTE}/es_fields`,
- handler(request: ESFieldsRequest, h: any) {
- const { index, fields } = request.query;
- if (!index) {
- return h.response({ error: '"index" query is required' }).code(400);
- }
-
- return getESFieldTypes(index, fields, partial(callWithRequest, request));
- },
- });
-}
diff --git a/x-pack/legacy/plugins/canvas/server/routes/index.ts b/x-pack/legacy/plugins/canvas/server/routes/index.ts
index 2f6b706fc7edb..6898a3c459e3d 100644
--- a/x-pack/legacy/plugins/canvas/server/routes/index.ts
+++ b/x-pack/legacy/plugins/canvas/server/routes/index.ts
@@ -4,11 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { esFields } from './es_fields';
import { shareableWorkpads } from './shareables';
import { CoreSetup } from '../shim';
export function routes(setup: CoreSetup): void {
- esFields(setup.http.route, setup.elasticsearch);
shareableWorkpads(setup.http.route);
}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx
index 03b3e0df8a0cf..317a3417841b8 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx
@@ -69,6 +69,8 @@ export class RenderedElementComponent extends PureComponent {
onResize: () => {},
setFilter: () => {},
getFilter: () => '',
+ onEmbeddableInputChange: () => {},
+ onEmbeddableDestroyed: () => {},
});
} catch (e) {
// eslint-disable-next-line no-console
diff --git a/x-pack/legacy/plugins/canvas/types/functions.ts b/x-pack/legacy/plugins/canvas/types/functions.ts
index 6510c018f1ed4..773c9c3020a85 100644
--- a/x-pack/legacy/plugins/canvas/types/functions.ts
+++ b/x-pack/legacy/plugins/canvas/types/functions.ts
@@ -192,3 +192,16 @@ export interface AxisConfig {
*/
export const isAxisConfig = (axisConfig: any): axisConfig is AxisConfig =>
!!axisConfig && axisConfig.type === 'axisConfig';
+
+export interface MapCenter {
+ type: 'mapCenter';
+ lat: number;
+ lon: number;
+ zoom: number;
+}
+
+export interface TimeRange {
+ type: 'timerange';
+ from: string;
+ to: string;
+}
diff --git a/x-pack/legacy/plugins/canvas/types/renderers.ts b/x-pack/legacy/plugins/canvas/types/renderers.ts
index 282a1c820e346..af1710e69c257 100644
--- a/x-pack/legacy/plugins/canvas/types/renderers.ts
+++ b/x-pack/legacy/plugins/canvas/types/renderers.ts
@@ -17,6 +17,10 @@ export interface RendererHandlers {
getFilter: () => string;
/** Sets the value of the filter property on the element object persisted on the workpad */
setFilter: (filter: string) => void;
+ /** Handler to invoke when the input to a function has changed internally */
+ onEmbeddableInputChange: (expression: string) => void;
+ /** Handler to invoke when a rendered embeddable is destroyed */
+ onEmbeddableDestroyed: () => void;
}
export interface RendererSpec {
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/index.ts b/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/index.ts
index 1749421277719..d9ca9a96ffe51 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/index.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/index.ts
@@ -4,4 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
+export * from './log_entry_categories';
+export * from './log_entry_category_datasets';
export * from './log_entry_rate';
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts b/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts
new file mode 100644
index 0000000000000..66823c25237ac
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/log_entry_categories.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+import {
+ badRequestErrorRT,
+ forbiddenErrorRT,
+ timeRangeRT,
+ routeTimingMetadataRT,
+} from '../../shared';
+
+export const LOG_ANALYSIS_GET_LOG_ENTRY_CATEGORIES_PATH =
+ '/api/infra/log_analysis/results/log_entry_categories';
+
+/**
+ * request
+ */
+
+const logEntryCategoriesHistogramParametersRT = rt.type({
+ id: rt.string,
+ timeRange: timeRangeRT,
+ bucketCount: rt.number,
+});
+
+export type LogEntryCategoriesHistogramParameters = rt.TypeOf<
+ typeof logEntryCategoriesHistogramParametersRT
+>;
+
+export const getLogEntryCategoriesRequestPayloadRT = rt.type({
+ data: rt.intersection([
+ rt.type({
+ // the number of categories to fetch
+ categoryCount: rt.number,
+ // the id of the source configuration
+ sourceId: rt.string,
+ // the time range to fetch the categories from
+ timeRange: timeRangeRT,
+ // a list of histograms to create
+ histograms: rt.array(logEntryCategoriesHistogramParametersRT),
+ }),
+ rt.partial({
+ // the datasets to filter for (optional, unfiltered if not present)
+ datasets: rt.array(rt.string),
+ }),
+ ]),
+});
+
+export type GetLogEntryCategoriesRequestPayload = rt.TypeOf<
+ typeof getLogEntryCategoriesRequestPayloadRT
+>;
+
+/**
+ * response
+ */
+
+export const logEntryCategoryHistogramBucketRT = rt.type({
+ startTime: rt.number,
+ bucketDuration: rt.number,
+ logEntryCount: rt.number,
+});
+
+export type LogEntryCategoryHistogramBucket = rt.TypeOf;
+
+export const logEntryCategoryHistogramRT = rt.type({
+ histogramId: rt.string,
+ buckets: rt.array(logEntryCategoryHistogramBucketRT),
+});
+
+export type LogEntryCategoryHistogram = rt.TypeOf;
+
+export const logEntryCategoryRT = rt.type({
+ categoryId: rt.number,
+ datasets: rt.array(rt.string),
+ histograms: rt.array(logEntryCategoryHistogramRT),
+ logEntryCount: rt.number,
+ maximumAnomalyScore: rt.number,
+ regularExpression: rt.string,
+});
+
+export type LogEntryCategory = rt.TypeOf;
+
+export const getLogEntryCategoriesSuccessReponsePayloadRT = rt.intersection([
+ rt.type({
+ data: rt.type({
+ categories: rt.array(logEntryCategoryRT),
+ }),
+ }),
+ rt.partial({
+ timing: routeTimingMetadataRT,
+ }),
+]);
+
+export type GetLogEntryCategoriesSuccessResponsePayload = rt.TypeOf<
+ typeof getLogEntryCategoriesSuccessReponsePayloadRT
+>;
+
+export const getLogEntryCategoriesResponsePayloadRT = rt.union([
+ getLogEntryCategoriesSuccessReponsePayloadRT,
+ badRequestErrorRT,
+ forbiddenErrorRT,
+]);
+
+export type GetLogEntryCategoriesReponsePayload = rt.TypeOf<
+ typeof getLogEntryCategoriesResponsePayloadRT
+>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/log_entry_category_datasets.ts b/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/log_entry_category_datasets.ts
new file mode 100644
index 0000000000000..934d1052fa29f
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_analysis/results/log_entry_category_datasets.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+import {
+ badRequestErrorRT,
+ forbiddenErrorRT,
+ timeRangeRT,
+ routeTimingMetadataRT,
+} from '../../shared';
+
+export const LOG_ANALYSIS_GET_LOG_ENTRY_CATEGORY_DATASETS_PATH =
+ '/api/infra/log_analysis/results/log_entry_category_datasets';
+
+/**
+ * request
+ */
+
+export const getLogEntryCategoryDatasetsRequestPayloadRT = rt.type({
+ data: rt.type({
+ // the id of the source configuration
+ sourceId: rt.string,
+ // the time range to fetch the category datasets from
+ timeRange: timeRangeRT,
+ }),
+});
+
+export type GetLogEntryCategoryDatasetsRequestPayload = rt.TypeOf<
+ typeof getLogEntryCategoryDatasetsRequestPayloadRT
+>;
+
+/**
+ * response
+ */
+
+export const getLogEntryCategoryDatasetsSuccessReponsePayloadRT = rt.intersection([
+ rt.type({
+ data: rt.type({
+ datasets: rt.array(rt.string),
+ }),
+ }),
+ rt.partial({
+ timing: routeTimingMetadataRT,
+ }),
+]);
+
+export type GetLogEntryCategoryDatasetsSuccessResponsePayload = rt.TypeOf<
+ typeof getLogEntryCategoryDatasetsSuccessReponsePayloadRT
+>;
+
+export const getLogEntryCategoryDatasetsResponsePayloadRT = rt.union([
+ getLogEntryCategoryDatasetsSuccessReponsePayloadRT,
+ badRequestErrorRT,
+ forbiddenErrorRT,
+]);
+
+export type GetLogEntryCategoryDatasetsReponsePayload = rt.TypeOf<
+ typeof getLogEntryCategoryDatasetsResponsePayloadRT
+>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/shared/index.ts b/x-pack/legacy/plugins/infra/common/http_api/shared/index.ts
index 1047ca2f2a01a..caeb1914cb8a2 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/shared/index.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/shared/index.ts
@@ -7,3 +7,4 @@
export * from './errors';
export * from './metric_statistics';
export * from './time_range';
+export * from './timing';
diff --git a/x-pack/legacy/plugins/infra/common/http_api/shared/timing.ts b/x-pack/legacy/plugins/infra/common/http_api/shared/timing.ts
new file mode 100644
index 0000000000000..a208921c03d6f
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/shared/timing.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+import { tracingSpanRT } from '../../performance_tracing';
+
+export const routeTimingMetadataRT = rt.type({
+ spans: rt.array(tracingSpanRT),
+});
diff --git a/x-pack/legacy/plugins/infra/common/log_analysis/index.ts b/x-pack/legacy/plugins/infra/common/log_analysis/index.ts
index 79913f829191d..22137e63ab7e7 100644
--- a/x-pack/legacy/plugins/infra/common/log_analysis/index.ts
+++ b/x-pack/legacy/plugins/infra/common/log_analysis/index.ts
@@ -5,4 +5,7 @@
*/
export * from './log_analysis';
+export * from './log_analysis_results';
+export * from './log_entry_rate_analysis';
+export * from './log_entry_categories_analysis';
export * from './job_parameters';
diff --git a/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis.ts b/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis.ts
index 4a6f20d549799..9b2f1a55eb8c1 100644
--- a/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis.ts
+++ b/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis.ts
@@ -4,14 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import * as rt from 'io-ts';
-
-export const jobTypeRT = rt.keyof({
- 'log-entry-rate': null,
-});
-
-export type JobType = rt.TypeOf;
-
// combines and abstracts job and datafeed status
export type JobStatus =
| 'unknown'
diff --git a/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis_results.ts b/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis_results.ts
new file mode 100644
index 0000000000000..1dcd4a10fc4e3
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/log_analysis/log_analysis_results.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const ML_SEVERITY_SCORES = {
+ warning: 3,
+ minor: 25,
+ major: 50,
+ critical: 75,
+};
+
+export type MLSeverityScoreCategories = keyof typeof ML_SEVERITY_SCORES;
+
+export const ML_SEVERITY_COLORS = {
+ critical: 'rgb(228, 72, 72)',
+ major: 'rgb(229, 113, 0)',
+ minor: 'rgb(255, 221, 0)',
+ warning: 'rgb(125, 180, 226)',
+};
+
+export const getSeverityCategoryForScore = (
+ score: number
+): MLSeverityScoreCategories | undefined => {
+ if (score >= ML_SEVERITY_SCORES.critical) {
+ return 'critical';
+ } else if (score >= ML_SEVERITY_SCORES.major) {
+ return 'major';
+ } else if (score >= ML_SEVERITY_SCORES.minor) {
+ return 'minor';
+ } else if (score >= ML_SEVERITY_SCORES.warning) {
+ return 'warning';
+ } else {
+ // Category is too low to include
+ return undefined;
+ }
+};
+
+export const formatAnomalyScore = (score: number) => {
+ return Math.round(score);
+};
+
+export const getFriendlyNameForPartitionId = (partitionId: string) => {
+ return partitionId !== '' ? partitionId : 'unknown';
+};
diff --git a/x-pack/legacy/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts b/x-pack/legacy/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts
new file mode 100644
index 0000000000000..0957126ee52e3
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/log_analysis/log_entry_categories_analysis.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const logEntryCategoriesJobTypeRT = rt.keyof({
+ 'log-entry-categories-count': null,
+});
+
+export type LogEntryCategoriesJobType = rt.TypeOf;
+
+export const logEntryCategoriesJobTypes: LogEntryCategoriesJobType[] = [
+ 'log-entry-categories-count',
+];
diff --git a/x-pack/legacy/plugins/infra/common/log_analysis/log_entry_rate_analysis.ts b/x-pack/legacy/plugins/infra/common/log_analysis/log_entry_rate_analysis.ts
new file mode 100644
index 0000000000000..7fd668dc4ebce
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/log_analysis/log_entry_rate_analysis.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const logEntryRateJobTypeRT = rt.keyof({
+ 'log-entry-rate': null,
+});
+
+export type LogEntryRateJobType = rt.TypeOf;
+
+export const logEntryRateJobTypes: LogEntryRateJobType[] = ['log-entry-rate'];
diff --git a/x-pack/legacy/plugins/infra/common/performance_tracing.ts b/x-pack/legacy/plugins/infra/common/performance_tracing.ts
new file mode 100644
index 0000000000000..3e96f3c19d06d
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/performance_tracing.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import uuid from 'uuid';
+
+export const tracingSpanRT = rt.type({
+ duration: rt.number,
+ id: rt.string,
+ name: rt.string,
+ start: rt.number,
+});
+
+export type TracingSpan = rt.TypeOf;
+
+export type ActiveTrace = (endTime?: number) => TracingSpan;
+
+export const startTracingSpan = (name: string): ActiveTrace => {
+ const initialState: TracingSpan = {
+ duration: Number.POSITIVE_INFINITY,
+ id: uuid.v4(),
+ name,
+ start: Date.now(),
+ };
+
+ return (endTime: number = Date.now()) => ({
+ ...initialState,
+ duration: endTime - initialState.start,
+ });
+};
diff --git a/x-pack/legacy/plugins/infra/common/runtime_types.ts b/x-pack/legacy/plugins/infra/common/runtime_types.ts
index 297743f9b3456..d5b858df38def 100644
--- a/x-pack/legacy/plugins/infra/common/runtime_types.ts
+++ b/x-pack/legacy/plugins/infra/common/runtime_types.ts
@@ -4,11 +4,22 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { Errors } from 'io-ts';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { Errors, Type } from 'io-ts';
import { failure } from 'io-ts/lib/PathReporter';
+type ErrorFactory = (message: string) => Error;
+
export const createPlainError = (message: string) => new Error(message);
-export const throwErrors = (createError: (message: string) => Error) => (errors: Errors) => {
+export const throwErrors = (createError: ErrorFactory) => (errors: Errors) => {
throw createError(failure(errors).join('\n'));
};
+
+export const decodeOrThrow = (
+ runtimeType: Type,
+ createError: ErrorFactory = createPlainError
+) => (inputValue: I) =>
+ pipe(runtimeType.decode(inputValue), fold(throwErrors(createError), identity));
diff --git a/x-pack/legacy/plugins/infra/public/apps/start_app.tsx b/x-pack/legacy/plugins/infra/public/apps/start_app.tsx
index 8ccb051724ede..dbdc827478a45 100644
--- a/x-pack/legacy/plugins/infra/public/apps/start_app.tsx
+++ b/x-pack/legacy/plugins/infra/public/apps/start_app.tsx
@@ -27,6 +27,7 @@ import {
KibanaContextProvider,
} from '../../../../../../src/plugins/kibana_react/public';
import { ROOT_ELEMENT_ID } from '../app';
+
// NP_TODO: Type plugins
export async function startApp(libs: InfraFrontendLibs, core: CoreStart, plugins: any) {
const history = createHashHistory();
diff --git a/x-pack/legacy/plugins/infra/public/components/beta_badge.tsx b/x-pack/legacy/plugins/infra/public/components/beta_badge.tsx
new file mode 100644
index 0000000000000..5d5770af1a41e
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/beta_badge.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiBetaBadge } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+
+export const BetaBadge: React.FunctionComponent = () => (
+
+);
+const betaBadgeLabel = i18n.translate('xpack.infra.common.tabBetaBadgeLabel', {
+ defaultMessage: 'Beta',
+});
+
+const betaBadgeTooltipContent = i18n.translate('xpack.infra.common.tabBetaBadgeTooltipContent', {
+ defaultMessage:
+ 'This feature is under active development. Extra functionality is coming, and some functionality may change.',
+});
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/index.ts b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/index.ts
index 06229a26afd19..e954cf21229ee 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/index.ts
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/index.ts
@@ -5,3 +5,4 @@
*/
export * from './log_analysis_job_problem_indicator';
+export * from './recreate_job_button';
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/log_analysis_job_problem_indicator.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/log_analysis_job_problem_indicator.tsx
index 018c5f5e0570d..8a16d819e12c2 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/log_analysis_job_problem_indicator.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/log_analysis_job_problem_indicator.tsx
@@ -17,13 +17,22 @@ export const LogAnalysisJobProblemIndicator: React.FC<{
onRecreateMlJobForReconfiguration: () => void;
onRecreateMlJobForUpdate: () => void;
}> = ({ jobStatus, setupStatus, onRecreateMlJobForReconfiguration, onRecreateMlJobForUpdate }) => {
- if (jobStatus === 'stopped') {
+ if (isStopped(jobStatus)) {
return ;
- } else if (setupStatus === 'skippedButUpdatable') {
+ } else if (isUpdatable(setupStatus)) {
return ;
- } else if (setupStatus === 'skippedButReconfigurable') {
+ } else if (isReconfigurable(setupStatus)) {
return ;
}
return null; // no problem to indicate
};
+
+const isStopped = (jobStatus: JobStatus) => jobStatus === 'stopped';
+
+const isUpdatable = (setupStatus: SetupStatus) => setupStatus === 'skippedButUpdatable';
+
+const isReconfigurable = (setupStatus: SetupStatus) => setupStatus === 'skippedButReconfigurable';
+
+export const jobHasProblem = (jobStatus: JobStatus, setupStatus: SetupStatus) =>
+ isStopped(jobStatus) || isUpdatable(setupStatus) || isReconfigurable(setupStatus);
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_button.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_button.tsx
new file mode 100644
index 0000000000000..74e8d197ef455
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_button.tsx
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButton, PropsOf } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+
+export const RecreateJobButton: React.FunctionComponent> = props => (
+
+
+
+);
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_callout.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_callout.tsx
index b95054bbd6a9b..5b872d4ee5147 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_callout.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_job_status/recreate_job_callout.tsx
@@ -5,8 +5,9 @@
*/
import React from 'react';
-import { EuiCallOut, EuiButton } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCallOut } from '@elastic/eui';
+
+import { RecreateJobButton } from './recreate_job_button';
export const RecreateJobCallout: React.FC<{
onRecreateMlJob: () => void;
@@ -14,11 +15,6 @@ export const RecreateJobCallout: React.FC<{
}> = ({ children, onRecreateMlJob, title }) => (
{children}
-
-
-
+
);
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/first_use_callout.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/first_use_callout.tsx
new file mode 100644
index 0000000000000..7fcdcc89a633a
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/first_use_callout.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+
+export const FirstUseCallout = () => {
+ return (
+
+
+ {i18n.translate('xpack.infra.logs.analysis.onboardingSuccessContent', {
+ defaultMessage:
+ 'Please allow a few minutes for our machine learning robots to begin collecting data.',
+ })}
+