Duration | Timeout after which PING HTTP request will be aborted and retried. |
| [requestHeadersWhitelist](./kibana-plugin-core-server.elasticsearchconfig.requestheaderswhitelist.md) | | string[] | List of Kibana client-side headers to send to Elasticsearch when request scoped cluster client is used. If this is an empty array then \*no\* client-side will be sent. |
| [requestTimeout](./kibana-plugin-core-server.elasticsearchconfig.requesttimeout.md) | | Duration | Timeout after which HTTP request will be aborted and retried. |
+| [serviceAccountToken](./kibana-plugin-core-server.elasticsearchconfig.serviceaccounttoken.md) | | string | If Elasticsearch security features are enabled, this setting provides the service account token that the Kibana server users to perform its administrative functions.This is an alternative to specifying a username and password. |
| [shardTimeout](./kibana-plugin-core-server.elasticsearchconfig.shardtimeout.md) | | Duration | Timeout for Elasticsearch to wait for responses from shards. Set to 0 to disable. |
| [sniffInterval](./kibana-plugin-core-server.elasticsearchconfig.sniffinterval.md) | | false | Duration | Interval to perform a sniff operation and make sure the list of nodes is complete. If false then sniffing is disabled. |
| [sniffOnConnectionFault](./kibana-plugin-core-server.elasticsearchconfig.sniffonconnectionfault.md) | | boolean | Specifies whether the client should immediately sniff for a more current list of nodes when a connection dies. |
| [sniffOnStart](./kibana-plugin-core-server.elasticsearchconfig.sniffonstart.md) | | boolean | Specifies whether the client should attempt to detect the rest of the cluster when it is first instantiated. |
| [ssl](./kibana-plugin-core-server.elasticsearchconfig.ssl.md) | | Pick<SslConfigSchema, Exclude<keyof SslConfigSchema, 'certificateAuthorities' | 'keystore' | 'truststore'>> & { certificateAuthorities?: string[]; } | Set of settings configure SSL connection between Kibana and Elasticsearch that are required when xpack.ssl.verification_mode in Elasticsearch is set to either certificate or full. |
-| [username](./kibana-plugin-core-server.elasticsearchconfig.username.md) | | string | If Elasticsearch is protected with basic authentication, this setting provides the username that the Kibana server uses to perform its administrative functions. |
+| [username](./kibana-plugin-core-server.elasticsearchconfig.username.md) | | string | If Elasticsearch is protected with basic authentication, this setting provides the username that the Kibana server uses to perform its administrative functions. Cannot be used in conjunction with serviceAccountToken. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.serviceaccounttoken.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.serviceaccounttoken.md
new file mode 100644
index 0000000000000..5934e83de17a4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.serviceaccounttoken.md
@@ -0,0 +1,15 @@
+
+
+[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [ElasticsearchConfig](./kibana-plugin-core-server.elasticsearchconfig.md) > [serviceAccountToken](./kibana-plugin-core-server.elasticsearchconfig.serviceaccounttoken.md)
+
+## ElasticsearchConfig.serviceAccountToken property
+
+If Elasticsearch security features are enabled, this setting provides the service account token that the Kibana server users to perform its administrative functions.
+
+This is an alternative to specifying a username and password.
+
+Signature:
+
+```typescript
+readonly serviceAccountToken?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.username.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.username.md
index 14db9f2e36ccf..959870ff43a0f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.username.md
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.username.md
@@ -4,7 +4,7 @@
## ElasticsearchConfig.username property
-If Elasticsearch is protected with basic authentication, this setting provides the username that the Kibana server uses to perform its administrative functions.
+If Elasticsearch is protected with basic authentication, this setting provides the username that the Kibana server uses to perform its administrative functions. Cannot be used in conjunction with serviceAccountToken.
Signature:
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
index b028a09bee453..a80ebe2fee493 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
@@ -11,7 +11,7 @@
Signature:
```typescript
-export declare type LegacyElasticsearchClientConfig = Pick
-
+
@@ -1021,9 +1019,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
onResize={[Function]}
>
-
+
@@ -1315,9 +1311,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
onResize={[Function]}
>
-
+
@@ -1570,9 +1564,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
onResize={[Function]}
>
= ({
}
}, [modal, lastModal, settings]);
+ const fleetStatus = useFleetStatus();
+ const [policyId, setSelectedPolicyId] = useState(agentPolicy?.id);
+ const [isFleetServerPolicySelected, setIsFleetServerPolicySelected] = useState(false);
+
+ useEffect(() => {
+ async function checkPolicyIsFleetServer() {
+ if (policyId && setIsFleetServerPolicySelected) {
+ const agentPolicyRequest = await sendGetOneAgentPolicy(policyId);
+ if (
+ agentPolicyRequest.data?.item &&
+ (agentPolicyRequest.data.item.package_policies as PackagePolicy[]).some(
+ (packagePolicy) => packagePolicy.package?.name === FLEET_SERVER_PACKAGE
+ )
+ ) {
+ setIsFleetServerPolicySelected(true);
+ } else {
+ setIsFleetServerPolicySelected(false);
+ }
+ }
+ }
+
+ checkPolicyIsFleetServer();
+ }, [policyId]);
+
const isLoadingInitialRequest = settings.isLoading && settings.isInitialRequest;
return (
@@ -110,16 +136,23 @@ export const AgentEnrollmentFlyout: React.FunctionComponent = ({
(
- ({ agentPolicy, agentPolicies, viewDataStep }) => {
+ ({
+ agentPolicy,
+ agentPolicies,
+ viewDataStep,
+ setSelectedPolicyId,
+ isFleetServerPolicySelected,
+ settings,
+ }) => {
const fleetStatus = useFleetStatus();
const [selectedApiKeyId, setSelectedAPIKeyId] = useState();
- const [isFleetServerPolicySelected, setIsFleetServerPolicySelected] = useState(false);
const apiKey = useGetOneEnrollmentAPIKey(selectedApiKeyId);
- const settings = useGetSettings();
const fleetServerInstructions = useFleetServerInstructions(apiKey?.data?.item?.policy_id);
const fleetServerSteps = useMemo(() => {
@@ -88,7 +93,7 @@ export const ManagedInstructions = React.memo(
}, [fleetServerInstructions]);
const steps = useMemo(() => {
- const fleetServerHosts = settings.data?.item?.fleet_server_hosts || [];
+ const fleetServerHosts = settings?.fleet_server_hosts || [];
const baseSteps: EuiContainedStepProps[] = [
DownloadStep(),
!agentPolicy
@@ -96,7 +101,7 @@ export const ManagedInstructions = React.memo(
agentPolicies,
selectedApiKeyId,
setSelectedAPIKeyId,
- setIsFleetServerPolicySelected,
+ setSelectedPolicyId,
})
: AgentEnrollmentKeySelectionStep({ agentPolicy, selectedApiKeyId, setSelectedAPIKeyId }),
];
@@ -121,30 +126,39 @@ export const ManagedInstructions = React.memo(
}, [
agentPolicy,
selectedApiKeyId,
+ setSelectedPolicyId,
setSelectedAPIKeyId,
agentPolicies,
apiKey.data,
fleetServerSteps,
isFleetServerPolicySelected,
- settings.data?.item?.fleet_server_hosts,
+ settings?.fleet_server_hosts,
viewDataStep,
]);
+ if (fleetStatus.isReady && settings?.fleet_server_hosts.length === 0) {
+ return null;
+ }
+
+ if (fleetStatus.isReady) {
+ return (
+ <>
+
+
+
-
- {
id="xpack.infra.alerting.alertsButton"
defaultMessage="Alerts and rules"
/>
-
+
}
isOpen={popoverOpen}
closePopover={closePopover}
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
index f3481cab73360..302de15db9f5a 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
@@ -7,7 +7,7 @@
import React, { useState, useCallback, useMemo } from 'react';
import { i18n } from '@kbn/i18n';
-import { EuiPopover, EuiButtonEmpty, EuiContextMenuItem, EuiContextMenuPanel } from '@elastic/eui';
+import { EuiPopover, EuiContextMenuItem, EuiContextMenuPanel, EuiHeaderLink } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { AlertFlyout } from './alert_flyout';
import { useLinkProps } from '../../../hooks/use_link_props';
@@ -83,8 +83,7 @@ export const AlertDropdown = () => {
{
id="xpack.infra.alerting.logs.alertsButton"
defaultMessage="Alerts and rules"
/>
-
+
}
isOpen={popoverOpen}
closePopover={closePopover}
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/index.ts b/x-pack/plugins/infra/public/alerting/log_threshold/index.ts
index 5bd64de2f3ac2..0f2746b446927 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/index.ts
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/index.ts
@@ -5,5 +5,5 @@
* 2.0.
*/
-export { getAlertType } from './log_threshold_alert_type';
+export * from './log_threshold_alert_type';
export { AlertDropdown } from './components/alert_dropdown';
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts
index 2c8a6a7ea286a..44097fd005cc7 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts
@@ -7,14 +7,15 @@
import { i18n } from '@kbn/i18n';
import React from 'react';
-import { AlertTypeModel } from '../../../../triggers_actions_ui/public';
+import { ObservabilityRuleTypeModel } from '../../../../observability/public';
import {
LOG_DOCUMENT_COUNT_ALERT_TYPE_ID,
PartialAlertParams,
} from '../../../common/alerting/logs/log_threshold/types';
+import { formatReason } from './rule_data_formatters';
import { validateExpression } from './validation';
-export function getAlertType(): AlertTypeModel {
+export function createLogThresholdAlertType(): ObservabilityRuleTypeModel {
return {
id: LOG_DOCUMENT_COUNT_ALERT_TYPE_ID,
description: i18n.translate('xpack.infra.logs.alertFlyout.alertDescription', {
@@ -33,5 +34,6 @@ export function getAlertType(): AlertTypeModel {
}
),
requiresAppContext: false,
+ format: formatReason,
};
}
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
new file mode 100644
index 0000000000000..6ca081ffbc5ef
--- /dev/null
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import {
+ ALERT_EVALUATION_THRESHOLD,
+ ALERT_EVALUATION_VALUE,
+ ALERT_ID,
+ ALERT_START,
+} from '@kbn/rule-data-utils';
+import { modifyUrl } from '@kbn/std';
+import { fold } from 'fp-ts/lib/Either';
+import { pipe } from 'fp-ts/lib/function';
+import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import {
+ ComparatorToi18nMap,
+ logThresholdRuleDataRT,
+ logThresholdRuleDataSerializedParamsKey,
+ ratioAlertParamsRT,
+} from '../../../common/alerting/logs/log_threshold';
+
+export const formatReason: ObservabilityRuleTypeFormatter = ({ fields }) => {
+ const reason = pipe(
+ logThresholdRuleDataRT.decode(fields),
+ fold(
+ () =>
+ i18n.translate('xpack.infra.logs.alerting.threshold.unknownReasonDescription', {
+ defaultMessage: 'unknown reason',
+ }),
+ (logThresholdRuleData) => {
+ const params = logThresholdRuleData[logThresholdRuleDataSerializedParamsKey][0];
+
+ const actualCount = fields[ALERT_EVALUATION_VALUE];
+ const groupName = fields[ALERT_ID];
+ const isGrouped = (params.groupBy?.length ?? 0) > 0;
+ const isRatio = ratioAlertParamsRT.is(params);
+ const thresholdCount = fields[ALERT_EVALUATION_THRESHOLD];
+ const translatedComparator = ComparatorToi18nMap[params.count.comparator];
+
+ if (isRatio) {
+ return i18n.translate('xpack.infra.logs.alerting.threshold.ratioAlertReasonDescription', {
+ defaultMessage:
+ '{isGrouped, select, true{{groupName}: } false{}}The log entries ratio is {actualCount} ({translatedComparator} {thresholdCount}).',
+ values: {
+ actualCount,
+ translatedComparator,
+ groupName,
+ isGrouped,
+ thresholdCount,
+ },
+ });
+ } else {
+ return i18n.translate('xpack.infra.logs.alerting.threshold.countAlertReasonDescription', {
+ defaultMessage:
+ '{isGrouped, select, true{{groupName}: } false{}}{actualCount, plural, one {{actualCount} log entry} other {{actualCount} log entries} } ({translatedComparator} {thresholdCount}) match the configured conditions.',
+ values: {
+ actualCount,
+ translatedComparator,
+ groupName,
+ isGrouped,
+ thresholdCount,
+ },
+ });
+ }
+ }
+ )
+ );
+
+ const alertStartDate = fields[ALERT_START];
+ const timestamp = alertStartDate != null ? new Date(alertStartDate).valueOf() : null;
+ const link = modifyUrl('/app/logs/link-to/default/logs', ({ query, ...otherUrlParts }) => ({
+ ...otherUrlParts,
+ query: {
+ ...query,
+ ...(timestamp != null ? { time: `${timestamp}` } : {}),
+ },
+ }));
+
+ return {
+ reason,
+ link, // TODO: refactor to URL generators
+ };
+};
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
index 8175a95f6a064..d8b5667e60d04 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
+import { EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useContext } from 'react';
import { Route, Switch } from 'react-router-dom';
@@ -78,28 +78,19 @@ export const LogsPageContent: React.FunctionComponent = () => {
{setHeaderActionMenu && (
-
-
-
- {settingsTabTitle}
-
-
-
-
-
-
- {ADD_DATA_LABEL}
-
-
-
+
+
+ {settingsTabTitle}
+
+
+ {ADD_DATA_LABEL}
+
+
)}
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index 045fcb57ae943..d4845a4dd9e44 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
import React, { useContext } from 'react';
import { Route, RouteComponentProps, Switch } from 'react-router-dom';
-import { EuiErrorBoundary, EuiFlexItem, EuiFlexGroup, EuiButtonEmpty } from '@elastic/eui';
+import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
import { IIndexPattern } from 'src/plugins/data/common';
import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources';
import { DocumentTitle } from '../../components/document_title';
@@ -86,31 +86,22 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
{setHeaderActionMenu && (
-
-
-
- {settingsTabTitle}
-
-
-
-
-
-
-
-
- {ADD_DATA_LABEL}
-
-
-
+
+
+ {settingsTabTitle}
+
+
+ {ADD_DATA_LABEL}
+
+
)}
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx
index d2cd4f87a5342..4e28fb4202bdc 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout.tsx
@@ -6,7 +6,7 @@
*/
import React, { useState, useCallback } from 'react';
-import { EuiButtonEmpty, EuiFlyout } from '@elastic/eui';
+import { EuiHeaderLink, EuiFlyout } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { FlyoutHome } from './flyout_home';
import { JobSetupScreen } from './job_setup_screen';
@@ -50,8 +50,7 @@ export const AnomalyDetectionFlyout = () => {
return (
<>
- {
id="xpack.infra.ml.anomalyDetectionButton"
defaultMessage="Anomaly detection"
/>
-
+
{showFlyout && (
;
-type LogThresholdAlertServices = AlertServices<
- AlertInstanceState,
- AlertInstanceContext,
- LogThresholdActionGroups
->;
-type LogThresholdAlertExecutorOptions = AlertExecutorOptions<
- AlertTypeParams,
- AlertTypeState,
- AlertInstanceState,
- AlertInstanceContext,
+export type LogThresholdActionGroups = ActionGroupIdsOf;
+export type LogThresholdAlertTypeParams = AlertParams;
+export type LogThresholdAlertTypeState = AlertTypeState; // no specific state used
+export type LogThresholdAlertInstanceState = AlertInstanceState; // no specific state used
+export type LogThresholdAlertInstanceContext = AlertInstanceContext; // no specific instance context used
+
+type LogThresholdAlertInstance = AlertInstance<
+ LogThresholdAlertInstanceState,
+ LogThresholdAlertInstanceContext,
LogThresholdActionGroups
>;
+type LogThresholdAlertInstanceFactory = (
+ id: string,
+ threshold: number,
+ value: number
+) => LogThresholdAlertInstance;
const COMPOSITE_GROUP_SIZE = 2000;
@@ -75,9 +80,26 @@ const checkValueAgainstComparatorMap: {
// With forks for group_by vs ungrouped, and ratio vs non-ratio.
export const createLogThresholdExecutor = (libs: InfraBackendLibs) =>
- async function ({ services, params }: LogThresholdAlertExecutorOptions) {
- const { alertInstanceFactory, savedObjectsClient, scopedClusterClient } = services;
+ libs.logsRules.createLifecycleRuleExecutor<
+ LogThresholdAlertTypeParams,
+ LogThresholdAlertTypeState,
+ LogThresholdAlertInstanceState,
+ LogThresholdAlertInstanceContext,
+ LogThresholdActionGroups
+ >(async ({ services, params }) => {
+ const { alertWithLifecycle, savedObjectsClient, scopedClusterClient } = services;
const { sources } = libs;
+ const alertInstanceFactory: LogThresholdAlertInstanceFactory = (id, threshold, value) =>
+ alertWithLifecycle({
+ id,
+ fields: {
+ [ALERT_EVALUATION_THRESHOLD]: threshold,
+ [ALERT_EVALUATION_VALUE]: value,
+ ...logThresholdRuleDataRT.encode({
+ [logThresholdRuleDataSerializedParamsKey]: [params],
+ }),
+ },
+ });
const sourceConfiguration = await sources.getSourceConfiguration(savedObjectsClient, 'default');
const { indices, timestampField, runtimeMappings } = await resolveLogSourceConfiguration(
@@ -113,7 +135,7 @@ export const createLogThresholdExecutor = (libs: InfraBackendLibs) =>
} catch (e) {
throw new Error(e);
}
- };
+ });
async function executeAlert(
alertParams: CountAlertParams,
@@ -121,7 +143,7 @@ async function executeAlert(
indexPattern: string,
runtimeMappings: estypes.MappingRuntimeFields,
esClient: ElasticsearchClient,
- alertInstanceFactory: LogThresholdAlertServices['alertInstanceFactory']
+ alertInstanceFactory: LogThresholdAlertInstanceFactory
) {
const query = getESQuery(alertParams, timestampField, indexPattern, runtimeMappings);
@@ -152,7 +174,7 @@ async function executeRatioAlert(
indexPattern: string,
runtimeMappings: estypes.MappingRuntimeFields,
esClient: ElasticsearchClient,
- alertInstanceFactory: LogThresholdAlertServices['alertInstanceFactory']
+ alertInstanceFactory: LogThresholdAlertInstanceFactory
) {
// Ratio alert params are separated out into two standard sets of alert params
const numeratorParams: AlertParams = {
@@ -214,14 +236,14 @@ const getESQuery = (
export const processUngroupedResults = (
results: UngroupedSearchQueryResponse,
params: CountAlertParams,
- alertInstanceFactory: LogThresholdAlertExecutorOptions['services']['alertInstanceFactory'],
+ alertInstanceFactory: LogThresholdAlertInstanceFactory,
alertInstaceUpdater: AlertInstanceUpdater
) => {
const { count, criteria } = params;
const documentCount = results.hits.total.value;
if (checkValueAgainstComparatorMap[count.comparator](documentCount, count.value)) {
- const alertInstance = alertInstanceFactory(UNGROUPED_FACTORY_KEY);
+ const alertInstance = alertInstanceFactory(UNGROUPED_FACTORY_KEY, count.value, documentCount);
alertInstaceUpdater(alertInstance, AlertStates.ALERT, [
{
actionGroup: FIRED_ACTIONS.id,
@@ -240,7 +262,7 @@ export const processUngroupedRatioResults = (
numeratorResults: UngroupedSearchQueryResponse,
denominatorResults: UngroupedSearchQueryResponse,
params: RatioAlertParams,
- alertInstanceFactory: LogThresholdAlertExecutorOptions['services']['alertInstanceFactory'],
+ alertInstanceFactory: LogThresholdAlertInstanceFactory,
alertInstaceUpdater: AlertInstanceUpdater
) => {
const { count, criteria } = params;
@@ -250,7 +272,7 @@ export const processUngroupedRatioResults = (
const ratio = getRatio(numeratorCount, denominatorCount);
if (ratio !== undefined && checkValueAgainstComparatorMap[count.comparator](ratio, count.value)) {
- const alertInstance = alertInstanceFactory(UNGROUPED_FACTORY_KEY);
+ const alertInstance = alertInstanceFactory(UNGROUPED_FACTORY_KEY, count.value, ratio);
alertInstaceUpdater(alertInstance, AlertStates.ALERT, [
{
actionGroup: FIRED_ACTIONS.id,
@@ -308,7 +330,7 @@ const getReducedGroupByResults = (
export const processGroupByResults = (
results: GroupedSearchQueryResponse['aggregations']['groups']['buckets'],
params: CountAlertParams,
- alertInstanceFactory: LogThresholdAlertExecutorOptions['services']['alertInstanceFactory'],
+ alertInstanceFactory: LogThresholdAlertInstanceFactory,
alertInstaceUpdater: AlertInstanceUpdater
) => {
const { count, criteria } = params;
@@ -319,7 +341,7 @@ export const processGroupByResults = (
const documentCount = group.documentCount;
if (checkValueAgainstComparatorMap[count.comparator](documentCount, count.value)) {
- const alertInstance = alertInstanceFactory(group.name);
+ const alertInstance = alertInstanceFactory(group.name, count.value, documentCount);
alertInstaceUpdater(alertInstance, AlertStates.ALERT, [
{
actionGroup: FIRED_ACTIONS.id,
@@ -339,7 +361,7 @@ export const processGroupByRatioResults = (
numeratorResults: GroupedSearchQueryResponse['aggregations']['groups']['buckets'],
denominatorResults: GroupedSearchQueryResponse['aggregations']['groups']['buckets'],
params: RatioAlertParams,
- alertInstanceFactory: LogThresholdAlertExecutorOptions['services']['alertInstanceFactory'],
+ alertInstanceFactory: LogThresholdAlertInstanceFactory,
alertInstaceUpdater: AlertInstanceUpdater
) => {
const { count, criteria } = params;
@@ -360,7 +382,7 @@ export const processGroupByRatioResults = (
ratio !== undefined &&
checkValueAgainstComparatorMap[count.comparator](ratio, count.value)
) {
- const alertInstance = alertInstanceFactory(numeratorGroup.name);
+ const alertInstance = alertInstanceFactory(numeratorGroup.name, count.value, ratio);
alertInstaceUpdater(alertInstance, AlertStates.ALERT, [
{
actionGroup: FIRED_ACTIONS.id,
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_alert_type.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_alert_type.ts
index 62d92d0487ff7..3d0bac3dd2bf5 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_alert_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_alert_type.ts
@@ -6,14 +6,7 @@
*/
import { i18n } from '@kbn/i18n';
-import {
- PluginSetupContract,
- AlertTypeParams,
- AlertTypeState,
- AlertInstanceContext,
- AlertInstanceState,
- ActionGroupIdsOf,
-} from '../../../../../alerting/server';
+import { PluginSetupContract } from '../../../../../alerting/server';
import { createLogThresholdExecutor, FIRED_ACTIONS } from './log_threshold_executor';
import {
LOG_DOCUMENT_COUNT_ALERT_TYPE_ID,
@@ -88,13 +81,7 @@ export async function registerLogThresholdAlertType(
);
}
- alertingPlugin.registerType<
- AlertTypeParams,
- AlertTypeState,
- AlertInstanceState,
- AlertInstanceContext,
- ActionGroupIdsOf
- >({
+ alertingPlugin.registerType({
id: LOG_DOCUMENT_COUNT_ALERT_TYPE_ID,
name: i18n.translate('xpack.infra.logs.alertName', {
defaultMessage: 'Log threshold',
diff --git a/x-pack/plugins/infra/server/lib/infra_types.ts b/x-pack/plugins/infra/server/lib/infra_types.ts
index 0c57ff2e05847..332a2e499977b 100644
--- a/x-pack/plugins/infra/server/lib/infra_types.ts
+++ b/x-pack/plugins/infra/server/lib/infra_types.ts
@@ -5,15 +5,16 @@
* 2.0.
*/
+import { handleEsError } from '../../../../../src/plugins/es_ui_shared/server';
+import { InfraConfig } from '../plugin';
+import { GetLogQueryFields } from '../services/log_queries/get_log_query_fields';
+import { RulesServiceSetup } from '../services/rules';
+import { KibanaFramework } from './adapters/framework/kibana_framework_adapter';
import { InfraFieldsDomain } from './domains/fields_domain';
import { InfraLogEntriesDomain } from './domains/log_entries_domain';
import { InfraMetricsDomain } from './domains/metrics_domain';
import { InfraSources } from './sources';
import { InfraSourceStatus } from './source_status';
-import { InfraConfig } from '../plugin';
-import { KibanaFramework } from './adapters/framework/kibana_framework_adapter';
-import { GetLogQueryFields } from '../services/log_queries/get_log_query_fields';
-import { handleEsError } from '../../../../../src/plugins/es_ui_shared/server';
export interface InfraDomainLibs {
fields: InfraFieldsDomain;
@@ -28,4 +29,6 @@ export interface InfraBackendLibs extends InfraDomainLibs {
sourceStatus: InfraSourceStatus;
getLogQueryFields: GetLogQueryFields;
handleEsError: typeof handleEsError;
+ logsRules: RulesServiceSetup;
+ metricsRules: RulesServiceSetup;
}
diff --git a/x-pack/plugins/infra/server/plugin.ts b/x-pack/plugins/infra/server/plugin.ts
index 7c5666049bd60..de445affc178e 100644
--- a/x-pack/plugins/infra/server/plugin.ts
+++ b/x-pack/plugins/infra/server/plugin.ts
@@ -8,7 +8,9 @@
import { Server } from '@hapi/hapi';
import { schema, TypeOf } from '@kbn/config-schema';
import { i18n } from '@kbn/i18n';
+import { Logger } from '@kbn/logging';
import { CoreSetup, PluginInitializerContext, Plugin } from 'src/core/server';
+import { LOGS_FEATURE_ID, METRICS_FEATURE_ID } from '../common/constants';
import { InfraStaticSourceConfiguration } from '../common/source_configuration/source_configuration';
import { inventoryViewSavedObjectType } from '../common/saved_objects/inventory_view';
import { metricsExplorerViewSavedObjectType } from '../common/saved_objects/metrics_explorer_view';
@@ -32,6 +34,7 @@ import { InfraPluginRequestHandlerContext } from './types';
import { UsageCollector } from './usage/usage_collector';
import { createGetLogQueryFields } from './services/log_queries/get_log_query_fields';
import { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+import { RulesService } from './services/rules';
export const config = {
schema: schema.object({
@@ -82,9 +85,25 @@ export interface InfraPluginSetup {
export class InfraServerPlugin implements Plugin {
public config: InfraConfig;
public libs: InfraBackendLibs | undefined;
+ public logger: Logger;
+
+ private logsRules: RulesService;
+ private metricsRules: RulesService;
constructor(context: PluginInitializerContext) {
this.config = context.config.get();
+ this.logger = context.logger.get();
+
+ this.logsRules = new RulesService(
+ LOGS_FEATURE_ID,
+ 'observability.logs',
+ this.logger.get('logsRules')
+ );
+ this.metricsRules = new RulesService(
+ METRICS_FEATURE_ID,
+ 'observability.metrics',
+ this.logger.get('metricsRules')
+ );
}
setup(core: CoreSetup, plugins: InfraServerPluginSetupDeps) {
@@ -126,6 +145,8 @@ export class InfraServerPlugin implements Plugin {
...domainLibs,
getLogQueryFields: createGetLogQueryFields(sources, framework),
handleEsError,
+ logsRules: this.logsRules.setup(core, plugins),
+ metricsRules: this.metricsRules.setup(core, plugins),
};
plugins.features.registerKibanaFeature(METRICS_FEATURE);
diff --git a/x-pack/plugins/infra/server/services/rules/index.ts b/x-pack/plugins/infra/server/services/rules/index.ts
new file mode 100644
index 0000000000000..eaa3d0da493e5
--- /dev/null
+++ b/x-pack/plugins/infra/server/services/rules/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './rules_service';
+export * from './types';
diff --git a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
new file mode 100644
index 0000000000000..d693be40f10d0
--- /dev/null
+++ b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { once } from 'lodash';
+import { CoreSetup, Logger } from 'src/core/server';
+import { TECHNICAL_COMPONENT_TEMPLATE_NAME } from '../../../../rule_registry/common/assets';
+import { RuleRegistryPluginSetupContract } from '../../../../rule_registry/server';
+import { logThresholdRuleDataNamespace } from '../../../common/alerting/logs/log_threshold';
+import type { InfraFeatureId } from '../../../common/constants';
+import { RuleRegistrationContext, RulesServiceStartDeps } from './types';
+
+export const createRuleDataClient = ({
+ ownerFeatureId,
+ registrationContext,
+ getStartServices,
+ logger,
+ ruleDataService,
+}: {
+ ownerFeatureId: InfraFeatureId;
+ registrationContext: RuleRegistrationContext;
+ getStartServices: CoreSetup['getStartServices'];
+ logger: Logger;
+ ruleDataService: RuleRegistryPluginSetupContract['ruleDataService'];
+}) => {
+ const initializeRuleDataTemplates = once(async () => {
+ const componentTemplateName = ruleDataService.getFullAssetName(
+ `${registrationContext}-mappings`
+ );
+
+ const indexNamePattern = ruleDataService.getFullAssetName(`${registrationContext}*`);
+
+ if (!ruleDataService.isWriteEnabled()) {
+ return;
+ }
+
+ await ruleDataService.createOrUpdateComponentTemplate({
+ name: componentTemplateName,
+ body: {
+ template: {
+ settings: {
+ number_of_shards: 1,
+ },
+ mappings: {
+ properties: {
+ [logThresholdRuleDataNamespace]: {
+ properties: {
+ serialized_params: {
+ type: 'keyword',
+ index: false,
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ });
+
+ await ruleDataService.createOrUpdateIndexTemplate({
+ name: ruleDataService.getFullAssetName(registrationContext),
+ body: {
+ index_patterns: [indexNamePattern],
+ composed_of: [
+ ruleDataService.getFullAssetName(TECHNICAL_COMPONENT_TEMPLATE_NAME),
+ componentTemplateName,
+ ],
+ },
+ });
+
+ await ruleDataService.updateIndexMappingsMatchingPattern(indexNamePattern);
+ });
+
+ // initialize eagerly
+ const initializeRuleDataTemplatesPromise = initializeRuleDataTemplates().catch((err) => {
+ logger.error(err);
+ });
+
+ return ruleDataService.getRuleDataClient(
+ ownerFeatureId,
+ ruleDataService.getFullAssetName(registrationContext),
+ () => initializeRuleDataTemplatesPromise
+ );
+};
diff --git a/x-pack/plugins/infra/server/services/rules/rules_service.ts b/x-pack/plugins/infra/server/services/rules/rules_service.ts
new file mode 100644
index 0000000000000..9341fc59d75b8
--- /dev/null
+++ b/x-pack/plugins/infra/server/services/rules/rules_service.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreSetup, Logger } from 'src/core/server';
+import { createLifecycleExecutor } from '../../../../rule_registry/server';
+import { InfraFeatureId } from '../../../common/constants';
+import { createRuleDataClient } from './rule_data_client';
+import {
+ RuleRegistrationContext,
+ RulesServiceSetup,
+ RulesServiceSetupDeps,
+ RulesServiceStart,
+ RulesServiceStartDeps,
+} from './types';
+
+export class RulesService {
+ constructor(
+ public readonly ownerFeatureId: InfraFeatureId,
+ public readonly registrationContext: RuleRegistrationContext,
+ private readonly logger: Logger
+ ) {}
+
+ public setup(
+ core: CoreSetup,
+ setupDeps: RulesServiceSetupDeps
+ ): RulesServiceSetup {
+ const ruleDataClient = createRuleDataClient({
+ getStartServices: core.getStartServices,
+ logger: this.logger,
+ ownerFeatureId: this.ownerFeatureId,
+ registrationContext: this.registrationContext,
+ ruleDataService: setupDeps.ruleRegistry.ruleDataService,
+ });
+
+ const createLifecycleRuleExecutor = createLifecycleExecutor(this.logger, ruleDataClient);
+
+ return {
+ createLifecycleRuleExecutor,
+ ruleDataClient,
+ };
+ }
+
+ public start(_startDeps: RulesServiceStartDeps): RulesServiceStart {
+ return {};
+ }
+}
diff --git a/x-pack/plugins/infra/server/services/rules/types.ts b/x-pack/plugins/infra/server/services/rules/types.ts
new file mode 100644
index 0000000000000..b67b79ee5d3c2
--- /dev/null
+++ b/x-pack/plugins/infra/server/services/rules/types.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginSetupContract as AlertingPluginSetup } from '../../../../alerting/server';
+import {
+ createLifecycleExecutor,
+ RuleDataClient,
+ RuleRegistryPluginSetupContract,
+} from '../../../../rule_registry/server';
+
+type LifecycleRuleExecutorCreator = ReturnType;
+
+export interface RulesServiceSetupDeps {
+ alerting: AlertingPluginSetup;
+ ruleRegistry: RuleRegistryPluginSetupContract;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface RulesServiceStartDeps {}
+
+export interface RulesServiceSetup {
+ createLifecycleRuleExecutor: LifecycleRuleExecutorCreator;
+ ruleDataClient: RuleDataClient;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface RulesServiceStart {}
+
+export type RuleRegistrationContext = 'observability.logs' | 'observability.metrics';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
new file mode 100644
index 0000000000000..7a4c55d6f5e02
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
@@ -0,0 +1,180 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { act } from 'react-dom/test-utils';
+import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+
+// Default parameter values automatically added to the network direction processor when saved
+const defaultNetworkDirectionParameters = {
+ if: undefined,
+ tag: undefined,
+ source_ip: undefined,
+ description: undefined,
+ target_field: undefined,
+ ignore_missing: undefined,
+ ignore_failure: undefined,
+ destination_ip: undefined,
+ internal_networks: undefined,
+ internal_networks_field: undefined,
+};
+
+const NETWORK_DIRECTION_TYPE = 'network_direction';
+
+describe('Processor: Network Direction', () => {
+ let onUpdate: jest.Mock;
+ let testBed: SetupResult;
+
+ beforeAll(() => {
+ jest.useFakeTimers();
+ });
+
+ afterAll(() => {
+ jest.useRealTimers();
+ });
+
+ beforeEach(async () => {
+ onUpdate = jest.fn();
+
+ await act(async () => {
+ testBed = await setup({
+ value: {
+ processors: [],
+ },
+ onFlyoutOpen: jest.fn(),
+ onUpdate,
+ });
+ });
+
+ testBed.component.update();
+
+ // Open flyout to add new processor
+ testBed.actions.addProcessor();
+ // Add type (the other fields are not visible until a type is selected)
+ await testBed.actions.addProcessorType(NETWORK_DIRECTION_TYPE);
+ });
+
+ test('prevents form submission if internal_network field is not provided', async () => {
+ const {
+ actions: { saveNewProcessor },
+ form,
+ } = testBed;
+
+ // Click submit button with only the type defined
+ await saveNewProcessor();
+
+ // Expect form error as "field" is required parameter
+ expect(form.getErrorsMessages()).toEqual(['A field value is required.']);
+ });
+
+ test('saves with default parameter values', async () => {
+ const {
+ actions: { saveNewProcessor },
+ find,
+ component,
+ } = testBed;
+
+ // Add "networkDirectionField" value (required)
+ await act(async () => {
+ find('networkDirectionField.input').simulate('change', [{ label: 'loopback' }]);
+ });
+ component.update();
+
+ // Save the field
+ await saveNewProcessor();
+
+ const processors = getProcessorValue(onUpdate, NETWORK_DIRECTION_TYPE);
+ expect(processors[0][NETWORK_DIRECTION_TYPE]).toEqual({
+ ...defaultNetworkDirectionParameters,
+ internal_networks: ['loopback'],
+ });
+ });
+
+ test('allows to set internal_networks_field', async () => {
+ const {
+ actions: { saveNewProcessor },
+ form,
+ find,
+ } = testBed;
+
+ find('toggleCustomField').simulate('click');
+
+ form.setInputValue('networkDirectionField.input', 'internal_networks_field');
+
+ // Save the field with new changes
+ await saveNewProcessor();
+
+ const processors = getProcessorValue(onUpdate, NETWORK_DIRECTION_TYPE);
+ expect(processors[0][NETWORK_DIRECTION_TYPE]).toEqual({
+ ...defaultNetworkDirectionParameters,
+ internal_networks_field: 'internal_networks_field',
+ });
+ });
+
+ test('allows to set just internal_networks_field or internal_networks', async () => {
+ const {
+ actions: { saveNewProcessor },
+ form,
+ find,
+ component,
+ } = testBed;
+
+ // Set internal_networks field
+ await act(async () => {
+ find('networkDirectionField.input').simulate('change', [{ label: 'loopback' }]);
+ });
+ component.update();
+
+ // Toggle to internal_networks_field and set a random value
+ find('toggleCustomField').simulate('click');
+ form.setInputValue('networkDirectionField.input', 'internal_networks_field');
+
+ // Save the field with new changes
+ await saveNewProcessor();
+
+ const processors = getProcessorValue(onUpdate, NETWORK_DIRECTION_TYPE);
+ expect(processors[0][NETWORK_DIRECTION_TYPE]).toEqual({
+ ...defaultNetworkDirectionParameters,
+ internal_networks_field: 'internal_networks_field',
+ });
+ });
+
+ test('allows optional parameters to be set', async () => {
+ const {
+ actions: { saveNewProcessor },
+ form,
+ find,
+ component,
+ } = testBed;
+
+ // Add "networkDirectionField" value (required)
+ await act(async () => {
+ find('networkDirectionField.input').simulate('change', [{ label: 'loopback' }]);
+ });
+ component.update();
+
+ // Set optional parameteres
+ form.toggleEuiSwitch('ignoreMissingSwitch.input');
+ form.toggleEuiSwitch('ignoreFailureSwitch.input');
+ form.setInputValue('sourceIpField.input', 'source.ip');
+ form.setInputValue('targetField.input', 'target_field');
+ form.setInputValue('destinationIpField.input', 'destination.ip');
+
+ // Save the field with new changes
+ await saveNewProcessor();
+
+ const processors = getProcessorValue(onUpdate, NETWORK_DIRECTION_TYPE);
+ expect(processors[0][NETWORK_DIRECTION_TYPE]).toEqual({
+ ...defaultNetworkDirectionParameters,
+ ignore_failure: true,
+ ignore_missing: false,
+ source_ip: 'source.ip',
+ target_field: 'target_field',
+ destination_ip: 'destination.ip',
+ internal_networks: ['loopback'],
+ });
+ });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
index 24e1ddce008ea..e4024e4ec67f4 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
@@ -171,6 +171,10 @@ type TestSubject =
| 'regexFileField.input'
| 'valueFieldInput'
| 'mediaTypeSelectorField'
+ | 'networkDirectionField.input'
+ | 'sourceIpField.input'
+ | 'destinationIpField.input'
+ | 'toggleCustomField'
| 'ignoreEmptyField.input'
| 'overrideField.input'
| 'fieldsValueField.input'
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/index.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/index.ts
index 5e3e5f82478bd..f5eb1ab3ec59b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/index.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/index.ts
@@ -28,6 +28,7 @@ export { Join } from './join';
export { Json } from './json';
export { Kv } from './kv';
export { Lowercase } from './lowercase';
+export { NetworkDirection } from './network_direction';
export { Pipeline } from './pipeline';
export { RegisteredDomain } from './registered_domain';
export { Remove } from './remove';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/network_direction.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/network_direction.tsx
new file mode 100644
index 0000000000000..2026a77bc6566
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/network_direction.tsx
@@ -0,0 +1,242 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FunctionComponent, useState, useCallback, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { isEmpty } from 'lodash';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiButtonEmpty, EuiCode } from '@elastic/eui';
+
+import {
+ FIELD_TYPES,
+ UseField,
+ useFormContext,
+ Field,
+ FieldHook,
+ FieldConfig,
+ SerializerFunc,
+} from '../../../../../../shared_imports';
+import { FieldsConfig, from, to } from './shared';
+import { TargetField } from './common_fields/target_field';
+import { IgnoreMissingField } from './common_fields/ignore_missing_field';
+
+interface InternalNetworkTypes {
+ internal_networks: string[];
+ internal_networks_field: string;
+}
+
+type InternalNetworkFields = {
+ [K in keyof InternalNetworkTypes]: FieldHook;
+};
+
+const internalNetworkValues: string[] = [
+ 'loopback',
+ 'unicast',
+ 'global_unicast',
+ 'multicast',
+ 'interface_local_multicast',
+ 'link_local_unicast',
+ 'link_local_multicast',
+ 'link_local_multicast',
+ 'private',
+ 'public',
+ 'unspecified',
+];
+
+const fieldsConfig: FieldsConfig = {
+ /* Optional fields config */
+ source_ip: {
+ type: FIELD_TYPES.TEXT,
+ serializer: from.emptyStringToUndefined,
+ label: i18n.translate('xpack.ingestPipelines.pipelineEditor.networkDirection.sourceIpLabel', {
+ defaultMessage: 'Source IP (optional)',
+ }),
+ helpText: (
+ {'source.ip'},
+ }}
+ />
+ ),
+ },
+ destination_ip: {
+ type: FIELD_TYPES.TEXT,
+ serializer: from.emptyStringToUndefined,
+ label: i18n.translate(
+ 'xpack.ingestPipelines.pipelineEditor.networkDirection.destinationIpLabel',
+ {
+ defaultMessage: 'Destination IP (optional)',
+ }
+ ),
+ helpText: (
+ {'destination.ip'},
+ }}
+ />
+ ),
+ },
+};
+
+const getInternalNetworkConfig: (
+ toggleCustom: () => void
+) => Record<
+ keyof InternalNetworkFields,
+ {
+ path: string;
+ config?: FieldConfig;
+ euiFieldProps?: Record;
+ labelAppend: JSX.Element;
+ }
+> = (toggleCustom: () => void) => ({
+ internal_networks: {
+ path: 'fields.internal_networks',
+ euiFieldProps: {
+ noSuggestions: false,
+ options: internalNetworkValues.map((label) => ({ label })),
+ },
+ config: {
+ type: FIELD_TYPES.COMBO_BOX,
+ deserializer: to.arrayOfStrings,
+ serializer: from.optionalArrayOfStrings,
+ fieldsToValidateOnChange: ['fields.internal_networks', 'fields.internal_networks_field'],
+ validations: [
+ {
+ validator: ({ value, path, formData }) => {
+ if (isEmpty(value) && isEmpty(formData['fields.internal_networks_field'])) {
+ return { path, message: 'A field value is required.' };
+ }
+ },
+ },
+ ],
+ label: i18n.translate(
+ 'xpack.ingestPipelines.pipelineEditor.networkDirection.internalNetworksLabel',
+ {
+ defaultMessage: 'Internal networks',
+ }
+ ),
+ helpText: (
+
+ {i18n.translate('xpack.ingestPipelines.pipelineEditor.internalNetworkCustomLabel', {
+ defaultMessage: 'Use custom field',
+ })}
+
+ ),
+ key: 'preset',
+ },
+ internal_networks_field: {
+ path: 'fields.internal_networks_field',
+ config: {
+ type: FIELD_TYPES.TEXT,
+ serializer: from.emptyStringToUndefined,
+ fieldsToValidateOnChange: ['fields.internal_networks', 'fields.internal_networks_field'],
+ validations: [
+ {
+ validator: ({ value, path, formData }) => {
+ if (isEmpty(value) && isEmpty(formData['fields.internal_networks'])) {
+ return { path, message: 'A field value is required.' };
+ }
+ },
+ },
+ ],
+ label: i18n.translate(
+ 'xpack.ingestPipelines.pipelineEditor.networkDirection.internalNetworksFieldLabel',
+ {
+ defaultMessage: 'Internal networks field',
+ }
+ ),
+ helpText: (
+ {'internal_networks'},
+ }}
+ />
+ ),
+ },
+ labelAppend: (
+
+ {i18n.translate('xpack.ingestPipelines.pipelineEditor.internalNetworkPredefinedLabel', {
+ defaultMessage: 'Use preset field',
+ })}
+
+ ),
+ key: 'custom',
+ },
+});
+
+export const NetworkDirection: FunctionComponent = () => {
+ const { getFieldDefaultValue } = useFormContext();
+ const isInternalNetowrksFieldDefined =
+ getFieldDefaultValue('fields.internal_networks_field') !== undefined;
+ const [isCustom, setIsCustom] = useState(isInternalNetowrksFieldDefined);
+
+ const toggleCustom = useCallback(() => {
+ setIsCustom((prev) => !prev);
+ }, []);
+
+ const internalNetworkFieldProps = useMemo(
+ () =>
+ isCustom
+ ? getInternalNetworkConfig(toggleCustom).internal_networks_field
+ : getInternalNetworkConfig(toggleCustom).internal_networks,
+ [isCustom, toggleCustom]
+ );
+
+ return (
+ <>
+ {'network.direction'},
+ }}
+ />
+ }
+ />
+
+ }
+ />
+
+ );
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/shared/map_processor_type_to_form.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/shared/map_processor_type_to_form.tsx
index 983fb0ea67bb0..e6ca465bf1a02 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/shared/map_processor_type_to_form.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/shared/map_processor_type_to_form.tsx
@@ -34,6 +34,7 @@ import {
Json,
Kv,
Lowercase,
+ NetworkDirection,
Pipeline,
RegisteredDomain,
Remove,
@@ -517,6 +518,23 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
},
}),
},
+ network_direction: {
+ FieldsComponent: NetworkDirection,
+ docLinkPath: '/network-direction-processor.html',
+ label: i18n.translate('xpack.ingestPipelines.processors.label.networkDirection', {
+ defaultMessage: 'Network Direction',
+ }),
+ typeDescription: i18n.translate(
+ 'xpack.ingestPipelines.processors.description.networkDirection',
+ {
+ defaultMessage: 'Calculates the network direction given a source IP address.',
+ }
+ ),
+ getDefaultDescription: () =>
+ i18n.translate('xpack.ingestPipelines.processors.defaultDescription.networkDirection', {
+ defaultMessage: 'Calculates the network direction given a source IP address.',
+ }),
+ },
pipeline: {
FieldsComponent: Pipeline,
docLinkPath: '/pipeline-processor.html',
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/context/processors_context.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/context/processors_context.tsx
index 0c43297e811d3..ddf996de7805c 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/context/processors_context.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/context/processors_context.tsx
@@ -151,7 +151,13 @@ export const PipelineProcessorsContextProvider: FunctionComponent = ({
break;
case 'managingProcessor':
// These are the option names we get back from our UI
- const knownOptionNames = Object.keys(processorTypeAndOptions.options);
+ const knownOptionNames = [
+ ...Object.keys(processorTypeAndOptions.options),
+ // We manually add fields that we **don't** want to be treated as "unknownOptions"
+ 'internal_networks',
+ 'internal_networks_field',
+ ];
+
// The processor that we are updating may have options configured the UI does not know about
const unknownOptions = omit(mode.arg.processor.options, knownOptionNames);
// In order to keep the options we don't get back from our UI, we merge the known and unknown options
diff --git a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
index 8ed57221a1395..29be11430bf64 100644
--- a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
+++ b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
@@ -43,6 +43,7 @@ export {
ArrayItem,
FormHook,
useFormContext,
+ UseMultiFields,
FormDataProvider,
OnFormUpdateArg,
FieldConfig,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
index 19d91c1006cf0..936f1e477057d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
@@ -35,7 +35,7 @@ const operationDefinitionMap: Record = {
}),
} as unknown) as GenericOperationDefinition,
terms: { input: 'field' } as GenericOperationDefinition,
- sum: { input: 'field' } as GenericOperationDefinition,
+ sum: { input: 'field', filterable: true } as GenericOperationDefinition,
last_value: { input: 'field' } as GenericOperationDefinition,
max: { input: 'field' } as GenericOperationDefinition,
count: ({
@@ -928,6 +928,63 @@ invalid: "
).toEqual(['The operation average does not accept any parameter']);
});
+ it('returns an error if first argument type is passed multiple times', () => {
+ const formulas = [
+ 'average(bytes, bytes)',
+ "sum(bytes, kql='category.keyword: *', bytes)",
+ 'moving_average(average(bytes), average(bytes))',
+ "moving_average(average(bytes), kql='category.keyword: *', average(bytes))",
+ 'moving_average(average(bytes, bytes), count())',
+ 'moving_average(moving_average(average(bytes, bytes), count(), count()))',
+ ];
+ for (const formula of formulas) {
+ expect(
+ formulaOperation.getErrorMessage!(
+ getNewLayerWithFormula(formula),
+ 'col1',
+ indexPattern,
+ operationDefinitionMap
+ )
+ ).toEqual(
+ expect.arrayContaining([
+ expect.stringMatching(
+ /The operation (moving_average|average|sum) in the Formula requires a single (field|metric), found:/
+ ),
+ ])
+ );
+ }
+ });
+
+ it('returns an error if a function received an argument of the wrong argument type in any position', () => {
+ const formulas = [
+ 'average(bytes, count())',
+ "sum(bytes, kql='category.keyword: *', count(), count())",
+ 'average(bytes, bytes + 1)',
+ 'average(count(), bytes)',
+ 'moving_average(average(bytes), bytes)',
+ 'moving_average(bytes, bytes)',
+ 'moving_average(average(bytes), window=7, bytes)',
+ 'moving_average(window=7, bytes)',
+ "moving_average(kql='category.keyword: *', bytes)",
+ ];
+ for (const formula of formulas) {
+ expect(
+ formulaOperation.getErrorMessage!(
+ getNewLayerWithFormula(formula),
+ 'col1',
+ indexPattern,
+ operationDefinitionMap
+ )
+ ).toEqual(
+ expect.arrayContaining([
+ expect.stringMatching(
+ /The operation (moving_average|average|sum) in the Formula does not support (metric|field) parameters, found:/
+ ),
+ ])
+ );
+ }
+ });
+
it('returns an error if the parameter passed to an operation is of the wrong type', () => {
expect(
formulaOperation.getErrorMessage!(
@@ -1087,6 +1144,14 @@ invalid: "
)
).toEqual([`The first argument for ${fn} should be a field name. Found no field`]);
}
+ expect(
+ formulaOperation.getErrorMessage!(
+ getNewLayerWithFormula(`sum(kql='category.keyword: *')`),
+ 'col1',
+ indexPattern,
+ operationDefinitionMap
+ )
+ ).toEqual([`The first argument for sum should be a field name. Found category.keyword: *`]);
});
it("returns a clear error when there's a missing function for a fullReference operation", () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
index 445df21a6067e..6d0a585db048f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
@@ -455,7 +455,7 @@ Example: Calculate area based on side length
},
};
-export function isMathNode(node: TinymathAST) {
+export function isMathNode(node: TinymathAST | string) {
return isObject(node) && node.type === 'function' && tinymathFunctions[node.name];
}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
index 5b7a9beaa4e32..d65ef5ada8b37 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
@@ -7,7 +7,7 @@
import { isObject, partition } from 'lodash';
import { i18n } from '@kbn/i18n';
-import { parse, TinymathLocation } from '@kbn/tinymath';
+import { parse, TinymathLocation, TinymathVariable } from '@kbn/tinymath';
import type { TinymathAST, TinymathFunction, TinymathNamedArgument } from '@kbn/tinymath';
import { esKuery, esQuery } from '../../../../../../../../src/plugins/data/public';
import {
@@ -63,6 +63,19 @@ interface ValidationErrors {
message: string;
type: {};
};
+ tooManyFirstArguments: {
+ message: string;
+ type: {
+ operation: string;
+ type: string;
+ text: string;
+ supported?: number;
+ };
+ };
+ wrongArgument: {
+ message: string;
+ type: { operation: string; text: string; type: string };
+ };
}
type ErrorTypes = keyof ValidationErrors;
@@ -276,6 +289,25 @@ function getMessageFromId({
defaultMessage: 'Use only one of kql= or lucene=, not both',
});
break;
+ case 'tooManyFirstArguments':
+ message = i18n.translate('xpack.lens.indexPattern.formulaOperationTooManyFirstArguments', {
+ defaultMessage:
+ 'The operation {operation} in the Formula requires a {supported, plural, one {single} other {supported}} {type}, found: {text}',
+ values: {
+ operation: out.operation,
+ text: out.text,
+ type: out.type,
+ supported: out.supported || 1,
+ },
+ });
+ break;
+ case 'wrongArgument':
+ message = i18n.translate('xpack.lens.indexPattern.formulaOperationwrongArgument', {
+ defaultMessage:
+ 'The operation {operation} in the Formula does not support {type} parameters, found: {text}',
+ values: { operation: out.operation, text: out.text, type: out.type },
+ });
+ break;
// case 'mathRequiresFunction':
// message = i18n.translate('xpack.lens.indexPattern.formulaMathRequiresFunctionLabel', {
// defaultMessage; 'The function {name} requires an Elasticsearch function',
@@ -531,14 +563,16 @@ function runFullASTValidation(
} else {
if (nodeOperation.input === 'field') {
if (shouldHaveFieldArgument(node)) {
- if (!isFirstArgumentValidType(firstArg, 'variable')) {
+ if (!isArgumentValidType(firstArg, 'variable')) {
if (isMathNode(firstArg)) {
errors.push(
getMessageFromId({
messageId: 'wrongFirstArgument',
values: {
operation: node.name,
- type: 'field',
+ type: i18n.translate('xpack.lens.indexPattern.formulaFieldValue', {
+ defaultMessage: 'field',
+ }),
argument: `math operation`,
},
locations: node.location ? [node.location] : [],
@@ -550,7 +584,9 @@ function runFullASTValidation(
messageId: 'wrongFirstArgument',
values: {
operation: node.name,
- type: 'field',
+ type: i18n.translate('xpack.lens.indexPattern.formulaFieldValue', {
+ defaultMessage: 'field',
+ }),
argument:
getValueOrName(firstArg) ||
i18n.translate('xpack.lens.indexPattern.formulaNoFieldForOperation', {
@@ -561,6 +597,25 @@ function runFullASTValidation(
})
);
}
+ } else {
+ // If the first argument is valid proceed with the other arguments validation
+ const fieldErrors = validateFieldArguments(node, variables, {
+ isFieldOperation: true,
+ firstArg,
+ });
+ if (fieldErrors.length) {
+ errors.push(...fieldErrors);
+ }
+ }
+ const functionErrors = validateFunctionArguments(node, functions, 0, {
+ isFieldOperation: true,
+ type: i18n.translate('xpack.lens.indexPattern.formulaFieldValue', {
+ defaultMessage: 'field',
+ }),
+ firstArgValidation: false,
+ });
+ if (functionErrors.length) {
+ errors.push(...functionErrors);
}
} else {
// Named arguments only
@@ -602,16 +657,20 @@ function runFullASTValidation(
if (nodeOperation.input === 'fullReference') {
// What about fn(7 + 1)? We may want to allow that
// In general this should be handled down the Esaggs route rather than here
- if (
- !isFirstArgumentValidType(firstArg, 'function') ||
- (isMathNode(firstArg) && validateMathNodes(firstArg, missingVariablesSet).length)
- ) {
+ const isFirstArgumentNotValid = Boolean(
+ !isArgumentValidType(firstArg, 'function') ||
+ (isMathNode(firstArg) && validateMathNodes(firstArg, missingVariablesSet).length)
+ );
+ // First field has a special handling
+ if (isFirstArgumentNotValid) {
errors.push(
getMessageFromId({
messageId: 'wrongFirstArgument',
values: {
operation: node.name,
- type: 'operation',
+ type: i18n.translate('xpack.lens.indexPattern.formulaOperationValue', {
+ defaultMessage: 'operation',
+ }),
argument:
getValueOrName(firstArg) ||
i18n.translate('xpack.lens.indexPattern.formulaNoOperation', {
@@ -622,6 +681,21 @@ function runFullASTValidation(
})
);
}
+ // Check for multiple function passed
+ const requiredFunctions = nodeOperation.requiredReferences
+ ? nodeOperation.requiredReferences.length
+ : 1;
+ const functionErrors = validateFunctionArguments(node, functions, requiredFunctions, {
+ isFieldOperation: false,
+ firstArgValidation: isFirstArgumentNotValid,
+ type: i18n.translate('xpack.lens.indexPattern.formulaMetricValue', {
+ defaultMessage: 'metric',
+ }),
+ });
+ if (functionErrors.length) {
+ errors.push(...functionErrors);
+ }
+
if (!canHaveParams(nodeOperation) && namedArguments.length) {
errors.push(
getMessageFromId({
@@ -633,6 +707,14 @@ function runFullASTValidation(
})
);
} else {
+ // check for fields passed at any position
+ const fieldErrors = validateFieldArguments(node, variables, {
+ isFieldOperation: false,
+ firstArg,
+ });
+ if (fieldErrors.length) {
+ errors.push(...fieldErrors);
+ }
const argumentsErrors = validateNameArguments(
node,
nodeOperation,
@@ -736,7 +818,7 @@ export function hasFunctionFieldArgument(type: string) {
return !['count'].includes(type);
}
-export function isFirstArgumentValidType(arg: TinymathAST, type: TinymathNodeTypes['type']) {
+export function isArgumentValidType(arg: TinymathAST | string, type: TinymathNodeTypes['type']) {
return isObject(arg) && arg.type === type;
}
@@ -812,3 +894,109 @@ export function validateMathNodes(root: TinymathAST, missingVariableSet: Set,
+ { isFieldOperation, firstArg }: { isFieldOperation: boolean; firstArg: TinymathAST }
+) {
+ const fields = variables.filter(
+ (arg) => isArgumentValidType(arg, 'variable') && !isMathNode(arg)
+ );
+ const errors = [];
+ if (isFieldOperation && (fields.length > 1 || (fields.length === 1 && fields[0] !== firstArg))) {
+ errors.push(
+ getMessageFromId({
+ messageId: 'tooManyFirstArguments',
+ values: {
+ operation: node.name,
+ type: i18n.translate('xpack.lens.indexPattern.formulaFieldValue', {
+ defaultMessage: 'field',
+ }),
+ supported: 1,
+ text: (fields as TinymathVariable[]).map(({ text }) => text).join(', '),
+ },
+ locations: node.location ? [node.location] : [],
+ })
+ );
+ }
+ if (!isFieldOperation && fields.length) {
+ errors.push(
+ getMessageFromId({
+ messageId: 'wrongArgument',
+ values: {
+ operation: node.name,
+ text: (fields as TinymathVariable[]).map(({ text }) => text).join(', '),
+ type: i18n.translate('xpack.lens.indexPattern.formulaFieldValue', {
+ defaultMessage: 'field',
+ }),
+ },
+ locations: node.location ? [node.location] : [],
+ })
+ );
+ }
+ return errors;
+}
+
+function validateFunctionArguments(
+ node: TinymathFunction,
+ functions: TinymathFunction[],
+ requiredFunctions: number = 0,
+ {
+ isFieldOperation,
+ firstArgValidation,
+ type,
+ }: { isFieldOperation: boolean; firstArgValidation: boolean; type: string }
+) {
+ const errors = [];
+ // For math operation let the native operation run its own validation
+ const [esOperations, mathOperations] = partition(functions, (arg) => !isMathNode(arg));
+ if (esOperations.length > requiredFunctions) {
+ if (isFieldOperation) {
+ errors.push(
+ getMessageFromId({
+ messageId: 'wrongArgument',
+ values: {
+ operation: node.name,
+ text: (esOperations as TinymathFunction[]).map(({ text }) => text).join(', '),
+ type: i18n.translate('xpack.lens.indexPattern.formulaMetricValue', {
+ defaultMessage: 'metric',
+ }),
+ },
+ locations: node.location ? [node.location] : [],
+ })
+ );
+ } else {
+ errors.push(
+ getMessageFromId({
+ messageId: 'tooManyFirstArguments',
+ values: {
+ operation: node.name,
+ type,
+ supported: requiredFunctions,
+ text: (esOperations as TinymathFunction[]).map(({ text }) => text).join(', '),
+ },
+ locations: node.location ? [node.location] : [],
+ })
+ );
+ }
+ }
+ // full reference operation have another way to handle math operations
+ if (
+ isFieldOperation &&
+ ((!firstArgValidation && mathOperations.length) || mathOperations.length > 1)
+ ) {
+ errors.push(
+ getMessageFromId({
+ messageId: 'wrongArgument',
+ values: {
+ operation: node.name,
+ type,
+ text: (mathOperations as TinymathFunction[]).map(({ text }) => text).join(', '),
+ },
+ locations: node.location ? [node.location] : [],
+ })
+ );
+ }
+ return errors;
+}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
index a1bc643c3bd93..8cfd25914f59c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
@@ -81,12 +81,6 @@ export const timeShiftOptions = [
}),
value: '1y',
},
- {
- label: i18n.translate('xpack.lens.indexPattern.timeShift.previous', {
- defaultMessage: 'Previous time range',
- }),
- value: 'previous',
- },
];
export const timeShiftOptionOrder = timeShiftOptions.reduce<{ [key: string]: number }>(
diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
index 12d3ef3f4a95e..7103e395eabdc 100644
--- a/x-pack/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/plugins/lens/server/routes/field_stats.ts
@@ -8,7 +8,7 @@ import { errors, estypes } from '@elastic/elasticsearch';
import DateMath from '@elastic/datemath';
import { schema } from '@kbn/config-schema';
import { CoreSetup } from 'src/core/server';
-import { IFieldType } from 'src/plugins/data/common';
+import type { IndexPatternField } from 'src/plugins/data/common';
import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/common';
import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
import { FieldStatsResponse, BASE_API_URL } from '../../common';
@@ -79,6 +79,14 @@ export async function initFieldsRoute(setup: CoreSetup) {
},
};
+ const runtimeMappings = indexPattern.fields
+ .filter((f) => f.runtimeField)
+ .reduce((acc, f) => {
+ if (!f.runtimeField) return acc;
+ acc[f.name] = f.runtimeField;
+ return acc;
+ }, {} as Record);
+
const search = async (aggs: Record) => {
const { body: result } = await requestClient.search({
index: indexPattern.title,
@@ -86,7 +94,7 @@ export async function initFieldsRoute(setup: CoreSetup) {
body: {
query,
aggs,
- runtime_mappings: field.runtimeField ? { [fieldName]: field.runtimeField } : {},
+ runtime_mappings: runtimeMappings,
},
size: 0,
});
@@ -138,7 +146,7 @@ export async function getNumberHistogram(
aggSearchWithBody: (
aggs: Record
) => Promise,
- field: IFieldType,
+ field: IndexPatternField,
useTopHits = true
): Promise {
const fieldRef = getFieldRef(field);
@@ -247,7 +255,7 @@ export async function getNumberHistogram(
export async function getStringSamples(
aggSearchWithBody: (aggs: Record) => unknown,
- field: IFieldType,
+ field: IndexPatternField,
size = 10
): Promise {
const fieldRef = getFieldRef(field);
@@ -287,7 +295,7 @@ export async function getStringSamples(
// This one is not sampled so that it returns the full date range
export async function getDateHistogram(
aggSearchWithBody: (aggs: Record) => unknown,
- field: IFieldType,
+ field: IndexPatternField,
range: { fromDate: string; toDate: string }
): Promise {
const fromDate = DateMath.parse(range.fromDate);
@@ -329,7 +337,7 @@ export async function getDateHistogram(
};
}
-function getFieldRef(field: IFieldType) {
+function getFieldRef(field: IndexPatternField) {
return field.scripted
? {
script: {
diff --git a/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx b/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx
index 82347f6212442..e5a5e76f8cc5d 100644
--- a/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/autocomplete/field_value_match_any.tsx
@@ -164,7 +164,6 @@ export const AutocompleteFieldMatchAnyComponent: React.FC;
}
diff --git a/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts b/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
index 79db56f9a7fe9..65392f8c379d9 100644
--- a/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
+++ b/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
@@ -7,11 +7,11 @@
import type { estypes } from '@elastic/elasticsearch';
import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
+import { encodeHitVersion } from '@kbn/securitysolution-es-utils';
import { ErrorWithStatusCode } from '../../error_with_status_code';
import { SearchEsListItemSchema } from '../../schemas/elastic_response';
-import { encodeHitVersion } from './encode_hit_version';
import { findSourceValue } from './find_source_value';
export interface TransformElasticToListItemOptions {
diff --git a/x-pack/plugins/maps/public/classes/layers/file_upload_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/file_upload_wizard/wizard.tsx
index 024c2308df6c6..87747d915af4a 100644
--- a/x-pack/plugins/maps/public/classes/layers/file_upload_wizard/wizard.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/file_upload_wizard/wizard.tsx
@@ -106,7 +106,7 @@ export class ClientFileCreateSourceEditor extends Component {
sourceDataRequest
);
expect(areResultsTrimmed).toBe(true);
- expect(tooltipContent).toBe('Results limited to first 1000 tracks of ~5000.');
+ expect(tooltipContent).toBe('Results limited to first 1,000 tracks of ~5,000.');
});
it('Should show results trimmed icon and message when tracks are trimmed', () => {
@@ -90,7 +90,7 @@ describe('getSourceTooltipContent', () => {
);
expect(areResultsTrimmed).toBe(true);
expect(tooltipContent).toBe(
- 'Results limited to first 1000 tracks of ~5000. 10 of 1000 tracks are incomplete.'
+ 'Results limited to first 1,000 tracks of ~5,000. 10 of 1,000 tracks are incomplete.'
);
});
});
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
index 460c1228e50a8..82be83dad43f7 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
@@ -326,21 +326,21 @@ export class ESGeoLineSource extends AbstractESAggSource {
? i18n.translate('xpack.maps.esGeoLine.areEntitiesTrimmedMsg', {
defaultMessage: `Results limited to first {entityCount} tracks of ~{totalEntities}.`,
values: {
- entityCount: meta.entityCount,
- totalEntities: meta.totalEntities,
+ entityCount: meta.entityCount.toLocaleString(),
+ totalEntities: meta.totalEntities.toLocaleString(),
},
})
: i18n.translate('xpack.maps.esGeoLine.tracksCountMsg', {
defaultMessage: `Found {entityCount} tracks.`,
- values: { entityCount: meta.entityCount },
+ values: { entityCount: meta.entityCount.toLocaleString() },
});
const tracksTrimmedMsg =
meta.numTrimmedTracks > 0
? i18n.translate('xpack.maps.esGeoLine.tracksTrimmedMsg', {
defaultMessage: `{numTrimmedTracks} of {entityCount} tracks are incomplete.`,
values: {
- entityCount: meta.entityCount,
- numTrimmedTracks: meta.numTrimmedTracks,
+ entityCount: meta.entityCount.toLocaleString(),
+ numTrimmedTracks: meta.numTrimmedTracks.toLocaleString(),
},
})
: undefined;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
index 343c366b548f6..55eed588b8840 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
@@ -620,17 +620,17 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
? i18n.translate('xpack.maps.esSearch.topHitsResultsTrimmedMsg', {
defaultMessage: `Results limited to first {entityCount} entities of ~{totalEntities}.`,
values: {
- entityCount: meta.entityCount,
- totalEntities: meta.totalEntities,
+ entityCount: meta.entityCount?.toLocaleString(),
+ totalEntities: meta.totalEntities?.toLocaleString(),
},
})
: i18n.translate('xpack.maps.esSearch.topHitsEntitiesCountMsg', {
defaultMessage: `Found {entityCount} entities.`,
- values: { entityCount: meta.entityCount },
+ values: { entityCount: meta.entityCount?.toLocaleString() },
});
const docsPerEntityMsg = i18n.translate('xpack.maps.esSearch.topHitsSizeMsg', {
defaultMessage: `Showing top {topHitsSize} documents per entity.`,
- values: { topHitsSize: this._descriptor.topHitsSize },
+ values: { topHitsSize: this._descriptor.topHitsSize?.toLocaleString() },
});
return {
@@ -645,7 +645,7 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
return {
tooltipContent: i18n.translate('xpack.maps.esSearch.resultsTrimmedMsg', {
defaultMessage: `Results limited to first {count} documents.`,
- values: { count: meta.resultsCount },
+ values: { count: meta.resultsCount?.toLocaleString() },
}),
areResultsTrimmed: true,
};
@@ -654,7 +654,7 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
return {
tooltipContent: i18n.translate('xpack.maps.esSearch.featureCountMsg', {
defaultMessage: `Found {count} documents.`,
- values: { count: meta.resultsCount },
+ values: { count: meta.resultsCount?.toLocaleString() },
}),
areResultsTrimmed: false,
};
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
index 03f2594f287ea..99ce13ce326d6 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
@@ -28,7 +28,7 @@ exports[`scaling form should disable clusters option when clustering is not supp
{
state = {
- maxResultWindow: DEFAULT_MAX_RESULT_WINDOW,
+ maxResultWindow: DEFAULT_MAX_RESULT_WINDOW.toLocaleString(),
};
_isMounted = false;
@@ -61,7 +61,7 @@ export class ScalingForm extends Component {
const indexPattern = await getIndexPatternService().get(this.props.indexPatternId);
const { maxResultWindow } = await loadIndexSettings(indexPattern!.title);
if (this._isMounted) {
- this.setState({ maxResultWindow });
+ this.setState({ maxResultWindow: maxResultWindow.toLocaleString() });
}
} catch (err) {
return;
@@ -90,7 +90,7 @@ export class ScalingForm extends Component {
{
{
},
},
];
+ actionItems.push({
+ disabled: this.props.isEditButtonDisabled,
+ name: EDIT_LAYER_SETTINGS_LABEL,
+ icon: {
},
});
}
- actionItems.push({
- disabled: this.props.isEditButtonDisabled,
- name: EDIT_LAYER_SETTINGS_LABEL,
- icon: {
footnotes.push({
icon: annotationUpdatesService.setValue(originalAnnotation ?? annotation)}
- >
- {editAnnotationsText}
-
- );
+
+ annotationUpdatesService.setValue(originalAnnotation ?? annotation);
},
});
if (this.state.jobId && this.props.jobs[0].analysis_config.bucket_span) {
// add datafeed modal action
actions.push({
- render: (annotation) => {
- const viewDataFeedText = (
-
- this.setState({
- datafeedFlyoutVisible: true,
- datafeedEnd: annotation.end_timestamp,
- })
- }
- >
- {viewDataFeedText}
-
- );
+ name: viewDataFeedText,
+ description: viewDataFeedText,
+ icon: 'visAreaStacked',
+ type: 'icon',
+ onClick: (annotation) => {
+ this.setState({
+ datafeedFlyoutVisible: true,
+ datafeedEnd: annotation.end_timestamp,
+ });
},
});
}
if (isSingleMetricViewerLinkVisible) {
actions.push({
- render: (annotation) => {
+ name: (annotation) => {
const isDrillDownAvailable = isTimeSeriesViewJob(this.getJob(annotation.job_id));
- const openInSingleMetricViewerTooltipText = isDrillDownAvailable ? (
-
);
- const openInSingleMetricViewerAriaLabelText = isDrillDownAvailable
+ },
+ description: (annotation) => {
+ const isDrillDownAvailable = isTimeSeriesViewJob(this.getJob(annotation.job_id));
+
+ return isDrillDownAvailable
? i18n.translate('xpack.ml.annotationsTable.openInSingleMetricViewerAriaLabel', {
defaultMessage: 'Open in Single Metric Viewer',
})
@@ -540,19 +544,11 @@ class AnnotationsTableUI extends Component {
'xpack.ml.annotationsTable.jobConfigurationNotSupportedInSingleMetricViewerAriaLabel',
{ defaultMessage: 'Job configuration not supported in Single Metric Viewer' }
);
-
- return (
- this.openSingleMetricView(annotation)}
- >
- {openInSingleMetricViewerTooltipText}
-
- );
},
+ enabled: (annotation) => isTimeSeriesViewJob(this.getJob(annotation.job_id)),
+ icon: 'visLine',
+ type: 'icon',
+ onClick: (annotation) => this.openSingleMetricView(annotation),
});
}
diff --git a/x-pack/plugins/ml/public/application/components/help_popover/help_popover.tsx b/x-pack/plugins/ml/public/application/components/help_popover/help_popover.tsx
index 8cd6a3fbd1138..95c66d58dbb75 100644
--- a/x-pack/plugins/ml/public/application/components/help_popover/help_popover.tsx
+++ b/x-pack/plugins/ml/public/application/components/help_popover/help_popover.tsx
@@ -6,6 +6,7 @@
*/
import React, { ReactNode } from 'react';
+import { i18n } from '@kbn/i18n';
import {
EuiButtonIcon,
EuiLinkButtonProps,
@@ -22,6 +23,9 @@ export const HelpPopoverButton = ({ onClick }: { onClick: EuiLinkButtonProps['on
className="mlHelpPopover__buttonIcon"
size="s"
iconType="help"
+ aria-label={i18n.translate('xpack.ml.helpPopover.ariaLabel', {
+ defaultMessage: 'Help',
+ })}
onClick={onClick}
/>
);
diff --git a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/revert_model_snapshot_flyout.tsx b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/revert_model_snapshot_flyout.tsx
index 6dd4e6c14589b..f282b2fde2b3a 100644
--- a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/revert_model_snapshot_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/revert_model_snapshot_flyout.tsx
@@ -42,6 +42,7 @@ import { Anomaly } from '../../../jobs/new_job/common/results_loader/results_loa
import { parseInterval } from '../../../../../common/util/parse_interval';
import { CreateCalendar, CalendarEvent } from './create_calendar';
import { timeFormatter } from '../../../../../common/util/date_utils';
+import { toastNotificationServiceProvider } from '../../../services/toast_notification_service';
interface Props {
snapshot: ModelSnapshot;
@@ -139,6 +140,10 @@ export const RevertModelSnapshotFlyout: FC = ({
})
);
refresh();
+ })
+ .catch((error) => {
+ const { displayErrorToast } = toastNotificationServiceProvider(toasts);
+ displayErrorToast(error);
});
hideRevertModal();
closeFlyout();
diff --git a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
index 621ce44204730..45afab0cce4fd 100644
--- a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
+++ b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
@@ -223,7 +223,9 @@ const loadExplorerDataProvider = (
swimlaneLimit,
viewByPerPage,
viewByFromPage,
- swimlaneContainerWidth
+ swimlaneContainerWidth,
+ selectionInfluencers,
+ influencersFilterQuery
)
: Promise.resolve([]),
}).pipe(
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
index 6f5ae5e17590a..57e051e1b8417 100644
--- a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -95,7 +95,6 @@ function getInitSearchInputState({
interface ExplorerQueryBarProps {
filterActive: boolean;
- filterIconTriggeredQuery: string;
filterPlaceHolder: string;
indexPattern: IIndexPattern;
queryString?: string;
@@ -104,7 +103,6 @@ interface ExplorerQueryBarProps {
export const ExplorerQueryBar: FC = ({
filterActive,
- filterIconTriggeredQuery,
filterPlaceHolder,
indexPattern,
queryString,
@@ -116,14 +114,12 @@ export const ExplorerQueryBar: FC = ({
);
const [errorMessage, setErrorMessage] = useState(undefined);
- useEffect(() => {
- if (filterIconTriggeredQuery !== undefined) {
- setSearchInput({
- language: searchInput.language,
- query: filterIconTriggeredQuery,
- });
- }
- }, [filterIconTriggeredQuery]);
+ useEffect(
+ function updateSearchInputFromFilter() {
+ setSearchInput(getInitSearchInputState({ filterActive, queryString }));
+ },
+ [filterActive, queryString]
+ );
const searchChangeHandler = (query: Query) => {
if (searchInput.language !== query.language) {
@@ -131,6 +127,7 @@ export const ExplorerQueryBar: FC = ({
}
setSearchInput(query);
};
+
const applyInfluencersFilterQuery = (query: Query) => {
try {
const { clearSettings, settings } = getKqlQueryValues({
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.js b/x-pack/plugins/ml/public/application/explorer/explorer.js
index a11a42b9b65b2..81474c212d265 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer.js
@@ -86,7 +86,6 @@ const ExplorerPage = ({
filterPlaceHolder,
indexPattern,
queryString,
- filterIconTriggeredQuery,
updateLanguage,
}) => (
+
+ ) : (
+
+
+ );
+
const jobSelectorProps = {
dateFormatTz: getDateFormatTz(),
};
@@ -303,7 +323,6 @@ export class ExplorerUI extends React.Component {
influencers={influencers}
filterActive={filterActive}
filterPlaceHolder={filterPlaceHolder}
- filterIconTriggeredQuery={this.state.filterIconTriggeredQuery}
indexPattern={indexPattern}
queryString={queryString}
updateLanguage={this.updateLanguage}
@@ -404,7 +423,7 @@ export class ExplorerUI extends React.Component {
{loading === false && tableData.anomalies?.length ? (
- ;
-
export declare interface FilterData {
influencersFilterQuery: InfluencersFilterQuery;
filterActive: boolean;
diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
index 82f8a90fafb7d..86ec2014c8339 100644
--- a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
@@ -411,7 +411,7 @@ export const SwimlaneContainer: FC = ({
>
<>
-
-
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
index cfb3ed8044235..45175e489f94a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
@@ -36,12 +36,6 @@ const SOURCES_TABLE_HEADER = i18n.translate(
defaultMessage: 'Content sources',
}
);
-const USERS_TABLE_HEADER = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.usersTableHeader',
- {
- defaultMessage: 'Users',
- }
-);
export const GroupsTable: React.FC<{}> = () => {
const { setActivePage } = useActions(GroupsLogic);
@@ -77,7 +71,6 @@ export const GroupsTable: React.FC<{}> = () => {
{GROUP_TABLE_HEADER}
{SOURCES_TABLE_HEADER}
- {USERS_TABLE_HEADER}
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
index e6524151b0a6c..f9756119b336c 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
@@ -209,17 +209,23 @@ describe('EnterpriseSearchRequestHandler', () => {
headers: mockExpectedResponseHeaders,
});
});
- });
- it('works if response contains no json data', async () => {
- EnterpriseSearchAPI.mockReturn();
+ it('passes back the response body as-is if hasJsonResponse is false', async () => {
+ const mockFile = new File(['mockFile'], 'mockFile.json');
+ EnterpriseSearchAPI.mockReturn(mockFile);
- const requestHandler = enterpriseSearchRequestHandler.createRequest({ path: '/api/prep' });
- await makeAPICall(requestHandler);
+ const requestHandler = enterpriseSearchRequestHandler.createRequest({
+ path: '/api/file',
+ hasJsonResponse: false,
+ });
+ await makeAPICall(requestHandler);
- expect(responseMock.custom).toHaveBeenCalledWith({
- statusCode: 200,
- headers: mockExpectedResponseHeaders,
+ EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/file');
+ expect(responseMock.custom).toHaveBeenCalledWith({
+ body: expect.any(Buffer), // Unfortunately Response() buffers the body so we can't actually inspect/equality assert on it
+ statusCode: 200,
+ headers: mockExpectedResponseHeaders,
+ });
});
});
});
@@ -397,7 +403,7 @@ describe('EnterpriseSearchRequestHandler', () => {
expect(responseMock.customError).toHaveBeenCalledWith({
statusCode: 502,
body: 'Cannot authenticate Enterprise Search user',
- headers: mockExpectedResponseHeaders,
+ headers: { ...mockExpectedResponseHeaders, [ERROR_CONNECTING_HEADER]: 'true' },
});
expect(mockLogger.error).toHaveBeenCalled();
});
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
index b4768c1a9ee15..57b91c2b30c73 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
@@ -34,6 +34,7 @@ interface ConstructorDependencies {
interface RequestParams {
path: string;
params?: object;
+ hasJsonResponse?: boolean;
hasValidData?: Function;
}
interface ErrorResponse {
@@ -64,7 +65,12 @@ export class EnterpriseSearchRequestHandler {
this.enterpriseSearchUrl = config.host as string;
}
- createRequest({ path, params = {}, hasValidData = () => true }: RequestParams) {
+ createRequest({
+ path,
+ params = {},
+ hasJsonResponse = true,
+ hasValidData = () => true,
+ }: RequestParams) {
return async (
_context: RequestHandlerContext,
request: KibanaRequest,
@@ -119,7 +125,7 @@ export class EnterpriseSearchRequestHandler {
// Check returned data
let responseBody;
- try {
+ if (hasJsonResponse) {
const json = await apiResponse.json();
if (!hasValidData(json)) {
@@ -134,8 +140,8 @@ export class EnterpriseSearchRequestHandler {
} else {
responseBody = json;
}
- } catch (e) {
- responseBody = undefined;
+ } else {
+ responseBody = apiResponse.body;
}
// Pass successful responses back to the front-end
@@ -277,12 +283,11 @@ export class EnterpriseSearchRequestHandler {
handleConnectionError(response: KibanaResponseFactory, e: Error) {
const errorMessage = `Error connecting to Enterprise Search: ${e?.message || e.toString()}`;
+ const headers = { ...this.headers, [ERROR_CONNECTING_HEADER]: 'true' };
this.log.error(errorMessage);
if (e instanceof Error) this.log.debug(e.stack as string);
- const headers = { ...this.headers, [ERROR_CONNECTING_HEADER]: 'true' };
-
return response.customError({ statusCode: 502, headers, body: errorMessage });
}
@@ -292,9 +297,10 @@ export class EnterpriseSearchRequestHandler {
*/
handleAuthenticationError(response: KibanaResponseFactory) {
const errorMessage = 'Cannot authenticate Enterprise Search user';
+ const headers = { ...this.headers, [ERROR_CONNECTING_HEADER]: 'true' };
this.log.error(errorMessage);
- return response.customError({ statusCode: 502, headers: this.headers, body: errorMessage });
+ return response.customError({ statusCode: 502, headers, body: errorMessage });
}
/**
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.test.ts
index c26f8dbaf5213..47b480f61341a 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.test.ts
@@ -30,6 +30,7 @@ describe('engine routes', () => {
mockRouter.callRoute({ body: {} });
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/as/onboarding/complete',
+ hasJsonResponse: false,
});
});
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.ts
index 9a46c75555969..147f935a56aed 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/onboarding.ts
@@ -24,6 +24,7 @@ export function registerOnboardingRoutes({
},
enterpriseSearchRequestHandler.createRequest({
path: '/as/onboarding/complete',
+ hasJsonResponse: false,
})
);
}
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts
index 4043f9daddaa7..a68a7716933f8 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts
@@ -559,6 +559,7 @@ describe('sources routes', () => {
it('creates a request handler', () => {
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/ws/sources/:sourceId/download_diagnostics',
+ hasJsonResponse: false,
});
});
});
@@ -1057,6 +1058,7 @@ describe('sources routes', () => {
it('creates a request handler', () => {
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/ws/org/sources/:sourceId/download_diagnostics',
+ hasJsonResponse: false,
});
});
});
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
index b393ab9d1f26a..5de4387f2c0d9 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
@@ -400,6 +400,7 @@ export function registerAccountSourceDownloadDiagnosticsRoute({
},
enterpriseSearchRequestHandler.createRequest({
path: '/ws/sources/:sourceId/download_diagnostics',
+ hasJsonResponse: false,
})
);
}
@@ -748,6 +749,7 @@ export function registerOrgSourceDownloadDiagnosticsRoute({
},
enterpriseSearchRequestHandler.createRequest({
path: '/ws/org/sources/:sourceId/download_diagnostics',
+ hasJsonResponse: false,
})
);
}
diff --git a/x-pack/plugins/file_upload/server/plugin.ts b/x-pack/plugins/file_upload/server/plugin.ts
index c729afec92f94..bd5eebe372a75 100644
--- a/x-pack/plugins/file_upload/server/plugin.ts
+++ b/x-pack/plugins/file_upload/server/plugin.ts
@@ -21,7 +21,7 @@ export class FileUploadPlugin implements Plugin {
this._logger = initializerContext.logger.get();
}
- async setup(coreSetup: CoreSetup, plugins: SetupDeps) {
+ setup(coreSetup: CoreSetup, plugins: SetupDeps) {
fileUploadRoutes(coreSetup, this._logger);
setupCapabilities(coreSetup);
diff --git a/x-pack/plugins/fleet/common/services/agent_status.ts b/x-pack/plugins/fleet/common/services/agent_status.ts
index b8a59e6447723..e4b227b79536c 100644
--- a/x-pack/plugins/fleet/common/services/agent_status.ts
+++ b/x-pack/plugins/fleet/common/services/agent_status.ts
@@ -54,7 +54,7 @@ export function buildKueryForOnlineAgents() {
}
export function buildKueryForErrorAgents() {
- return 'last_checkin_status:error or last_checkin_status:degraded';
+ return `(last_checkin_status:error or last_checkin_status:degraded) AND not (${buildKueryForUpdatingAgents()})`;
}
export function buildKueryForOfflineAgents() {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
index b07d76dc6bd8e..ee529b6865e56 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -430,7 +430,9 @@ export const EditPackagePolicyForm = memo<{
/>
)}
{configurePackage}
-
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx
index 47174561230ba..18f6a8b565ab9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_dataset.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import React, { memo, useState, useEffect } from 'react';
+import React, { memo, useState, useEffect, useCallback } from 'react';
import { EuiPopover, EuiFilterButton, EuiFilterSelectItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
@@ -22,6 +22,9 @@ export const DatasetFilter: React.FunctionComponent<{
const [isLoading, setIsLoading] = useState(false);
const [datasetValues, setDatasetValues] = useState([AGENT_DATASET]);
+ const togglePopover = useCallback(() => setIsOpen((prevIsOpen) => !prevIsOpen), [setIsOpen]);
+ const closePopover = useCallback(() => setIsOpen(false), [setIsOpen]);
+
useEffect(() => {
const fetchValues = async () => {
setIsLoading(true);
@@ -48,7 +51,7 @@ export const DatasetFilter: React.FunctionComponent<{
button={
setIsOpen(true)}
+ onClick={togglePopover}
isSelected={isOpen}
isLoading={isLoading}
numFilters={datasetValues.length}
@@ -61,7 +64,7 @@ export const DatasetFilter: React.FunctionComponent<{
}
isOpen={isOpen}
- closePopover={() => setIsOpen(false)}
+ closePopover={closePopover}
panelPaddingSize="none"
>
{datasetValues.map((dataset) => (
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx
index 120f21fe68207..b423f3a8a57b3 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/filter_log_level.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import React, { memo, useState, useEffect } from 'react';
+import React, { memo, useState, useEffect, useCallback } from 'react';
import { EuiPopover, EuiFilterButton, EuiFilterSelectItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
@@ -33,6 +33,9 @@ export const LogLevelFilter: React.FunctionComponent<{
const [isLoading, setIsLoading] = useState(false);
const [levelValues, setLevelValues] = useState([]);
+ const togglePopover = useCallback(() => setIsOpen((prevIsOpen) => !prevIsOpen), []);
+ const closePopover = useCallback(() => setIsOpen(false), []);
+
useEffect(() => {
const fetchValues = async () => {
setIsLoading(true);
@@ -59,7 +62,7 @@ export const LogLevelFilter: React.FunctionComponent<{
button={
setIsOpen(true)}
+ onClick={togglePopover}
isSelected={isOpen}
isLoading={isLoading}
numFilters={levelValues.length}
@@ -72,7 +75,7 @@ export const LogLevelFilter: React.FunctionComponent<{
}
isOpen={isOpen}
- closePopover={() => setIsOpen(false)}
+ closePopover={closePopover}
panelPaddingSize="none"
>
{levelValues.map((level) => (
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx
index 48ff51f1a25e8..0fc3821d2e3f7 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx
@@ -452,6 +452,8 @@ export const AddFleetServerHostStepContent = ({
await addFleetServerHost(fleetServerHost);
setCalloutHost(fleetServerHost);
setFleetServerHost('');
+ } else {
+ setCalloutHost('');
}
} finally {
setIsLoading(false);
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
index 0b13fcc9c72be..fae88fcda4bc8 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
@@ -137,7 +137,7 @@ export const AgentUnenrollAgentModal: React.FunctionComponent = ({
) => {
+ async ({
+ name,
+ version,
+ title,
+ redirectToVersion,
+ }: Pick & { redirectToVersion: string }) => {
setPackageInstallStatus({ name, status: InstallStatus.uninstalling, version });
const pkgkey = `${name}-${version}`;
@@ -160,9 +165,15 @@ function usePackageInstall({ notifications }: { notifications: NotificationsStar
/>
),
});
+ if (redirectToVersion !== version) {
+ const settingsPath = getPath('integration_details_settings', {
+ pkgkey: `${name}-${redirectToVersion}`,
+ });
+ history.push(settingsPath);
+ }
}
},
- [notifications.toasts, setPackageInstallStatus]
+ [notifications.toasts, setPackageInstallStatus, getPath, history]
);
return {
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
index 96e4071e9b464..63372e435cfa1 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
@@ -151,7 +151,10 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
/>
+
{i18n.translate('xpack.fleet.epm.agentEnrollment.viewDataAssetsLabel', {
defaultMessage: 'View assets',
})}
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx
index 8cf8466e6d9b0..eab28a051f061 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx
@@ -24,9 +24,10 @@ import { ConfirmPackageInstall } from './confirm_package_install';
type InstallationButtonProps = Pick & {
disabled?: boolean;
isUpdate?: boolean;
+ latestVersion?: string;
};
export function InstallationButton(props: InstallationButtonProps) {
- const { assets, name, title, version, disabled = true, isUpdate = false } = props;
+ const { assets, name, title, version, disabled = true, isUpdate = false, latestVersion } = props;
const hasWriteCapabilites = useCapabilities().write;
const installPackage = useInstallPackage();
const uninstallPackage = useUninstallPackage();
@@ -52,9 +53,9 @@ export function InstallationButton(props: InstallationButtonProps) {
}, [installPackage, name, title, version]);
const handleClickUninstall = useCallback(() => {
- uninstallPackage({ name, version, title });
+ uninstallPackage({ name, version, title, redirectToVersion: latestVersion ?? version });
toggleModal();
- }, [uninstallPackage, name, title, toggleModal, version]);
+ }, [uninstallPackage, name, title, toggleModal, version, latestVersion]);
// counts the number of assets in the package
const numOfAssets = useMemo(
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
index 9e8d200344b01..14f378bc379a6 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
@@ -10,11 +10,11 @@ import styled from 'styled-components';
import { FormattedMessage } from '@kbn/i18n/react';
import semverLt from 'semver/functions/lt';
-import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elastic/eui';
+import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer, EuiLink } from '@elastic/eui';
import type { PackageInfo } from '../../../../../types';
import { InstallStatus } from '../../../../../types';
-import { useGetPackagePolicies, useGetPackageInstallStatus } from '../../../../../hooks';
+import { useGetPackagePolicies, useGetPackageInstallStatus, useLink } from '../../../../../hooks';
import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../constants';
import { UpdateIcon } from '../components';
@@ -47,6 +47,21 @@ const UpdatesAvailableMsg = () => (
);
+const LatestVersionLink = ({ name, version }: { name: string; version: string }) => {
+ const { getPath } = useLink();
+ const settingsPath = getPath('integration_details_settings', {
+ pkgkey: `${name}-${version}`,
+ });
+ return (
+
+
+ );
+};
+
interface Props {
packageInfo: PackageInfo;
}
@@ -72,6 +87,7 @@ export const SettingsPage: React.FC = memo(({ packageInfo }: Props) => {
(installationStatus === InstallStatus.installed && installedVersion !== version);
const isUpdating = installationStatus === InstallStatus.installing && installedVersion;
+
return (
= memo(({ packageInfo }: Props) => {
= memo(({ packageInfo }: Props) => {
)}
)}
+ {hideInstallOptions && isViewingOldPackage && !isUpdating && (
+
+
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/subtitle_field.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/subtitle_field.test.tsx
index 76c28ae3d4060..7506c499dff31 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/subtitle_field.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/subtitle_field.test.tsx
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { exampleResult } from '../../../../__mocks__/content_sources.mock';
+
import React from 'react';
import { shallow } from 'enzyme';
@@ -12,7 +14,11 @@ import { shallow } from 'enzyme';
import { SubtitleField } from './subtitle_field';
describe('SubtitleField', () => {
- const result = { foo: 'bar' };
+ const result = {
+ ...exampleResult.exampleDocuments[0],
+ foo: 'bar',
+ };
+
it('renders', () => {
const props = {
result,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/title_field.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/title_field.test.tsx
index 2ed4aa0b0fad1..e5681bc7e8619 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/title_field.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/title_field.test.tsx
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { exampleResult } from '../../../../__mocks__/content_sources.mock';
+
import React from 'react';
import { shallow } from 'enzyme';
@@ -12,7 +14,10 @@ import { shallow } from 'enzyme';
import { TitleField } from './title_field';
describe('TitleField', () => {
- const result = { foo: 'bar' };
+ const result = {
+ ...exampleResult.exampleDocuments[0],
+ foo: 'bar',
+ };
it('renders', () => {
const props = {
result,
@@ -26,7 +31,10 @@ describe('TitleField', () => {
it('handles title when array', () => {
const props = {
- result: { foo: ['baz', 'bar'] },
+ result: {
+ ...exampleResult.exampleDocuments[0],
+ foo: ['baz', 'bar'],
+ },
titleField: 'foo',
titleFieldHover: false,
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx
index a0e3c28f20eb0..a97cc85cb822a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.tsx
@@ -137,7 +137,7 @@ export const SourceContent: React.FC = () => {
+
)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
index 74f32cc22c2a8..da4346d54727c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
@@ -125,5 +125,15 @@ describe('SourceSettings', () => {
'/api/workplace_search/account/sources/123/download_diagnostics'
);
});
+
+ it('renders with the correct download file name', () => {
+ jest.spyOn(global.Date, 'now').mockImplementationOnce(() => new Date('1970-01-01').valueOf());
+
+ const wrapper = shallow() => setValue(e.target.value);
@@ -172,9 +174,9 @@ export const SourceSettings: React.FC = () => {
baseUrl={baseUrl}
/>
-
- {SOURCE_CONFIG_LINK}
-
+
+ {SOURCE_CONFIG_LINK}
+
)}
@@ -184,7 +186,7 @@ export const SourceSettings: React.FC = () => {
href={diagnosticsPath}
isLoading={buttonLoading}
data-test-subj="DownloadDiagnosticsButton"
- download
+ download={`${id}_${serviceType}_${Date.now()}_diagnostics.json`}
>
{SYNC_DIAGNOSTICS_BUTTON}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
index e7dfd6ddf1389..5714cc965827e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
@@ -33,24 +33,23 @@ import { NAV, CANCEL_BUTTON } from '../../../constants';
import { USERS_AND_ROLES_PATH } from '../../../routes';
import { GroupLogic, MAX_NAME_LENGTH } from '../group_logic';
-import { GroupUsersTable } from './group_users_table';
-
export const EMPTY_SOURCES_DESCRIPTION = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.groups.overview.emptySourcesDescription',
{
defaultMessage: 'No content sources are shared with this group.',
}
);
-const GROUP_USERS_DESCRIPTION = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.groups.overview.groupUsersDescription',
+const USERS_SECTION_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.groups.overview.usersSectionTitle',
{
- defaultMessage: 'Members will be able to search over the group’s sources.',
+ defaultMessage: 'Group users',
}
);
-export const EMPTY_USERS_DESCRIPTION = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.groups.overview.emptyUsersDescription',
+const GROUP_USERS_DESCRIPTION = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.groups.overview.groupUsersDescription',
{
- defaultMessage: 'There are no users in this group.',
+ defaultMessage:
+ "Users assigned to this group gain access to the sources' data and content defined above. User assignments for this group can be managed in the Users and Roles area.",
}
);
const MANAGE_SOURCES_BUTTON_TEXT = i18n.translate(
@@ -118,7 +117,7 @@ export const GroupOverview: React.FC = () => {
onGroupNameInputChange,
} = useActions(GroupLogic);
const {
- group: { name, contentSources, users, canDeleteGroup },
+ group: { name, contentSources, canDeleteGroup },
groupNameInputValue,
dataLoading,
confirmDeleteModalVisible,
@@ -158,7 +157,6 @@ export const GroupOverview: React.FC = () => {
);
const hasContentSources = contentSources?.length > 0;
- const hasUsers = users?.length > 0;
const manageSourcesButton = (
@@ -199,12 +197,11 @@ export const GroupOverview: React.FC = () => {
const usersSection = (
- {hasUsers &&
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
index f98b873aed5bb..770bf8a51efd3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
@@ -14,8 +14,7 @@ import moment from 'moment';
import { EuiTableRow } from '@elastic/eui';
-import { GroupRow, NO_USERS_MESSAGE, NO_SOURCES_MESSAGE } from './group_row';
-import { GroupUsers } from './group_users';
+import { GroupRow, NO_SOURCES_MESSAGE } from './group_row';
describe('GroupRow', () => {
it('renders', () => {
@@ -24,12 +23,6 @@ describe('GroupRow', () => {
expect(wrapper.find(EuiTableRow)).toHaveLength(1);
});
- it('renders group users', () => {
- const wrapper = shallow( = ({
- id,
- name,
- updatedAt,
- contentSources,
- users,
- usersCount,
-}) => {
+export const GroupRow: React.FC = ({ id, name, updatedAt, contentSources }) => {
const GROUP_UPDATED_TEXT = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText',
{
@@ -76,15 +68,6 @@ export const GroupRow: React.FC = ({
)}
-
@@ -1786,9 +1778,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
onResize={[Function]}
>
-
)}
@@ -127,7 +127,7 @@ export const ExampleStandoutResult: React.FC = () => {
by {result[updatedByField]}
)}
- {getAsLocalDateTimeString(result.last_updated as string) || result.last_updated}
+ {getAsLocalDateTimeString(result.last_updated) || result.last_updated}
+
+
+ );
+ await waitFor(() => {
+ expect(wrapper.find(`[data-test-subj="endpoint-action"]`).exists()).toBe(true);
+ });
+ });
+
+ it('shows the correct username', async () => {
+ const isolateAction = [getHostIsolationUserAction()];
+ const props = {
+ ...defaultProps,
+ caseUserActions: isolateAction,
+ data: { ...defaultProps.data, comments: [hostIsolationComment()] },
+ };
+
+ const wrapper = mount(
+
+
+ );
+ await waitFor(() => {
+ expect(wrapper.find(`[data-test-subj="user-action-avatar"]`).first().prop('name')).toEqual(
+ defaultProps.data.createdBy.fullName
+ );
+ });
+ });
+
+ it('shows a lock icon if the action is isolate', async () => {
+ const isolateAction = [getHostIsolationUserAction()];
+ const props = {
+ ...defaultProps,
+ caseUserActions: isolateAction,
+ data: { ...defaultProps.data, comments: [hostIsolationComment()] },
+ };
+
+ const wrapper = mount(
+
+
+ );
+ await waitFor(() => {
+ expect(
+ wrapper.find(`[data-test-subj="endpoint-action"]`).first().prop('timelineIcon')
+ ).toBe('lock');
+ });
+ });
+ it('shows a lockOpen icon if the action is unisolate/release', async () => {
+ const isolateAction = [getHostIsolationUserAction()];
+ const props = {
+ ...defaultProps,
+ caseUserActions: isolateAction,
+ data: { ...defaultProps.data, comments: [hostReleaseComment()] },
+ };
+
+ const wrapper = mount(
+
+
+ );
+ await waitFor(() => {
+ expect(
+ wrapper.find(`[data-test-subj="endpoint-action"]`).first().prop('timelineIcon')
+ ).toBe('lockOpen');
+ });
+ });
+ });
});
diff --git a/x-pack/plugins/cases/public/components/user_action_tree/user_action_host_isolation_comment_event.test.tsx b/x-pack/plugins/cases/public/components/user_action_tree/user_action_host_isolation_comment_event.test.tsx
new file mode 100644
index 0000000000000..636cd7e40aac1
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/user_action_tree/user_action_host_isolation_comment_event.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { HostIsolationCommentEvent } from './user_action_host_isolation_comment_event';
+
+const defaultProps = () => {
+ return {
+ type: 'isolate',
+ endpoints: [{ endpointId: 'e1', hostname: 'host1' }],
+ href: jest.fn(),
+ onClick: jest.fn(),
+ };
+};
+
+describe('UserActionHostIsolationCommentEvent', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('renders with the correct action and hostname', async () => {
+ const wrapper = mount( = ({
{endpoints[0].hostname}
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index a900010235c9f..c955bb34240e2 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -76,6 +76,58 @@ export const alertComment: Comment = {
version: 'WzQ3LDFc',
};
+export const hostIsolationComment: () => Comment = () => {
+ return {
+ type: CommentType.actions,
+ comment: 'I just isolated the host!',
+ id: 'isolate-comment-id',
+ actions: {
+ targets: [
+ {
+ hostname: 'host1',
+ endpointId: '001',
+ },
+ ],
+ type: 'isolate',
+ },
+ associationType: AssociationType.case,
+ createdAt: basicCreatedAt,
+ createdBy: elasticUser,
+ owner: SECURITY_SOLUTION_OWNER,
+ pushedAt: null,
+ pushedBy: null,
+ updatedAt: null,
+ updatedBy: null,
+ version: 'WzQ3LDFc',
+ };
+};
+
+export const hostReleaseComment: () => Comment = () => {
+ return {
+ type: CommentType.actions,
+ comment: 'I just released the host!',
+ id: 'isolate-comment-id',
+ actions: {
+ targets: [
+ {
+ hostname: 'host1',
+ endpointId: '001',
+ },
+ ],
+ type: 'unisolate',
+ },
+ associationType: AssociationType.case,
+ createdAt: basicCreatedAt,
+ createdBy: elasticUser,
+ owner: SECURITY_SOLUTION_OWNER,
+ pushedAt: null,
+ pushedBy: null,
+ updatedAt: null,
+ updatedBy: null,
+ version: 'WzQ3LDFc',
+ };
+};
+
export const basicCase: Case = {
type: CaseType.individual,
owner: SECURITY_SOLUTION_OWNER,
@@ -374,6 +426,15 @@ export const getAlertUserAction = () => ({
newValue: '{"type":"alert","alertId":"alert-id-1","index":"index-id-1"}',
});
+export const getHostIsolationUserAction = () => ({
+ ...basicAction,
+ actionId: 'isolate-action-id',
+ actionField: ['comment'] as UserActionField,
+ action: 'create' as UserAction,
+ commentId: 'isolate-comment-id',
+ newValue: 'some value',
+});
+
export const caseUserActions: CaseUserActions[] = [
getUserAction(['description'], 'create'),
getUserAction(['comment'], 'create'),
diff --git a/x-pack/plugins/cases/server/client/cases/mock.ts b/x-pack/plugins/cases/server/client/cases/mock.ts
index 23db57c6d3097..313d6cd12a6db 100644
--- a/x-pack/plugins/cases/server/client/cases/mock.ts
+++ b/x-pack/plugins/cases/server/client/cases/mock.ts
@@ -52,6 +52,106 @@ export const comment: CommentResponse = {
version: 'WzEsMV0=',
};
+export const isolateCommentActions: CommentResponse = {
+ associationType: AssociationType.case,
+ id: 'mock-action-comment-1',
+ comment: 'Isolating this for investigation',
+ type: CommentType.actions as const,
+ created_at: '2019-11-25T21:55:00.177Z',
+ actions: {
+ targets: [
+ {
+ endpointId: '123',
+ hostname: 'windows-host-1',
+ },
+ ],
+ type: 'isolate',
+ },
+ created_by: {
+ full_name: 'elastic',
+ email: 'testemail@elastic.co',
+ username: 'elastic',
+ },
+ owner: SECURITY_SOLUTION_OWNER,
+ pushed_at: null,
+ pushed_by: null,
+ updated_at: '2019-11-25T21:55:00.177Z',
+ updated_by: {
+ full_name: 'elastic',
+ email: 'testemail@elastic.co',
+ username: 'elastic',
+ },
+ version: 'WzEsMV0=',
+};
+
+export const releaseCommentActions: CommentResponse = {
+ associationType: AssociationType.case,
+ id: 'mock-action-comment-1',
+ comment: 'Releasing this for investigation',
+ type: CommentType.actions as const,
+ created_at: '2019-11-25T21:55:00.177Z',
+ actions: {
+ targets: [
+ {
+ endpointId: '123',
+ hostname: 'windows-host-1',
+ },
+ ],
+ type: 'unisolate',
+ },
+ created_by: {
+ full_name: 'elastic',
+ email: 'testemail@elastic.co',
+ username: 'elastic',
+ },
+ owner: SECURITY_SOLUTION_OWNER,
+ pushed_at: null,
+ pushed_by: null,
+ updated_at: '2019-11-25T21:55:00.177Z',
+ updated_by: {
+ full_name: 'elastic',
+ email: 'testemail@elastic.co',
+ username: 'elastic',
+ },
+ version: 'WzEsMV0=',
+};
+
+export const isolateCommentActionsMultipleTargets: CommentResponse = {
+ associationType: AssociationType.case,
+ id: 'mock-action-comment-1',
+ comment: 'Isolating this for investigation',
+ type: CommentType.actions as const,
+ created_at: '2019-11-25T21:55:00.177Z',
+ actions: {
+ targets: [
+ {
+ endpointId: '123',
+ hostname: 'windows-host-1',
+ },
+ {
+ endpointId: '456',
+ hostname: 'windows-host-2',
+ },
+ ],
+ type: 'isolate',
+ },
+ created_by: {
+ full_name: 'elastic',
+ email: 'testemail@elastic.co',
+ username: 'elastic',
+ },
+ owner: SECURITY_SOLUTION_OWNER,
+ pushed_at: null,
+ pushed_by: null,
+ updated_at: '2019-11-25T21:55:00.177Z',
+ updated_by: {
+ full_name: 'elastic',
+ email: 'testemail@elastic.co',
+ username: 'elastic',
+ },
+ version: 'WzEsMV0=',
+};
+
export const commentAlert: CommentResponse = {
associationType: AssociationType.case,
id: 'mock-comment-1',
diff --git a/x-pack/plugins/cases/server/client/cases/utils.test.ts b/x-pack/plugins/cases/server/client/cases/utils.test.ts
index bfd5d1279420b..d7c45d3e1e9ae 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.test.ts
@@ -18,6 +18,9 @@ import {
commentAlert,
commentAlertMultipleIds,
commentGeneratedAlert,
+ isolateCommentActions,
+ releaseCommentActions,
+ isolateCommentActionsMultipleTargets,
} from './mock';
import {
@@ -37,6 +40,52 @@ const formatComment = {
comment: 'Wow, good luck catching that bad meanie!',
};
+const formatIsolateActionComment = {
+ commentId: isolateCommentActions.id,
+ comment: 'Isolating this for investigation',
+ actions: {
+ targets: [
+ {
+ hostname: 'windows-host-1',
+ endpointId: '123',
+ },
+ ],
+ type: 'isolate',
+ },
+};
+
+const formatReleaseActionComment = {
+ commentId: releaseCommentActions.id,
+ comment: 'Releasing this for investigation',
+ actions: {
+ targets: [
+ {
+ hostname: 'windows-host-1',
+ endpointId: '123',
+ },
+ ],
+ type: 'unisolate',
+ },
+};
+
+const formatIsolateCommentActionsMultipleTargets = {
+ commentId: isolateCommentActionsMultipleTargets.id,
+ comment: 'Isolating this for investigation',
+ actions: {
+ targets: [
+ {
+ hostname: 'windows-host-1',
+ endpointId: '123',
+ },
+ {
+ hostname: 'windows-host-2',
+ endpointId: '456',
+ },
+ ],
+ type: 'isolate',
+ },
+};
+
const params = { ...basicParams };
describe('utils', () => {
@@ -289,6 +338,42 @@ describe('utils', () => {
},
]);
});
+
+ test('transform isolate action comment', () => {
+ const comments = [isolateCommentActions];
+ const res = transformComments(comments, ['informationCreated']);
+ const actionText = `Isolated host ${formatIsolateActionComment.actions.targets[0].hostname} with comment: ${formatIsolateActionComment.comment}`;
+ expect(res).toEqual([
+ {
+ commentId: formatIsolateActionComment.commentId,
+ comment: `${actionText} (created at ${comments[0].created_at} by ${comments[0].created_by.full_name})`,
+ },
+ ]);
+ });
+
+ test('transform release action comment', () => {
+ const comments = [releaseCommentActions];
+ const res = transformComments(comments, ['informationCreated']);
+ const actionText = `Released host ${formatReleaseActionComment.actions.targets[0].hostname} with comment: ${formatReleaseActionComment.comment}`;
+ expect(res).toEqual([
+ {
+ commentId: formatReleaseActionComment.commentId,
+ comment: `${actionText} (created at ${comments[0].created_at} by ${comments[0].created_by.full_name})`,
+ },
+ ]);
+ });
+
+ test('transform isolate action comment with multiple hosts', () => {
+ const comments = [isolateCommentActionsMultipleTargets];
+ const res = transformComments(comments, ['informationCreated']);
+ const actionText = `Isolated host ${formatIsolateCommentActionsMultipleTargets.actions.targets[0].hostname} and 1 more with comment: ${formatIsolateCommentActionsMultipleTargets.comment}`;
+ expect(res).toEqual([
+ {
+ commentId: formatIsolateCommentActionsMultipleTargets.commentId,
+ comment: `${actionText} (created at ${comments[0].created_at} by ${comments[0].created_by.full_name})`,
+ },
+ ]);
+ });
});
describe('transformers', () => {
@@ -523,8 +608,7 @@ describe('utils', () => {
},
],
},
- // Remove second push
- userActions: userActions.filter((item, index) => index !== 4),
+ userActions,
connector,
mappings: [
...mappings,
@@ -551,7 +635,7 @@ describe('utils', () => {
]);
});
- it('it removes alerts correctly', async () => {
+ it('it filters out the alerts from the comments correctly', async () => {
const res = await createIncident({
actionsClient: actionsMock,
theCase: {
@@ -582,6 +666,32 @@ describe('utils', () => {
]);
});
+ it('does not add the alerts count comment if all alerts have been pushed', async () => {
+ const res = await createIncident({
+ actionsClient: actionsMock,
+ theCase: {
+ ...theCase,
+ comments: [
+ { ...commentObj, id: 'comment-user-1', pushed_at: '2019-11-25T21:55:00.177Z' },
+ { ...commentGeneratedAlert, pushed_at: '2019-11-25T21:55:00.177Z' },
+ ],
+ },
+ userActions,
+ connector,
+ mappings,
+ alerts: [],
+ casesConnectors,
+ });
+
+ expect(res.comments).toEqual([
+ {
+ comment:
+ 'Wow, good luck catching that bad meanie! (added at 2019-11-25T21:55:00.177Z by elastic)',
+ commentId: 'comment-user-1',
+ },
+ ]);
+ });
+
it('updates an existing incident', async () => {
const existingIncidentData = {
priority: null,
@@ -644,22 +754,6 @@ describe('utils', () => {
});
});
- it('throws error if connector is not supported', async () => {
- expect.assertions(2);
- createIncident({
- actionsClient: actionsMock,
- theCase,
- userActions,
- connector: { ...connector, actionTypeId: 'not-supported' },
- mappings,
- alerts: [],
- casesConnectors,
- }).catch((e) => {
- expect(e).not.toBeNull();
- expect(e).toEqual(new Error('Invalid external service'));
- });
- });
-
describe('getLatestPushInfo', () => {
it('it returns the latest push information correctly', async () => {
const res = getLatestPushInfo('456', userActions);
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index f5a10d705e095..617191462c556 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -19,6 +19,7 @@ import {
CommentAttributes,
CommentRequestUserType,
CommentRequestAlertType,
+ CommentRequestActionsType,
} from '../../../common';
import { ActionsClient } from '../../../../actions/server';
import { CasesClientGetAlertsResponse } from '../../client/alerts/types';
@@ -76,18 +77,69 @@ const getCommentContent = (comment: CommentResponse): string => {
} else if (comment.type === CommentType.alert || comment.type === CommentType.generatedAlert) {
const ids = getAlertIds(comment);
return `Alert with ids ${ids.join(', ')} added to case`;
+ } else if (
+ comment.type === CommentType.actions &&
+ (comment.actions.type === 'isolate' || comment.actions.type === 'unisolate')
+ ) {
+ const firstHostname =
+ comment.actions.targets?.length > 0 ? comment.actions.targets[0].hostname : 'unknown';
+ const totalHosts = comment.actions.targets.length;
+ const actionText = comment.actions.type === 'isolate' ? 'Isolated' : 'Released';
+ const additionalHostsText = totalHosts - 1 > 0 ? `and ${totalHosts - 1} more ` : ``;
+
+ return `${actionText} host ${firstHostname} ${additionalHostsText}with comment: ${comment.comment}`;
}
return '';
};
-const countAlerts = (comments: CaseResponse['comments']): number =>
- comments?.reduce((total, comment) => {
- if (comment.type === CommentType.alert || comment.type === CommentType.generatedAlert) {
- return total + (Array.isArray(comment.alertId) ? comment.alertId.length : 1);
- }
- return total;
- }, 0) ?? 0;
+interface CountAlertsInfo {
+ totalComments: number;
+ pushed: number;
+ totalAlerts: number;
+}
+
+const getAlertsInfo = (
+ comments: CaseResponse['comments']
+): { totalAlerts: number; hasUnpushedAlertComments: boolean } => {
+ const countingInfo = { totalComments: 0, pushed: 0, totalAlerts: 0 };
+
+ const res =
+ comments?.reduce(({ totalComments, pushed, totalAlerts }, comment) => {
+ if (comment.type === CommentType.alert || comment.type === CommentType.generatedAlert) {
+ return {
+ totalComments: totalComments + 1,
+ pushed: comment.pushed_at != null ? pushed + 1 : pushed,
+ totalAlerts: totalAlerts + (Array.isArray(comment.alertId) ? comment.alertId.length : 1),
+ };
+ }
+ return { totalComments, pushed, totalAlerts };
+ }, countingInfo) ?? countingInfo;
+
+ return {
+ totalAlerts: res.totalAlerts,
+ hasUnpushedAlertComments: res.totalComments > res.pushed,
+ };
+};
+
+const addAlertMessage = (
+ caseId: string,
+ caseComments: CaseResponse['comments'],
+ comments: ExternalServiceComment[]
+): ExternalServiceComment[] => {
+ const { totalAlerts, hasUnpushedAlertComments } = getAlertsInfo(caseComments);
+
+ const newComments = [...comments];
+
+ if (hasUnpushedAlertComments) {
+ newComments.push({
+ comment: `Elastic Alerts attached to the case: ${totalAlerts}`,
+ commentId: `${caseId}-total-alerts`,
+ });
+ }
+
+ return newComments;
+};
export const createIncident = async ({
actionsClient,
@@ -161,11 +213,10 @@ export const createIncident = async ({
const commentsToBeUpdated = caseComments?.filter(
(comment) =>
// We push only user's comments
- comment.type === CommentType.user && commentsIdsToBeUpdated.has(comment.id)
+ (comment.type === CommentType.user || comment.type === CommentType.actions) &&
+ commentsIdsToBeUpdated.has(comment.id)
);
- const totalAlerts = countAlerts(caseComments);
-
let comments: ExternalServiceComment[] = [];
if (commentsToBeUpdated && Array.isArray(commentsToBeUpdated) && commentsToBeUpdated.length > 0) {
@@ -175,12 +226,7 @@ export const createIncident = async ({
}
}
- if (totalAlerts > 0) {
- comments.push({
- comment: `Elastic Alerts attached to the case: ${totalAlerts}`,
- commentId: `${theCase.id}-total-alerts`,
- });
- }
+ comments = addAlertMessage(theCase.id, caseComments, comments);
return { incident, comments };
};
@@ -322,7 +368,7 @@ export const isCommentAlertType = (
export const getCommentContextFromAttributes = (
attributes: CommentAttributes
-): CommentRequestUserType | CommentRequestAlertType => {
+): CommentRequestUserType | CommentRequestAlertType | CommentRequestActionsType => {
const owner = attributes.owner;
switch (attributes.type) {
case CommentType.user:
@@ -340,6 +386,16 @@ export const getCommentContextFromAttributes = (
rule: attributes.rule,
owner,
};
+ case CommentType.actions:
+ return {
+ type: attributes.type,
+ comment: attributes.comment,
+ actions: {
+ targets: attributes.actions.targets,
+ type: attributes.actions.type,
+ },
+ owner,
+ };
default:
return {
type: CommentType.user,
diff --git a/x-pack/plugins/console_extensions/README.md b/x-pack/plugins/console_extensions/README.md
deleted file mode 100644
index 49d83d2888d6b..0000000000000
--- a/x-pack/plugins/console_extensions/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Console extensions
-
-This plugin provides autocomplete definitions of licensed APIs to the OSS Console plugin.
\ No newline at end of file
diff --git a/x-pack/plugins/console_extensions/kibana.json b/x-pack/plugins/console_extensions/kibana.json
deleted file mode 100644
index 9411523d3f6dd..0000000000000
--- a/x-pack/plugins/console_extensions/kibana.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "id": "consoleExtensions",
- "version": "1.0.0",
- "kibanaVersion": "kibana",
- "requiredPlugins": ["console"],
- "server": true,
- "ui": false
-}
diff --git a/x-pack/plugins/console_extensions/server/index.ts b/x-pack/plugins/console_extensions/server/index.ts
deleted file mode 100644
index a03111a487090..0000000000000
--- a/x-pack/plugins/console_extensions/server/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
-
-import { config as configSchema, ConfigType } from './config';
-import { ConsoleExtensionsServerPlugin } from './plugin';
-
-export const plugin = (ctx: PluginInitializerContext) => new ConsoleExtensionsServerPlugin(ctx);
-
-export const config: PluginConfigDescriptor = {
- schema: configSchema,
-};
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/js/ingest.ts b/x-pack/plugins/console_extensions/server/lib/spec_definitions/js/ingest.ts
deleted file mode 100644
index 36ebfa589b823..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/js/ingest.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// NOTE: This is copy-pasted from es_6_0/ingest.js in OSS Console.
-const commonPipelineParams = {
- on_failure: [],
- ignore_failure: {
- __one_of: [false, true],
- },
- if: '',
- tag: '',
-};
-
-// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/enrich-processor.html
-const enrichProcessorDefinition = {
- enrich: {
- __template: {
- policy_name: '',
- field: '',
- target_field: '',
- },
- policy_name: '',
- field: '',
- target_field: '',
- ignore_missing: {
- __one_of: [false, true],
- },
- override: {
- __one_of: [true, false],
- },
- max_matches: 1,
- shape_relation: 'INTERSECTS',
- ...commonPipelineParams,
- },
-};
-
-// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/inference-processor.html
-const inferenceProcessorDefinition = {
- inference: {
- __template: {
- model_id: '',
- inference_config: {},
- field_mappings: {},
- },
- target_field: '',
- model_id: '',
- field_mappings: {
- __template: {},
- },
- inference_config: {
- regression: {
- __template: {},
- results_field: '',
- },
- classification: {
- __template: {},
- results_field: '',
- num_top_classes: 2,
- top_classes_results_field: '',
- },
- },
- ...commonPipelineParams,
- },
-};
-
-export const processors = [enrichProcessorDefinition, inferenceProcessorDefinition];
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_expired_data.json b/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_expired_data.json
deleted file mode 100644
index 4afa9e323b030..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_expired_data.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "ml.delete_expired_data": {
- "methods": [
- "DELETE"
- ],
- "patterns": [
- "_ml/_delete_expired_data"
- ]
- }
-}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.info.json b/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.info.json
deleted file mode 100644
index 51b571776ead9..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "ml.info": {
- "methods": [
- "GET"
- ],
- "patterns": [
- "_ml/info"
- ]
- }
-}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_filter.json b/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_filter.json
deleted file mode 100644
index 6d57c433d71f4..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_filter.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "ml.put_filter": {
- "methods": [
- "PUT"
- ],
- "patterns": [
- "_ml/filters/{filter_id}"
- ]
- }
-}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_trained_model.json b/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_trained_model.json
deleted file mode 100644
index 27d0393be6086..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_trained_model.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ml.put_trained_model": {
- "methods": [
- "PUT"
- ],
- "patterns": [
- "_ml/inference/{model_id}"
- ],
- "documentation": "TODO"
- }
-}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.delete_job.json b/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.delete_job.json
deleted file mode 100644
index 8ecf617751a51..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.delete_job.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "rollup.delete_job": {
- "methods": [
- "DELETE"
- ],
- "patterns": [
- "_rollup/job/{id}"
- ]
- }
-}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.put_job.json b/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.put_job.json
deleted file mode 100644
index 7734fd54a1ab1..0000000000000
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.put_job.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "rollup.put_job": {
- "methods": [
- "PUT"
- ],
- "patterns": [
- "_rollup/job/{id}"
- ]
- }
-}
diff --git a/x-pack/plugins/console_extensions/server/plugin.ts b/x-pack/plugins/console_extensions/server/plugin.ts
deleted file mode 100644
index 9ea3f314296ee..0000000000000
--- a/x-pack/plugins/console_extensions/server/plugin.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { join } from 'path';
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
-
-import { ConsoleSetup, ConsoleStart } from '../../../../src/plugins/console/server';
-
-import { processors } from './lib/spec_definitions/js';
-
-interface SetupDependencies {
- console: ConsoleSetup;
-}
-
-interface StartDependencies {
- console: ConsoleStart;
-}
-
-const CONSOLE_XPACK_JSON_SPEC_PATH = join(__dirname, 'lib/spec_definitions/json');
-
-export class ConsoleExtensionsServerPlugin implements Plugin {
- log: Logger;
- constructor(private readonly ctx: PluginInitializerContext) {
- this.log = this.ctx.logger.get();
- }
-
- setup(core: CoreSetup, { console: { addExtensionSpecFilePath } }: SetupDependencies) {
- addExtensionSpecFilePath(CONSOLE_XPACK_JSON_SPEC_PATH);
- this.log.debug(`Added extension path to ${CONSOLE_XPACK_JSON_SPEC_PATH}...`);
- }
-
- start(core: CoreStart, { console: { addProcessorDefinition } }: StartDependencies) {
- processors.forEach((processor) => addProcessorDefinition(processor));
- this.log.debug('Added processor definition extensions.');
- }
-}
diff --git a/x-pack/plugins/console_extensions/tsconfig.json b/x-pack/plugins/console_extensions/tsconfig.json
deleted file mode 100644
index 5ad28f230a0bb..0000000000000
--- a/x-pack/plugins/console_extensions/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "extends": "../../../tsconfig.base.json",
- "compilerOptions": {
- "composite": true,
- "outDir": "./target/types",
- "emitDeclarationOnly": true,
- "declaration": true,
- "declarationMap": true
- },
- "include": [
- "server/**/*"
- ],
- "references": [
- { "path": "../../../src/core/tsconfig.json" },
- { "path": "../../../src/plugins/console/tsconfig.json" }
- ]
-}
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts
index 8c75ce91cac6a..2115ce85eeb27 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persiseted_sessions.ts
@@ -59,7 +59,11 @@ function checkNonPersistedSessionsPage(
`${SEARCH_SESSIONS_CLEANUP_TASK_TYPE} Found ${nonPersistedSearchSessions.total} sessions, processing ${nonPersistedSearchSessions.saved_objects.length}`
);
- const updatedSessions = await getAllSessionsStatusUpdates(deps, nonPersistedSearchSessions);
+ const updatedSessions = await getAllSessionsStatusUpdates(
+ deps,
+ config,
+ nonPersistedSearchSessions
+ );
const deletedSessionIds: string[] = [];
await Promise.all(
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
index 0d51e97952275..3e89383c16d5e 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
@@ -36,7 +36,11 @@ function checkPersistedSessionsPage(
`${SEARCH_SESSIONS_TASK_TYPE} Found ${persistedSearchSessions.total} sessions, processing ${persistedSearchSessions.saved_objects.length}`
);
- const updatedSessions = await getAllSessionsStatusUpdates(deps, persistedSearchSessions);
+ const updatedSessions = await getAllSessionsStatusUpdates(
+ deps,
+ config,
+ persistedSearchSessions
+ );
await bulkUpdateSessions(deps, updatedSessions);
return persistedSearchSessions;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
index e261c324f440f..61d1635dabe1b 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
@@ -36,7 +36,7 @@ function checkSessionExpirationPage(
`${SEARCH_SESSIONS_EXPIRE_TASK_TYPE} Found ${searchSessions.total} sessions, processing ${searchSessions.saved_objects.length}`
);
- const updatedSessions = await getAllSessionsStatusUpdates(deps, searchSessions);
+ const updatedSessions = await getAllSessionsStatusUpdates(deps, config, searchSessions);
await bulkUpdateSessions(deps, updatedSessions);
return searchSessions;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
index fc86e75297393..c3946e5af16fa 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
@@ -5,16 +5,21 @@
* 2.0.
*/
-import { SearchStatus } from './types';
+import { SearchSessionsConfig, SearchStatus } from './types';
import { getSessionStatus } from './get_session_status';
import { SearchSessionStatus } from '../../../../../../src/plugins/data/common';
+import moment from 'moment';
describe('getSessionStatus', () => {
+ const mockConfig = ({
+ notTouchedInProgressTimeout: moment.duration(1, 'm'),
+ } as unknown) as SearchSessionsConfig;
test("returns an in_progress status if there's nothing inside the session", () => {
const session: any = {
idMapping: {},
+ touched: moment(),
};
- expect(getSessionStatus(session)).toBe(SearchSessionStatus.IN_PROGRESS);
+ expect(getSessionStatus(session, mockConfig)).toBe(SearchSessionStatus.IN_PROGRESS);
});
test("returns an error status if there's at least one error", () => {
@@ -25,7 +30,25 @@ describe('getSessionStatus', () => {
c: { status: SearchStatus.COMPLETE },
},
};
- expect(getSessionStatus(session)).toBe(SearchSessionStatus.ERROR);
+ expect(getSessionStatus(session, mockConfig)).toBe(SearchSessionStatus.ERROR);
+ });
+
+ test('expires a empty session after a minute', () => {
+ const session: any = {
+ idMapping: {},
+ touched: moment().subtract(2, 'm'),
+ };
+ expect(getSessionStatus(session, mockConfig)).toBe(SearchSessionStatus.EXPIRED);
+ });
+
+ test('doesnt expire a full session after a minute', () => {
+ const session: any = {
+ idMapping: {
+ a: { status: SearchStatus.IN_PROGRESS },
+ },
+ touched: moment().subtract(2, 'm'),
+ };
+ expect(getSessionStatus(session, mockConfig)).toBe(SearchSessionStatus.IN_PROGRESS);
});
test('returns a complete status if all are complete', () => {
@@ -36,7 +59,7 @@ describe('getSessionStatus', () => {
c: { status: SearchStatus.COMPLETE },
},
};
- expect(getSessionStatus(session)).toBe(SearchSessionStatus.COMPLETE);
+ expect(getSessionStatus(session, mockConfig)).toBe(SearchSessionStatus.COMPLETE);
});
test('returns a running status if some are still running', () => {
@@ -47,6 +70,6 @@ describe('getSessionStatus', () => {
c: { status: SearchStatus.IN_PROGRESS },
},
};
- expect(getSessionStatus(session)).toBe(SearchSessionStatus.IN_PROGRESS);
+ expect(getSessionStatus(session, mockConfig)).toBe(SearchSessionStatus.IN_PROGRESS);
});
});
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
index 23e02eedc0004..e7ae52b6c88ae 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
@@ -5,16 +5,28 @@
* 2.0.
*/
+import moment from 'moment';
import {
SearchSessionSavedObjectAttributes,
SearchSessionStatus,
} from '../../../../../../src/plugins/data/common/';
-import { SearchStatus } from './types';
+import { SearchSessionsConfig, SearchStatus } from './types';
-export function getSessionStatus(session: SearchSessionSavedObjectAttributes): SearchSessionStatus {
+export function getSessionStatus(
+ session: SearchSessionSavedObjectAttributes,
+ config: SearchSessionsConfig
+): SearchSessionStatus {
const searchStatuses = Object.values(session.idMapping);
+ const curTime = moment();
if (searchStatuses.some((item) => item.status === SearchStatus.ERROR)) {
return SearchSessionStatus.ERROR;
+ } else if (
+ searchStatuses.length === 0 &&
+ curTime.diff(moment(session.touched), 'ms') >
+ moment.duration(config.notTouchedInProgressTimeout).asMilliseconds()
+ ) {
+ // Expire empty sessions that weren't touched for a minute
+ return SearchSessionStatus.EXPIRED;
} else if (
searchStatuses.length > 0 &&
searchStatuses.every((item) => item.status === SearchStatus.COMPLETE)
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
index 485a30fd54951..d9e3fa6f8cab3 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
@@ -21,6 +21,7 @@ import {
describe('bulkUpdateSessions', () => {
let mockClient: any;
+ const mockConfig: any = {};
let savedObjectsClient: jest.Mocked;
const mockLogger: any = {
debug: jest.fn(),
@@ -66,6 +67,7 @@ describe('bulkUpdateSessions', () => {
client: mockClient,
logger: mockLogger,
},
+ mockConfig,
so
);
@@ -105,6 +107,7 @@ describe('bulkUpdateSessions', () => {
client: mockClient,
logger: mockLogger,
},
+ mockConfig,
so
);
@@ -139,6 +142,7 @@ describe('bulkUpdateSessions', () => {
client: mockClient,
logger: mockLogger,
},
+ mockConfig,
so
);
@@ -176,6 +180,7 @@ describe('bulkUpdateSessions', () => {
client: mockClient,
logger: mockLogger,
},
+ mockConfig,
so
);
@@ -219,6 +224,7 @@ describe('bulkUpdateSessions', () => {
client: mockClient,
logger: mockLogger,
},
+ mockConfig,
so
);
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
index 1c484467bef63..4758e7cb22684 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
@@ -13,11 +13,17 @@ import {
} from '../../../../../../src/plugins/data/common';
import { getSearchStatus } from './get_search_status';
import { getSessionStatus } from './get_session_status';
-import { CheckSearchSessionsDeps, SearchSessionsResponse, SearchStatus } from './types';
+import {
+ CheckSearchSessionsDeps,
+ SearchSessionsConfig,
+ SearchSessionsResponse,
+ SearchStatus,
+} from './types';
import { isSearchSessionExpired } from './utils';
export async function updateSessionStatus(
{ logger, client }: CheckSearchSessionsDeps,
+ config: SearchSessionsConfig,
session: SavedObjectsFindResult
) {
let sessionUpdated = false;
@@ -61,7 +67,7 @@ export async function updateSessionStatus(
// And only then derive the session's status
const sessionStatus = isExpired
? SearchSessionStatus.EXPIRED
- : getSessionStatus(session.attributes);
+ : getSessionStatus(session.attributes, config);
if (sessionStatus !== session.attributes.status) {
const now = new Date().toISOString();
session.attributes.status = sessionStatus;
@@ -79,13 +85,14 @@ export async function updateSessionStatus(
export async function getAllSessionsStatusUpdates(
deps: CheckSearchSessionsDeps,
+ config: SearchSessionsConfig,
searchSessions: SearchSessionsResponse
) {
const updatedSessions = new Array>();
await Promise.all(
searchSessions.saved_objects.map(async (session) => {
- const updated = await updateSessionStatus(deps, session);
+ const updated = await updateSessionStatus(deps, config, session);
if (updated) {
updatedSessions.push(session);
diff --git a/x-pack/plugins/data_visualizer/common/constants.ts b/x-pack/plugins/data_visualizer/common/constants.ts
index 7e0fe65632ae3..55ebdf9a196d6 100644
--- a/x-pack/plugins/data_visualizer/common/constants.ts
+++ b/x-pack/plugins/data_visualizer/common/constants.ts
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { KBN_FIELD_TYPES } from '../../../../src/plugins/data/common';
+
export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize';
export const MB = Math.pow(2, 20);
@@ -27,7 +29,26 @@ export const JOB_FIELD_TYPES = {
KEYWORD: 'keyword',
NUMBER: 'number',
TEXT: 'text',
+ HISTOGRAM: 'histogram',
UNKNOWN: 'unknown',
} as const;
+export const JOB_FIELD_TYPES_OPTIONS = {
+ [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' },
+ [JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' },
+ [JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' },
+ [JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' },
+ [JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' },
+ [JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' },
+ [JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' },
+ [JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' },
+ [JOB_FIELD_TYPES.HISTOGRAM]: { name: 'Histogram', icon: 'tokenNumber' },
+ [JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' },
+};
+
export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
+
+export const NON_AGGREGATABLE_FIELD_TYPES = new Set([
+ KBN_FIELD_TYPES.GEO_SHAPE,
+ KBN_FIELD_TYPES.HISTOGRAM,
+]);
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx
index 50823006db3b6..ee4b4f8171d7d 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx
@@ -72,6 +72,9 @@ export const FieldTypeIcon: FC = ({
iconType = 'tokenNumber';
color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2';
break;
+ case JOB_FIELD_TYPES.HISTOGRAM:
+ iconType = 'tokenHistogram';
+ color = 'euiColorVis7';
case JOB_FIELD_TYPES.UNKNOWN:
// Use defaults
break;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx
index 152926ad84ba7..511a068f305f9 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx
@@ -14,19 +14,7 @@ import type {
FileBasedUnknownFieldVisConfig,
} from '../stats_table/types/field_vis_config';
import { FieldTypeIcon } from '../field_type_icon';
-import { JOB_FIELD_TYPES } from '../../../../../common';
-
-const JOB_FIELD_TYPES_OPTIONS = {
- [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' },
- [JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' },
- [JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' },
- [JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' },
- [JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' },
- [JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' },
- [JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' },
- [JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' },
- [JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' },
-};
+import { JOB_FIELD_TYPES_OPTIONS } from '../../../../../common';
interface Props {
fields: Array;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
index e0a6c8ebf85c9..98d43059e5ee3 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
@@ -78,6 +78,9 @@ export function kbnTypeToJobType(field: IndexPatternField) {
case KBN_FIELD_TYPES.GEO_SHAPE:
type = JOB_FIELD_TYPES.GEO_SHAPE;
break;
+ case KBN_FIELD_TYPES.HISTOGRAM:
+ type = JOB_FIELD_TYPES.HISTOGRAM;
+ break;
default:
break;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
index 62d860c1513e8..12e92f2936fff 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
@@ -107,7 +107,7 @@ export const FileCouldNotBeRead: FC = ({
defaultMessage="If you know something about this data, such as the file format or timestamp format, adding initial overrides may help us to infer the rest of the structure."
/>
-
+
= (dataVi
}
}, [currentIndexPattern, toasts]);
- // Obtain the list of non metric field types which appear in the index pattern.
- let indexedFieldTypes: JobFieldType[] = [];
const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields;
- indexPatternFields.forEach((field) => {
- if (field.scripted !== true) {
- const dataVisualizerType: JobFieldType | undefined = kbnTypeToJobType(field);
- if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) {
- indexedFieldTypes.push(dataVisualizerType);
+
+ const fieldTypes = useMemo(() => {
+ // Obtain the list of non metric field types which appear in the index pattern.
+ const indexedFieldTypes: JobFieldType[] = [];
+ indexPatternFields.forEach((field) => {
+ if (!OMIT_FIELDS.includes(field.name) && field.scripted !== true) {
+ const dataVisualizerType: JobFieldType | undefined = kbnTypeToJobType(field);
+ if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) {
+ indexedFieldTypes.push(dataVisualizerType);
+ }
}
- }
- });
- indexedFieldTypes = indexedFieldTypes.sort();
+ });
+ return indexedFieldTypes.sort();
+ }, [indexPatternFields]);
const defaults = getDefaultPageState();
@@ -368,9 +372,16 @@ export const IndexDataVisualizerView: FC = (dataVi
earliest,
latest
);
+ // Because load overall stats perform queries in batches
+ // there could be multiple errors
+ if (Array.isArray(allStats.errors) && allStats.errors.length > 0) {
+ allStats.errors.forEach((err: any) => {
+ dataLoader.displayError(extractErrorProperties(err));
+ });
+ }
setOverallStats(allStats);
} catch (err) {
- dataLoader.displayError(err);
+ dataLoader.displayError(err.body ?? err);
}
}
@@ -859,7 +870,7 @@ export const IndexDataVisualizerView: FC = (dataVi
samplerShardSize={samplerShardSize}
setSamplerShardSize={setSamplerShardSize}
overallStats={overallStats}
- indexedFieldTypes={indexedFieldTypes}
+ indexedFieldTypes={fieldTypes}
setVisibleFieldTypes={setVisibleFieldTypes}
visibleFieldTypes={visibleFieldTypes}
visibleFieldNames={visibleFieldNames}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx
index 4f9de09dc670e..a4286bc4e09d1 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx
@@ -8,22 +8,10 @@
import React, { FC, useMemo } from 'react';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { JOB_FIELD_TYPES, JobFieldType } from '../../../../../common';
+import { JOB_FIELD_TYPES_OPTIONS, JobFieldType } from '../../../../../common';
import { FieldTypeIcon } from '../../../common/components/field_type_icon';
import { MultiSelectPicker, Option } from '../../../common/components/multi_select_picker';
-const ML_JOB_FIELD_TYPES_OPTIONS = {
- [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' },
- [JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' },
- [JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' },
- [JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' },
- [JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' },
- [JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' },
- [JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' },
- [JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' },
- [JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' },
-};
-
export const DatavisualizerFieldTypeFilter: FC<{
indexedFieldTypes: JobFieldType[];
setVisibleFieldTypes(q: string[]): void;
@@ -31,7 +19,7 @@ export const DatavisualizerFieldTypeFilter: FC<{
}> = ({ indexedFieldTypes, setVisibleFieldTypes, visibleFieldTypes }) => {
const options: Option[] = useMemo(() => {
return indexedFieldTypes.map((indexedFieldName) => {
- const item = ML_JOB_FIELD_TYPES_OPTIONS[indexedFieldName];
+ const item = JOB_FIELD_TYPES_OPTIONS[indexedFieldName];
return {
value: indexedFieldName,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
index 468bd3a2bd7ee..1b92eaddd1343 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
@@ -10,8 +10,7 @@ import { CoreSetup } from 'kibana/public';
import { estypes } from '@elastic/elasticsearch';
import { i18n } from '@kbn/i18n';
import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
-import { OMIT_FIELDS } from '../../../../common/constants';
+import { NON_AGGREGATABLE_FIELD_TYPES, OMIT_FIELDS } from '../../../../common/constants';
import { FieldRequestConfig } from '../../../../common/types';
import { getVisualizerFieldStats, getVisualizerOverallStats } from '../services/visualizer_stats';
@@ -49,7 +48,7 @@ export class DataLoader {
this._indexPattern.fields.forEach((field) => {
const fieldName = field.displayName !== undefined ? field.displayName : field.name;
if (this.isDisplayField(fieldName) === true) {
- if (field.aggregatable === true && field.type !== KBN_FIELD_TYPES.GEO_SHAPE) {
+ if (field.aggregatable === true && !NON_AGGREGATABLE_FIELD_TYPES.has(field.type)) {
aggregatableFields.push(field.name);
} else {
nonAggregatableFields.push(field.name);
@@ -110,17 +109,17 @@ export class DataLoader {
'The request may have timed out. Try using a smaller sample size or narrowing the time range.',
values: {
index: this._indexPattern.title,
- message: err.message,
+ message: err.error ?? err.message,
},
}),
});
} else {
this._toastNotifications.addError(err, {
- title: i18n.translate('xpack.dataVisualizer.index.errorLoadingDataMessage.', {
- defaultMessage: 'Error loading data in index {index}. {message}',
+ title: i18n.translate('xpack.dataVisualizer.index.errorLoadingDataMessage', {
+ defaultMessage: 'Error loading data in index {index}. {message}.',
values: {
index: this._indexPattern.title,
- message: err.message,
+ message: err.error ?? err.message,
},
}),
});
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
new file mode 100644
index 0000000000000..9bb36496a149e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
@@ -0,0 +1,184 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HttpFetchError } from 'kibana/public';
+import Boom from '@hapi/boom';
+import { isPopulatedObject } from '../../../../common/utils/object_utils';
+
+export interface WrappedError {
+ body: {
+ attributes: {
+ body: EsErrorBody;
+ };
+ message: Boom.Boom;
+ };
+ statusCode: number;
+}
+
+export interface EsErrorRootCause {
+ type: string;
+ reason: string;
+ caused_by?: EsErrorRootCause;
+ script?: string;
+}
+
+export interface EsErrorBody {
+ error: {
+ root_cause?: EsErrorRootCause[];
+ caused_by?: EsErrorRootCause;
+ type: string;
+ reason: string;
+ };
+ status: number;
+}
+
+export interface DVResponseError {
+ statusCode: number;
+ error: string;
+ message: string;
+ attributes?: {
+ body: EsErrorBody;
+ };
+}
+
+export interface ErrorMessage {
+ message: string;
+}
+
+export interface DVErrorObject {
+ causedBy?: string;
+ message: string;
+ statusCode?: number;
+ fullError?: EsErrorBody;
+}
+
+export interface DVHttpFetchError extends HttpFetchError {
+ body: T;
+}
+
+export type ErrorType =
+ | WrappedError
+ | DVHttpFetchError
+ | EsErrorBody
+ | Boom.Boom
+ | string
+ | undefined;
+
+export function isEsErrorBody(error: any): error is EsErrorBody {
+ return error && error.error?.reason !== undefined;
+}
+
+export function isErrorString(error: any): error is string {
+ return typeof error === 'string';
+}
+
+export function isErrorMessage(error: any): error is ErrorMessage {
+ return error && error.message !== undefined && typeof error.message === 'string';
+}
+
+export function isDVResponseError(error: any): error is DVResponseError {
+ return typeof error.body === 'object' && 'message' in error.body;
+}
+
+export function isBoomError(error: any): error is Boom.Boom {
+ return error.isBoom === true;
+}
+
+export function isWrappedError(error: any): error is WrappedError {
+ return error && isBoomError(error.body?.message) === true;
+}
+
+export const extractErrorProperties = (error: ErrorType): DVErrorObject => {
+ // extract properties of the error object from within the response error
+ // coming from Kibana, Elasticsearch, and our own DV messages
+
+ // some responses contain raw es errors as part of a bulk response
+ // e.g. if some jobs fail the action in a bulk request
+
+ if (isEsErrorBody(error)) {
+ return {
+ message: error.error.reason,
+ statusCode: error.status,
+ fullError: error,
+ };
+ }
+
+ if (isErrorString(error)) {
+ return {
+ message: error,
+ };
+ }
+ if (isWrappedError(error)) {
+ return error.body.message?.output?.payload;
+ }
+
+ if (isBoomError(error)) {
+ return {
+ message: error.output.payload.message,
+ statusCode: error.output.payload.statusCode,
+ };
+ }
+
+ if (error?.body === undefined && !error?.message) {
+ return {
+ message: '',
+ };
+ }
+
+ if (typeof error.body === 'string') {
+ return {
+ message: error.body,
+ };
+ }
+
+ if (isDVResponseError(error)) {
+ if (
+ typeof error.body.attributes === 'object' &&
+ typeof error.body.attributes.body?.error?.reason === 'string'
+ ) {
+ const errObj: DVErrorObject = {
+ message: error.body.attributes.body.error.reason,
+ statusCode: error.body.statusCode,
+ fullError: error.body.attributes.body,
+ };
+ if (
+ typeof error.body.attributes.body.error.caused_by === 'object' &&
+ (typeof error.body.attributes.body.error.caused_by?.reason === 'string' ||
+ typeof error.body.attributes.body.error.caused_by?.caused_by?.reason === 'string')
+ ) {
+ errObj.causedBy =
+ error.body.attributes.body.error.caused_by?.caused_by?.reason ||
+ error.body.attributes.body.error.caused_by?.reason;
+ }
+ if (
+ Array.isArray(error.body.attributes.body.error.root_cause) &&
+ typeof error.body.attributes.body.error.root_cause[0] === 'object' &&
+ isPopulatedObject(error.body.attributes.body.error.root_cause[0], ['script'])
+ ) {
+ errObj.causedBy = error.body.attributes.body.error.root_cause[0].script;
+ errObj.message += `: '${error.body.attributes.body.error.root_cause[0].script}'`;
+ }
+ return errObj;
+ } else {
+ return {
+ message: error.body.message,
+ statusCode: error.body.statusCode,
+ };
+ }
+ }
+
+ if (isErrorMessage(error)) {
+ return {
+ message: error.message,
+ };
+ }
+
+ // If all else fail return an empty message instead of JSON.stringify
+ return {
+ message: '',
+ };
+};
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts
index 27c09c889deb7..155cf09ebb8db 100644
--- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts
@@ -31,6 +31,7 @@ import {
getNumericFieldsStats,
getStringFieldsStats,
} from './get_fields_stats';
+import { wrapError } from '../../utils/error_wrapper';
export class DataVisualizer {
private _client: IScopedClusterClient;
@@ -60,6 +61,7 @@ export class DataVisualizer {
aggregatableNotExistsFields: [] as FieldData[],
nonAggregatableExistsFields: [] as FieldData[],
nonAggregatableNotExistsFields: [] as FieldData[],
+ errors: [] as any[],
};
// To avoid checking for the existence of too many aggregatable fields in one request,
@@ -76,49 +78,61 @@ export class DataVisualizer {
await Promise.all(
batches.map(async (fields) => {
- const batchStats = await this.checkAggregatableFieldsExist(
- indexPatternTitle,
- query,
- fields,
- samplerShardSize,
- timeFieldName,
- earliestMs,
- latestMs,
- undefined,
- runtimeMappings
- );
+ try {
+ const batchStats = await this.checkAggregatableFieldsExist(
+ indexPatternTitle,
+ query,
+ fields,
+ samplerShardSize,
+ timeFieldName,
+ earliestMs,
+ latestMs,
+ undefined,
+ runtimeMappings
+ );
- // Total count will be returned with each batch of fields. Just overwrite.
- stats.totalCount = batchStats.totalCount;
+ // Total count will be returned with each batch of fields. Just overwrite.
+ stats.totalCount = batchStats.totalCount;
- // Add to the lists of fields which do and do not exist.
- stats.aggregatableExistsFields.push(...batchStats.aggregatableExistsFields);
- stats.aggregatableNotExistsFields.push(...batchStats.aggregatableNotExistsFields);
+ // Add to the lists of fields which do and do not exist.
+ stats.aggregatableExistsFields.push(...batchStats.aggregatableExistsFields);
+ stats.aggregatableNotExistsFields.push(...batchStats.aggregatableNotExistsFields);
+ } catch (e) {
+ // If index not found, no need to proceed with other batches
+ if (e.statusCode === 404) {
+ throw e;
+ }
+ stats.errors.push(wrapError(e));
+ }
})
);
await Promise.all(
nonAggregatableFields.map(async (field) => {
- const existsInDocs = await this.checkNonAggregatableFieldExists(
- indexPatternTitle,
- query,
- field,
- timeFieldName,
- earliestMs,
- latestMs,
- runtimeMappings
- );
+ try {
+ const existsInDocs = await this.checkNonAggregatableFieldExists(
+ indexPatternTitle,
+ query,
+ field,
+ timeFieldName,
+ earliestMs,
+ latestMs,
+ runtimeMappings
+ );
- const fieldData: FieldData = {
- fieldName: field,
- existsInDocs,
- stats: {},
- };
+ const fieldData: FieldData = {
+ fieldName: field,
+ existsInDocs,
+ stats: {},
+ };
- if (existsInDocs === true) {
- stats.nonAggregatableExistsFields.push(fieldData);
- } else {
- stats.nonAggregatableNotExistsFields.push(fieldData);
+ if (existsInDocs === true) {
+ stats.nonAggregatableExistsFields.push(fieldData);
+ } else {
+ stats.nonAggregatableNotExistsFields.push(fieldData);
+ }
+ } catch (e) {
+ stats.errors.push(wrapError(e));
}
})
);
diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts
index 4ae695b05b81f..9db580959b116 100644
--- a/x-pack/plugins/data_visualizer/server/plugin.ts
+++ b/x-pack/plugins/data_visualizer/server/plugin.ts
@@ -12,7 +12,7 @@ import { dataVisualizerRoutes } from './routes';
export class DataVisualizerPlugin implements Plugin {
constructor() {}
- async setup(coreSetup: CoreSetup, plugins: SetupDeps) {
+ setup(coreSetup: CoreSetup, plugins: SetupDeps) {
dataVisualizerRoutes(coreSetup);
}
diff --git a/x-pack/plugins/enterprise_search/README.md b/x-pack/plugins/enterprise_search/README.md
index 0b067e25e32e8..96b0391bbc8da 100644
--- a/x-pack/plugins/enterprise_search/README.md
+++ b/x-pack/plugins/enterprise_search/README.md
@@ -2,16 +2,30 @@
## Overview
-This plugin's goal is to provide a Kibana user interface to the Enterprise Search solution's products (App Search and Workplace Search). In it's current MVP state, the plugin provides the following with the goal of gathering user feedback and raising product awareness:
+This plugin provides beta Kibana user interfaces for managing the Enterprise Search solution and its products, App Search and Workplace Search.
-- **App Search:** A basic engines overview with links into the product.
-- **Workplace Search:** A simple app overview with basic statistics, links to the sources, users (if standard auth), and product settings.
+> :warning: The Kibana interface for Enterprise Search is a beta feature. It is subject to change and is not covered by the same level of support as generally available features. This interface will become the sole management panel for Enterprise Search with the 8.0 release. Until then, the standalone Enterprise Search UI remains available and supported.
+
+### App Search
+
+
+
+Add rich, relevant search to your apps and websites. https://www.elastic.co/app-search/
+
+### Workplace Search
+
+
+
+Unify all your team's content into a personalized search experience. https://www.elastic.co/workplace-search/
## Development
1. When developing locally, Enterprise Search should be running locally alongside Kibana on `localhost:3002`.
2. Update `config/kibana.dev.yml` with `enterpriseSearch.host: 'http://localhost:3002'`
-3. For faster QA/development, run Enterprise Search on [elasticsearch-native auth](https://www.elastic.co/guide/en/app-search/current/security-and-users.html#app-search-self-managed-security-and-user-management-elasticsearch-native-realm) and log in as the `elastic` superuser on Kibana.
+
+Problems? If you're an Elastic Enterprise Search engineer, please reach out to @elastic/enterprise-search-frontend for questions or our in-depth Getting Started developer guide.
+
+Don't forget to read Kibana's [contributing documentation](https://github.com/elastic/kibana/#building-and-running-kibana-andor-contributing-code) and developer guides for more general info on the Kibana ecosystem.
### Kea
diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json
index f8b4261114a22..723b24f951434 100644
--- a/x-pack/plugins/enterprise_search/kibana.json
+++ b/x-pack/plugins/enterprise_search/kibana.json
@@ -12,5 +12,5 @@
"name": "Enterprise Search",
"githubTeam": "enterprise-search-frontend"
},
- "description": "Adds dashboards for discovering and managing Enterprise Search products"
+ "description": "Adds dashboards for discovering and managing Enterprise Search products."
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
index 0c8455e986ae1..dd99d368a0105 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
@@ -80,6 +80,7 @@ export const AnalyticsFilters: React.FC = () => {
'xpack.enterpriseSearch.appSearch.engine.analytics.filters.startDateAriaLabel',
{ defaultMessage: 'Filter by start date' }
)}
+ locale={i18n.getLocale()}
/>
}
endDateControl={
@@ -93,6 +94,7 @@ export const AnalyticsFilters: React.FC = () => {
'xpack.enterpriseSearch.appSearch.engine.analytics.filters.endDateAriaLabel',
{ defaultMessage: 'Filter by end date' }
)}
+ locale={i18n.getLocale()}
/>
}
fullWidth
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
index 3b8e1c96ff504..63952bc2a6de7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
@@ -10,7 +10,7 @@ import '../../../__mocks__/shallow_useeffect.mock';
import React from 'react';
-import { shallow } from 'enzyme';
+import { shallow, ShallowWrapper } from 'enzyme';
import { rerender } from '../../../test_helpers';
@@ -162,10 +162,18 @@ describe('MultiInputRows', () => {
});
describe('onChange', () => {
+ let wrapper: ShallowWrapper;
const onChange = jest.fn();
+ beforeEach(() => {
+ wrapper = shallow( = ({
const { values, addedNewRow, hasEmptyValues, hasOnlyOneValue } = useValues(logic);
const { addValue, editValue, deleteValue } = useActions(logic);
- useEffect(() => {
+ useUpdateEffect(() => {
if (onChange) {
onChange(filterEmptyValues(values));
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
index 4233a7b300d15..e2493b6404f7d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
@@ -229,7 +229,7 @@ describe('RelevanceTuningLogic', () => {
});
describe('updatePrecision', () => {
- it('should set precision inside search settings', () => {
+ it('should set precision inside search settings and set unsavedChanges to true', () => {
mount();
RelevanceTuningLogic.actions.updatePrecision(9);
@@ -239,6 +239,7 @@ describe('RelevanceTuningLogic', () => {
...DEFAULT_VALUES.searchSettings,
precision: 9,
},
+ unsavedChanges: true,
});
});
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts
index 743bb1aa1502b..02903b4588ed4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts
@@ -191,6 +191,7 @@ export const RelevanceTuningLogic = kea<
unsavedChanges: [
false,
{
+ updatePrecision: () => true,
setSearchSettings: () => true,
setSearchSettingsResponse: () => false,
},
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/field_number.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/field_number.test.tsx
index 3ac50d906e9c4..c012167f67818 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/field_number.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/field_number.test.tsx
@@ -54,7 +54,7 @@ describe('FieldNumber', () => {
}}
/>
);
- expect(wrapper.find(EuiFieldNumber).prop('value')).toEqual('');
+ expect(wrapper.find(EuiFieldNumber).prop('value')).toEqual(' ');
});
it('is disabled if the [fieldEnabledProperty] in fieldSettings is false', () => {
@@ -90,10 +90,10 @@ describe('FieldNumber', () => {
expect(props.updateAction).toHaveBeenCalledWith('foo', 21);
});
- it('will call updateAction on blur using the minimum possible value if the current value is something other than a number', () => {
+ it('will call clearAction on blur if the current value is something other than a number', () => {
const wrapper = shallow() => {
- const value = parseInt(e.target.value, 10);
- const fieldValue = Math.min(
- SIZE_FIELD_MAXIMUM,
- Math.max(SIZE_FIELD_MINIMUM, isNaN(value) ? 0 : value)
- );
+ let fieldValue = parseInt(e.target.value, 10);
+ if (!isNaN(fieldValue)) {
+ fieldValue = Math.min(SIZE_FIELD_MAXIMUM, Math.max(SIZE_FIELD_MINIMUM, fieldValue));
+ }
updateOrClearSizeForField(fieldName, fieldValue, updateAction, clearAction);
};
};
@@ -74,7 +73,7 @@ export const FieldNumber: React.FC = ({
value={
typeof fieldSettings[fieldSizeProperty] === 'number'
? (fieldSettings[fieldSizeProperty] as number)
- : ''
+ : ' ' // Without the space, invalid non-numbers don't get cleared for some reason
}
placeholder={i18n.translate(
'xpack.enterpriseSearch.appSearch.engine.resultSettings.numberFieldPlaceholder',
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.tsx
index 3a2eb20fecdf0..c3b46f5852724 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.tsx
@@ -56,7 +56,7 @@ export const TextFieldsBody: React.FC = () => {
}}
/>
-
+
{
}}
/>
-
+
{
{ defaultMessage: 'Raw' }
)}
-
+
{i18n.translate(
'xpack.enterpriseSearch.appSearch.engine.resultSettings.table.column.maxSizeTitle',
{ defaultMessage: 'Max size' }
@@ -48,7 +48,7 @@ export const TextFieldsHeader: React.FC = () => {
{ defaultMessage: 'Fallback' }
)}
-
+
{i18n.translate(
'xpack.enterpriseSearch.appSearch.engine.resultSettings.table.column.maxSizeTitle',
{ defaultMessage: 'Max size' }
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.tsx
index a7eb2424e797a..0dd2b0988b3f4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.tsx
@@ -19,6 +19,7 @@ import {
EuiFlexItem,
EuiSpacer,
EuiTitle,
+ EuiText,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
@@ -59,14 +60,15 @@ export const ProductSelector: React.FC = ({ access }) => {
-
+
-
-
+
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss
index 45bf37def1121..4be8d7322b4c8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.scss
@@ -21,21 +21,7 @@
&__header {
text-align: center;
margin: auto;
- }
-
- &__heading {
- @include euiBreakpoint('xs', 's') {
- font-size: $euiFontSizeXL;
- line-height: map-get(map-get($euiTitles, 'm'), 'line-height');
- }
- }
-
- &__subheading {
- color: $euiColorMediumShade;
- font-size: $euiFontSize;
-
@include euiBreakpoint('m', 'l', 'xl') {
- font-size: $euiFontSizeL;
margin-bottom: $euiSizeL;
}
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
index 748dc6a7cbcf8..c599a13cc3119 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
@@ -303,6 +303,7 @@ export const exampleResult = {
titleField: 'otherTitle',
subtitleField: 'otherSubtitle',
urlField: 'myLink',
+ urlFieldIsLinkable: true,
color: '#e3e3e3',
descriptionField: 'about',
typeField: 'otherType',
@@ -314,14 +315,18 @@ export const exampleResult = {
{ fieldName: 'dogs', label: 'Canines' },
],
},
- titleFieldHover: false,
- urlFieldHover: false,
exampleDocuments: [
{
myLink: 'http://foo',
otherTitle: 'foo',
+ content_source_id: '60e85e7ea2564c265a88a4f0',
+ external_id: 'doc-60e85eb7a2564c937a88a4f3',
+ last_updated: '2021-07-09T14:35:35+00:00',
+ updated_at: '2021-07-09T14:35:35+00:00',
+ source: 'custom',
},
],
+ schemaFields: {},
};
export const mostRecentIndexJob = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.tsx
index 79455ccc1d90d..35ac8f1b85c05 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.tsx
@@ -44,7 +44,7 @@ export const StatusItem: React.FC = ({ details }) => {
const infoPopover = (
{
expect(getAsLocalDateTimeString(date)).toEqual(new Date(Date.parse(date)).toLocaleString());
});
+ it('returns null if passed value is not a string', () => {
+ const date = ['1', '2'];
+
+ expect(getAsLocalDateTimeString(date)).toEqual(null);
+ });
+
it('returns null if string cannot be parsed as date', () => {
const date = 'foo';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.ts
index d5ceb50d4c9af..6350c4e4a4099 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.ts
@@ -5,7 +5,11 @@
* 2.0.
*/
-export const getAsLocalDateTimeString = (str: string) => {
- const dateValue = Date.parse(str);
+import { CustomAPIFieldValue } from '../types';
+
+export const getAsLocalDateTimeString = (maybeDate: CustomAPIFieldValue) => {
+ if (typeof maybeDate !== 'string') return null;
+
+ const dateValue = Date.parse(maybeDate);
return dateValue ? new Date(dateValue).toLocaleString() : null;
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.ts
index f7664c90d461c..7a5020be5986e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.ts
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { CustomAPIFieldValue } from '../types';
+
const mimeTypes = {
'application/iwork-keynote-sffkey': 'Keynote',
'application/x-iwork-keynote-sffkey': 'Keynote',
@@ -51,4 +53,5 @@ const mimeTypes = {
'video/quicktime': 'MOV',
} as { [key: string]: string };
-export const mimeType = (type: string) => mimeTypes[type.toLowerCase()] || type;
+export const mimeType = (type: CustomAPIFieldValue) =>
+ mimeTypes[type.toString().toLowerCase()] || type;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx
index b30511f0a6d80..af94707aa3612 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx
@@ -58,6 +58,13 @@ describe('AddSourceList', () => {
expect(wrapper.find(AvailableSourcesList)).toHaveLength(1);
});
+ it('does not render header when loading', () => {
+ setMockValues({ ...mockValues, dataLoading: true });
+ const wrapper = shallow(
{!isOrganization && (
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx
index eef508b2e618f..8b0a72ac23e39 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx
@@ -62,7 +62,7 @@ export const ExampleResultDetailCard: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx
index 46b8de6789467..b3ba4c6d50973 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx
@@ -109,7 +109,7 @@ export const ExampleStandoutResult: React.FC = () => {
data-test-subj="MediaTypeField"
>
- {mimeType(result[mediaTypeField] as string)}
+ {mimeType(result[mediaTypeField])}
diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx
index c6a09c1177a5e..cbf89bba2ca44 100644
--- a/src/core/public/chrome/ui/header/header_help_menu.tsx
+++ b/src/core/public/chrome/ui/header/header_help_menu.tsx
@@ -211,7 +211,7 @@ export class HeaderHelpMenu extends Component {
return (
-
+
{
+
{
+
{
@@ -330,7 +330,7 @@ export class HeaderHelpMenu extends Component {
{customLinks}
{content && (
<>
- {customLinks &&
-
+
{text}
{addSpacer && => ({
set: jest.fn(),
});
-describe('getFileHash', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/105174
+describe.skip('getFileHash', () => {
const sampleFilePath = resolve(__dirname, 'foo.js');
const fd = 42;
const stats: Stats = { ino: 42, size: 9000 } as any;
diff --git a/src/core/server/elasticsearch/client/client_config.test.ts b/src/core/server/elasticsearch/client/client_config.test.ts
index faca79b3aa6fa..7e16339b40235 100644
--- a/src/core/server/elasticsearch/client/client_config.test.ts
+++ b/src/core/server/elasticsearch/client/client_config.test.ts
@@ -204,11 +204,27 @@ describe('parseClientOptions', () => {
);
});
+ it('adds an authorization header if `serviceAccountToken` is set', () => {
+ expect(
+ parseClientOptions(
+ createConfig({
+ serviceAccountToken: 'ABC123',
+ }),
+ false
+ )
+ ).toEqual(
+ expect.objectContaining({
+ headers: expect.objectContaining({
+ authorization: `Bearer ABC123`,
+ }),
+ })
+ );
+ });
+
it('does not add auth to the nodes', () => {
const options = parseClientOptions(
createConfig({
- username: 'user',
- password: 'pass',
+ serviceAccountToken: 'ABC123',
hosts: ['http://node-A:9200'],
}),
true
@@ -252,6 +268,34 @@ describe('parseClientOptions', () => {
]
`);
});
+
+ it('does not add the authorization header even if `serviceAccountToken` is set', () => {
+ expect(
+ parseClientOptions(
+ createConfig({
+ serviceAccountToken: 'ABC123',
+ }),
+ true
+ ).headers
+ ).not.toHaveProperty('authorization');
+ });
+
+ it('does not add auth to the nodes even if `serviceAccountToken` is set', () => {
+ const options = parseClientOptions(
+ createConfig({
+ serviceAccountToken: 'ABC123',
+ hosts: ['http://node-A:9200'],
+ }),
+ true
+ );
+ expect(options.nodes).toMatchInlineSnapshot(`
+ Array [
+ Object {
+ "url": "http://node-a:9200/",
+ },
+ ]
+ `);
+ });
});
});
diff --git a/src/core/server/elasticsearch/client/client_config.ts b/src/core/server/elasticsearch/client/client_config.ts
index 3044b277db902..bbbb1ac247b3b 100644
--- a/src/core/server/elasticsearch/client/client_config.ts
+++ b/src/core/server/elasticsearch/client/client_config.ts
@@ -29,6 +29,7 @@ export type ElasticsearchClientConfig = Pick<
| 'hosts'
| 'username'
| 'password'
+ | 'serviceAccountToken'
> & {
pingTimeout?: ElasticsearchConfig['pingTimeout'] | ClientOptions['pingTimeout'];
requestTimeout?: ElasticsearchConfig['requestTimeout'] | ClientOptions['requestTimeout'];
@@ -74,11 +75,16 @@ export function parseClientOptions(
};
}
- if (config.username && config.password && !scoped) {
- clientOptions.auth = {
- username: config.username,
- password: config.password,
- };
+ if (!scoped) {
+ if (config.username && config.password) {
+ clientOptions.auth = {
+ username: config.username,
+ password: config.password,
+ };
+ } else if (config.serviceAccountToken) {
+ // TODO: change once ES client has native support for service account tokens: https://github.com/elastic/elasticsearch-js/issues/1477
+ clientOptions.headers!.authorization = `Bearer ${config.serviceAccountToken}`;
+ }
}
clientOptions.nodes = config.hosts.map((host) => convertHost(host));
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts
index f8ef1a7a20a83..6e05baac88e34 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.ts
@@ -41,6 +41,7 @@ test('set correct defaults', () => {
"authorization",
],
"requestTimeout": "PT30S",
+ "serviceAccountToken": undefined,
"shardTimeout": "PT30S",
"sniffInterval": false,
"sniffOnConnectionFault": false,
@@ -377,3 +378,22 @@ test('#username throws if equal to "elastic", only while running from source', (
);
expect(() => config.schema.validate(obj, { dist: true })).not.toThrow();
});
+
+test('serviceAccountToken throws if username is also set', () => {
+ const obj = {
+ username: 'elastic',
+ serviceAccountToken: 'abc123',
+ };
+
+ expect(() => config.schema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+ `"[serviceAccountToken]: serviceAccountToken cannot be specified when \\"username\\" is also set."`
+ );
+});
+
+test('serviceAccountToken does not throw if username is not set', () => {
+ const obj = {
+ serviceAccountToken: 'abc123',
+ };
+
+ expect(() => config.schema.validate(obj)).not.toThrow();
+});
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index b2b25cda3ac2a..e756d9da867b3 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -53,6 +53,18 @@ export const configSchema = schema.object({
)
),
password: schema.maybe(schema.string()),
+ serviceAccountToken: schema.maybe(
+ schema.conditional(
+ schema.siblingRef('username'),
+ schema.never(),
+ schema.string(),
+ schema.string({
+ validate: () => {
+ return `serviceAccountToken cannot be specified when "username" is also set.`;
+ },
+ })
+ )
+ ),
requestHeadersWhitelist: schema.oneOf(
[
schema.string({
@@ -272,6 +284,7 @@ export class ElasticsearchConfig {
/**
* If Elasticsearch is protected with basic authentication, this setting provides
* the username that the Kibana server uses to perform its administrative functions.
+ * Cannot be used in conjunction with serviceAccountToken.
*/
public readonly username?: string;
@@ -281,6 +294,14 @@ export class ElasticsearchConfig {
*/
public readonly password?: string;
+ /**
+ * If Elasticsearch security features are enabled, this setting provides the service account
+ * token that the Kibana server users to perform its administrative functions.
+ *
+ * This is an alternative to specifying a username and password.
+ */
+ public readonly serviceAccountToken?: string;
+
/**
* Set of settings configure SSL connection between Kibana and Elasticsearch that
* are required when `xpack.ssl.verification_mode` in Elasticsearch is set to
@@ -314,6 +335,7 @@ export class ElasticsearchConfig {
this.healthCheckDelay = rawConfig.healthCheck.delay;
this.username = rawConfig.username;
this.password = rawConfig.password;
+ this.serviceAccountToken = rawConfig.serviceAccountToken;
this.customHeaders = rawConfig.customHeaders;
const { alwaysPresentCertificate, verificationMode } = rawConfig.ssl;
diff --git a/src/core/server/elasticsearch/legacy/cluster_client.test.ts b/src/core/server/elasticsearch/legacy/cluster_client.test.ts
index 2ce19570677c5..52bc4bd45660e 100644
--- a/src/core/server/elasticsearch/legacy/cluster_client.test.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.test.ts
@@ -101,6 +101,30 @@ describe('#callAsInternalUser', () => {
expect(mockEsClientInstance.ping).toHaveBeenLastCalledWith(mockParams);
});
+ test('sets the authorization header when a service account token is configured', async () => {
+ clusterClient = new LegacyClusterClient(
+ { apiVersion: 'es-version', serviceAccountToken: 'ABC123' } as any,
+ logger.get(),
+ 'custom-type'
+ );
+
+ const mockResponse = { data: 'ping' };
+ const mockParams = { param: 'ping' };
+ mockEsClientInstance.ping.mockImplementation(function mockCall(this: any) {
+ return Promise.resolve({
+ context: this,
+ response: mockResponse,
+ });
+ });
+
+ await clusterClient.callAsInternalUser('ping', mockParams);
+
+ expect(mockEsClientInstance.ping).toHaveBeenCalledWith({
+ headers: { authorization: 'Bearer ABC123' },
+ param: 'ping',
+ });
+ });
+
test('correctly deals with nested endpoint', async () => {
const mockResponse = { data: 'authenticate' };
const mockParams = { param: 'authenticate' };
@@ -355,6 +379,31 @@ describe('#asScoped', () => {
);
});
+ test('does not set the authorization header when a service account token is configured', async () => {
+ clusterClient = new LegacyClusterClient(
+ {
+ apiVersion: 'es-version',
+ requestHeadersWhitelist: ['zero'],
+ serviceAccountToken: 'ABC123',
+ } as any,
+ logger.get(),
+ 'custom-type'
+ );
+
+ clusterClient.asScoped(
+ httpServerMock.createRawRequest({ headers: { zero: '0', one: '1', two: '2', three: '3' } })
+ );
+
+ const expectedHeaders = { zero: '0' };
+
+ expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
+ expect(MockScopedClusterClient).toHaveBeenCalledWith(
+ expect.any(Function),
+ expect.any(Function),
+ expectedHeaders
+ );
+ });
+
test('both scoped and internal API caller fail if cluster client is closed', async () => {
clusterClient.asScoped(
httpServerMock.createRawRequest({ headers: { zero: '0', one: '1', two: '2', three: '3' } })
diff --git a/src/core/server/elasticsearch/legacy/cluster_client.ts b/src/core/server/elasticsearch/legacy/cluster_client.ts
index bdb2ca4d01b3c..6a6765b67da9f 100644
--- a/src/core/server/elasticsearch/legacy/cluster_client.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.ts
@@ -147,6 +147,13 @@ export class LegacyClusterClient implements ILegacyClusterClient {
) => {
this.assertIsNotClosed();
+ if (this.config.serviceAccountToken) {
+ clientParams.headers = {
+ ...clientParams.headers,
+ authorization: `Bearer ${this.config.serviceAccountToken}`,
+ };
+ }
+
return await (callAPI.bind(null, this.client) as LegacyAPICaller)(
endpoint,
clientParams,
diff --git a/src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts
index 6239ad270d5b5..a343c0d5d2ad1 100644
--- a/src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts
+++ b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts
@@ -333,6 +333,128 @@ describe('#auth', () => {
});
});
+describe('#serviceAccountToken', () => {
+ it('is set when #auth is true, and a token is provided', () => {
+ expect(
+ parseElasticsearchClientConfig(
+ {
+ apiVersion: 'v7.0.0',
+ customHeaders: { xsrf: 'something' },
+ sniffOnStart: true,
+ sniffOnConnectionFault: true,
+ hosts: ['https://es.local'],
+ requestHeadersWhitelist: [],
+ serviceAccountToken: 'ABC123',
+ },
+ logger.get(),
+ 'custom-type',
+ { auth: true }
+ )
+ ).toMatchInlineSnapshot(`
+ Object {
+ "apiVersion": "v7.0.0",
+ "hosts": Array [
+ Object {
+ "headers": Object {
+ "x-elastic-product-origin": "kibana",
+ "xsrf": "something",
+ },
+ "host": "es.local",
+ "path": "/",
+ "port": "443",
+ "protocol": "https:",
+ "query": null,
+ },
+ ],
+ "keepAlive": true,
+ "log": [Function],
+ "serviceAccountToken": "ABC123",
+ "sniffOnConnectionFault": true,
+ "sniffOnStart": true,
+ }
+ `);
+ });
+
+ it('is not set when #auth is true, and a token is not provided', () => {
+ expect(
+ parseElasticsearchClientConfig(
+ {
+ apiVersion: 'v7.0.0',
+ customHeaders: { xsrf: 'something' },
+ sniffOnStart: true,
+ sniffOnConnectionFault: true,
+ hosts: ['https://es.local'],
+ requestHeadersWhitelist: [],
+ },
+ logger.get(),
+ 'custom-type',
+ { auth: true }
+ )
+ ).toMatchInlineSnapshot(`
+ Object {
+ "apiVersion": "v7.0.0",
+ "hosts": Array [
+ Object {
+ "headers": Object {
+ "x-elastic-product-origin": "kibana",
+ "xsrf": "something",
+ },
+ "host": "es.local",
+ "path": "/",
+ "port": "443",
+ "protocol": "https:",
+ "query": null,
+ },
+ ],
+ "keepAlive": true,
+ "log": [Function],
+ "sniffOnConnectionFault": true,
+ "sniffOnStart": true,
+ }
+ `);
+ });
+
+ it('is not set when #auth is false, and a token is provided', () => {
+ expect(
+ parseElasticsearchClientConfig(
+ {
+ apiVersion: 'v7.0.0',
+ customHeaders: { xsrf: 'something' },
+ sniffOnStart: true,
+ sniffOnConnectionFault: true,
+ hosts: ['https://es.local'],
+ requestHeadersWhitelist: [],
+ serviceAccountToken: 'ABC123',
+ },
+ logger.get(),
+ 'custom-type',
+ { auth: false }
+ )
+ ).toMatchInlineSnapshot(`
+ Object {
+ "apiVersion": "v7.0.0",
+ "hosts": Array [
+ Object {
+ "headers": Object {
+ "x-elastic-product-origin": "kibana",
+ "xsrf": "something",
+ },
+ "host": "es.local",
+ "path": "/",
+ "port": "443",
+ "protocol": "https:",
+ "query": null,
+ },
+ ],
+ "keepAlive": true,
+ "log": [Function],
+ "sniffOnConnectionFault": true,
+ "sniffOnStart": true,
+ }
+ `);
+ });
+});
+
describe('#customHeaders', () => {
test('override the default headers', () => {
const headerKey = Object.keys(DEFAULT_HEADERS)[0];
diff --git a/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
index d68e7635c57cb..3d81caefad457 100644
--- a/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
+++ b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
@@ -35,6 +35,7 @@ export type LegacyElasticsearchClientConfig = Pick & {
pingTimeout?: ElasticsearchConfig['pingTimeout'] | ConfigOptions['pingTimeout'];
requestTimeout?: ElasticsearchConfig['requestTimeout'] | ConfigOptions['requestTimeout'];
@@ -61,6 +62,7 @@ interface LegacyElasticsearchClientConfigOverrides {
/** @internal */
type ExtendedConfigOptions = ConfigOptions &
Partial<{
+ serviceAccountToken?: string;
ssl: Partial<{
rejectUnauthorized: boolean;
checkServerIdentity: typeof checkServerIdentity;
@@ -106,9 +108,14 @@ export function parseElasticsearchClientConfig(
esClientConfig.sniffInterval = getDurationAsMs(config.sniffInterval);
}
- const needsAuth = auth !== false && config.username && config.password;
+ const needsAuth =
+ auth !== false && ((config.username && config.password) || config.serviceAccountToken);
if (needsAuth) {
- esClientConfig.httpAuth = `${config.username}:${config.password}`;
+ if (config.username) {
+ esClientConfig.httpAuth = `${config.username}:${config.password}`;
+ } else if (config.serviceAccountToken) {
+ esClientConfig.serviceAccountToken = config.serviceAccountToken;
+ }
}
if (Array.isArray(config.hosts)) {
diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.ts b/src/core/server/saved_objects/migrations/core/elastic_index.ts
index 09c2935422b79..8bda77563be8c 100644
--- a/src/core/server/saved_objects/migrations/core/elastic_index.ts
+++ b/src/core/server/saved_objects/migrations/core/elastic_index.ts
@@ -40,6 +40,7 @@ export const REMOVED_TYPES: string[] = [
'fleet-agent-events',
// Was removed in 7.12
'ml-telemetry',
+ 'server',
// https://github.com/elastic/kibana/issues/95617
'tsvb-validation-telemetry',
].sort();
diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts
index 0481e6118acb0..c8ff79351aadb 100644
--- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts
+++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts
@@ -137,14 +137,15 @@ describe('migrateRawDocsSafely', () => {
const transform = jest.fn((doc: any) => [
set(_.cloneDeep(doc), 'attributes.name', 'HOI!'),
]);
- const task = migrateRawDocsSafely(
- new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
- transform,
- [
+ const task = migrateRawDocsSafely({
+ serializer: new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+ knownTypes: new Set(['a', 'c']),
+ migrateDoc: transform,
+ rawDocs: [
{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } },
{ _id: 'c:d', _source: { type: 'c', c: { name: 'DDD' } } },
- ]
- );
+ ],
+ });
const result = (await task()) as Either.Right;
expect(result._tag).toEqual('Right');
expect(result.right.processedDocs).toEqual([
@@ -181,14 +182,15 @@ describe('migrateRawDocsSafely', () => {
const transform = jest.fn((doc: any) => [
set(_.cloneDeep(doc), 'attributes.name', 'TADA'),
]);
- const task = migrateRawDocsSafely(
- new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
- transform,
- [
+ const task = migrateRawDocsSafely({
+ serializer: new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+ knownTypes: new Set(['a', 'c']),
+ migrateDoc: transform,
+ rawDocs: [
{ _id: 'foo:b', _source: { type: 'a', a: { name: 'AAA' } } },
{ _id: 'c:d', _source: { type: 'c', c: { name: 'DDD' } } },
- ]
- );
+ ],
+ });
const result = (await task()) as Either.Left;
expect(transform).toHaveBeenCalledTimes(1);
expect(result._tag).toEqual('Left');
@@ -202,11 +204,12 @@ describe('migrateRawDocsSafely', () => {
set(_.cloneDeep(doc), 'attributes.name', 'HOI!'),
{ id: 'bar', type: 'foo', attributes: { name: 'baz' } },
]);
- const task = migrateRawDocsSafely(
- new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
- transform,
- [{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }]
- );
+ const task = migrateRawDocsSafely({
+ serializer: new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+ knownTypes: new Set(['a', 'c']),
+ migrateDoc: transform,
+ rawDocs: [{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }],
+ });
const result = (await task()) as Either.Right;
expect(result._tag).toEqual('Right');
expect(result.right.processedDocs).toEqual([
@@ -235,11 +238,12 @@ describe('migrateRawDocsSafely', () => {
const transform = jest.fn((doc: any) => {
throw new TransformSavedObjectDocumentError(new Error('error during transform'), '8.0.0');
});
- const task = migrateRawDocsSafely(
- new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
- transform,
- [{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }] // this is the raw doc
- );
+ const task = migrateRawDocsSafely({
+ serializer: new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+ knownTypes: new Set(['a', 'c']),
+ migrateDoc: transform,
+ rawDocs: [{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }], // this is the raw doc
+ });
const result = (await task()) as Either.Left;
expect(transform).toHaveBeenCalledTimes(1);
expect(result._tag).toEqual('Left');
@@ -252,4 +256,43 @@ describe('migrateRawDocsSafely', () => {
}
`);
});
+
+ test('skips documents of unknown types', async () => {
+ const transform = jest.fn((doc: any) => [
+ set(_.cloneDeep(doc), 'attributes.name', 'HOI!'),
+ ]);
+ const task = migrateRawDocsSafely({
+ serializer: new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+ knownTypes: new Set(['a']),
+ migrateDoc: transform,
+ rawDocs: [
+ { _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } },
+ { _id: 'c:d', _source: { type: 'c', c: { name: 'DDD' } } },
+ ],
+ });
+
+ const result = (await task()) as Either.Right;
+ expect(result._tag).toEqual('Right');
+ expect(result.right.processedDocs).toEqual([
+ {
+ _id: 'a:b',
+ _source: { type: 'a', a: { name: 'HOI!' }, migrationVersion: {}, references: [] },
+ },
+ {
+ _id: 'c:d',
+ // name field is not migrated on unknown type
+ _source: { type: 'c', c: { name: 'DDD' } },
+ },
+ ]);
+
+ const obj1 = {
+ id: 'b',
+ type: 'a',
+ attributes: { name: 'AAA' },
+ migrationVersion: {},
+ references: [],
+ };
+ expect(transform).toHaveBeenCalledTimes(1);
+ expect(transform).toHaveBeenNthCalledWith(1, obj1);
+ });
});
diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts
index 461ae1df6bc3d..65ea21a6778d5 100644
--- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts
+++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts
@@ -81,6 +81,13 @@ export async function migrateRawDocs(
return processedDocs;
}
+interface MigrateRawDocsSafelyDeps {
+ serializer: SavedObjectsSerializer;
+ knownTypes: ReadonlySet;
+ migrateDoc: MigrateAndConvertFn;
+ rawDocs: SavedObjectsRawDoc[];
+}
+
/**
* Applies the specified migration function to every saved object document provided
* and converts the saved object to a raw document.
@@ -88,11 +95,15 @@ export async function migrateRawDocs(
* for which the transformation function failed.
* @returns {TaskEither.TaskEither}
*/
-export function migrateRawDocsSafely(
- serializer: SavedObjectsSerializer,
- migrateDoc: MigrateAndConvertFn,
- rawDocs: SavedObjectsRawDoc[]
-): TaskEither.TaskEither {
+export function migrateRawDocsSafely({
+ serializer,
+ knownTypes,
+ migrateDoc,
+ rawDocs,
+}: MigrateRawDocsSafelyDeps): TaskEither.TaskEither<
+ DocumentsTransformFailed,
+ DocumentsTransformSuccess
+> {
return async () => {
const migrateDocNonBlocking = transformNonBlocking(migrateDoc);
const processedDocs: SavedObjectsRawDoc[] = [];
@@ -100,7 +111,10 @@ export function migrateRawDocsSafely(
const corruptSavedObjectIds: string[] = [];
const options = { namespaceTreatment: 'lax' as const };
for (const raw of rawDocs) {
- if (serializer.isRawSavedObject(raw, options)) {
+ // Do not transform documents of unknown types
+ if (raw?._source?.type && !knownTypes.has(raw._source.type)) {
+ processedDocs.push(raw);
+ } else if (serializer.isRawSavedObject(raw, options)) {
try {
const savedObject = convertToRawAddMigrationVersion(raw, options, serializer);
processedDocs.push(
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
index 2d0282e6d2632..572b2934e49b8 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -184,11 +184,12 @@ export class KibanaMigrator {
logger: this.log,
preMigrationScript: indexMap[index].script,
transformRawDocs: (rawDocs: SavedObjectsRawDoc[]) =>
- migrateRawDocsSafely(
- this.serializer,
- this.documentMigrator.migrateAndConvert,
- rawDocs
- ),
+ migrateRawDocsSafely({
+ serializer: this.serializer,
+ knownTypes: new Set(this.typeRegistry.getAllTypes().map((t) => t.name)),
+ migrateDoc: this.documentMigrator.migrateAndConvert,
+ rawDocs,
+ }),
migrationVersionPerType: this.documentMigrator.migrationVersion,
indexPrefix: index,
migrationsConfig: this.soMigrationsConfig,
diff --git a/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.test.ts b/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.test.ts
index 62a619ef447fa..a52cb2a922968 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.test.ts
@@ -97,9 +97,12 @@ describe('checkForUnknownDocs', () => {
const result = await task();
expect(Either.isRight(result)).toBe(true);
+ expect((result as Either.Right).right).toEqual({
+ unknownDocs: [],
+ });
});
- it('resolves with `Either.left` when unknown docs are found', async () => {
+ it('resolves with `Either.right` when unknown docs are found', async () => {
const client = elasticsearchClientMock.createInternalClient(
elasticsearchClientMock.createSuccessTransportRequestPromise({
hits: {
@@ -120,9 +123,8 @@ describe('checkForUnknownDocs', () => {
const result = await task();
- expect(Either.isLeft(result)).toBe(true);
- expect((result as Either.Left).left).toEqual({
- type: 'unknown_docs_found',
+ expect(Either.isRight(result)).toBe(true);
+ expect((result as Either.Right).right).toEqual({
unknownDocs: [
{ id: '12', type: 'foo' },
{ id: '14', type: 'bar' },
@@ -148,9 +150,8 @@ describe('checkForUnknownDocs', () => {
const result = await task();
- expect(Either.isLeft(result)).toBe(true);
- expect((result as Either.Left).left).toEqual({
- type: 'unknown_docs_found',
+ expect(Either.isRight(result)).toBe(true);
+ expect((result as Either.Right).right).toEqual({
unknownDocs: [{ id: '12', type: 'unknown' }],
});
});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.ts b/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.ts
index 7cc1c26a2ea8b..e3d72fbdf866f 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/check_for_unknown_docs.ts
@@ -32,7 +32,6 @@ export interface CheckForUnknownDocsFoundDoc {
/** @internal */
export interface UnknownDocsFound {
- type: 'unknown_docs_found';
unknownDocs: CheckForUnknownDocsFoundDoc[];
}
@@ -42,8 +41,8 @@ export const checkForUnknownDocs = ({
unusedTypesQuery,
knownTypes,
}: CheckForUnknownDocsParams): TaskEither.TaskEither<
- RetryableEsClientError | UnknownDocsFound,
- {}
+ RetryableEsClientError,
+ UnknownDocsFound
> => () => {
const query = createUnknownDocQuery(unusedTypesQuery, knownTypes);
@@ -56,14 +55,9 @@ export const checkForUnknownDocs = ({
})
.then((response) => {
const { hits } = response.body.hits;
- if (hits.length) {
- return Either.left({
- type: 'unknown_docs_found' as const,
- unknownDocs: hits.map((hit) => ({ id: hit._id, type: hit._source?.type ?? 'unknown' })),
- });
- } else {
- return Either.right({});
- }
+ return Either.right({
+ unknownDocs: hits.map((hit) => ({ id: hit._id, type: hit._source?.type ?? 'unknown' })),
+ });
})
.catch(catchRetryableEsClientErrors);
};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/index.ts b/src/core/server/saved_objects/migrationsv2/actions/index.ts
index 8e4584970f138..6bfcddfe1f6de 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/index.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/index.ts
@@ -80,7 +80,6 @@ export type {
} from './update_and_pickup_mappings';
export { updateAndPickupMappings } from './update_and_pickup_mappings';
-import type { UnknownDocsFound } from './check_for_unknown_docs';
export type {
CheckForUnknownDocsParams,
UnknownDocsFound,
@@ -131,7 +130,6 @@ export interface ActionErrorTypeMap {
alias_not_found_exception: AliasNotFound;
remove_index_not_a_concrete_index: RemoveIndexNotAConcreteIndex;
documents_transform_failed: DocumentsTransformFailed;
- unknown_docs_found: UnknownDocsFound;
}
/**
diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/migration_7_13_0_unknown_types.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/migration_7_13_0_unknown_types.test.ts
index c5e302adbe903..a30b3d291e7ec 100644
--- a/src/core/server/saved_objects/migrationsv2/integration_tests/migration_7_13_0_unknown_types.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/integration_tests/migration_7_13_0_unknown_types.test.ts
@@ -7,42 +7,31 @@
*/
import Path from 'path';
-import Fs from 'fs';
-import Util from 'util';
+import fs from 'fs/promises';
import { estypes } from '@elastic/elasticsearch';
import * as kbnTestServer from '../../../../test_helpers/kbn_server';
import { Root } from '../../../root';
+import JSON5 from 'json5';
+import { ElasticsearchClient } from '../../../elasticsearch';
const logFilePath = Path.join(__dirname, '7_13_unknown_types_test.log');
-const asyncUnlink = Util.promisify(Fs.unlink);
-
async function removeLogFile() {
// ignore errors if it doesn't exist
- await asyncUnlink(logFilePath).catch(() => void 0);
+ await fs.unlink(logFilePath).catch(() => void 0);
}
describe('migration v2', () => {
let esServer: kbnTestServer.TestElasticsearchUtils;
let root: Root;
+ let startES: () => Promise;
beforeAll(async () => {
await removeLogFile();
});
- afterAll(async () => {
- if (root) {
- await root.shutdown();
- }
- if (esServer) {
- await esServer.stop();
- }
-
- await new Promise((resolve) => setTimeout(resolve, 10000));
- });
-
- it('migrates the documents to the highest version', async () => {
- const { startES } = kbnTestServer.createTestServers({
+ beforeEach(() => {
+ ({ startES } = kbnTestServer.createTestServers({
adjustTimeout: (t: number) => jest.setTimeout(t),
settings: {
es: {
@@ -53,50 +42,155 @@ describe('migration v2', () => {
dataArchive: Path.join(__dirname, 'archives', '7.13.0_with_unknown_so.zip'),
},
},
- });
+ }));
+ });
+
+ afterEach(async () => {
+ if (root) {
+ await root.shutdown();
+ }
+ if (esServer) {
+ await esServer.stop();
+ }
+
+ await new Promise((resolve) => setTimeout(resolve, 10000));
+ });
+ it('logs a warning and completes the migration with unknown docs retained', async () => {
root = createRoot();
+ esServer = await startES();
+ await root.setup();
+ await root.start();
+
+ const logFileContent = await fs.readFile(logFilePath, 'utf-8');
+ const records = logFileContent
+ .split('\n')
+ .filter(Boolean)
+ .map((str) => JSON5.parse(str));
+
+ const unknownDocsWarningLog = records.find((rec) =>
+ rec.message.startsWith(`[.kibana] CHECK_UNKNOWN_DOCUMENTS`)
+ );
+
+ expect(
+ unknownDocsWarningLog.message.startsWith(
+ '[.kibana] CHECK_UNKNOWN_DOCUMENTS Upgrades will fail for 8.0+ because documents were found for unknown saved ' +
+ 'object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete ' +
+ 'these documents from the ".kibana_8.0.0_001" index after the current upgrade completes.'
+ )
+ ).toBeTruthy();
+
+ const unknownDocs = [
+ { type: 'space', id: 'space:default' },
+ { type: 'space', id: 'space:first' },
+ { type: 'space', id: 'space:second' },
+ { type: 'space', id: 'space:third' },
+ { type: 'space', id: 'space:forth' },
+ { type: 'space', id: 'space:fifth' },
+ { type: 'space', id: 'space:sixth' },
+ { type: 'foo', id: 'P2SQfHkBs3dBRGh--No5' },
+ { type: 'foo', id: 'QGSZfHkBs3dBRGh-ANoD' },
+ { type: 'foo', id: 'QWSZfHkBs3dBRGh-hNob' },
+ ];
+
+ unknownDocs.forEach(({ id, type }) => {
+ expect(unknownDocsWarningLog.message).toEqual(
+ expect.stringContaining(`- "${id}" (type: "${type}")`)
+ );
+ });
+
+ const client: ElasticsearchClient = esServer.es.getClient();
+ const { body: response } = await client.indices.getSettings({ index: '.kibana_8.0.0_001' });
+ const settings = response['.kibana_8.0.0_001']
+ .settings as estypes.IndicesIndexStatePrefixedSettings;
+ expect(settings.index).not.toBeUndefined();
+ expect(settings.index!.blocks?.write).not.toEqual('true');
+
+ // Ensure that documents for unknown types were preserved in target index in an unmigrated state
+ const spaceDocs = await fetchDocs(client, '.kibana_8.0.0_001', 'space');
+ expect(spaceDocs.map((s) => s.id)).toEqual(
+ expect.arrayContaining([
+ 'space:default',
+ 'space:first',
+ 'space:second',
+ 'space:third',
+ 'space:forth',
+ 'space:fifth',
+ 'space:sixth',
+ ])
+ );
+ spaceDocs.forEach((d) => {
+ expect(d.migrationVersion.space).toEqual('6.6.0');
+ expect(d.coreMigrationVersion).toEqual('7.13.0');
+ });
+ const fooDocs = await fetchDocs(client, '.kibana_8.0.0_001', 'foo');
+ expect(fooDocs.map((f) => f.id)).toEqual(
+ expect.arrayContaining([
+ 'P2SQfHkBs3dBRGh--No5',
+ 'QGSZfHkBs3dBRGh-ANoD',
+ 'QWSZfHkBs3dBRGh-hNob',
+ ])
+ );
+ fooDocs.forEach((d) => {
+ expect(d.migrationVersion.foo).toEqual('7.13.0');
+ expect(d.coreMigrationVersion).toEqual('7.13.0');
+ });
+ });
+ it('migrates outdated documents when types are re-enabled', async () => {
+ // Start kibana with foo and space types disabled
+ root = createRoot();
esServer = await startES();
await root.setup();
+ await root.start();
- try {
- await root.start();
- } catch (err) {
- const errorMessage = err.message;
-
- expect(
- errorMessage.startsWith(
- 'Unable to complete saved object migrations for the [.kibana] index: Migration failed because documents ' +
- 'were found for unknown saved object types. To proceed with the migration, please delete these documents from the ' +
- '".kibana_7.13.0_001" index.'
- )
- ).toBeTruthy();
-
- const unknownDocs = [
- { type: 'space', id: 'space:default' },
- { type: 'space', id: 'space:first' },
- { type: 'space', id: 'space:second' },
- { type: 'space', id: 'space:third' },
- { type: 'space', id: 'space:forth' },
- { type: 'space', id: 'space:fifth' },
- { type: 'space', id: 'space:sixth' },
- { type: 'foo', id: 'P2SQfHkBs3dBRGh--No5' },
- { type: 'foo', id: 'QGSZfHkBs3dBRGh-ANoD' },
- { type: 'foo', id: 'QWSZfHkBs3dBRGh-hNob' },
- ];
-
- unknownDocs.forEach(({ id, type }) => {
- expect(errorMessage).toEqual(expect.stringContaining(`- "${id}" (type: "${type}")`));
- });
-
- const client = esServer.es.getClient();
- const { body: response } = await client.indices.getSettings({ index: '.kibana_7.13.0_001' });
- const settings = response['.kibana_7.13.0_001']
- .settings as estypes.IndicesIndexStatePrefixedSettings;
- expect(settings.index).not.toBeUndefined();
- expect(settings.index!.blocks?.write).not.toEqual('true');
- }
+ // Shutdown and start Kibana again with space type registered to ensure space docs get migrated
+ await root.shutdown();
+ root = createRoot();
+ const coreSetup = await root.setup();
+ coreSetup.savedObjects.registerType({
+ name: 'space',
+ hidden: false,
+ mappings: { properties: {} },
+ namespaceType: 'agnostic',
+ migrations: {
+ '6.6.0': (d) => d,
+ '8.0.0': (d) => d,
+ },
+ });
+ await root.start();
+
+ const client: ElasticsearchClient = esServer.es.getClient();
+ const spacesDocsMigrated = await fetchDocs(client, '.kibana_8.0.0_001', 'space');
+ expect(spacesDocsMigrated.map((s) => s.id)).toEqual(
+ expect.arrayContaining([
+ 'space:default',
+ 'space:first',
+ 'space:second',
+ 'space:third',
+ 'space:forth',
+ 'space:fifth',
+ 'space:sixth',
+ ])
+ );
+ spacesDocsMigrated.forEach((d) => {
+ expect(d.migrationVersion.space).toEqual('8.0.0'); // should be migrated
+ expect(d.coreMigrationVersion).toEqual('8.0.0');
+ });
+
+ // Make sure unmigrated foo docs are also still there in an unmigrated state
+ const fooDocsUnmigrated = await fetchDocs(client, '.kibana_8.0.0_001', 'foo');
+ expect(fooDocsUnmigrated.map((f) => f.id)).toEqual(
+ expect.arrayContaining([
+ 'P2SQfHkBs3dBRGh--No5',
+ 'QGSZfHkBs3dBRGh-ANoD',
+ 'QWSZfHkBs3dBRGh-hNob',
+ ])
+ );
+ fooDocsUnmigrated.forEach((d) => {
+ expect(d.migrationVersion.foo).toEqual('7.13.0'); // should still not be migrated
+ expect(d.coreMigrationVersion).toEqual('7.13.0');
+ });
});
});
@@ -131,3 +225,26 @@ function createRoot() {
}
);
}
+
+async function fetchDocs(esClient: ElasticsearchClient, index: string, type: string) {
+ const { body } = await esClient.search({
+ index,
+ size: 10000,
+ body: {
+ query: {
+ bool: {
+ should: [
+ {
+ term: { type },
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ return body.hits.hits.map((h) => ({
+ ...h._source,
+ id: h._id,
+ }));
+}
diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/type_registrations.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/type_registrations.test.ts
index 47c492622fa3f..e8871586cdfb7 100644
--- a/src/core/server/saved_objects/migrationsv2/integration_tests/type_registrations.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/integration_tests/type_registrations.test.ts
@@ -79,6 +79,7 @@ const previouslyRegisteredTypes = [
'search-telemetry',
'security-rule',
'security-solution-signals-migration',
+ 'server',
'siem-detection-engine-rule-actions',
'siem-detection-engine-rule-status',
'siem-ui-timeline',
diff --git a/src/core/server/saved_objects/migrationsv2/migrations_state_action_machine.ts b/src/core/server/saved_objects/migrationsv2/migrations_state_action_machine.ts
index 8443f837a7f1d..cd42d4077695e 100644
--- a/src/core/server/saved_objects/migrationsv2/migrations_state_action_machine.ts
+++ b/src/core/server/saved_objects/migrationsv2/migrations_state_action_machine.ts
@@ -52,6 +52,8 @@ const logStateTransition = (
switch (level) {
case 'error':
return logger.error(logMessagePrefix + message);
+ case 'warning':
+ return logger.warn(logMessagePrefix + message);
case 'info':
return logger.info(logMessagePrefix + message);
default:
diff --git a/src/core/server/saved_objects/migrationsv2/model/extract_errors.test.ts b/src/core/server/saved_objects/migrationsv2/model/extract_errors.test.ts
index a028c40ca6597..c2daadcd342ac 100644
--- a/src/core/server/saved_objects/migrationsv2/model/extract_errors.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/model/extract_errors.test.ts
@@ -25,7 +25,7 @@ describe('extractUnknownDocFailureReason', () => {
'.kibana_15'
)
).toMatchInlineSnapshot(`
- "Migration failed because documents were found for unknown saved object types. To proceed with the migration, please delete these documents from the \\".kibana_15\\" index.
+ "Upgrades will fail for 8.0+ because documents were found for unknown saved object types. To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the \\".kibana_15\\" index after the current upgrade completes.
The documents with unknown types are:
- \\"unknownType:12\\" (type: \\"unknownType\\")
- \\"anotherUnknownType:42\\" (type: \\"anotherUnknownType\\")
diff --git a/src/core/server/saved_objects/migrationsv2/model/extract_errors.ts b/src/core/server/saved_objects/migrationsv2/model/extract_errors.ts
index cc6fe7bad3ca7..082e6344afffc 100644
--- a/src/core/server/saved_objects/migrationsv2/model/extract_errors.ts
+++ b/src/core/server/saved_objects/migrationsv2/model/extract_errors.ts
@@ -38,15 +38,16 @@ export function extractTransformFailuresReason(
export function extractUnknownDocFailureReason(
unknownDocs: CheckForUnknownDocsFoundDoc[],
- sourceIndex: string
+ targetIndex: string
): string {
return (
- `Migration failed because documents were found for unknown saved object types. ` +
- `To proceed with the migration, please delete these documents from the "${sourceIndex}" index.\n` +
+ `Upgrades will fail for 8.0+ because documents were found for unknown saved object types. ` +
+ `To ensure that upgrades will succeed in the future, either re-enable plugins or delete these documents from the ` +
+ `"${targetIndex}" index after the current upgrade completes.\n` +
`The documents with unknown types are:\n` +
unknownDocs.map((doc) => `- "${doc.id}" (type: "${doc.type}")\n`).join('') +
`You can delete them using the following command:\n` +
- `curl -X POST "{elasticsearch}/${sourceIndex}/_bulk?pretty" -H 'Content-Type: application/json' -d'\n` +
+ `curl -X POST "{elasticsearch}/${targetIndex}/_bulk?pretty" -H 'Content-Type: application/json' -d'\n` +
unknownDocs.map((doc) => `{ "delete" : { "_id" : "${doc.id}" } }\n`).join('') +
`'`
);
diff --git a/src/core/server/saved_objects/migrationsv2/model/model.test.ts b/src/core/server/saved_objects/migrationsv2/model/model.test.ts
index 136709d1b874f..3058f586efb0c 100644
--- a/src/core/server/saved_objects/migrationsv2/model/model.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/model/model.test.ts
@@ -715,7 +715,7 @@ describe('migrations v2 model', () => {
},
} as const;
- test('CHECK_UNKNOWN_DOCUMENTS -> SET_SOURCE_WRITE_BLOCK if action succeeds', () => {
+ test('CHECK_UNKNOWN_DOCUMENTS -> SET_SOURCE_WRITE_BLOCK if action succeeds and no unknown docs are found', () => {
const checkUnknownDocumentsSourceState: CheckUnknownDocumentsState = {
...baseState,
controlState: 'CHECK_UNKNOWN_DOCUMENTS',
@@ -723,7 +723,7 @@ describe('migrations v2 model', () => {
sourceIndexMappings: mappingsWithUnknownType,
};
- const res: ResponseType<'CHECK_UNKNOWN_DOCUMENTS'> = Either.right({});
+ const res: ResponseType<'CHECK_UNKNOWN_DOCUMENTS'> = Either.right({ unknownDocs: [] });
const newState = model(checkUnknownDocumentsSourceState, res);
expect(newState.controlState).toEqual('SET_SOURCE_WRITE_BLOCK');
@@ -758,9 +758,12 @@ describe('migrations v2 model', () => {
},
}
`);
+
+ // No log message gets appended
+ expect(newState.logs).toEqual([]);
});
- test('CHECK_UNKNOWN_DOCUMENTS -> FATAL if action fails and unknown docs were found', () => {
+ test('CHECK_UNKNOWN_DOCUMENTS -> SET_SOURCE_WRITE_BLOCK and adds log if action succeeds and unknown docs were found', () => {
const checkUnknownDocumentsSourceState: CheckUnknownDocumentsState = {
...baseState,
controlState: 'CHECK_UNKNOWN_DOCUMENTS',
@@ -768,20 +771,51 @@ describe('migrations v2 model', () => {
sourceIndexMappings: mappingsWithUnknownType,
};
- const res: ResponseType<'CHECK_UNKNOWN_DOCUMENTS'> = Either.left({
- type: 'unknown_docs_found',
+ const res: ResponseType<'CHECK_UNKNOWN_DOCUMENTS'> = Either.right({
unknownDocs: [
{ id: 'dashboard:12', type: 'dashboard' },
{ id: 'foo:17', type: 'foo' },
],
});
const newState = model(checkUnknownDocumentsSourceState, res);
- expect(newState.controlState).toEqual('FATAL');
+ expect(newState.controlState).toEqual('SET_SOURCE_WRITE_BLOCK');
expect(newState).toMatchObject({
- controlState: 'FATAL',
- reason: expect.stringContaining(
- 'Migration failed because documents were found for unknown saved object types'
+ controlState: 'SET_SOURCE_WRITE_BLOCK',
+ sourceIndex: Option.some('.kibana_3'),
+ targetIndex: '.kibana_7.11.0_001',
+ });
+
+ // This snapshot asserts that we disable the unknown saved object
+ // type. Because it's mappings are disabled, we also don't copy the
+ // `_meta.migrationMappingPropertyHashes` for the disabled type.
+ expect(newState.targetIndexMappings).toMatchInlineSnapshot(`
+ Object {
+ "_meta": Object {
+ "migrationMappingPropertyHashes": Object {
+ "new_saved_object_type": "4a11183eee21e6fbad864f7a30b39ad0",
+ },
+ },
+ "properties": Object {
+ "disabled_saved_object_type": Object {
+ "dynamic": false,
+ "properties": Object {},
+ },
+ "new_saved_object_type": Object {
+ "properties": Object {
+ "value": Object {
+ "type": "text",
+ },
+ },
+ },
+ },
+ }
+ `);
+
+ expect(newState.logs[0]).toMatchObject({
+ level: 'warning',
+ message: expect.stringContaining(
+ 'Upgrades will fail for 8.0+ because documents were found for unknown saved object types'
),
});
});
diff --git a/src/core/server/saved_objects/migrationsv2/model/model.ts b/src/core/server/saved_objects/migrationsv2/model/model.ts
index b28e4e3024380..a78457fa891f7 100644
--- a/src/core/server/saved_objects/migrationsv2/model/model.ts
+++ b/src/core/server/saved_objects/migrationsv2/model/model.ts
@@ -10,7 +10,7 @@ import * as Either from 'fp-ts/lib/Either';
import * as Option from 'fp-ts/lib/Option';
import { AliasAction, isLeftTypeof } from '../actions';
-import { AllActionStates, State } from '../types';
+import { AllActionStates, MigrationLog, State } from '../types';
import type { ResponseType } from '../next';
import { disableUnknownTypeMappingFields } from '../../migrations/core/migration_context';
import {
@@ -318,6 +318,7 @@ export const model = (currentState: State, resW: ResponseType):
}
} else if (stateP.controlState === 'CHECK_UNKNOWN_DOCUMENTS') {
const res = resW as ExcludeRetryableEsError>;
+
if (Either.isRight(res)) {
const source = stateP.sourceIndex;
const target = stateP.versionIndex;
@@ -336,17 +337,24 @@ export const model = (currentState: State, resW: ResponseType):
{ add: { index: target, alias: stateP.versionAlias } },
{ remove_index: { index: stateP.tempIndex } },
]),
+
+ logs: [
+ ...stateP.logs,
+ ...(res.right.unknownDocs.length > 0
+ ? ([
+ {
+ level: 'warning',
+ message: `CHECK_UNKNOWN_DOCUMENTS ${extractUnknownDocFailureReason(
+ res.right.unknownDocs,
+ target
+ )}`,
+ },
+ ] as MigrationLog[])
+ : []),
+ ],
};
} else {
- if (isLeftTypeof(res.left, 'unknown_docs_found')) {
- return {
- ...stateP,
- controlState: 'FATAL',
- reason: extractUnknownDocFailureReason(res.left.unknownDocs, stateP.sourceIndex.value),
- };
- } else {
- return throwBadResponse(stateP, res.left);
- }
+ return throwBadResponse(stateP, res);
}
} else if (stateP.controlState === 'SET_SOURCE_WRITE_BLOCK') {
const res = resW as ExcludeRetryableEsError>;
diff --git a/src/core/server/saved_objects/migrationsv2/types.ts b/src/core/server/saved_objects/migrationsv2/types.ts
index ed361a710ac99..576e3a4412184 100644
--- a/src/core/server/saved_objects/migrationsv2/types.ts
+++ b/src/core/server/saved_objects/migrationsv2/types.ts
@@ -19,7 +19,7 @@ import {
DocumentsTransformSuccess,
} from '../migrations/core/migrate_raw_docs';
-export type MigrationLogLevel = 'error' | 'info';
+export type MigrationLogLevel = 'error' | 'info' | 'warning';
export interface MigrationLog {
level: MigrationLogLevel;
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index ed55c6e3d09cb..65ea082c9d8a8 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -345,6 +345,7 @@ export const config: {
hosts: Type;
username: Type;
password: Type;
+ serviceAccountToken: Type;
requestHeadersWhitelist: Type;
customHeaders: Type>;
shardTimeout: Type;
@@ -948,7 +949,7 @@ export type ElasticsearchClient = Omit & {
+export type ElasticsearchClientConfig = Pick & {
pingTimeout?: ElasticsearchConfig['pingTimeout'] | ClientOptions['pingTimeout'];
requestTimeout?: ElasticsearchConfig['requestTimeout'] | ClientOptions['requestTimeout'];
ssl?: Partial;
@@ -968,6 +969,7 @@ export class ElasticsearchConfig {
readonly pingTimeout: Duration;
readonly requestHeadersWhitelist: string[];
readonly requestTimeout: Duration;
+ readonly serviceAccountToken?: string;
readonly shardTimeout: Duration;
readonly sniffInterval: false | Duration;
readonly sniffOnConnectionFault: boolean;
@@ -1675,7 +1677,7 @@ export class LegacyClusterClient implements ILegacyClusterClient {
}
// @public @deprecated (undocumented)
-export type LegacyElasticsearchClientConfig = Pick & Pick & {
+export type LegacyElasticsearchClientConfig = Pick & Pick & {
pingTimeout?: ElasticsearchConfig['pingTimeout'] | ConfigOptions['pingTimeout'];
requestTimeout?: ElasticsearchConfig['requestTimeout'] | ConfigOptions['requestTimeout'];
sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];
diff --git a/src/dev/build/tasks/install_chromium.js b/src/dev/build/tasks/install_chromium.js
index 37abcbad4466e..95e0df8984f9d 100644
--- a/src/dev/build/tasks/install_chromium.js
+++ b/src/dev/build/tasks/install_chromium.js
@@ -19,7 +19,6 @@ export const InstallChromium = {
log.info(`Installing Chromium for ${platform.getName()}-${platform.getArchitecture()}`);
const { binaryPath$ } = installBrowser(
- // TODO: https://github.com/elastic/kibana/issues/72496
log,
build.resolvePathForPlatform(platform, 'x-pack/plugins/reporting/chromium'),
platform.getName(),
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 39a7665f1ce5e..c7a129418765b 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -51,6 +51,7 @@ kibana_vars=(
elasticsearch.pingTimeout
elasticsearch.requestHeadersWhitelist
elasticsearch.requestTimeout
+ elasticsearch.serviceAccountToken
elasticsearch.shardTimeout
elasticsearch.sniffInterval
elasticsearch.sniffOnConnectionFault
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index ba18c085b649d..57ae640da3c84 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -77,7 +77,11 @@ export const IGNORE_FILE_GLOBS = [
*
* @type {Array}
*/
-export const KEBAB_CASE_DIRECTORY_GLOBS = ['packages/*', 'x-pack'];
+export const KEBAB_CASE_DIRECTORY_GLOBS = [
+ 'packages/*',
+ 'x-pack',
+ 'packages/kbn-optimizer/src/__fixtures__/mock_repo/packages/kbn-ui-shared-deps',
+];
/**
* These patterns are matched against directories and indicate
diff --git a/src/plugins/console/server/lib/spec_definitions/js/ingest.ts b/src/plugins/console/server/lib/spec_definitions/js/ingest.ts
index 2ac8d2cb87ccc..5ffae9d7be23e 100644
--- a/src/plugins/console/server/lib/spec_definitions/js/ingest.ts
+++ b/src/plugins/console/server/lib/spec_definitions/js/ingest.ts
@@ -179,6 +179,29 @@ const dropProcessorDefinition = {
},
};
+// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/enrich-processor.html
+const enrichProcessorDefinition = {
+ enrich: {
+ __template: {
+ policy_name: '',
+ field: '',
+ target_field: '',
+ },
+ policy_name: '',
+ field: '',
+ target_field: '',
+ ignore_missing: {
+ __one_of: [false, true],
+ },
+ override: {
+ __one_of: [true, false],
+ },
+ max_matches: 1,
+ shape_relation: 'INTERSECTS',
+ ...commonPipelineParams,
+ },
+};
+
// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/fail-processor.html
const failProcessorDefinition = {
fail: {
@@ -279,13 +302,26 @@ const inferenceProcessorDefinition = {
inference: {
__template: {
model_id: '',
- field_map: {},
inference_config: {},
+ field_mappings: {},
},
- model_id: '',
- field_map: {},
- inference_config: {},
target_field: '',
+ model_id: '',
+ field_mappings: {
+ __template: {},
+ },
+ inference_config: {
+ regression: {
+ __template: {},
+ results_field: '',
+ },
+ classification: {
+ __template: {},
+ results_field: '',
+ num_top_classes: 2,
+ top_classes_results_field: '',
+ },
+ },
...commonPipelineParams,
},
};
@@ -530,6 +566,7 @@ const processorDefinition = {
dissectProcessorDefinition,
dotExpanderProcessorDefinition,
dropProcessorDefinition,
+ enrichProcessorDefinition,
failProcessorDefinition,
foreachProcessorDefinition,
geoipProcessorDefinition,
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.delete.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.delete.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/async_search.delete.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.get.json
similarity index 88%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.get.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/async_search.get.json
index 09f4520d580e3..3fb1f3da6fdf7 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.get.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.get.json
@@ -1,7 +1,7 @@
{
"async_search.get": {
"url_params": {
- "wait_for_completion": "",
+ "wait_for_completion_timeout": "",
"keep_alive": "",
"typed_keys": "__flag__"
},
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.status.json
new file mode 100644
index 0000000000000..f2aef917ea23d
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.status.json
@@ -0,0 +1,11 @@
+{
+ "async_search.status": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_async_search/status/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.submit.json b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json
similarity index 92%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.submit.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json
index 83fb7c0fe75ad..635436bdb167f 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/async_search.submit.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json
@@ -1,8 +1,8 @@
{
"async_search.submit": {
"url_params": {
- "wait_for_completion": "",
- "clean_on_completion": "__flag__",
+ "wait_for_completion_timeout": "",
+ "keep_on_completion": "__flag__",
"keep_alive": "",
"batched_reduce_size": "",
"request_cache": "__flag__",
@@ -23,6 +23,7 @@
"expand_wildcards": [
"open",
"closed",
+ "hidden",
"none",
"all"
],
@@ -51,7 +52,7 @@
"suggest_text": "",
"timeout": "",
"track_scores": "__flag__",
- "track_total_hits": "__flag__",
+ "track_total_hits": "",
"allow_partial_search_results": "__flag__",
"typed_keys": "__flag__",
"version": "__flag__",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.delete_autoscaling_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.delete_autoscaling_policy.json
new file mode 100644
index 0000000000000..2d65c9744987c
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.delete_autoscaling_policy.json
@@ -0,0 +1,11 @@
+{
+ "autoscaling.delete_autoscaling_policy": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_autoscaling/policy/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-delete-autoscaling-policy.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_capacity.json b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_capacity.json
new file mode 100644
index 0000000000000..24aea8cfba86b
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_capacity.json
@@ -0,0 +1,11 @@
+{
+ "autoscaling.get_autoscaling_capacity": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_autoscaling/capacity"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-get-autoscaling-capacity.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_decision.json b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_decision.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_decision.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_decision.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_policy.json
new file mode 100644
index 0000000000000..4d5ab1d00266b
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.get_autoscaling_policy.json
@@ -0,0 +1,11 @@
+{
+ "autoscaling.get_autoscaling_policy": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_autoscaling/policy/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-get-autoscaling-policy.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.put_autoscaling_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.put_autoscaling_policy.json
new file mode 100644
index 0000000000000..3ed40851c94d9
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/autoscaling.put_autoscaling_policy.json
@@ -0,0 +1,11 @@
+{
+ "autoscaling.put_autoscaling_policy": {
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_autoscaling/policy/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-put-autoscaling-policy.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json b/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json
index 2d3bd260372ba..144a3ad359c40 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json
@@ -13,7 +13,8 @@
"_source": [],
"_source_excludes": [],
"_source_includes": [],
- "pipeline": ""
+ "pipeline": "",
+ "require_alias": "__flag__"
},
"methods": [
"POST",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
index 410350df13721..a0d405f60904d 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json
@@ -15,7 +15,6 @@
"p",
"pb"
],
- "local": "__flag__",
"master_timeout": "",
"h": [],
"health": [
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_datafeeds.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_datafeeds.json
similarity index 93%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_datafeeds.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_datafeeds.json
index 04f4e45782e1f..e58735a037153 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_datafeeds.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_datafeeds.json
@@ -1,6 +1,7 @@
{
"cat.ml_datafeeds": {
"url_params": {
+ "allow_no_match": "__flag__",
"allow_no_datafeeds": "__flag__",
"format": "",
"h": [],
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_jobs.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_jobs.json
similarity index 95%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_jobs.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_jobs.json
index 2f7e03e564b5d..a7a068fa3691e 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_jobs.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_jobs.json
@@ -1,6 +1,7 @@
{
"cat.ml_jobs": {
"url_params": {
+ "allow_no_match": "__flag__",
"allow_no_jobs": "__flag__",
"bytes": [
"b",
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_trained_models.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_trained_models.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/cat.ml_trained_models.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/cat.ml_trained_models.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json
index 2e89a66ef1f35..b695bb1df9625 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json
@@ -16,7 +16,6 @@
],
"format": "",
"full_id": "__flag__",
- "local": "__flag__",
"master_timeout": "",
"h": [],
"help": "__flag__",
@@ -30,7 +29,8 @@
"micros",
"nanos"
],
- "v": "__flag__"
+ "v": "__flag__",
+ "include_unloaded_segments": "__flag__"
},
"methods": [
"GET"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json
index 958992be81216..752313bf6f975 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json
@@ -6,6 +6,7 @@
"master_timeout": "",
"h": [],
"help": "__flag__",
+ "include_bootstrap": "__flag__",
"s": [],
"v": "__flag__"
},
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json
index 2b66562e3d6df..64a235eae67d5 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json
@@ -15,7 +15,6 @@
"p",
"pb"
],
- "local": "__flag__",
"master_timeout": "",
"h": [],
"help": "__flag__",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.tasks.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.tasks.json
index 31c987a5893cf..f981d189a17b2 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.tasks.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.tasks.json
@@ -2,10 +2,10 @@
"cat.tasks": {
"url_params": {
"format": "",
- "node_id": [],
+ "nodes": [],
"actions": [],
"detailed": "__flag__",
- "parent_task": "",
+ "parent_task_id": "",
"h": [],
"help": "__flag__",
"s": [],
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json
index 5017a0390a2e4..d237f8d54ab2a 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json
@@ -2,13 +2,14 @@
"cat.thread_pool": {
"url_params": {
"format": "",
- "size": [
- "",
- "k",
+ "time": [
+ "d",
+ "h",
"m",
- "g",
- "t",
- "p"
+ "s",
+ "ms",
+ "micros",
+ "nanos"
],
"local": "__flag__",
"master_timeout": "",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.transforms.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.transforms.json
new file mode 100644
index 0000000000000..048d7af411635
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.transforms.json
@@ -0,0 +1,31 @@
+{
+ "cat.transforms": {
+ "url_params": {
+ "from": 0,
+ "size": 0,
+ "allow_no_match": "__flag__",
+ "format": "",
+ "h": [],
+ "help": "__flag__",
+ "s": [],
+ "time": [
+ "d",
+ "h",
+ "m",
+ "s",
+ "ms",
+ "micros",
+ "nanos"
+ ],
+ "v": "__flag__"
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_cat/transforms",
+ "_cat/transforms/{transform_id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-transforms.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.delete_auto_follow_pattern.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.delete_auto_follow_pattern.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.delete_auto_follow_pattern.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.delete_auto_follow_pattern.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.follow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.follow.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.follow_info.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_info.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.follow_info.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_info.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.follow_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.follow_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_stats.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.forget_follower.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.forget_follower.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.forget_follower.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.forget_follower.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.get_auto_follow_pattern.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.get_auto_follow_pattern.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.get_auto_follow_pattern.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.get_auto_follow_pattern.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.pause_auto_follow_pattern.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_auto_follow_pattern.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.pause_auto_follow_pattern.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_auto_follow_pattern.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.pause_follow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_follow.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.pause_follow.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_follow.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.put_auto_follow_pattern.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.put_auto_follow_pattern.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.put_auto_follow_pattern.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.put_auto_follow_pattern.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.resume_auto_follow_pattern.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_auto_follow_pattern.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.resume_auto_follow_pattern.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_auto_follow_pattern.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.resume_follow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_follow.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.resume_follow.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_follow.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.stats.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.unfollow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.unfollow.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ccr.unfollow.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ccr.unfollow.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/clear_scroll.json b/src/plugins/console/server/lib/spec_definitions/json/generated/clear_scroll.json
index 7e6e6692f931b..5273574357ddd 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/clear_scroll.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/clear_scroll.json
@@ -6,6 +6,6 @@
"patterns": [
"_search/scroll"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#_clear_scroll_api"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-scroll-api.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/close_point_in_time.json b/src/plugins/console/server/lib/spec_definitions/json/generated/close_point_in_time.json
new file mode 100644
index 0000000000000..e1997bc2e20ea
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/close_point_in_time.json
@@ -0,0 +1,11 @@
+{
+ "close_point_in_time": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_pit"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
index e935b8999e6d3..24255f7231892 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json
@@ -10,6 +10,6 @@
"patterns": [
"_component_template/{name}"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-templates.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_voting_config_exclusions.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_voting_config_exclusions.json
new file mode 100644
index 0000000000000..6b4b48113f2a8
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_voting_config_exclusions.json
@@ -0,0 +1,14 @@
+{
+ "cluster.delete_voting_config_exclusions": {
+ "url_params": {
+ "wait_for_removal": "__flag__"
+ },
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_cluster/voting_config_exclusions"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.exists_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.exists_component_template.json
new file mode 100644
index 0000000000000..24dcbeb006e6f
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.exists_component_template.json
@@ -0,0 +1,15 @@
+{
+ "cluster.exists_component_template": {
+ "url_params": {
+ "master_timeout": "",
+ "local": "__flag__"
+ },
+ "methods": [
+ "HEAD"
+ ],
+ "patterns": [
+ "_component_template/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json
index 784053d69ad5a..cbfed6741f8a4 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json
@@ -12,5 +12,6 @@
"_component_template",
"_component_template/{name}"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html" }
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html"
+ }
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json
index 249f582c33682..6c97254b5201c 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json
@@ -12,6 +12,6 @@
"patterns": [
"_cluster/settings"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-get-settings.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.post_voting_config_exclusions.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.post_voting_config_exclusions.json
new file mode 100644
index 0000000000000..74cc74a8c05a4
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.post_voting_config_exclusions.json
@@ -0,0 +1,16 @@
+{
+ "cluster.post_voting_config_exclusions": {
+ "url_params": {
+ "node_ids": "",
+ "node_names": "",
+ "timeout": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_cluster/voting_config_exclusions"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_component_template.json
index 8a0bfc278cbf3..999ff0c149fe8 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_component_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_component_template.json
@@ -5,10 +5,12 @@
"master_timeout": ""
},
"methods": [
- "PUT"
+ "PUT",
+ "POST"
],
"patterns": [
"_component_template/{name}"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html" }
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html"
+ }
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.delete_dangling_index.json b/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.delete_dangling_index.json
new file mode 100644
index 0000000000000..03d7c914baab5
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.delete_dangling_index.json
@@ -0,0 +1,16 @@
+{
+ "dangling_indices.delete_dangling_index": {
+ "url_params": {
+ "accept_data_loss": "__flag__",
+ "timeout": "",
+ "master_timeout": ""
+ },
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_dangling/{index_uuid}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.import_dangling_index.json b/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.import_dangling_index.json
new file mode 100644
index 0000000000000..c55cdd2901699
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.import_dangling_index.json
@@ -0,0 +1,16 @@
+{
+ "dangling_indices.import_dangling_index": {
+ "url_params": {
+ "accept_data_loss": "__flag__",
+ "timeout": "",
+ "master_timeout": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_dangling/{index_uuid}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.list_dangling_indices.json b/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.list_dangling_indices.json
new file mode 100644
index 0000000000000..63dd560947876
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/dangling_indices.list_dangling_indices.json
@@ -0,0 +1,11 @@
+{
+ "dangling_indices.list_dangling_indices": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_dangling"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.delete_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.delete_transform.json
new file mode 100644
index 0000000000000..6dfd81ded7bc5
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.delete_transform.json
@@ -0,0 +1,10 @@
+{
+ "data_frame_transform_deprecated.delete_transform": {
+ "url_params": {
+ "force": "__flag__"
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.get_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.get_transform.json
new file mode 100644
index 0000000000000..be3716ba3da6e
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.get_transform.json
@@ -0,0 +1,13 @@
+{
+ "data_frame_transform_deprecated.get_transform": {
+ "url_params": {
+ "from": 0,
+ "size": 0,
+ "allow_no_match": "__flag__",
+ "exclude_generated": "__flag__"
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.get_transform_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.get_transform_stats.json
new file mode 100644
index 0000000000000..440eed6a1f2a4
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.get_transform_stats.json
@@ -0,0 +1,12 @@
+{
+ "data_frame_transform_deprecated.get_transform_stats": {
+ "url_params": {
+ "from": "",
+ "size": "",
+ "allow_no_match": "__flag__"
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform-stats.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.preview_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.preview_transform.json
new file mode 100644
index 0000000000000..f095847ed0d9a
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.preview_transform.json
@@ -0,0 +1,7 @@
+{
+ "data_frame_transform_deprecated.preview_transform": {
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/preview-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.put_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.put_transform.json
new file mode 100644
index 0000000000000..e7555ce4bad29
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.put_transform.json
@@ -0,0 +1,10 @@
+{
+ "data_frame_transform_deprecated.put_transform": {
+ "url_params": {
+ "defer_validation": "__flag__"
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/put-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.start_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.start_transform.json
new file mode 100644
index 0000000000000..d50346ff328c6
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.start_transform.json
@@ -0,0 +1,10 @@
+{
+ "data_frame_transform_deprecated.start_transform": {
+ "url_params": {
+ "timeout": ""
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/start-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.stop_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.stop_transform.json
new file mode 100644
index 0000000000000..2618446916c76
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.stop_transform.json
@@ -0,0 +1,12 @@
+{
+ "data_frame_transform_deprecated.stop_transform": {
+ "url_params": {
+ "wait_for_completion": "__flag__",
+ "timeout": "",
+ "allow_no_match": "__flag__"
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.update_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.update_transform.json
new file mode 100644
index 0000000000000..60f71474e865a
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/data_frame_transform_deprecated.update_transform.json
@@ -0,0 +1,10 @@
+{
+ "data_frame_transform_deprecated.update_transform": {
+ "url_params": {
+ "defer_validation": "__flag__"
+ },
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/update-transform.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json
index 0852d8d184831..a71a659618eb1 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json
@@ -15,8 +15,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json
index e01ea8b2dec6d..4e2b3a180fbba 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json
@@ -32,7 +32,6 @@
"dfs_query_then_fetch"
],
"search_timeout": "",
- "size": "",
"max_docs": "all documents",
"sort": [],
"_source": [],
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.delete_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/enrich.delete_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.delete_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/enrich.delete_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.execute_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/enrich.execute_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.execute_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/enrich.execute_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.get_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/enrich.get_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.get_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/enrich.get_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.put_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/enrich.put_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.put_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/enrich.put_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/enrich.stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/enrich.stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/enrich.stats.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/eql.delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.delete.json
new file mode 100644
index 0000000000000..4bc4846f628a0
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.delete.json
@@ -0,0 +1,11 @@
+{
+ "eql.delete": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_eql/search/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/eql.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.get.json
new file mode 100644
index 0000000000000..4aa740c333beb
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.get.json
@@ -0,0 +1,15 @@
+{
+ "eql.get": {
+ "url_params": {
+ "wait_for_completion_timeout": "",
+ "keep_alive": ""
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_eql/search/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/eql.get_status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.get_status.json
new file mode 100644
index 0000000000000..68fe8aff70046
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.get_status.json
@@ -0,0 +1,11 @@
+{
+ "eql.get_status": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_eql/search/status/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-async-eql-status-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json
new file mode 100644
index 0000000000000..67e7a1729c295
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json
@@ -0,0 +1,17 @@
+{
+ "eql.search": {
+ "url_params": {
+ "wait_for_completion_timeout": "",
+ "keep_on_completion": "__flag__",
+ "keep_alive": ""
+ },
+ "methods": [
+ "GET",
+ "POST"
+ ],
+ "patterns": [
+ "{indices}/_eql/search"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json b/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json
index a6799b9e361cd..7d66dad050e5d 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json
@@ -13,8 +13,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json b/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json
index 9ffc4b55f3037..6811940cb0f1e 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json
@@ -12,8 +12,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/features.get_features.json b/src/plugins/console/server/lib/spec_definitions/json/generated/features.get_features.json
new file mode 100644
index 0000000000000..abbf74b880f1a
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/features.get_features.json
@@ -0,0 +1,14 @@
+{
+ "features.get_features": {
+ "url_params": {
+ "master_timeout": ""
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_features"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-features-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/features.reset_features.json b/src/plugins/console/server/lib/spec_definitions/json/generated/features.reset_features.json
new file mode 100644
index 0000000000000..98280afdab1a0
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/features.reset_features.json
@@ -0,0 +1,11 @@
+{
+ "features.reset_features": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_features/_reset"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/reset-features-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json
new file mode 100644
index 0000000000000..29f37c9099de2
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json
@@ -0,0 +1,17 @@
+{
+ "fleet.global_checkpoints": {
+ "url_params": {
+ "wait_for_advance": "__flag__",
+ "wait_for_index": "__flag__",
+ "checkpoints": [],
+ "timeout": ""
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "{indices}/_fleet/global_checkpoints"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-global-checkpoints.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get.json
index 5a72761c7c32e..396396f7550ca 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/get.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get.json
@@ -13,8 +13,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_context.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_context.json
index 528c261df7707..f3808d568e989 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_context.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_context.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_script_context"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/painless/master/painless-contexts.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_languages.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_languages.json
index 10ea433ca68c5..a872885615d05 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_languages.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get_script_languages.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_script_language"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json
index 8201960363a78..de1b5b0f3de21 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json
@@ -12,8 +12,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/graph.explore.json b/src/plugins/console/server/lib/spec_definitions/json/generated/graph.explore.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/graph.explore.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/graph.explore.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.delete_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.delete_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.delete_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.delete_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.get_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.get_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.get_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.get_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.get_status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.get_status.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.get_status.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.get_status.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.migrate_to_data_tiers.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.migrate_to_data_tiers.json
new file mode 100644
index 0000000000000..acafe1183a893
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.migrate_to_data_tiers.json
@@ -0,0 +1,14 @@
+{
+ "ilm.migrate_to_data_tiers": {
+ "url_params": {
+ "dry_run": "__flag__"
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ilm/migrate_to_data_tiers"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-migrate-to-data-tiers.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.move_to_step.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.move_to_step.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.move_to_step.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.move_to_step.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.put_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.put_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.put_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.put_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.remove_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.remove_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.remove_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.remove_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.retry.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.retry.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.retry.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.retry.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.set_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.set_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.set_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.set_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.start.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.start.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.start.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.start.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.stop.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.stop.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ilm.stop.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ilm.stop.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/index.json b/src/plugins/console/server/lib/spec_definitions/json/generated/index.json
index 25977806776a7..c6b290a58812b 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/index.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/index.json
@@ -21,7 +21,8 @@
],
"if_seq_no": "",
"if_primary_term": "",
- "pipeline": ""
+ "pipeline": "",
+ "require_alias": "__flag__"
},
"methods": [
"PUT",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json
new file mode 100644
index 0000000000000..ff2623b100bda
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json
@@ -0,0 +1,24 @@
+{
+ "indices.add_block": {
+ "url_params": {
+ "timeout": "",
+ "master_timeout": "",
+ "ignore_unavailable": "__flag__",
+ "allow_no_indices": "__flag__",
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ]
+ },
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "{indices}/_block/{block}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/index-modules-blocks.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
index 1970f88b30958..8227e38d3c6d9 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json
@@ -1,7 +1,6 @@
{
"indices.create": {
"url_params": {
- "include_type_name": "__flag__",
"wait_for_active_shards": "",
"timeout": "",
"master_timeout": ""
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create_data_stream.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create_data_stream.json
new file mode 100644
index 0000000000000..832d5b8de1f47
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create_data_stream.json
@@ -0,0 +1,11 @@
+{
+ "indices.create_data_stream": {
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_data_stream/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.data_streams_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.data_streams_stats.json
new file mode 100644
index 0000000000000..6a88c351ff700
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.data_streams_stats.json
@@ -0,0 +1,12 @@
+{
+ "indices.data_streams_stats": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_data_stream/_stats",
+ "_data_stream/{name}/_stats"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_stream.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_stream.json
new file mode 100644
index 0000000000000..9b91e3deb3a08
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_stream.json
@@ -0,0 +1,20 @@
+{
+ "indices.delete_data_stream": {
+ "url_params": {
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ]
+ },
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_data_stream/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_index_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_index_template.json
new file mode 100644
index 0000000000000..ef3f836207f17
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_index_template.json
@@ -0,0 +1,15 @@
+{
+ "indices.delete_index_template": {
+ "url_params": {
+ "timeout": "",
+ "master_timeout": ""
+ },
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_index_template/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json
new file mode 100644
index 0000000000000..fe7d378b2b168
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json
@@ -0,0 +1,24 @@
+{
+ "indices.disk_usage": {
+ "url_params": {
+ "run_expensive_tasks": "__flag__",
+ "flush": "__flag__",
+ "ignore_unavailable": "__flag__",
+ "allow_no_indices": "__flag__",
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ]
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "{indices}/_disk_usage"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-disk-usage.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_index_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_index_template.json
new file mode 100644
index 0000000000000..97fa8cf55576f
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_index_template.json
@@ -0,0 +1,16 @@
+{
+ "indices.exists_index_template": {
+ "url_params": {
+ "flat_settings": "__flag__",
+ "master_timeout": "",
+ "local": "__flag__"
+ },
+ "methods": [
+ "HEAD"
+ ],
+ "patterns": [
+ "_index_template/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.freeze.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.freeze.json
similarity index 75%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.freeze.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/indices.freeze.json
index 06e8c606f59f7..77c765b90bcdc 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.freeze.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.freeze.json
@@ -8,17 +8,14 @@
"expand_wildcards": [
"open",
"closed",
+ "hidden",
"none",
"all"
],
"wait_for_active_shards": ""
},
- "methods": [
- "POST"
- ],
- "patterns": [
- "{indices}/_freeze"
- ],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/frozen.html"
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/freeze-index-api.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
index 6df796ed6c4cf..99a654d023ba2 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json
@@ -1,7 +1,6 @@
{
"indices.get": {
"url_params": {
- "include_type_name": "__flag__",
"local": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_stream.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_stream.json
new file mode 100644
index 0000000000000..45199a60f337d
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_stream.json
@@ -0,0 +1,21 @@
+{
+ "indices.get_data_stream": {
+ "url_params": {
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ]
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_data_stream",
+ "_data_stream/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json
index c95e2efc73fab..c50919af0a2f3 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json
@@ -1,7 +1,6 @@
{
"indices.get_field_mapping": {
"url_params": {
- "include_type_name": "__flag__",
"include_defaults": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_index_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_index_template.json
new file mode 100644
index 0000000000000..142b75f22c2a6
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_index_template.json
@@ -0,0 +1,17 @@
+{
+ "indices.get_index_template": {
+ "url_params": {
+ "flat_settings": "__flag__",
+ "master_timeout": "",
+ "local": "__flag__"
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_index_template",
+ "_index_template/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
index 555137d0e2ee0..f484f0dca0669 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json
@@ -1,7 +1,6 @@
{
"indices.get_mapping": {
"url_params": {
- "include_type_name": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
"expand_wildcards": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
index d5f52ec76b374..f5902929c25cc 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json
@@ -1,7 +1,6 @@
{
"indices.get_template": {
"url_params": {
- "include_type_name": "__flag__",
"flat_settings": "__flag__",
"master_timeout": "",
"local": "__flag__"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.migrate_to_data_stream.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.migrate_to_data_stream.json
new file mode 100644
index 0000000000000..45cd033801e55
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.migrate_to_data_stream.json
@@ -0,0 +1,11 @@
+{
+ "indices.migrate_to_data_stream": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_data_stream/_migrate/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.promote_data_stream.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.promote_data_stream.json
new file mode 100644
index 0000000000000..a92b9a7a4a40d
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.promote_data_stream.json
@@ -0,0 +1,11 @@
+{
+ "indices.promote_data_stream": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_data_stream/_promote/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_index_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_index_template.json
new file mode 100644
index 0000000000000..0ce27c1d9d21e
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_index_template.json
@@ -0,0 +1,17 @@
+{
+ "indices.put_index_template": {
+ "url_params": {
+ "create": "__flag__",
+ "cause": "",
+ "master_timeout": ""
+ },
+ "methods": [
+ "PUT",
+ "POST"
+ ],
+ "patterns": [
+ "_index_template/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
index e36783c815e3f..5b8ce2b8b4350 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json
@@ -1,7 +1,6 @@
{
"indices.put_mapping": {
"url_params": {
- "include_type_name": "__flag__",
"timeout": "",
"master_timeout": "",
"ignore_unavailable": "__flag__",
@@ -12,7 +11,8 @@
"hidden",
"none",
"all"
- ]
+ ],
+ "write_index_only": "__flag__"
},
"methods": [
"PUT",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json
index 8fb31277da44e..537428f3c53c9 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json
@@ -1,11 +1,9 @@
{
"indices.put_template": {
"url_params": {
- "include_type_name": "__flag__",
"order": "",
"create": "__flag__",
- "master_timeout": "",
- "flat_settings": "__flag__"
+ "master_timeout": ""
},
"methods": [
"PUT",
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json
similarity index 96%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json
index 13ae3a0fd4d18..d4d1d8c52b349 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json
@@ -6,6 +6,7 @@
"expand_wildcards": [
"open",
"closed",
+ "hidden",
"none",
"all"
]
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.resolve_index.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.resolve_index.json
new file mode 100644
index 0000000000000..574d07f1e4324
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.resolve_index.json
@@ -0,0 +1,20 @@
+{
+ "indices.resolve_index": {
+ "url_params": {
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ]
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_resolve/index/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-resolve-index-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json
index 7fa76a687eb77..19e0f1f909ab8 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json
@@ -1,7 +1,6 @@
{
"indices.rollover": {
"url_params": {
- "include_type_name": "__flag__",
"timeout": "",
"dry_run": "__flag__",
"master_timeout": "",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json
index 6fbdea0f1244b..31acc86a2fa56 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json
@@ -1,7 +1,6 @@
{
"indices.shrink": {
"url_params": {
- "copy_settings": "__flag__",
"timeout": "",
"master_timeout": "",
"wait_for_active_shards": ""
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.simulate_index_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.simulate_index_template.json
new file mode 100644
index 0000000000000..e122bd844e9bc
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.simulate_index_template.json
@@ -0,0 +1,16 @@
+{
+ "indices.simulate_index_template": {
+ "url_params": {
+ "create": "__flag__",
+ "cause": "",
+ "master_timeout": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_index_template/_simulate_index/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.simulate_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.simulate_template.json
new file mode 100644
index 0000000000000..9e174799e6c07
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.simulate_template.json
@@ -0,0 +1,17 @@
+{
+ "indices.simulate_template": {
+ "url_params": {
+ "create": "__flag__",
+ "cause": "",
+ "master_timeout": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_index_template/_simulate",
+ "_index_template/_simulate/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json
index 68f2e338cd201..1bfbaa078b796 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json
@@ -1,7 +1,6 @@
{
"indices.split": {
"url_params": {
- "copy_settings": "__flag__",
"timeout": "",
"master_timeout": "",
"wait_for_active_shards": ""
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json
index 1fa32265c91ee..9cdcbdf672d8c 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json
@@ -34,6 +34,7 @@
"url_components": {
"metrics": [
"_all",
+ "bulk",
"completion",
"docs",
"fielddata",
@@ -47,7 +48,6 @@
"search",
"segments",
"store",
- "suggest",
"warmer"
],
"indices": null
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.unfreeze.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.unfreeze.json
similarity index 75%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.unfreeze.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/indices.unfreeze.json
index 186a671347240..3e87971cb66f5 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/indices.unfreeze.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.unfreeze.json
@@ -8,17 +8,14 @@
"expand_wildcards": [
"open",
"closed",
+ "hidden",
"none",
"all"
],
"wait_for_active_shards": ""
},
- "methods": [
- "POST"
- ],
- "patterns": [
- "{indices}/_unfreeze"
- ],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/frozen.html"
+ "methods": [],
+ "patterns": [],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/unfreeze-index-api.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.geo_ip_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.geo_ip_stats.json
new file mode 100644
index 0000000000000..2993eca9f0af5
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.geo_ip_stats.json
@@ -0,0 +1,11 @@
+{
+ "ingest.geo_ip_stats": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_ingest/geoip/stats"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/geoip-stats-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json
index cffcbb1261f90..df90b976444c1 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json
@@ -1,6 +1,7 @@
{
"ingest.get_pipeline": {
"url_params": {
+ "summary": "__flag__",
"master_timeout": ""
},
"methods": [
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.delete.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.delete.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.delete.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.get.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.get.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.get.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.get_basic_status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.get_basic_status.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.get_basic_status.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.get_basic_status.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.get_trial_status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.get_trial_status.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.get_trial_status.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.get_trial_status.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.post.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.post.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.post.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.post.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.post_start_basic.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.post_start_basic.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.post_start_basic.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.post_start_basic.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.post_start_trial.json b/src/plugins/console/server/lib/spec_definitions/json/generated/license.post_start_trial.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/license.post_start_trial.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/license.post_start_trial.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.delete_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.delete_pipeline.json
new file mode 100644
index 0000000000000..9e2c32e287253
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.delete_pipeline.json
@@ -0,0 +1,11 @@
+{
+ "logstash.delete_pipeline": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_logstash/pipeline/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-delete-pipeline.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.get_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.get_pipeline.json
new file mode 100644
index 0000000000000..a6b3a69b53a60
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.get_pipeline.json
@@ -0,0 +1,11 @@
+{
+ "logstash.get_pipeline": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_logstash/pipeline/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-get-pipeline.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.put_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.put_pipeline.json
new file mode 100644
index 0000000000000..9640ced182898
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/logstash.put_pipeline.json
@@ -0,0 +1,11 @@
+{
+ "logstash.put_pipeline": {
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_logstash/pipeline/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-put-pipeline.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/migration.deprecations.json b/src/plugins/console/server/lib/spec_definitions/json/generated/migration.deprecations.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/migration.deprecations.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/migration.deprecations.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/migration.get_assistance.json b/src/plugins/console/server/lib/spec_definitions/json/generated/migration.get_assistance.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/migration.get_assistance.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/migration.get_assistance.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/migration.upgrade.json b/src/plugins/console/server/lib/spec_definitions/json/generated/migration.upgrade.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/migration.upgrade.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/migration.upgrade.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.close_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.close_job.json
similarity index 90%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.close_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.close_job.json
index b0f2c6489b30e..4fd0b7ccf98a7 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.close_job.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.close_job.json
@@ -1,6 +1,7 @@
{
"ml.close_job": {
"url_params": {
+ "allow_no_match": "__flag__",
"allow_no_jobs": "__flag__",
"force": "__flag__",
"timeout": ""
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar.json
similarity index 51%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar.json
index 97e5898072a08..7ccf7ef673070 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar_event.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar_event.json
similarity index 54%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar_event.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar_event.json
index 85ea5add0b60b..7ee8ef376a4db 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar_event.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar_event.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}/events/{event_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar-event.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar_job.json
similarity index 54%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar_job.json
index 6665f52eeb90d..b97667900fe35 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_calendar_job.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_calendar_job.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}/jobs/{job_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar-job.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_data_frame_analytics.json
similarity index 85%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_data_frame_analytics.json
index 2e4593f339212..a46bfdf8318db 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_data_frame_analytics.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_data_frame_analytics.json
@@ -1,7 +1,8 @@
{
"ml.delete_data_frame_analytics": {
"url_params": {
- "force": "__flag__"
+ "force": "__flag__",
+ "timeout": ""
},
"methods": [
"DELETE"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_datafeed.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_datafeed.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_expired_data.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_expired_data.json
new file mode 100644
index 0000000000000..1515821cb1628
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_expired_data.json
@@ -0,0 +1,16 @@
+{
+ "ml.delete_expired_data": {
+ "url_params": {
+ "requests_per_second": "",
+ "timeout": ""
+ },
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_ml/_delete_expired_data/{job_id}",
+ "_ml/_delete_expired_data"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-expired-data.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_filter.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_filter.json
similarity index 51%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_filter.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_filter.json
index 8210a2acd71d0..515986d44d77c 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_filter.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_filter.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/filters/{filter_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-filter.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_forecast.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_forecast.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_forecast.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_forecast.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_model_snapshot.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_model_snapshot.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_model_snapshot.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_model_snapshot.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_trained_model.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_trained_model.json
similarity index 65%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_trained_model.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_trained_model.json
index 343fa904c4216..75592c5964ed0 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.delete_trained_model.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_trained_model.json
@@ -4,8 +4,8 @@
"DELETE"
],
"patterns": [
- "_ml/inference/{model_id}"
+ "_ml/trained_models/{model_id}"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-inference.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-trained-models.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_trained_model_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_trained_model_alias.json
new file mode 100644
index 0000000000000..cd27f21b1d6e4
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.delete_trained_model_alias.json
@@ -0,0 +1,11 @@
+{
+ "ml.delete_trained_model_alias": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_ml/trained_models/{model_id}/model_aliases/{model_alias}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-trained-models-aliases.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.estimate_model_memory.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.estimate_model_memory.json
new file mode 100644
index 0000000000000..94b149e542d43
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.estimate_model_memory.json
@@ -0,0 +1,11 @@
+{
+ "ml.estimate_model_memory": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/anomaly_detectors/_estimate_model_memory"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-apis.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.evaluate_data_frame.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.evaluate_data_frame.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.evaluate_data_frame.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.evaluate_data_frame.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.explain_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.explain_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.explain_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.explain_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.find_file_structure.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.find_file_structure.json
similarity index 88%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.find_file_structure.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.find_file_structure.json
index 6e7163ae2b740..9ede28306e313 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.find_file_structure.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.find_file_structure.json
@@ -25,8 +25,8 @@
"POST"
],
"patterns": [
- "_ml/find_file_structure"
+ "_text_structure/find_structure"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-find-file-structure.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/find-structure.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.flush_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.flush_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.flush_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.flush_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.forecast.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.forecast.json
similarity index 52%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.forecast.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.forecast.json
index 3a8849aad3e4d..d2b53c11cb985 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.forecast.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.forecast.json
@@ -2,13 +2,15 @@
"ml.forecast": {
"url_params": {
"duration": "",
- "expires_in": ""
+ "expires_in": "",
+ "max_model_memory": ""
},
"methods": [
"POST"
],
"patterns": [
"_ml/anomaly_detectors/{job_id}/_forecast"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-forecast.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_buckets.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_buckets.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_buckets.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_buckets.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_calendar_events.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_calendar_events.json
similarity index 67%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_calendar_events.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_calendar_events.json
index 8999af6320dfa..f8886067dd80e 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_calendar_events.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_calendar_events.json
@@ -12,6 +12,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}/events"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-calendar-event.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_calendars.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_calendars.json
similarity index 65%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_calendars.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_calendars.json
index 87f582b5c364d..575f2573d1ee9 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_calendars.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_calendars.json
@@ -11,6 +11,7 @@
"patterns": [
"_ml/calendars",
"_ml/calendars/{calendar_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-calendar.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_categories.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_categories.json
similarity index 88%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_categories.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_categories.json
index 64edb196bb366..1083760d7594f 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_categories.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_categories.json
@@ -2,7 +2,8 @@
"ml.get_categories": {
"url_params": {
"from": 0,
- "size": 0
+ "size": 0,
+ "partition_field_value": ""
},
"methods": [
"GET",
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics.json
similarity index 86%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics.json
index ecccec9c7e059..cccaa516110aa 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics.json
@@ -3,7 +3,8 @@
"url_params": {
"allow_no_match": "__flag__",
"from": 0,
- "size": 0
+ "size": 0,
+ "exclude_generated": "__flag__"
},
"methods": [
"GET"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics_stats.json
similarity index 89%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics_stats.json
index 3ae103f79f798..20fbb2981a28c 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics_stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_data_frame_analytics_stats.json
@@ -3,7 +3,8 @@
"url_params": {
"allow_no_match": "__flag__",
"from": 0,
- "size": 0
+ "size": 0,
+ "verbose": "__flag__"
},
"methods": [
"GET"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_datafeed_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_datafeed_stats.json
similarity index 90%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_datafeed_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_datafeed_stats.json
index 2971b8a7f6c63..75ece20e87443 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_datafeed_stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_datafeed_stats.json
@@ -1,6 +1,7 @@
{
"ml.get_datafeed_stats": {
"url_params": {
+ "allow_no_match": "__flag__",
"allow_no_datafeeds": "__flag__"
},
"methods": [
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_datafeeds.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_datafeeds.json
similarity index 71%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_datafeeds.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_datafeeds.json
index deeb81d692739..ec557966a7271 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_datafeeds.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_datafeeds.json
@@ -1,7 +1,9 @@
{
"ml.get_datafeeds": {
"url_params": {
- "allow_no_datafeeds": "__flag__"
+ "allow_no_match": "__flag__",
+ "allow_no_datafeeds": "__flag__",
+ "exclude_generated": "__flag__"
},
"methods": [
"GET"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_filters.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_filters.json
similarity index 63%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_filters.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_filters.json
index 9b06e618a0b0c..df5747e143412 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_filters.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_filters.json
@@ -10,6 +10,7 @@
"patterns": [
"_ml/filters",
"_ml/filters/{filter_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-filter.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_influencers.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_influencers.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_influencers.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_influencers.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_job_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_job_stats.json
similarity index 90%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_job_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_job_stats.json
index 6173b3ebdc6d0..48dd9e52cd990 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_job_stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_job_stats.json
@@ -1,6 +1,7 @@
{
"ml.get_job_stats": {
"url_params": {
+ "allow_no_match": "__flag__",
"allow_no_jobs": "__flag__"
},
"methods": [
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_jobs.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_jobs.json
similarity index 72%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_jobs.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_jobs.json
index 2486684424670..b46c86559ea09 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_jobs.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_jobs.json
@@ -1,7 +1,9 @@
{
"ml.get_jobs": {
"url_params": {
- "allow_no_jobs": "__flag__"
+ "allow_no_match": "__flag__",
+ "allow_no_jobs": "__flag__",
+ "exclude_generated": "__flag__"
},
"methods": [
"GET"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_model_snapshots.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_model_snapshots.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_model_snapshots.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_model_snapshots.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_overall_buckets.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_overall_buckets.json
similarity index 93%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_overall_buckets.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_overall_buckets.json
index 3a88c9d8ab9c9..e374f6c5ef63f 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_overall_buckets.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_overall_buckets.json
@@ -7,6 +7,7 @@
"exclude_interim": "__flag__",
"start": "",
"end": "",
+ "allow_no_match": "__flag__",
"allow_no_jobs": "__flag__"
},
"methods": [
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_records.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_records.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_records.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_records.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_trained_models.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_trained_models.json
similarity index 64%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_trained_models.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_trained_models.json
index 76598ee015c6d..19f169fa98e86 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_trained_models.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_trained_models.json
@@ -2,19 +2,21 @@
"ml.get_trained_models": {
"url_params": {
"allow_no_match": "__flag__",
+ "include": "",
"include_model_definition": "__flag__",
"decompress_definition": "__flag__",
"from": 0,
"size": 0,
- "tags": []
+ "tags": [],
+ "exclude_generated": "__flag__"
},
"methods": [
"GET"
],
"patterns": [
- "_ml/inference/{model_id}",
- "_ml/inference"
+ "_ml/trained_models/{model_id}",
+ "_ml/trained_models"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-inference.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-trained-models.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_trained_models_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_trained_models_stats.json
similarity index 66%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_trained_models_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_trained_models_stats.json
index ab05e203b3980..44d06c78aef70 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.get_trained_models_stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_trained_models_stats.json
@@ -9,9 +9,9 @@
"GET"
],
"patterns": [
- "_ml/inference/{model_id}/_stats",
- "_ml/inference/_stats"
+ "_ml/trained_models/{model_id}/_stats",
+ "_ml/trained_models/_stats"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-inference-stats.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-trained-models-stats.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.infer_trained_model_deployment.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.infer_trained_model_deployment.json
new file mode 100644
index 0000000000000..644942801d2f6
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.infer_trained_model_deployment.json
@@ -0,0 +1,14 @@
+{
+ "ml.infer_trained_model_deployment": {
+ "url_params": {
+ "timeout": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/trained_models/{model_id}/deployment/_infer"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-infer-trained-model-deployment.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.info.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.info.json
new file mode 100644
index 0000000000000..e09491dacf1fd
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.info.json
@@ -0,0 +1,11 @@
+{
+ "ml.info": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_ml/info"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-ml-info.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.open_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.open_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.open_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.open_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.post_calendar_events.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.post_calendar_events.json
similarity index 52%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.post_calendar_events.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.post_calendar_events.json
index 89ce2df63315b..9d0947c4704a1 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.post_calendar_events.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.post_calendar_events.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}/events"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-calendar-event.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.post_data.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.post_data.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.post_data.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.post_data.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.preview_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.preview_data_frame_analytics.json
new file mode 100644
index 0000000000000..bc3e0a4fd54b5
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.preview_data_frame_analytics.json
@@ -0,0 +1,13 @@
+{
+ "ml.preview_data_frame_analytics": {
+ "methods": [
+ "GET",
+ "POST"
+ ],
+ "patterns": [
+ "_ml/data_frame/analytics/_preview",
+ "_ml/data_frame/analytics/{id}/_preview"
+ ],
+ "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/preview-dfanalytics.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.preview_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.preview_datafeed.json
similarity index 65%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.preview_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.preview_datafeed.json
index 6eb537804134b..29dbabd67d60b 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.preview_datafeed.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.preview_datafeed.json
@@ -1,10 +1,12 @@
{
"ml.preview_datafeed": {
"methods": [
- "GET"
+ "GET",
+ "POST"
],
"patterns": [
- "_ml/datafeeds/{datafeed_id}/_preview"
+ "_ml/datafeeds/{datafeed_id}/_preview",
+ "_ml/datafeeds/_preview"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-preview-datafeed.html"
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_calendar.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_calendar.json
similarity index 51%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_calendar.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_calendar.json
index 7452d1b4b9707..c60a9b60f4ca0 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_calendar.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_calendar.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-calendar.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_calendar_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_calendar_job.json
similarity index 53%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_calendar_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_calendar_job.json
index 08dc3d77b5f25..5a3ac8e0b3243 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_calendar_job.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_calendar_job.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/calendars/{calendar_id}/jobs/{job_id}"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-calendar-job.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_datafeed.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_datafeed.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_filter.json
similarity index 58%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_filter.json
index 7a48994bd1a6c..ad9caa9417da9 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.put_job.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_filter.json
@@ -1,11 +1,11 @@
{
- "ml.put_job": {
+ "ml.put_filter": {
"methods": [
"PUT"
],
"patterns": [
- "_ml/anomaly_detectors/{job_id}"
+ "_ml/filters/{filter_id}"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-filter.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_job.json
new file mode 100644
index 0000000000000..a55ee4ab21a63
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_job.json
@@ -0,0 +1,23 @@
+{
+ "ml.put_job": {
+ "url_params": {
+ "ignore_unavailable": "__flag__",
+ "allow_no_indices": "__flag__",
+ "ignore_throttled": "__flag__",
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ]
+ },
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_ml/anomaly_detectors/{job_id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_trained_model.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_trained_model.json
new file mode 100644
index 0000000000000..9b95f6891d474
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_trained_model.json
@@ -0,0 +1,11 @@
+{
+ "ml.put_trained_model": {
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_ml/trained_models/{model_id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/put-trained-models.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_trained_model_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_trained_model_alias.json
new file mode 100644
index 0000000000000..a83d54220b31a
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.put_trained_model_alias.json
@@ -0,0 +1,14 @@
+{
+ "ml.put_trained_model_alias": {
+ "url_params": {
+ "reassign": "__flag__"
+ },
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_ml/trained_models/{model_id}/model_aliases/{model_alias}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/put-trained-models-aliases.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.reset_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.reset_job.json
new file mode 100644
index 0000000000000..79441afbdebf7
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.reset_job.json
@@ -0,0 +1,14 @@
+{
+ "ml.reset_job": {
+ "url_params": {
+ "wait_for_completion": "__flag__"
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/anomaly_detectors/{job_id}/_reset"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-reset-job.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.revert_model_snapshot.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.revert_model_snapshot.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.revert_model_snapshot.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.revert_model_snapshot.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.set_upgrade_mode.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.set_upgrade_mode.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.set_upgrade_mode.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.set_upgrade_mode.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.start_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.start_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.start_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_datafeed.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.start_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_datafeed.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_trained_model_deployment.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_trained_model_deployment.json
new file mode 100644
index 0000000000000..49e246c90d8e1
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.start_trained_model_deployment.json
@@ -0,0 +1,14 @@
+{
+ "ml.start_trained_model_deployment": {
+ "url_params": {
+ "timeout": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/trained_models/{model_id}/deployment/_start"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-start-trained-model-deployment.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.stop_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.stop_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.stop_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_datafeed.json
similarity index 90%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.stop_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_datafeed.json
index d6769ed58148f..b52f1e22bddf8 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.stop_datafeed.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_datafeed.json
@@ -1,6 +1,7 @@
{
"ml.stop_datafeed": {
"url_params": {
+ "allow_no_match": "__flag__",
"allow_no_datafeeds": "__flag__",
"force": "__flag__",
"timeout": ""
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_trained_model_deployment.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_trained_model_deployment.json
new file mode 100644
index 0000000000000..94b34f597fc3b
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.stop_trained_model_deployment.json
@@ -0,0 +1,11 @@
+{
+ "ml.stop_trained_model_deployment": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/trained_models/{model_id}/deployment/_stop"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-trained-model-deployment.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_data_frame_analytics.json
new file mode 100644
index 0000000000000..e3134770742cb
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_data_frame_analytics.json
@@ -0,0 +1,11 @@
+{
+ "ml.update_data_frame_analytics": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/data_frame/analytics/{id}/_update"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/update-dfanalytics.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_datafeed.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_datafeed.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_filter.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_filter.json
similarity index 52%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_filter.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_filter.json
index 3f48013c2be1c..16b6aedb404d3 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_filter.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_filter.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/filters/{filter_id}/_update"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-filter.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_model_snapshot.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_model_snapshot.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.update_model_snapshot.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.update_model_snapshot.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.upgrade.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.upgrade.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.upgrade.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.upgrade.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.upgrade_job_snapshot.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.upgrade_job_snapshot.json
new file mode 100644
index 0000000000000..6818eab2bb084
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.upgrade_job_snapshot.json
@@ -0,0 +1,15 @@
+{
+ "ml.upgrade_job_snapshot": {
+ "url_params": {
+ "timeout": "",
+ "wait_for_completion": "__flag__"
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}/_upgrade"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-upgrade-job-model-snapshot.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.validate.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.validate.json
similarity index 54%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.validate.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.validate.json
index 298c7cf6dce26..da07f1a2fa203 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.validate.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.validate.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/anomaly_detectors/_validate"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.validate_detector.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.validate_detector.json
similarity index 58%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.validate_detector.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ml.validate_detector.json
index 5e6d7daeea772..73527bd28c5d8 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ml.validate_detector.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.validate_detector.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_ml/anomaly_detectors/_validate/detector"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/monitoring.bulk.json b/src/plugins/console/server/lib/spec_definitions/json/generated/monitoring.bulk.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/monitoring.bulk.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/monitoring.bulk.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json
index ecb71e9ba23c0..d460bf2b1add5 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json
@@ -3,9 +3,7 @@
"url_params": {
"search_type": [
"query_then_fetch",
- "query_and_fetch",
- "dfs_query_then_fetch",
- "dfs_query_and_fetch"
+ "dfs_query_then_fetch"
],
"max_concurrent_searches": "",
"typed_keys": "__flag__",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json
index 0b0ca087b1819..cc7cfbd6e82b6 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json
@@ -3,9 +3,7 @@
"url_params": {
"search_type": [
"query_then_fetch",
- "query_and_fetch",
- "dfs_query_then_fetch",
- "dfs_query_and_fetch"
+ "dfs_query_then_fetch"
],
"typed_keys": "__flag__",
"max_concurrent_searches": "",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json b/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json
index 72a134eca4d2e..20c3daca849c7 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json
@@ -15,8 +15,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json
index e194a6d42c031..cfbcf69b39b7a 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json
@@ -12,7 +12,8 @@
],
"types": [],
"timeout": "",
- "include_segment_file_sizes": "__flag__"
+ "include_segment_file_sizes": "__flag__",
+ "include_unloaded_segments": "__flag__"
},
"methods": [
"GET"
@@ -33,6 +34,7 @@
"discovery",
"fs",
"http",
+ "indexing_pressure",
"indices",
"jvm",
"os",
@@ -42,6 +44,7 @@
],
"index_metric": [
"_all",
+ "bulk",
"completion",
"docs",
"fielddata",
@@ -55,7 +58,6 @@
"search",
"segments",
"store",
- "suggest",
"warmer"
]
},
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json b/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json
new file mode 100644
index 0000000000000..9ce78acbc1a2a
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json
@@ -0,0 +1,25 @@
+{
+ "open_point_in_time": {
+ "url_params": {
+ "preference": "random",
+ "routing": "",
+ "ignore_unavailable": "__flag__",
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "hidden",
+ "none",
+ "all"
+ ],
+ "keep_alive": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_pit",
+ "{indices}/_pit"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/render_search_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/render_search_template.json
index e206140f9d16a..84377591e270b 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/render_search_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/render_search_template.json
@@ -8,6 +8,6 @@
"_render/template",
"_render/template/{id}"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html#_validating_templates"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/render-search-template-api.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.delete_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.delete_job.json
new file mode 100644
index 0000000000000..4f7b37006c3b6
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.delete_job.json
@@ -0,0 +1,11 @@
+{
+ "rollup.delete_job": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_rollup/job/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-delete-job.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_jobs.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_jobs.json
similarity index 53%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_jobs.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_jobs.json
index 49524b394167c..70ce98063d57c 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_jobs.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_jobs.json
@@ -6,6 +6,7 @@
"patterns": [
"_rollup/job/{id}",
"_rollup/job/"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_rollup_caps.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_caps.json
similarity index 53%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_rollup_caps.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_caps.json
index 8a0ef67a0ad4e..9d39f5a4e2ba8 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_rollup_caps.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_caps.json
@@ -6,6 +6,7 @@
"patterns": [
"_rollup/data/{id}",
"_rollup/data/"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json
similarity index 50%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json
index 325115553c294..f7ae6d14f675c 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json
@@ -5,6 +5,7 @@
],
"patterns": [
"{indices}/_rollup/data"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-index-caps.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.put_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.put_job.json
new file mode 100644
index 0000000000000..7970008f8c8f4
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.put_job.json
@@ -0,0 +1,11 @@
+{
+ "rollup.put_job": {
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_rollup/job/{id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-put-job.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup.json
new file mode 100644
index 0000000000000..c3cc629abac80
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup.json
@@ -0,0 +1,11 @@
+{
+ "rollup.rollup": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "{indices}/_rollup/{rollup_index}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-rollup.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.rollup_search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json
similarity index 68%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.rollup_search.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json
index a1771126a71b4..431e5e532a323 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.rollup_search.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json
@@ -10,6 +10,7 @@
],
"patterns": [
"{indices}/_rollup_search"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.start_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.start_job.json
similarity index 50%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.start_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/rollup.start_job.json
index 9714275072b07..39ced395166c7 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.start_job.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.start_job.json
@@ -5,6 +5,7 @@
],
"patterns": [
"_rollup/job/{id}/_start"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-start-job.html"
}
}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.stop_job.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.stop_job.json
similarity index 64%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.stop_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/rollup.stop_job.json
index 70931030b4402..a1290cd388a09 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/rollup.stop_job.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.stop_job.json
@@ -9,6 +9,7 @@
],
"patterns": [
"_rollup/job/{id}/_stop"
- ]
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-stop-job.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search.json
index 78b969d3ed8f2..f5e3a0041c7a6 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/search.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search.json
@@ -49,7 +49,7 @@
"suggest_text": "",
"timeout": "",
"track_scores": "__flag__",
- "track_total_hits": "__flag__",
+ "track_total_hits": "",
"allow_partial_search_results": "__flag__",
"typed_keys": "__flag__",
"version": "__flag__",
@@ -58,7 +58,8 @@
"batched_reduce_size": "",
"max_concurrent_shard_requests": "",
"pre_filter_shard_size": "",
- "rest_total_hits_as_int": "__flag__"
+ "rest_total_hits_as_int": "__flag__",
+ "min_compatible_shard_node": ""
},
"methods": [
"GET",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json
index 748326522e5c2..6d7b3aa34c107 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json
@@ -16,9 +16,7 @@
"scroll": "",
"search_type": [
"query_then_fetch",
- "query_and_fetch",
- "dfs_query_then_fetch",
- "dfs_query_and_fetch"
+ "dfs_query_then_fetch"
],
"explain": "__flag__",
"profile": "__flag__",
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json
new file mode 100644
index 0000000000000..5a53319c164f8
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json
@@ -0,0 +1,15 @@
+{
+ "searchable_snapshots.cache_stats": {
+ "url_params": {
+ "master_timeout": ""
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_searchable_snapshots/cache/stats",
+ "_searchable_snapshots/{nodes}/cache/stats"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-api-cache-stats.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json
new file mode 100644
index 0000000000000..428991f758cdb
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json
@@ -0,0 +1,23 @@
+{
+ "searchable_snapshots.clear_cache": {
+ "url_params": {
+ "ignore_unavailable": "__flag__",
+ "allow_no_indices": "__flag__",
+ "expand_wildcards": [
+ "open",
+ "closed",
+ "none",
+ "all"
+ ],
+ "index": []
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_searchable_snapshots/cache/clear",
+ "{indices}/_searchable_snapshots/cache/clear"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.mount.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.mount.json
new file mode 100644
index 0000000000000..6556c466120da
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.mount.json
@@ -0,0 +1,16 @@
+{
+ "searchable_snapshots.mount": {
+ "url_params": {
+ "master_timeout": "",
+ "wait_for_completion": "__flag__",
+ "storage": ""
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_snapshot/{repository}/{snapshot}/_mount"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-api-mount-snapshot.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json
new file mode 100644
index 0000000000000..ccf7522634a0e
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json
@@ -0,0 +1,19 @@
+{
+ "searchable_snapshots.stats": {
+ "url_params": {
+ "level": [
+ "cluster",
+ "indices",
+ "shards"
+ ]
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_searchable_snapshots/stats",
+ "{indices}/_searchable_snapshots/stats"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-api-stats.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.authenticate.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.authenticate.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.authenticate.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.authenticate.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.change_password.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.change_password.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.change_password.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.change_password.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_api_key_cache.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_api_key_cache.json
new file mode 100644
index 0000000000000..0046dab4074e6
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_api_key_cache.json
@@ -0,0 +1,11 @@
+{
+ "security.clear_api_key_cache": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/api_key/{ids}/_clear_cache"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-api-key-cache.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_privileges.json
new file mode 100644
index 0000000000000..aaab692cefc35
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_privileges.json
@@ -0,0 +1,11 @@
+{
+ "security.clear_cached_privileges": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/privilege/{application}/_clear_cache"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-privilege-cache.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.clear_cached_realms.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_realms.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.clear_cached_realms.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_realms.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.clear_cached_roles.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_roles.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.clear_cached_roles.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_roles.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_service_tokens.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_service_tokens.json
new file mode 100644
index 0000000000000..2fc747518fbc3
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.clear_cached_service_tokens.json
@@ -0,0 +1,11 @@
+{
+ "security.clear_cached_service_tokens": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/service/{namespace}/{service}/credential/token/{name}/_clear_cache"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-service-token-caches.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.create_api_key.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.create_api_key.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.create_api_key.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.create_api_key.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.create_service_token.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.create_service_token.json
new file mode 100644
index 0000000000000..71c6ccedddc74
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.create_service_token.json
@@ -0,0 +1,20 @@
+{
+ "security.create_service_token": {
+ "url_params": {
+ "refresh": [
+ "true",
+ "false",
+ "wait_for"
+ ]
+ },
+ "methods": [
+ "PUT",
+ "POST"
+ ],
+ "patterns": [
+ "_security/service/{namespace}/{service}/credential/token/{name}",
+ "_security/service/{namespace}/{service}/credential/token"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_privileges.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_privileges.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_role.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_role.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_role.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_role.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_role_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_role_mapping.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_role_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_role_mapping.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_service_token.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_service_token.json
new file mode 100644
index 0000000000000..bfdfeb79cb27e
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_service_token.json
@@ -0,0 +1,18 @@
+{
+ "security.delete_service_token": {
+ "url_params": {
+ "refresh": [
+ "true",
+ "false",
+ "wait_for"
+ ]
+ },
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_security/service/{namespace}/{service}/credential/token/{name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-service-token.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_user.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.delete_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.delete_user.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.disable_user.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.disable_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.disable_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.disable_user.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.enable_user.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.enable_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.enable_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.enable_user.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.enroll_kibana.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.enroll_kibana.json
new file mode 100644
index 0000000000000..630adedd03ad7
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.enroll_kibana.json
@@ -0,0 +1,11 @@
+{
+ "security.enroll_kibana": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_security/enroll/kibana"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-enroll-kibana.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.enroll_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.enroll_node.json
new file mode 100644
index 0000000000000..d9cb7da17ed6e
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.enroll_node.json
@@ -0,0 +1,11 @@
+{
+ "security.enroll_node": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_security/enroll/node"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-node-enrollment.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_api_key.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_api_key.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_api_key.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_api_key.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_builtin_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_builtin_privileges.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_builtin_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_builtin_privileges.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_privileges.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_privileges.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_role.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_role.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_role.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_role.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_role_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_role_mapping.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_role_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_role_mapping.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_service_accounts.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_service_accounts.json
new file mode 100644
index 0000000000000..41afc1de8df5c
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_service_accounts.json
@@ -0,0 +1,13 @@
+{
+ "security.get_service_accounts": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_security/service/{namespace}/{service}",
+ "_security/service/{namespace}",
+ "_security/service"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-service-accounts.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_service_credentials.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_service_credentials.json
new file mode 100644
index 0000000000000..b98029aaae367
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_service_credentials.json
@@ -0,0 +1,11 @@
+{
+ "security.get_service_credentials": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_security/service/{namespace}/{service}/credential"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-service-credentials.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_token.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_token.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_token.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_token.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_user.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_user.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_user_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_user_privileges.json
similarity index 76%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_user_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.get_user_privileges.json
index 63bf8d6969344..1b939d2d9a29e 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.get_user_privileges.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.get_user_privileges.json
@@ -6,6 +6,6 @@
"patterns": [
"_security/user/_privileges"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-privileges.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-user-privileges.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.grant_api_key.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.grant_api_key.json
new file mode 100644
index 0000000000000..4d1a56e4fb0bb
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.grant_api_key.json
@@ -0,0 +1,18 @@
+{
+ "security.grant_api_key": {
+ "url_params": {
+ "refresh": [
+ "true",
+ "false",
+ "wait_for"
+ ]
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/api_key/grant"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-grant-api-key.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.has_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.has_privileges.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.has_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.has_privileges.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.invalidate_api_key.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.invalidate_api_key.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.invalidate_api_key.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.invalidate_api_key.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.invalidate_token.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.invalidate_token.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.invalidate_token.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.invalidate_token.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.put_privileges.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.put_privileges.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_role.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.put_role.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_role.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.put_role.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_role_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.put_role_mapping.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_role_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.put_role_mapping.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_user.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.put_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/security.put_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/security.put_user.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_authenticate.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_authenticate.json
new file mode 100644
index 0000000000000..5ed30f2a4ef83
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_authenticate.json
@@ -0,0 +1,11 @@
+{
+ "security.saml_authenticate": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/saml/authenticate"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-authenticate.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_complete_logout.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_complete_logout.json
new file mode 100644
index 0000000000000..7ecc4bdbc8784
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_complete_logout.json
@@ -0,0 +1,11 @@
+{
+ "security.saml_complete_logout": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/saml/complete_logout"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-complete-logout.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_invalidate.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_invalidate.json
new file mode 100644
index 0000000000000..cea5236c474f4
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_invalidate.json
@@ -0,0 +1,11 @@
+{
+ "security.saml_invalidate": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/saml/invalidate"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-invalidate.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_logout.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_logout.json
new file mode 100644
index 0000000000000..4300c948199b3
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_logout.json
@@ -0,0 +1,11 @@
+{
+ "security.saml_logout": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/saml/logout"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-logout.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_prepare_authentication.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_prepare_authentication.json
new file mode 100644
index 0000000000000..fa4303ccfedae
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_prepare_authentication.json
@@ -0,0 +1,11 @@
+{
+ "security.saml_prepare_authentication": {
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_security/saml/prepare"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-prepare-authentication.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_service_provider_metadata.json b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_service_provider_metadata.json
new file mode 100644
index 0000000000000..a77953309c9ce
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/security.saml_service_provider_metadata.json
@@ -0,0 +1,11 @@
+{
+ "security.saml_service_provider_metadata": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_security/saml/metadata/{realm_name}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-sp-metadata.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json
new file mode 100644
index 0000000000000..18605b2afc549
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json
@@ -0,0 +1,11 @@
+{
+ "shutdown.delete_node": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_nodes/{nodes}/shutdown"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json
new file mode 100644
index 0000000000000..0b9c9139b57e3
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json
@@ -0,0 +1,12 @@
+{
+ "shutdown.get_node": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_nodes/shutdown",
+ "_nodes/{nodes}/shutdown"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json
new file mode 100644
index 0000000000000..aee49831305f1
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json
@@ -0,0 +1,11 @@
+{
+ "shutdown.put_node": {
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_nodes/{nodes}/shutdown"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.delete_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.delete_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.delete_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.delete_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.execute_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.execute_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.execute_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.execute_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.execute_retention.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.execute_retention.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.execute_retention.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.execute_retention.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.get_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.get_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.get_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.get_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.get_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.get_stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.get_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.get_stats.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.get_status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.get_status.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.get_status.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.get_status.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.put_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.put_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.put_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.put_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.start.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.start.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.start.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.start.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.stop.json b/src/plugins/console/server/lib/spec_definitions/json/generated/slm.stop.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/slm.stop.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/slm.stop.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json
index eed3e597dc070..cd29d6c300dc6 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json
@@ -10,6 +10,6 @@
"patterns": [
"_snapshot/{repository}/_cleanup"
],
- "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html"
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/clean-up-snapshot-repo-api.html"
}
}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.clone.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.clone.json
new file mode 100644
index 0000000000000..ef8eedf78ac91
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.clone.json
@@ -0,0 +1,14 @@
+{
+ "snapshot.clone": {
+ "url_params": {
+ "master_timeout": ""
+ },
+ "methods": [
+ "PUT"
+ ],
+ "patterns": [
+ "_snapshot/{repository}/{snapshot}/_clone/{target_snapshot}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json
index b37141728f6b7..8edb85f416b48 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json
@@ -3,7 +3,12 @@
"url_params": {
"master_timeout": "",
"ignore_unavailable": "__flag__",
- "verbose": "__flag__"
+ "index_details": "__flag__",
+ "verbose": "__flag__",
+ "sort": ["start_time", "duration", "name", "index_count"],
+ "size": "",
+ "order": "",
+ "after": ""
},
"methods": [
"GET"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.repository_analyze.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.repository_analyze.json
new file mode 100644
index 0000000000000..cf591a66ad2fd
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.repository_analyze.json
@@ -0,0 +1,24 @@
+{
+ "snapshot.repository_analyze": {
+ "url_params": {
+ "blob_count": "",
+ "concurrency": "",
+ "read_node_count": "",
+ "early_read_node_count": "",
+ "seed": "",
+ "rare_action_probability": "",
+ "max_blob_size": "",
+ "max_total_data_size": "",
+ "timeout": "",
+ "detailed": "__flag__",
+ "rarely_abort_writes": "__flag__"
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_snapshot/{repository}/_analyze"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/sql.clear_cursor.json b/src/plugins/console/server/lib/spec_definitions/json/generated/sql.clear_cursor.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/sql.clear_cursor.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/sql.clear_cursor.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/sql.query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/sql.query.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/sql.query.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/sql.query.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/sql.translate.json b/src/plugins/console/server/lib/spec_definitions/json/generated/sql.translate.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/sql.translate.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/sql.translate.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ssl.certificates.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ssl.certificates.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/ssl.certificates.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/ssl.certificates.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/tasks.cancel.json b/src/plugins/console/server/lib/spec_definitions/json/generated/tasks.cancel.json
index 7a84c6acb53a7..2583876b93625 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/tasks.cancel.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/tasks.cancel.json
@@ -3,7 +3,8 @@
"url_params": {
"nodes": [],
"actions": [],
- "parent_task_id": ""
+ "parent_task_id": "",
+ "wait_for_completion": "__flag__"
},
"methods": [
"POST"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json b/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json
new file mode 100644
index 0000000000000..c1cb06b8a195a
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json
@@ -0,0 +1,12 @@
+{
+ "terms_enum": {
+ "methods": [
+ "GET",
+ "POST"
+ ],
+ "patterns": [
+ "{indices}/_terms_enum"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-terms-enum.html"
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json b/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json
index d94cffc38b7af..53ea7a9d6cbf6 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json
@@ -14,8 +14,7 @@
"version_type": [
"internal",
"external",
- "external_gte",
- "force"
+ "external_gte"
]
},
"methods": [
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/text_structure.find_structure.json b/src/plugins/console/server/lib/spec_definitions/json/generated/text_structure.find_structure.json
new file mode 100644
index 0000000000000..8b5e576b495a3
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/text_structure.find_structure.json
@@ -0,0 +1,32 @@
+{
+ "text_structure.find_structure": {
+ "url_params": {
+ "lines_to_sample": 0,
+ "line_merge_size_limit": 0,
+ "timeout": "",
+ "charset": "",
+ "format": [
+ "ndjson",
+ "xml",
+ "delimited",
+ "semi_structured_text"
+ ],
+ "has_header_row": "__flag__",
+ "column_names": [],
+ "delimiter": "",
+ "quote": "",
+ "should_trim_fields": "__flag__",
+ "grok_pattern": "",
+ "timestamp_field": "",
+ "timestamp_format": "",
+ "explain": "__flag__"
+ },
+ "methods": [
+ "POST"
+ ],
+ "patterns": [
+ "_text_structure/find_structure"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/find-structure.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.cat_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.cat_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.cat_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.cat_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.delete_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.delete_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.delete_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.delete_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.get_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.get_transform.json
similarity index 81%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.get_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.get_transform.json
index 2875ff8b91937..3a50ff7fc3c1c 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.get_transform.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.get_transform.json
@@ -3,7 +3,8 @@
"url_params": {
"from": 0,
"size": 0,
- "allow_no_match": "__flag__"
+ "allow_no_match": "__flag__",
+ "exclude_generated": "__flag__"
},
"methods": [
"GET"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.get_transform_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.get_transform_stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.get_transform_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.get_transform_stats.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.preview_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.preview_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.preview_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.preview_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.put_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.put_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.put_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.put_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.start_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.start_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.start_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.start_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.stop_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.stop_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.stop_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.stop_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.update_transform.json b/src/plugins/console/server/lib/spec_definitions/json/generated/transform.update_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/transform.update_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/transform.update_transform.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/update.json b/src/plugins/console/server/lib/spec_definitions/json/generated/update.json
index 43945dfada35c..4dd33978a77b8 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/update.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/update.json
@@ -15,7 +15,8 @@
"routing": "",
"timeout": "",
"if_seq_no": "",
- "if_primary_term": ""
+ "if_primary_term": "",
+ "require_alias": "__flag__"
},
"methods": [
"POST"
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json
index 596f8f8b83963..b4b88312e638e 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json
@@ -33,7 +33,6 @@
"dfs_query_then_fetch"
],
"search_timeout": "",
- "size": "",
"max_docs": "all documents",
"sort": [],
"_source": [],
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.ack_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.ack_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.ack_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.ack_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.activate_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.activate_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.activate_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.activate_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.deactivate_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.deactivate_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.deactivate_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.deactivate_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.delete_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.delete_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.delete_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.delete_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.execute_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.execute_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.execute_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.execute_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.get_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.get_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.get_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.get_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.put_watch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.put_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.put_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.put_watch.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.query_watches.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.query_watches.json
new file mode 100644
index 0000000000000..ea6f03a5672c1
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.query_watches.json
@@ -0,0 +1,12 @@
+{
+ "watcher.query_watches": {
+ "methods": [
+ "GET",
+ "POST"
+ ],
+ "patterns": [
+ "_watcher/_query/watches"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-query-watches.html"
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.start.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.start.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.start.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.start.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stats.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.stop.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stop.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/watcher.stop.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stop.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.info.json b/src/plugins/console/server/lib/spec_definitions/json/generated/xpack.info.json
similarity index 78%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.info.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/xpack.info.json
index 5b555dc129390..da92c12c5fd69 100644
--- a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.info.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/generated/xpack.info.json
@@ -1,7 +1,8 @@
{
"xpack.info": {
"url_params": {
- "categories": []
+ "categories": [],
+ "accept_enterprise": "__flag__"
},
"methods": [
"GET"
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.ssl.certificates.json b/src/plugins/console/server/lib/spec_definitions/json/generated/xpack.ssl.certificates.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.ssl.certificates.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/xpack.ssl.certificates.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.usage.json b/src/plugins/console/server/lib/spec_definitions/json/generated/xpack.usage.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/generated/xpack.usage.json
rename to src/plugins/console/server/lib/spec_definitions/json/generated/xpack.usage.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/async_search.submit.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/async_search.submit.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/async_search.submit.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/async_search.submit.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.follow.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.follow.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.follow.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.follow.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.forget_follower.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.forget_follower.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.forget_follower.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.forget_follower.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.put_auto_follow_pattern.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.put_auto_follow_pattern.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.put_auto_follow_pattern.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.put_auto_follow_pattern.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.resume_follow.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.resume_follow.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ccr.resume_follow.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ccr.resume_follow.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/enrich.put_policy.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/enrich.put_policy.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/enrich.put_policy.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/enrich.put_policy.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ilm.move_to_step.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ilm.move_to_step.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ilm.move_to_step.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ilm.move_to_step.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ilm.put_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ilm.put_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ilm.put_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ilm.put_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.evaluate_data_frame.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.evaluate_data_frame.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.evaluate_data_frame.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.evaluate_data_frame.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.explain_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.explain_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.explain_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.explain_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_buckets.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_buckets.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_buckets.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_buckets.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_calendar_events.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_calendar_events.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_calendar_events.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_calendar_events.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_calendars.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_calendars.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_calendars.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_calendars.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_categories.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_categories.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_categories.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_categories.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_influencers.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_influencers.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_influencers.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_influencers.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_model_snapshots.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_model_snapshots.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_model_snapshots.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_model_snapshots.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_overall_buckets.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_overall_buckets.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_overall_buckets.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_overall_buckets.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_records.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_records.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.get_records.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.get_records.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.post_calendar_events.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.post_calendar_events.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.post_calendar_events.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.post_calendar_events.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_calendar.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_calendar.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_calendar.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_calendar.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_data_frame_analytics.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_data_frame_analytics.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_data_frame_analytics.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_data_frame_analytics.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_datafeed.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_datafeed.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_job.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_trained_model.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_trained_model.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.put_trained_model.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.put_trained_model.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.revert_model_snapshot.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.revert_model_snapshot.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.revert_model_snapshot.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.revert_model_snapshot.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.update_datafeed.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.update_datafeed.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.update_datafeed.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.update_datafeed.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.update_job.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.update_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.update_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.update_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.update_model_snapshot.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/ml.update_model_snapshot.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/ml.update_model_snapshot.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/ml.update_model_snapshot.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.authenticate.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.authenticate.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.authenticate.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.authenticate.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.change_password.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.change_password.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.change_password.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.change_password.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.create_api_key.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.create_api_key.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.create_api_key.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.create_api_key.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.get_token.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.get_token.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.get_token.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.get_token.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.has_privileges.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.has_privileges.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.has_privileges.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.has_privileges.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.invalidate_api_key.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.invalidate_api_key.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.invalidate_api_key.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.invalidate_api_key.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.invalidate_token.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.invalidate_token.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.invalidate_token.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.invalidate_token.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.put_role.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.put_role.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.put_role.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.put_role.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.put_role_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.put_role_mapping.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.put_role_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.put_role_mapping.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.put_user.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.put_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/security.put_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/security.put_user.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_authenticate.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_authenticate.json
new file mode 100644
index 0000000000000..a1d50daa70572
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_authenticate.json
@@ -0,0 +1,9 @@
+{
+ "security.saml_authenticate": {
+ "data_autocomplete_rules": {
+ "content": "",
+ "ids": [],
+ "realm": ""
+ }
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_complete_logout.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_complete_logout.json
new file mode 100644
index 0000000000000..b9d5b83e0424c
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_complete_logout.json
@@ -0,0 +1,10 @@
+{
+ "security.saml_complete_logout": {
+ "data_autocomplete_rules": {
+ "realm": "",
+ "ids": [],
+ "query_string": "",
+ "content": ""
+ }
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_invalidate.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_invalidate.json
new file mode 100644
index 0000000000000..f4a27d659c360
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_invalidate.json
@@ -0,0 +1,9 @@
+{
+ "security.saml_invalidate": {
+ "data_autocomplete_rules": {
+ "query_string": "",
+ "acs": "",
+ "realm": ""
+ }
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_logout.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_logout.json
new file mode 100644
index 0000000000000..40e5c6bc09299
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_logout.json
@@ -0,0 +1,8 @@
+{
+ "security.saml_logout": {
+ "data_autocomplete_rules": {
+ "token": "",
+ "refresh_token": ""
+ }
+ }
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_prepare_authentication.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_prepare_authentication.json
new file mode 100644
index 0000000000000..4ebdd53c95166
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/security.saml_prepare_authentication.json
@@ -0,0 +1,8 @@
+{
+ "security.saml_prepare_authentication": {
+ "data_autocomplete_rules": {
+ "acs": "",
+ "realm": ""
+ }
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/slm.put_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/slm.put_lifecycle.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/slm.put_lifecycle.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/slm.put_lifecycle.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/slm.start.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/slm.start.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/slm.start.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/slm.start.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/slm.stop.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/slm.stop.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/slm.stop.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/slm.stop.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/sql.query.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/sql.query.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/sql.query.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/sql.query.json
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/terms_enum.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/terms_enum.json
new file mode 100644
index 0000000000000..3a3681cefe072
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/terms_enum.json
@@ -0,0 +1,12 @@
+{
+ "terms_enum": {
+ "data_autocomplete_rules": {
+ "field": "",
+ "string": "",
+ "size": "",
+ "timeout": "",
+ "case_insensitive": { "__one_of": [true, false] },
+ "index_filter": ""
+ }
+ }
+}
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.get_transform_stats.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/transform.get_transform_stats.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.get_transform_stats.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/transform.get_transform_stats.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.preview_transform.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/transform.preview_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.preview_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/transform.preview_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.put_transform.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/transform.put_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.put_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/transform.put_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.stop_transform.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/transform.stop_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.stop_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/transform.stop_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.update_transform.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/transform.update_transform.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/transform.update_transform.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/transform.update_transform.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.graph.explore.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.graph.explore.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.graph.explore.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.graph.explore.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.info.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.info.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.info.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.info.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.license.post.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.license.post.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.license.post.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.license.post.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.rollup.delete_job.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.rollup.delete_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.rollup.delete_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.rollup.delete_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.rollup.put_job.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.rollup.put_job.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.rollup.put_job.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.rollup.put_job.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.rollup.rollup_search.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.rollup.rollup_search.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.rollup.rollup_search.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.rollup.rollup_search.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.authenticate.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.authenticate.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.authenticate.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.authenticate.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.change_password.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.change_password.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.change_password.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.change_password.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.get_token.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.get_token.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.get_token.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.get_token.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.invalidate_token.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.invalidate_token.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.invalidate_token.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.invalidate_token.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.put_role.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.put_role.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.put_role.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.put_role.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.put_role_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.put_role_mapping.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.put_role_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.put_role_mapping.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.put_user.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.put_user.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.security.put_user.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.security.put_user.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.watcher.execute_watch.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.watcher.execute_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.watcher.execute_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.watcher.execute_watch.json
diff --git a/x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.watcher.put_watch.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.watcher.put_watch.json
similarity index 100%
rename from x-pack/plugins/console_extensions/server/lib/spec_definitions/json/overrides/xpack.watcher.put_watch.json
rename to src/plugins/console/server/lib/spec_definitions/json/overrides/xpack.watcher.put_watch.json
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 66d81d058fc77..b8af7c12d57fc 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -17,7 +17,6 @@ import { CoreSetup } from 'src/core/public';
import { CoreSetup as CoreSetup_2 } from 'kibana/public';
import { CoreStart } from 'kibana/public';
import { CoreStart as CoreStart_2 } from 'src/core/public';
-import * as CSS from 'csstype';
import { Datatable as Datatable_2 } from 'src/plugins/expressions';
import { Datatable as Datatable_3 } from 'src/plugins/expressions/common';
import { DatatableColumn as DatatableColumn_2 } from 'src/plugins/expressions';
@@ -72,13 +71,12 @@ import { Plugin } from 'src/core/public';
import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/public';
import { PluginInitializerContext as PluginInitializerContext_3 } from 'kibana/public';
import { PopoverAnchorPosition } from '@elastic/eui';
-import * as PropTypes from 'prop-types';
import { PublicContract } from '@kbn/utility-types';
import { PublicMethodsOf } from '@kbn/utility-types';
import { PublicUiSettingsParams } from 'src/core/server/types';
import { RangeFilter as RangeFilter_2 } from 'src/plugins/data/public';
import React from 'react';
-import * as React_3 from 'react';
+import * as React_2 from 'react';
import { RecursiveReadonly } from '@kbn/utility-types';
import { Request as Request_2 } from '@hapi/hapi';
import { RequestAdapter } from 'src/plugins/inspector/common';
diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
index 4655bbf8e91a5..cc796ad749f0b 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
@@ -77,7 +77,7 @@ function FilterBarUI(props: Props) {
const button = (
setIsAddFilterPopoverOpen(true)}
data-test-subj="addFilter"
className="globalFilterBar__addButton"
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index 0ab3f8a4e3466..1e7b59d8a9e76 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -1169,7 +1169,6 @@ exports[`Inspector Data View component should render single table without select
>
{
// Stub out a minimal mapping of 4 fields
let mapping;
+ beforeAll(async () => {
+ await initAngularBootstrap();
+ });
beforeAll(() => setScopedHistory(createBrowserHistory()));
beforeEach(() => {
angular.element.prototype.slice = jest.fn(function (index) {
diff --git a/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js b/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js
index 1db35ddf18089..097f32965b141 100644
--- a/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js
+++ b/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js
@@ -17,6 +17,7 @@ import hits from '../../../__fixtures__/real_hits';
import { coreMock } from '../../../../../../core/public/mocks';
import { dataPluginMock } from '../../../../../data/public/mocks';
import { navigationPluginMock } from '../../../../../navigation/public/mocks';
+import { initAngularBootstrap } from '../../../../../kibana_legacy/public/angular_bootstrap';
import { setScopedHistory, setServices } from '../../../kibana_services';
import { getInnerAngularModule } from '../get_inner_angular';
@@ -54,6 +55,9 @@ describe('docTable', () => {
const core = coreMock.createStart();
let $elem;
+ beforeAll(async () => {
+ await initAngularBootstrap();
+ });
beforeAll(() => setScopedHistory(createBrowserHistory()));
beforeEach(() => {
angular.element.prototype.slice = jest.fn(() => {
diff --git a/src/plugins/discover/public/application/angular/get_inner_angular.ts b/src/plugins/discover/public/application/angular/get_inner_angular.ts
index 26d64d5adc8a3..992d82795302b 100644
--- a/src/plugins/discover/public/application/angular/get_inner_angular.ts
+++ b/src/plugins/discover/public/application/angular/get_inner_angular.ts
@@ -33,13 +33,12 @@ import { createDocViewerDirective } from './doc_viewer';
import { createDiscoverGridDirective } from './create_discover_grid_directive';
import { createRenderCompleteDirective } from './directives/render_complete';
import {
- initAngularBootstrap,
configureAppAngularModule,
PrivateProvider,
- PromiseServiceCreator,
registerListenEventListener,
watchMultiDecorator,
} from '../../../../kibana_legacy/public';
+import { PromiseServiceCreator } from './helpers';
import { DiscoverStartPlugins } from '../../plugin';
import { getScopedHistory } from '../../kibana_services';
import { createDiscoverDirective } from './create_discover_directive';
@@ -54,7 +53,6 @@ export function getInnerAngularModule(
deps: DiscoverStartPlugins,
context: PluginInitializerContext
) {
- initAngularBootstrap();
const module = initializeInnerAngularModule(name, core, deps.navigation, deps.data);
configureAppAngularModule(module, { core, env: context.env }, true, getScopedHistory);
return module;
diff --git a/src/plugins/discover/public/application/angular/helpers/index.ts b/src/plugins/discover/public/application/angular/helpers/index.ts
index 3d2c0b1c63b33..6a7f75b7e81a2 100644
--- a/src/plugins/discover/public/application/angular/helpers/index.ts
+++ b/src/plugins/discover/public/application/angular/helpers/index.ts
@@ -8,3 +8,4 @@
export { formatRow, formatTopLevelObject } from './row_formatter';
export { handleSourceColumnState } from './state_helpers';
+export { PromiseServiceCreator } from './promises';
diff --git a/src/plugins/kibana_legacy/public/angular/promises.d.ts b/src/plugins/discover/public/application/angular/helpers/promises.d.ts
similarity index 100%
rename from src/plugins/kibana_legacy/public/angular/promises.d.ts
rename to src/plugins/discover/public/application/angular/helpers/promises.d.ts
diff --git a/src/plugins/kibana_legacy/public/angular/promises.js b/src/plugins/discover/public/application/angular/helpers/promises.js
similarity index 100%
rename from src/plugins/kibana_legacy/public/angular/promises.js
rename to src/plugins/discover/public/application/angular/helpers/promises.js
diff --git a/src/plugins/discover/public/plugin.tsx b/src/plugins/discover/public/plugin.tsx
index 3e31fe1d46d45..1e8a5cdac95ef 100644
--- a/src/plugins/discover/public/plugin.tsx
+++ b/src/plugins/discover/public/plugin.tsx
@@ -403,6 +403,7 @@ export class DiscoverPlugin
}
// this is used by application mount and tests
const { getInnerAngularModule } = await import('./application/angular/get_inner_angular');
+ await plugins.kibanaLegacy.loadAngularBootstrap();
const module = getInnerAngularModule(
innerAngularName,
core,
@@ -473,6 +474,7 @@ export class DiscoverPlugin
throw Error('Discover plugin getEmbeddableInjector: initializeServices is undefined');
}
const { core, plugins } = await this.initializeServices();
+ await getServices().kibanaLegacy.loadAngularBootstrap();
getServices().kibanaLegacy.loadFontAwesome();
const { getInnerAngularModuleEmbeddable } = await import(
'./application/angular/get_inner_angular'
diff --git a/src/plugins/embeddable/public/public.api.md b/src/plugins/embeddable/public/public.api.md
index a810b1f48a07c..54fe2a7b0bec2 100644
--- a/src/plugins/embeddable/public/public.api.md
+++ b/src/plugins/embeddable/public/public.api.md
@@ -11,7 +11,6 @@ import { ApiResponse } from '@elastic/elasticsearch/lib/Transport';
import { ApplicationStart as ApplicationStart_2 } from 'kibana/public';
import Boom from '@hapi/boom';
import { ConfigDeprecationProvider } from '@kbn/config';
-import * as CSS from 'csstype';
import { DetailedPeerCertificate } from 'tls';
import { EmbeddableStart as EmbeddableStart_2 } from 'src/plugins/embeddable/public/plugin';
import { EnvironmentMode } from '@kbn/config';
@@ -44,7 +43,6 @@ import { PackageInfo } from '@kbn/config';
import { Path } from 'history';
import { PeerCertificate } from 'tls';
import { PluginInitializerContext } from 'src/core/public';
-import * as PropTypes from 'prop-types';
import { PublicMethodsOf } from '@kbn/utility-types';
import { PublicUiSettingsParams } from 'src/core/server/types';
import React from 'react';
@@ -95,8 +93,7 @@ export interface Adapters {
//
// @public (undocumented)
export class AddPanelAction implements Action_3 {
- // Warning: (ae-forgotten-export) The symbol "React" needs to be exported by the entry point index.d.ts
- constructor(getFactory: EmbeddableStart_2['getEmbeddableFactory'], getAllFactories: EmbeddableStart_2['getEmbeddableFactories'], overlays: OverlayStart_2, notifications: NotificationsStart_2, SavedObjectFinder: React_2.ComponentType, reportUiCounter?: ((appName: string, type: import("@kbn/analytics").UiCounterMetricType, eventNames: string | string[], count?: number | undefined) => void) | undefined);
+ constructor(getFactory: EmbeddableStart_2['getEmbeddableFactory'], getAllFactories: EmbeddableStart_2['getEmbeddableFactories'], overlays: OverlayStart_2, notifications: NotificationsStart_2, SavedObjectFinder: React.ComponentType, reportUiCounter?: ((appName: string, type: import("@kbn/analytics").UiCounterMetricType, eventNames: string | string[], count?: number | undefined) => void) | undefined);
// (undocumented)
execute(context: ActionExecutionContext_2): Promise;
// (undocumented)
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
index 1152290f7d553..0a6f2cc2c2b18 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
@@ -62,7 +62,7 @@ export const UseArray = ({
const uniqueId = useRef(0);
const form = useFormContext();
- const { __getFieldDefaultValue } = form;
+ const { getFieldDefaultValue } = form;
const getNewItemAtIndex = useCallback(
(index: number): ArrayItem => ({
@@ -75,7 +75,7 @@ export const UseArray = ({
const fieldDefaultValue = useMemo(() => {
const defaultValues = readDefaultValueOnForm
- ? (__getFieldDefaultValue(path) as any[])
+ ? (getFieldDefaultValue(path) as any[])
: undefined;
const getInitialItemsFromValues = (values: any[]): ArrayItem[] =>
@@ -88,13 +88,7 @@ export const UseArray = ({
return defaultValues
? getInitialItemsFromValues(defaultValues)
: new Array(initialNumberOfItems).fill('').map((_, i) => getNewItemAtIndex(i));
- }, [
- path,
- initialNumberOfItems,
- readDefaultValueOnForm,
- __getFieldDefaultValue,
- getNewItemAtIndex,
- ]);
+ }, [path, initialNumberOfItems, readDefaultValueOnForm, getFieldDefaultValue, getNewItemAtIndex]);
// Create a new hook field with the "isIncludedInOutput" set to false so we don't use its value to build the final form data.
// Apart from that the field behaves like a normal field and is hooked into the form validation lifecycle.
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx
index 3a5fbaba8f3b8..45fa2e977a6c7 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.tsx
@@ -59,8 +59,7 @@ function UseFieldComp(props: Props {
+ describe('field.validate()', () => {
+ const EMPTY_VALUE = ' ';
+
+ test('It should not invalidate a field with arrayItem validation when isBlocking is false', async () => {
+ let fieldHook: FieldHook;
+
+ const TestField = ({ field }: { field: FieldHook }) => {
+ fieldHook = field;
+ return null;
+ };
+
+ const TestForm = () => {
+ const { form } = useForm();
+
+ return (
+
+ );
+ };
+
+ registerTestBed(TestForm)();
+
+ let validateResponse: FieldValidateResponse;
+
+ await act(async () => {
+ validateResponse = await fieldHook!.validate({
+ value: EMPTY_VALUE,
+ validationType: VALIDATION_TYPES.ARRAY_ITEM,
+ });
+ });
+
+ // validation fails for ARRAY_ITEM with a non-blocking validation error
+ expect(validateResponse!).toEqual({
+ isValid: false,
+ errors: [
+ {
+ code: 'ERR_FIELD_MISSING',
+ path: 'test-path',
+ message: 'error-message',
+ __isBlocking__: false,
+ validationType: 'arrayItem',
+ },
+ ],
+ });
+
+ // expect the field to be valid because the validation error is non-blocking
+ expect(fieldHook!.isValid).toBe(true);
+ });
+
+ test('It should invalidate an arrayItem field when isBlocking is true', async () => {
+ let fieldHook: FieldHook;
+
+ const TestField = ({ field }: { field: FieldHook }) => {
+ fieldHook = field;
+ return null;
+ };
+
+ const TestForm = () => {
+ const { form } = useForm();
+
+ return (
+
+ );
+ };
+
+ registerTestBed(TestForm)();
+
+ let validateResponse: FieldValidateResponse;
+
+ await act(async () => {
+ validateResponse = await fieldHook!.validate({
+ value: EMPTY_VALUE,
+ validationType: VALIDATION_TYPES.ARRAY_ITEM,
+ });
+ });
+
+ // validation fails for ARRAY_ITEM with a blocking validation error
+ expect(validateResponse!).toEqual({
+ isValid: false,
+ errors: [
+ {
+ code: 'ERR_FIELD_MISSING',
+ path: 'test-path',
+ message: 'error-message',
+ __isBlocking__: true,
+ validationType: 'arrayItem',
+ },
+ ],
+ });
+
+ // expect the field to be invalid because the validation error is blocking
+ expect(fieldHook!.isValid).toBe(false);
+ });
+ });
+});
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
index 0cf1bb3601667..77bb17d7b9e60 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
@@ -15,6 +15,7 @@ import {
FieldValidateResponse,
ValidationError,
FormData,
+ ValidationConfig,
} from '../types';
import { FIELD_TYPES, VALIDATION_TYPES } from '../constants';
@@ -189,10 +190,12 @@ export const useField = (
{
formData,
value: valueToValidate,
+ onlyBlocking: runOnlyBlockingValidations,
validationTypeToValidate,
}: {
formData: any;
value: I;
+ onlyBlocking: boolean;
validationTypeToValidate?: string;
},
clearFieldErrors: FieldHook['clearErrors']
@@ -203,10 +206,31 @@ export const useField = (
// By default, for fields that have an asynchronous validation
// we will clear the errors as soon as the field value changes.
- clearFieldErrors([VALIDATION_TYPES.FIELD, VALIDATION_TYPES.ASYNC]);
+ clearFieldErrors([
+ validationTypeToValidate ?? VALIDATION_TYPES.FIELD,
+ VALIDATION_TYPES.ASYNC,
+ ]);
cancelInflightValidation();
+ const doByPassValidation = ({
+ type: validationType,
+ isBlocking,
+ }: ValidationConfig) => {
+ if (
+ typeof validationTypeToValidate !== 'undefined' &&
+ validationType !== validationTypeToValidate
+ ) {
+ return true;
+ }
+
+ if (runOnlyBlockingValidations && isBlocking === false) {
+ return true;
+ }
+
+ return false;
+ };
+
const runAsync = async () => {
const validationErrors: ValidationError[] = [];
@@ -219,10 +243,7 @@ export const useField = (
type: validationType = VALIDATION_TYPES.FIELD,
} = validation;
- if (
- typeof validationTypeToValidate !== 'undefined' &&
- validationType !== validationTypeToValidate
- ) {
+ if (doByPassValidation(validation)) {
continue;
}
@@ -265,10 +286,7 @@ export const useField = (
type: validationType = VALIDATION_TYPES.FIELD,
} = validation;
- if (
- typeof validationTypeToValidate !== 'undefined' &&
- validationType !== validationTypeToValidate
- ) {
+ if (doByPassValidation(validation)) {
continue;
}
@@ -344,6 +362,7 @@ export const useField = (
formData = __getFormData$().value,
value: valueToValidate = value,
validationType,
+ onlyBlocking = false,
} = validationData;
setIsValidated(true);
@@ -377,6 +396,7 @@ export const useField = (
formData,
value: valueToValidate,
validationTypeToValidate: validationType,
+ onlyBlocking,
},
clearErrors
);
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
index 40fc179c73c3b..92a9876f1cd30 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
@@ -10,7 +10,7 @@ import React, { useEffect } from 'react';
import { act } from 'react-dom/test-utils';
import { registerTestBed, getRandomString, TestBed } from '../shared_imports';
-
+import { emptyField } from '../../helpers/field_validators';
import { Form, UseField } from '../components';
import {
FormSubmitHandler,
@@ -18,7 +18,8 @@ import {
FormHook,
ValidationFunc,
FieldConfig,
-} from '../types';
+ VALIDATION_TYPES,
+} from '..';
import { useForm } from './use_form';
interface MyForm {
@@ -501,4 +502,74 @@ describe('useForm() hook', () => {
expect(isValid).toBeUndefined(); // Make sure it is "undefined" and not "false".
});
});
+
+ describe('form.validate()', () => {
+ test('should not invalidate a field with arrayItem validation when validating a form', async () => {
+ const TestComp = () => {
+ const { form } = useForm();
+ formHook = form;
+
+ return (
+
+ );
+ };
+
+ registerTestBed(TestComp)();
+
+ let isValid: boolean = false;
+
+ await act(async () => {
+ isValid = await formHook!.validate();
+ });
+
+ expect(isValid).toBe(true);
+ });
+
+ test('should invalidate a field with a blocking arrayItem validation when validating a form', async () => {
+ const TestComp = () => {
+ const { form } = useForm();
+ formHook = form;
+
+ return (
+
+ );
+ };
+
+ registerTestBed(TestComp)();
+
+ let isValid: boolean = false;
+
+ await act(async () => {
+ isValid = await formHook!.validate();
+ });
+
+ expect(isValid).toBe(false);
+ });
+ });
});
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
index fb334afb22b13..dcf2cb37d6542 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
@@ -151,14 +151,14 @@ export function useForm(
}, [fieldsToArray]);
const validateFields: FormHook['__validateFields'] = useCallback(
- async (fieldNames) => {
+ async (fieldNames, onlyBlocking = false) => {
const fieldsToValidate = fieldNames
.map((name) => fieldsRefs.current[name])
.filter((field) => field !== undefined);
const formData = getFormData$().value;
const validationResult = await Promise.all(
- fieldsToValidate.map((field) => field.validate({ formData }))
+ fieldsToValidate.map((field) => field.validate({ formData, onlyBlocking }))
);
if (isMounted.current === false) {
@@ -257,11 +257,6 @@ export function useForm(
[getFormData$, updateFormData$, fieldsToArray]
);
- const getFieldDefaultValue: FormHook['__getFieldDefaultValue'] = useCallback(
- (fieldName) => get(defaultValueDeserialized.current, fieldName),
- []
- );
-
const readFieldConfigFromSchema: FormHook['__readFieldConfigFromSchema'] = useCallback(
(fieldName) => {
const config = (get(schema ?? {}, fieldName) as FieldConfig) || {};
@@ -315,7 +310,8 @@ export function useForm(
if (fieldsToValidate.length === 0) {
isFormValid = fieldsArray.every(isFieldValid);
} else {
- ({ isFormValid } = await validateFields(fieldsToValidate.map((field) => field.path)));
+ const fieldPathsToValidate = fieldsToValidate.map((field) => field.path);
+ ({ isFormValid } = await validateFields(fieldPathsToValidate, true));
}
setIsValid(isFormValid);
@@ -338,6 +334,11 @@ export function useForm(
const getFields: FormHook['getFields'] = useCallback(() => fieldsRefs.current, []);
+ const getFieldDefaultValue: FormHook['getFieldDefaultValue'] = useCallback(
+ (fieldName) => get(defaultValueDeserialized.current, fieldName),
+ []
+ );
+
const submit: FormHook['submit'] = useCallback(
async (e) => {
if (e) {
@@ -430,6 +431,7 @@ export function useForm(
setFieldValue,
setFieldErrors,
getFields,
+ getFieldDefaultValue,
getFormData,
getErrors,
reset,
@@ -438,7 +440,6 @@ export function useForm(
__updateFormDataAt: updateFormDataAt,
__updateDefaultValueAt: updateDefaultValueAt,
__readFieldConfigFromSchema: readFieldConfigFromSchema,
- __getFieldDefaultValue: getFieldDefaultValue,
__addField: addField,
__removeField: removeField,
__validateFields: validateFields,
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
index 75c918d4340f2..4e9ff29f0cdd3 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
@@ -36,6 +36,8 @@ export interface FormHook
setFieldErrors: (fieldName: string, errors: ValidationError[]) => void;
/** Access the fields on the form. */
getFields: () => FieldsMap;
+ /** Access the defaultValue for a specific field */
+ getFieldDefaultValue: (path: string) => unknown;
/**
* Return the form data. It accepts an optional options object with an `unflatten` parameter (defaults to `true`).
* If you are only interested in the raw form data, pass `unflatten: false` to the handler
@@ -53,12 +55,13 @@ export interface FormHook
__addField: (field: FieldHook) => void;
__removeField: (fieldNames: string | string[]) => void;
__validateFields: (
- fieldNames: string[]
+ fieldNames: string[],
+ /** Run only blocking validations */
+ onlyBlocking?: boolean
) => Promise<{ areFieldsValid: boolean; isFormValid: boolean | undefined }>;
__updateFormDataAt: (field: string, value: unknown) => void;
__updateDefaultValueAt: (field: string, value: unknown) => void;
__readFieldConfigFromSchema: (field: string) => FieldConfig;
- __getFieldDefaultValue: (path: string) => unknown;
}
export type FormSchema = {
@@ -137,6 +140,7 @@ export interface FieldHook {
formData?: any;
value?: I;
validationType?: string;
+ onlyBlocking?: boolean;
}) => FieldValidateResponse | Promise;
reset: (options?: { resetValue?: boolean; defaultValue?: T }) => unknown | undefined;
// Flag to indicate if the field value will be included in the form data outputted
diff --git a/src/plugins/expression_reveal_image/.i18nrc.json b/src/plugins/expression_reveal_image/.i18nrc.json
deleted file mode 100755
index 5b073e4374519..0000000000000
--- a/src/plugins/expression_reveal_image/.i18nrc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "prefix": "expressionRevealImage",
- "paths": {
- "expressionRevealImage": "."
- },
- "translations": ["translations/ja-JP.json"]
-}
diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
index 6bd06528084ce..6405a81282471 100644
--- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
@@ -132,7 +132,7 @@ export const IndexPatternTable = ({ canSave, history }: Props) => {
}
) => (
<>
-
+
{name}
diff --git a/src/plugins/kibana_legacy/public/angular/angular_config.tsx b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
index daecfbc57ea99..48ee6d2db269e 100644
--- a/src/plugins/kibana_legacy/public/angular/angular_config.tsx
+++ b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
@@ -13,6 +13,7 @@ import {
ILocationProvider,
IModule,
IRootScopeService,
+ IRequestConfig,
} from 'angular';
import $ from 'jquery';
import { set } from '@elastic/safer-lodash-set';
@@ -22,7 +23,6 @@ import { ChromeBreadcrumb, EnvironmentMode, PackageInfo } from 'kibana/public';
import { History } from 'history';
import { CoreStart } from 'kibana/public';
-import { isSystemApiRequest } from '../utils';
import { formatAngularHttpError, isAngularHttpError } from '../notify/lib';
export interface RouteConfiguration {
@@ -38,6 +38,11 @@ export interface RouteConfiguration {
requireUICapability?: string;
}
+function isSystemApiRequest(request: IRequestConfig) {
+ const { headers } = request;
+ return headers && !!headers['kbn-system-request'];
+}
+
/**
* Detects whether a given angular route is a dummy route that doesn't
* require any action. There are two ways this can happen:
diff --git a/src/plugins/kibana_legacy/public/angular/index.ts b/src/plugins/kibana_legacy/public/angular/index.ts
index d9d8c0c19eb7b..369495698591d 100644
--- a/src/plugins/kibana_legacy/public/angular/index.ts
+++ b/src/plugins/kibana_legacy/public/angular/index.ts
@@ -6,8 +6,6 @@
* Side Public License, v 1.
*/
-// @ts-ignore
-export { PromiseServiceCreator } from './promises';
// @ts-ignore
export { watchMultiDecorator } from './watch_multi';
export * from './angular_config';
diff --git a/src/plugins/kibana_legacy/public/index.ts b/src/plugins/kibana_legacy/public/index.ts
index 03adb768cde20..ea5172f78a68f 100644
--- a/src/plugins/kibana_legacy/public/index.ts
+++ b/src/plugins/kibana_legacy/public/index.ts
@@ -14,7 +14,6 @@ export const plugin = (initializerContext: PluginInitializerContext) =>
export * from './plugin';
-export { initAngularBootstrap } from './angular_bootstrap';
export { PaginateDirectiveProvider, PaginateControlsDirectiveProvider } from './paginate/paginate';
export * from './angular';
export * from './notify';
diff --git a/src/plugins/kibana_legacy/public/mocks.ts b/src/plugins/kibana_legacy/public/mocks.ts
index 40834635cc570..6116c0682cb3b 100644
--- a/src/plugins/kibana_legacy/public/mocks.ts
+++ b/src/plugins/kibana_legacy/public/mocks.ts
@@ -22,6 +22,7 @@ const createStartContract = (): Start => ({
getHideWriteControls: jest.fn(),
},
loadFontAwesome: jest.fn(),
+ loadAngularBootstrap: jest.fn(),
});
export const kibanaLegacyPluginMock = {
diff --git a/src/plugins/kibana_legacy/public/notify/index.ts b/src/plugins/kibana_legacy/public/notify/index.ts
index a243059cb1918..d4dcaa77cc47a 100644
--- a/src/plugins/kibana_legacy/public/notify/index.ts
+++ b/src/plugins/kibana_legacy/public/notify/index.ts
@@ -6,5 +6,4 @@
* Side Public License, v 1.
*/
-export * from './toasts';
export * from './lib';
diff --git a/src/plugins/kibana_legacy/public/notify/toasts/TOAST_NOTIFICATIONS.md b/src/plugins/kibana_legacy/public/notify/toasts/TOAST_NOTIFICATIONS.md
deleted file mode 100644
index de6a51f3927d1..0000000000000
--- a/src/plugins/kibana_legacy/public/notify/toasts/TOAST_NOTIFICATIONS.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Toast notifications
-
-Use this service to surface toasts in the bottom-right corner of the screen. After a brief delay, they'll disappear. They're useful for notifying the user of state changes. See [the EUI docs](https://elastic.github.io/eui/) for more information on toasts and their role within the UI.
-
-## Importing the module
-
-```js
-import { toastNotifications } from 'ui/notify';
-```
-
-## Interface
-
-### Adding toasts
-
-For convenience, there are several methods which predefine the appearance of different types of toasts. Use these methods so that the same types of toasts look similar to the user.
-
-#### Default
-
-Neutral toast. Tell the user a change in state has occurred, which is not necessarily good or bad.
-
-```js
-toastNotifications.add('Copied to clipboard');
-```
-
-#### Success
-
-Let the user know that an action was successful, such as saving or deleting an object.
-
-```js
-toastNotifications.addSuccess('Your document was saved');
-```
-
-#### Warning
-
-If something OK or good happened, but perhaps wasn't perfect, show a warning toast.
-
-```js
-toastNotifications.addWarning('Your document was saved, but not its edit history');
-```
-
-#### Danger
-
-When the user initiated an action but the action failed, show them a danger toast.
-
-```js
-toastNotifications.addDanger('An error caused your document to be lost');
-```
-
-### Removing a toast
-
-Toasts will automatically be dismissed after a brief delay, but if for some reason you want to dismiss a toast, you can use the returned toast from one of the `add` methods and then pass it to `remove`.
-
-```js
-const toast = toastNotifications.add('Your document was saved');
-toastNotifications.remove(toast);
-```
-
-### Configuration options
-
-If you want to configure the toast further you can provide an object instead of a string. The properties of this object correspond to the `propTypes` accepted by the `EuiToast` component. Refer to [the EUI docs](https://elastic.github.io/eui/) for info on these `propTypes`.
-
-```js
-toastNotifications.add({
- title: 'Your document was saved',
- text: 'Only you have access to this document',
- color: 'success',
- iconType: 'check',
- 'data-test-subj': 'saveDocumentSuccess',
-});
-```
-
-Because the underlying components are React, you can use JSX to pass in React elements to the `text` prop. This gives you total flexibility over the content displayed within the toast.
-
-```js
-toastNotifications.add({
- title: 'Your document was saved',
- text: (
- ([]);
- toastsMock.get$.mockReturnValue(toasts$);
- const toastNotifications = new ToastNotifications(toastsMock);
- const onChangeSpy = jest.fn();
- toastNotifications.onChange(onChangeSpy);
- toasts$.next([{ id: 'toast1' }]);
- toasts$.next([]);
- expect(onChangeSpy).toHaveBeenCalledTimes(2);
- });
- });
-
- describe('addSuccess method', () => {
- test('adds a success toast', () => {
- const { toastNotifications, toastsMock } = setup();
- toastNotifications.addSuccess({});
- expect(toastsMock.addSuccess).toHaveBeenCalled();
- });
- });
-
- describe('addWarning method', () => {
- test('adds a warning toast', () => {
- const { toastNotifications, toastsMock } = setup();
- toastNotifications.addWarning({});
- expect(toastsMock.addWarning).toHaveBeenCalled();
- });
- });
-
- describe('addDanger method', () => {
- test('adds a danger toast', () => {
- const { toastNotifications, toastsMock } = setup();
- toastNotifications.addWarning({});
- expect(toastsMock.addWarning).toHaveBeenCalled();
- });
- });
- });
-});
diff --git a/src/plugins/kibana_legacy/public/notify/toasts/toast_notifications.ts b/src/plugins/kibana_legacy/public/notify/toasts/toast_notifications.ts
deleted file mode 100644
index e7ccbbca07b73..0000000000000
--- a/src/plugins/kibana_legacy/public/notify/toasts/toast_notifications.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { NotificationsSetup, Toast, ToastInput, ErrorToastOptions } from 'kibana/public';
-
-export class ToastNotifications {
- public list: Toast[] = [];
-
- private onChangeCallback?: () => void;
-
- constructor(private readonly toasts: NotificationsSetup['toasts']) {
- toasts.get$().subscribe((list) => {
- this.list = list;
-
- if (this.onChangeCallback) {
- this.onChangeCallback();
- }
- });
- }
-
- public onChange = (callback: () => void) => {
- this.onChangeCallback = callback;
- };
-
- public add = (toastOrTitle: ToastInput) => this.toasts.add(toastOrTitle);
- public remove = (toast: Toast) => this.toasts.remove(toast);
- public addSuccess = (toastOrTitle: ToastInput) => this.toasts.addSuccess(toastOrTitle);
- public addWarning = (toastOrTitle: ToastInput) => this.toasts.addWarning(toastOrTitle);
- public addDanger = (toastOrTitle: ToastInput) => this.toasts.addDanger(toastOrTitle);
- public addError = (error: Error, options: ErrorToastOptions) =>
- this.toasts.addError(error, options);
-}
diff --git a/src/plugins/kibana_legacy/public/plugin.ts b/src/plugins/kibana_legacy/public/plugin.ts
index 337fdb80da7e4..f60130d367b58 100644
--- a/src/plugins/kibana_legacy/public/plugin.ts
+++ b/src/plugins/kibana_legacy/public/plugin.ts
@@ -33,6 +33,14 @@ export class KibanaLegacyPlugin {
loadFontAwesome: async () => {
await import('./font_awesome');
},
+ /**
+ * Loads angular bootstrap modules. Should be removed once the last consumer has migrated to EUI
+ * @deprecated
+ */
+ loadAngularBootstrap: async () => {
+ const { initAngularBootstrap } = await import('./angular_bootstrap');
+ initAngularBootstrap();
+ },
/**
* @deprecated
* Just exported for wiring up with dashboard mode, should not be used.
diff --git a/src/plugins/kibana_legacy/public/utils/index.ts b/src/plugins/kibana_legacy/public/utils/index.ts
index db3c0af6c8cb9..94233558b4627 100644
--- a/src/plugins/kibana_legacy/public/utils/index.ts
+++ b/src/plugins/kibana_legacy/public/utils/index.ts
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/
-export * from './system_api';
// @ts-ignore
export { KbnAccessibleClickProvider } from './kbn_accessible_click';
// @ts-ignore
diff --git a/src/plugins/kibana_legacy/public/utils/system_api.ts b/src/plugins/kibana_legacy/public/utils/system_api.ts
deleted file mode 100644
index d0fe221935ba5..0000000000000
--- a/src/plugins/kibana_legacy/public/utils/system_api.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { IRequestConfig } from 'angular';
-
-const SYSTEM_REQUEST_HEADER_NAME = 'kbn-system-request';
-const LEGACY_SYSTEM_API_HEADER_NAME = 'kbn-system-api';
-
-/**
- * Adds a custom header designating request as system API
- * @param originalHeaders Object representing set of headers
- * @return Object representing set of headers, with system API header added in
- */
-export function addSystemApiHeader(originalHeaders: Record) {
- const systemApiHeaders = {
- [SYSTEM_REQUEST_HEADER_NAME]: true,
- };
- return {
- ...originalHeaders,
- ...systemApiHeaders,
- };
-}
-
-/**
- * Returns true if request is a system API request; false otherwise
- *
- * @param request Object Request object created by $http service
- * @return true if request is a system API request; false otherwise
- */
-export function isSystemApiRequest(request: IRequestConfig) {
- const { headers } = request;
- return (
- headers && (!!headers[SYSTEM_REQUEST_HEADER_NAME] || !!headers[LEGACY_SYSTEM_API_HEADER_NAME])
- );
-}
diff --git a/src/plugins/kibana_react/common/eui_styled_components.tsx b/src/plugins/kibana_react/common/eui_styled_components.tsx
index 10cd168da6faa..62876a03c7d83 100644
--- a/src/plugins/kibana_react/common/eui_styled_components.tsx
+++ b/src/plugins/kibana_react/common/eui_styled_components.tsx
@@ -6,15 +6,14 @@
* Side Public License, v 1.
*/
+import type { DecoratorFn } from '@storybook/react';
import React from 'react';
import * as styledComponents from 'styled-components';
import { ThemedStyledComponentsModule, ThemeProvider, ThemeProviderProps } from 'styled-components';
-
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import { euiThemeVars, euiLightVars, euiDarkVars } from '@kbn/ui-shared-deps/theme';
export interface EuiTheme {
- eui: typeof euiLightVars | typeof euiDarkVars;
+ eui: typeof euiThemeVars;
darkMode: boolean;
}
@@ -36,6 +35,16 @@ const EuiThemeProvider = <
/>
);
+/**
+ * Storybook decorator using the EUI theme provider. Uses the value from
+ * `globals` provided by the Storybook theme switcher.
+ */
+export const EuiThemeProviderDecorator: DecoratorFn = (storyFn, { globals }) => {
+ const darkMode = globals.euiTheme === 'v8.dark' || globals.euiTheme === 'v7.dark';
+
+ return {storyFn()} ;
+};
+
const {
default: euiStyled,
css,
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
index 523bf07f828c9..f4ca53a9a974e 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
@@ -42,7 +42,7 @@ export function TopNavMenuItem(props: TopNavMenuData) {
{upperFirst(props.label || props.id!)}
) : (
-
+
{upperFirst(props.label || props.id!)}
);
diff --git a/src/plugins/screenshot_mode/.i18nrc.json b/src/plugins/screenshot_mode/.i18nrc.json
deleted file mode 100644
index 79643fbb63d30..0000000000000
--- a/src/plugins/screenshot_mode/.i18nrc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "prefix": "screenshotMode",
- "paths": {
- "screenshotMode": "."
- },
- "translations": ["translations/ja-JP.json"]
-}
diff --git a/src/plugins/timelion/public/plugin.ts b/src/plugins/timelion/public/plugin.ts
index 6f8dbfdcc6704..63ea9a38e2795 100644
--- a/src/plugins/timelion/public/plugin.ts
+++ b/src/plugins/timelion/public/plugin.ts
@@ -19,7 +19,7 @@ import {
AppNavLinkStatus,
} from '../../../core/public';
import { Panel } from './panels/panel';
-import { initAngularBootstrap } from '../../kibana_legacy/public';
+import { KibanaLegacyStart } from '../../kibana_legacy/public';
import { createKbnUrlTracker } from '../../kibana_utils/public';
import { DataPublicPluginStart, esFilters, DataPublicPluginSetup } from '../../data/public';
import { NavigationPublicPluginStart } from '../../navigation/public';
@@ -41,6 +41,7 @@ export interface TimelionPluginStartDependencies {
visualizations: VisualizationsStart;
visTypeTimelion: VisTypeTimelionPluginStart;
savedObjects: SavedObjectsStart;
+ kibanaLegacy: KibanaLegacyStart;
}
/** @internal */
@@ -91,7 +92,6 @@ export class TimelionPlugin
stopUrlTracker();
};
- initAngularBootstrap();
core.application.register({
id: 'timelion',
title: 'Timelion',
@@ -103,6 +103,7 @@ export class TimelionPlugin
visTypeTimelion.isUiEnabled === false ? AppNavLinkStatus.hidden : AppNavLinkStatus.default,
mount: async (params: AppMountParameters) => {
const [coreStart, pluginsStart] = await core.getStartServices();
+ await pluginsStart.kibanaLegacy.loadAngularBootstrap();
this.currentHistory = params.history;
appMounted();
diff --git a/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js b/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js
index 65e26ddf6e03f..cbc3db6585a7d 100644
--- a/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js
+++ b/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js
@@ -15,7 +15,7 @@ import { round } from 'lodash';
import { getFieldFormatsRegistry } from '../../../../data/public/test_utils';
import { coreMock } from '../../../../../core/public/mocks';
-import { initAngularBootstrap } from '../../../../kibana_legacy/public';
+import { initAngularBootstrap } from '../../../../kibana_legacy/public/angular_bootstrap';
import { setUiSettings } from '../../../../data/public/services';
import { UI_SETTINGS } from '../../../../data/public/';
import { CSV_SEPARATOR_SETTING, CSV_QUOTE_VALUES_SETTING } from '../../../../share/public';
@@ -60,10 +60,12 @@ describe('Table Vis - AggTable Directive', function () {
initTableVisLegacyModule(tableVisModule);
};
+ beforeAll(async () => {
+ await initAngularBootstrap();
+ });
beforeEach(() => {
setUiSettings(core.uiSettings);
setFormatService(getFieldFormatsRegistry(core));
- initAngularBootstrap();
initLocalAngular();
angular.mock.module('kibana/table_vis');
angular.mock.inject(($injector, config) => {
diff --git a/src/plugins/vis_type_table/public/legacy/agg_table/agg_table_group.test.js b/src/plugins/vis_type_table/public/legacy/agg_table/agg_table_group.test.js
index 1c6630e30e5f7..ba04b2f449f6d 100644
--- a/src/plugins/vis_type_table/public/legacy/agg_table/agg_table_group.test.js
+++ b/src/plugins/vis_type_table/public/legacy/agg_table/agg_table_group.test.js
@@ -13,11 +13,11 @@ import expect from '@kbn/expect';
import { getFieldFormatsRegistry } from '../../../../data/public/test_utils';
import { coreMock } from '../../../../../core/public/mocks';
-import { initAngularBootstrap } from '../../../../kibana_legacy/public';
import { setUiSettings } from '../../../../data/public/services';
import { setFormatService } from '../../services';
import { getInnerAngular } from '../get_inner_angular';
import { initTableVisLegacyModule } from '../table_vis_legacy_module';
+import { initAngularBootstrap } from '../../../../kibana_legacy/public/angular_bootstrap';
import { tabifiedData } from './tabified_data';
const uiSettings = new Map();
@@ -40,10 +40,12 @@ describe('Table Vis - AggTableGroup Directive', function () {
initTableVisLegacyModule(tableVisModule);
};
+ beforeAll(async () => {
+ await initAngularBootstrap();
+ });
beforeEach(() => {
setUiSettings(core.uiSettings);
setFormatService(getFieldFormatsRegistry(core));
- initAngularBootstrap();
initLocalAngular();
angular.mock.module('kibana/table_vis');
angular.mock.inject(($injector) => {
diff --git a/src/plugins/vis_type_table/public/legacy/get_inner_angular.ts b/src/plugins/vis_type_table/public/legacy/get_inner_angular.ts
index 09fde318ee4df..412dd904a5e87 100644
--- a/src/plugins/vis_type_table/public/legacy/get_inner_angular.ts
+++ b/src/plugins/vis_type_table/public/legacy/get_inner_angular.ts
@@ -16,7 +16,6 @@ import 'angular-recursion';
import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
import { CoreStart, IUiSettingsClient, PluginInitializerContext } from 'kibana/public';
import {
- initAngularBootstrap,
PaginateDirectiveProvider,
PaginateControlsDirectiveProvider,
PrivateProvider,
@@ -24,8 +23,6 @@ import {
KbnAccessibleClickProvider,
} from '../../../kibana_legacy/public';
-initAngularBootstrap();
-
const thirdPartyAngularDependencies = ['ngSanitize', 'ui.bootstrap', 'RecursionHelper'];
export function getAngularModule(name: string, core: CoreStart, context: PluginInitializerContext) {
diff --git a/src/plugins/vis_type_table/public/legacy/paginated_table/paginated_table.test.ts b/src/plugins/vis_type_table/public/legacy/paginated_table/paginated_table.test.ts
index 77148803e7978..3feff52f86792 100644
--- a/src/plugins/vis_type_table/public/legacy/paginated_table/paginated_table.test.ts
+++ b/src/plugins/vis_type_table/public/legacy/paginated_table/paginated_table.test.ts
@@ -12,6 +12,7 @@ import $ from 'jquery';
import 'angular-sanitize';
import 'angular-mocks';
+import { initAngularBootstrap } from '../../../../kibana_legacy/public/angular_bootstrap';
import { getAngularModule } from '../get_inner_angular';
import { initTableVisLegacyModule } from '../table_vis_legacy_module';
import { coreMock } from '../../../../../core/public/mocks';
@@ -56,6 +57,10 @@ describe('Table Vis - Paginated table', () => {
const defaultPerPage = 10;
let paginatedTable: any;
+ beforeAll(async () => {
+ await initAngularBootstrap();
+ });
+
const initLocalAngular = () => {
const tableVisModule = getAngularModule(
'kibana/table_vis',
diff --git a/src/plugins/vis_type_table/public/legacy/table_vis_controller.test.ts b/src/plugins/vis_type_table/public/legacy/table_vis_controller.test.ts
index 36a9cc9cce77f..f4a742ea16cb4 100644
--- a/src/plugins/vis_type_table/public/legacy/table_vis_controller.test.ts
+++ b/src/plugins/vis_type_table/public/legacy/table_vis_controller.test.ts
@@ -13,6 +13,7 @@ import $ from 'jquery';
import { getAngularModule } from './get_inner_angular';
import { initTableVisLegacyModule } from './table_vis_legacy_module';
+import { initAngularBootstrap } from '../../../kibana_legacy/public/angular_bootstrap';
import { tableVisLegacyTypeDefinition } from './table_vis_legacy_type';
import { Vis } from '../../../visualizations/public';
import { stubFields } from '../../../data/public/stubs';
@@ -76,6 +77,9 @@ describe('Table Vis - Controller', () => {
initTableVisLegacyModule(tableVisModule);
};
+ beforeAll(async () => {
+ await initAngularBootstrap();
+ });
beforeEach(initLocalAngular);
beforeEach(angular.mock.module('kibana/table_vis'));
diff --git a/src/plugins/vis_type_table/public/legacy/vis_controller.ts b/src/plugins/vis_type_table/public/legacy/vis_controller.ts
index ee446c58c0013..ec198aa96f1f9 100644
--- a/src/plugins/vis_type_table/public/legacy/vis_controller.ts
+++ b/src/plugins/vis_type_table/public/legacy/vis_controller.ts
@@ -56,6 +56,7 @@ export function getTableVisualizationControllerClass(
async initLocalAngular() {
if (!this.tableVisModule) {
const [coreStart, { kibanaLegacy }] = await core.getStartServices();
+ await kibanaLegacy.loadAngularBootstrap();
this.tableVisModule = getAngularModule(innerAngularName, coreStart, context);
initTableVisLegacyModule(this.tableVisModule);
kibanaLegacy.loadFontAwesome();
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js
index f167bc35c06e9..a232a1dc03ae3 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js
@@ -23,6 +23,7 @@ import {
EuiFormRow,
EuiSpacer,
} from '@elastic/eui';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
export function CumulativeSumAgg(props) {
const { model, siblings, fields, indexPattern } = props;
@@ -70,7 +71,7 @@ export function CumulativeSumAgg(props) {
onChange={handleSelectChange('field')}
metrics={siblings}
metric={model}
- fields={fields[indexPattern]}
+ fields={fields[getIndexPatternKey(indexPattern)]}
value={model.field}
exclude={[METRIC_TYPES.TOP_HIT]}
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js
index 9bed7015b0245..616f40128ff22 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js
@@ -25,6 +25,7 @@ import {
EuiSpacer,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
export const DerivativeAgg = (props) => {
const { siblings, fields, indexPattern } = props;
@@ -80,7 +81,7 @@ export const DerivativeAgg = (props) => {
onChange={handleSelectChange('field')}
metrics={siblings}
metric={model}
- fields={fields[indexPattern]}
+ fields={fields[getIndexPatternKey(indexPattern)]}
value={model.field}
exclude={[METRIC_TYPES.TOP_HIT]}
fullWidth
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
index 79f70f45d6256..a3ce43f97a36a 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
@@ -26,6 +26,7 @@ import {
EuiFieldNumber,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
const DEFAULTS = {
model_type: MODEL_TYPES.UNWEIGHTED,
@@ -141,7 +142,7 @@ export const MovingAverageAgg = (props) => {
onChange={handleSelectChange('field')}
metrics={siblings}
metric={model}
- fields={fields[indexPattern]}
+ fields={fields[getIndexPatternKey(indexPattern)]}
value={model.field}
exclude={[METRIC_TYPES.TOP_HIT]}
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js
index 156a042abb4e2..c974f5d5f05f5 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js
@@ -23,6 +23,7 @@ import {
EuiSpacer,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
export const PositiveOnlyAgg = (props) => {
const { siblings, fields, indexPattern } = props;
@@ -74,7 +75,7 @@ export const PositiveOnlyAgg = (props) => {
onChange={handleSelectChange('field')}
metrics={siblings}
metric={model}
- fields={fields[indexPattern]}
+ fields={fields[getIndexPatternKey(indexPattern)]}
value={model.field}
exclude={[METRIC_TYPES.TOP_HIT]}
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
index a553b1a4c6671..efc2a72c3dd67 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
@@ -24,6 +24,7 @@ import {
EuiSpacer,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
export const SerialDiffAgg = (props) => {
const { siblings, fields, indexPattern, model } = props;
@@ -74,7 +75,7 @@ export const SerialDiffAgg = (props) => {
onChange={handleSelectChange('field')}
metrics={siblings}
metric={model}
- fields={fields[indexPattern]}
+ fields={fields[getIndexPatternKey(indexPattern)]}
value={model.field}
exclude={[METRIC_TYPES.TOP_HIT]}
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js
index 9a30988d252e5..d2b3f45a70164 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js
@@ -27,6 +27,7 @@ import {
EuiSpacer,
} from '@elastic/eui';
import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
const StandardSiblingAggUi = (props) => {
const { siblings, intl, fields, indexPattern } = props;
@@ -147,7 +148,7 @@ const StandardSiblingAggUi = (props) => {
onChange={handleSelectChange('field')}
exclude={[METRIC_TYPES.PERCENTILE, METRIC_TYPES.TOP_HIT]}
metrics={siblings}
- fields={fields[indexPattern]}
+ fields={fields[getIndexPatternKey(indexPattern)]}
metric={model}
value={model.field}
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
index 546c09cdf34fd..b9ef2d8913574 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import React from 'react';
+import React, { useMemo, useEffect } from 'react';
import { AggRow } from './agg_row';
import { AggSelect } from './agg_select';
import { FieldSelect } from './field_select';
@@ -62,6 +62,7 @@ const getAggWithOptions = (field = {}, fieldTypesRestriction) => {
},
];
case KBN_FIELD_TYPES.STRING:
+ case KBN_FIELD_TYPES.DATE:
return [
{
label: i18n.translate('visTypeTimeseries.topHit.aggWithOptions.concatenate', {
@@ -91,16 +92,18 @@ const getOrderOptions = () => [
},
];
+const AGG_WITH_KEY = 'agg_with';
const ORDER_DATE_RESTRICT_FIELDS = [KBN_FIELD_TYPES.DATE];
+const getModelDefaults = () => ({
+ size: 1,
+ order: 'desc',
+ [AGG_WITH_KEY]: 'noop',
+});
+
const TopHitAggUi = (props) => {
const { fields, series, panel } = props;
- const defaults = {
- size: 1,
- agg_with: 'noop',
- order: 'desc',
- };
- const model = { ...defaults, ...props.model };
+ const model = useMemo(() => ({ ...getModelDefaults(), ...props.model }), [props.model]);
const indexPattern = series.override_index_pattern
? series.series_index_pattern
: panel.index_pattern;
@@ -110,7 +113,7 @@ const TopHitAggUi = (props) => {
PANEL_TYPES.METRIC,
PANEL_TYPES.MARKDOWN,
].includes(panel.type)
- ? [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.STRING]
+ ? [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.STRING, KBN_FIELD_TYPES.DATE]
: [KBN_FIELD_TYPES.NUMBER];
const handleChange = createChangeHandler(props.onChange, model);
@@ -124,13 +127,23 @@ const TopHitAggUi = (props) => {
const htmlId = htmlIdGenerator();
const selectedAggWithOption = aggWithOptions.find((option) => {
- return model.agg_with === option.value;
+ return model[AGG_WITH_KEY] === option.value;
});
const selectedOrderOption = orderOptions.find((option) => {
return model.order === option.value;
});
+ useEffect(() => {
+ const defaultFn = aggWithOptions?.[0]?.value;
+ const aggWith = model[AGG_WITH_KEY];
+ if (aggWith && defaultFn && aggWith !== defaultFn && !selectedAggWithOption) {
+ handleChange({
+ [AGG_WITH_KEY]: defaultFn,
+ });
+ }
+ }, [model, selectedAggWithOption, aggWithOptions, handleChange]);
+
return (
{
{
)}
options={aggWithOptions}
selectedOptions={selectedAggWithOption ? [selectedAggWithOption] : []}
- onChange={handleSelectChange('agg_with')}
+ onChange={handleSelectChange(AGG_WITH_KEY)}
singleSelection={{ asPlainText: true }}
+ data-test-subj="topHitAggregateWithComboBox"
/>
@@ -231,6 +245,7 @@ const TopHitAggUi = (props) => {
onChange={handleSelectChange('order_by')}
indexPattern={indexPattern}
fields={fields}
+ data-test-subj="topHitOrderByFieldSelect"
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js
index b9d554e254bcc..ba06b0fffd307 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js
@@ -15,6 +15,7 @@ import { AddDeleteButtons } from '../add_delete_buttons';
import { collectionActions } from '../lib/collection_actions';
import { MetricSelect } from './metric_select';
import { EuiFlexGroup, EuiFlexItem, EuiFieldText } from '@elastic/eui';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
export const newVariable = (opts) => ({ id: uuid.v1(), name: '', field: '', ...opts });
@@ -59,7 +60,7 @@ export class CalculationVars extends Component {
metrics={this.props.metrics}
metric={this.props.model}
value={row.field}
- fields={this.props.fields[this.props.indexPattern]}
+ fields={this.props.fields[getIndexPatternKey(this.props.indexPattern)]}
includeSiblings={this.props.includeSiblings}
exclude={this.props.exclude}
/>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js
index c1d82a182e509..9bccc13d19269 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js
@@ -16,7 +16,7 @@ export const createTickFormatter = (format = '0,0.[00]', template, getConfig = n
const fieldFormats = getFieldFormats();
if (!template) template = '{{value}}';
- const render = handlebars.compile(template, { knownHelpersOnly: true });
+ const render = handlebars.compile(template, { noEscape: true, knownHelpersOnly: true });
let formatter;
if (isDuration(format)) {
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx
index 9ba0822402562..3633f8add7457 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx
@@ -207,6 +207,7 @@ export class TablePanelConfig extends Component<
@@ -160,6 +163,7 @@ export const SplitByTermsUI = ({
- {getValueOrEmpty(rowDisplay)}
+ {rowDisplay}
{columns}
);
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
index 16e7b9d6072cb..13b890189325c 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
@@ -111,7 +111,7 @@ export const bucketTransform = {
docs: {
top_hits: {
size: bucket.size,
- _source: { includes: [bucket.field] },
+ fields: [bucket.field],
},
},
},
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js
index 32d17ef6d6cb7..90df3f2675959 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js
@@ -45,10 +45,10 @@ export const getAggValue = (row, metric) => {
}
const hits = get(row, [metric.id, 'docs', 'hits', 'hits'], []);
- const values = hits.map((doc) => get(doc, `_source.${metric.field}`));
+ const values = hits.map((doc) => doc.fields[metric.field]);
const aggWith = (metric.agg_with && aggFns[metric.agg_with]) || aggFns.noop;
- return aggWith(values);
+ return aggWith(values.flat());
case METRIC_TYPES.COUNT:
return get(row, 'doc_count', null);
default:
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js
index a23c57f567563..ecbdd1563c304 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js
@@ -67,11 +67,7 @@ describe('getAggValue', () => {
doc_count: 1,
docs: {
hits: {
- hits: [
- { _source: { example: { value: 25 } } },
- { _source: { example: { value: 25 } } },
- { _source: { example: { value: 25 } } },
- ],
+ hits: [{ fields: { 'example.value': [25, 25, 25] } }],
},
},
},
diff --git a/test/examples/expressions_explorer/expressions.ts b/test/examples/expressions_explorer/expressions.ts
index 4c240653b5fdd..9aef64a392a7b 100644
--- a/test/examples/expressions_explorer/expressions.ts
+++ b/test/examples/expressions_explorer/expressions.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
await retry.try(async () => {
const text = await testSubjects.getVisibleText('expressionResult');
expect(text).to.be(
- '{\n "type": "render",\n "as": "markdown",\n "value": {\n "content": "## expressions explorer",\n "font": {\n "type": "style",\n "spec": {\n "fontFamily": "\'Open Sans\', Helvetica, Arial, sans-serif",\n "fontWeight": "normal",\n "fontStyle": "normal",\n "textDecoration": "none",\n "textAlign": "left",\n "fontSize": "14px",\n "lineHeight": "1"\n },\n "css": "font-family:\'Open Sans\', Helvetica, Arial, sans-serif;font-weight:normal;font-style:normal;text-decoration:none;text-align:left;font-size:14px;line-height:1"\n },\n "openLinksInNewTab": false\n }\n}'
+ '{\n "type": "render",\n "as": "markdown_vis",\n "value": {\n "visType": "markdown",\n "visParams": {\n "markdown": "## expressions explorer",\n "openLinksInNewTab": false,\n "fontSize": 12\n }\n }\n}'
);
});
});
diff --git a/test/functional/apps/discover/_field_data.ts b/test/functional/apps/discover/_field_data.ts
index 5ab6495686726..ec9f9cf65e0fa 100644
--- a/test/functional/apps/discover/_field_data.ts
+++ b/test/functional/apps/discover/_field_data.ts
@@ -33,8 +33,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
await PageObjects.common.navigateToApp('discover');
});
- // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/104466
- describe.skip('field data', function () {
+
+ describe('field data', function () {
it('search php should show the correct hit count', async function () {
const expectedHitCount = '445';
await retry.try(async function () {
diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts
index b396f172f6961..a17bf53e7f478 100644
--- a/test/functional/apps/discover/index.ts
+++ b/test/functional/apps/discover/index.ts
@@ -12,7 +12,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const browser = getService('browser');
- describe('discover app', function () {
+ // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/104466
+ describe.skip('discover app', function () {
this.tags('ciGroup6');
before(function () {
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
index ca310493960f5..49b2ad8f9646a 100644
--- a/test/functional/apps/visualize/_tsvb_chart.ts
+++ b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -24,6 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'timePicker',
'visChart',
'common',
+ 'settings',
]);
describe('visual builder', function describeIndexTests() {
@@ -44,14 +45,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
describe('metric', () => {
+ const { visualBuilder } = PageObjects;
+
beforeEach(async () => {
- await PageObjects.visualBuilder.resetPage();
- await PageObjects.visualBuilder.clickMetric();
- await PageObjects.visualBuilder.checkMetricTabIsPresent();
- await PageObjects.visualBuilder.clickPanelOptions('metric');
- await PageObjects.visualBuilder.setMetricsDataTimerangeMode('Last value');
- await PageObjects.visualBuilder.setDropLastBucket(true);
- await PageObjects.visualBuilder.clickDataTab('metric');
+ await visualBuilder.resetPage();
+ await visualBuilder.clickMetric();
+ await visualBuilder.checkMetricTabIsPresent();
+ await visualBuilder.clickPanelOptions('metric');
+ await visualBuilder.setMetricsDataTimerangeMode('Last value');
+ await visualBuilder.setDropLastBucket(true);
+ await visualBuilder.clickDataTab('metric');
});
it('should not have inspector enabled', async () => {
@@ -59,28 +62,98 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
it('should show correct data', async () => {
- const value = await PageObjects.visualBuilder.getMetricValue();
+ const value = await visualBuilder.getMetricValue();
expect(value).to.eql('156');
});
it('should show correct data with Math Aggregation', async () => {
- await PageObjects.visualBuilder.createNewAgg();
- await PageObjects.visualBuilder.selectAggType('math', 1);
- await PageObjects.visualBuilder.fillInVariable();
- await PageObjects.visualBuilder.fillInExpression('params.test + 1');
- const value = await PageObjects.visualBuilder.getMetricValue();
+ await visualBuilder.createNewAgg();
+ await visualBuilder.selectAggType('math', 1);
+ await visualBuilder.fillInVariable();
+ await visualBuilder.fillInExpression('params.test + 1');
+ const value = await visualBuilder.getMetricValue();
expect(value).to.eql('157');
});
it('should populate fields for basic functions', async () => {
- const { visualBuilder } = PageObjects;
-
await visualBuilder.selectAggType('Average');
await visualBuilder.setFieldForAggregation('machine.ram');
const isFieldForAggregationValid = await visualBuilder.checkFieldForAggregationValidity();
expect(isFieldForAggregationValid).to.be(true);
});
+
+ it('should show correct data for Value Count with Entire time range mode', async () => {
+ await visualBuilder.selectAggType('Value Count');
+ await visualBuilder.setFieldForAggregation('machine.ram');
+
+ await visualBuilder.clickPanelOptions('metric');
+ await visualBuilder.setMetricsDataTimerangeMode('Entire time range');
+
+ const value = await visualBuilder.getMetricValue();
+ expect(value).to.eql('13,492');
+ });
+
+ it('should show same data for kibana and string index pattern modes', async () => {
+ await visualBuilder.selectAggType('Max');
+ await visualBuilder.setFieldForAggregation('machine.ram');
+ const kibanaIndexPatternModeValue = await visualBuilder.getMetricValue();
+
+ await visualBuilder.clickPanelOptions('metric');
+ await visualBuilder.switchIndexPatternSelectionMode(false);
+ const stringIndexPatternModeValue = await visualBuilder.getMetricValue();
+
+ expect(kibanaIndexPatternModeValue).to.eql(stringIndexPatternModeValue);
+ expect(kibanaIndexPatternModeValue).to.eql('32,212,254,720');
+ });
+
+ describe('Color rules', () => {
+ beforeEach(async () => {
+ await visualBuilder.selectAggType('Min');
+ await visualBuilder.setFieldForAggregation('machine.ram');
+
+ await visualBuilder.clickPanelOptions('metric');
+ await visualBuilder.setColorRuleOperator('>= greater than or equal');
+ await visualBuilder.setColorRuleValue(0);
+ });
+
+ it('should apply color rules to visualization background', async () => {
+ await visualBuilder.setColorPickerValue('#FFCFDF');
+
+ const backGroundStyle = await visualBuilder.getBackgroundStyle();
+ expect(backGroundStyle).to.eql('background-color: rgb(255, 207, 223);');
+ });
+
+ it('should apply color rules to metric value', async () => {
+ await visualBuilder.setColorPickerValue('#AD7DE6', 1);
+
+ const backGroundStyle = await visualBuilder.getMetricValueStyle();
+ expect(backGroundStyle).to.eql('color: rgb(173, 125, 230);');
+ });
+ });
+
+ describe('Top Hit aggregation', () => {
+ beforeEach(async () => {
+ await visualBuilder.selectAggType('Top Hit');
+ await visualBuilder.setTopHitOrderByField('@timestamp');
+ });
+
+ it('should show correct data for string type field', async () => {
+ await visualBuilder.setFieldForAggregation('machine.os.raw');
+ await visualBuilder.setTopHitAggregateWithOption('Concatenate');
+
+ const value = await visualBuilder.getMetricValue();
+ expect(value).to.eql('win 7');
+ });
+
+ it('should show correct data for runtime field', async () => {
+ await visualBuilder.setFieldForAggregation('hello_world_runtime_field');
+ await visualBuilder.setTopHitAggregateWithOption('Concatenate');
+
+ const value = await visualBuilder.getMetricValue();
+ expect(value).to.eql('hello world');
+ });
+ });
});
describe('gauge', () => {
diff --git a/test/functional/apps/visualize/_tsvb_table.ts b/test/functional/apps/visualize/_tsvb_table.ts
index abe3b799e4711..de0771d3c8ec5 100644
--- a/test/functional/apps/visualize/_tsvb_table.ts
+++ b/test/functional/apps/visualize/_tsvb_table.ts
@@ -10,12 +10,14 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
-export default function ({ getPageObjects }: FtrProviderContext) {
+export default function ({ getPageObjects, getService }: FtrProviderContext) {
const { visualBuilder, visualize, visChart } = getPageObjects([
'visualBuilder',
'visualize',
'visChart',
]);
+ const findService = getService('find');
+ const retry = getService('retry');
describe('visual builder', function describeIndexTests() {
before(async () => {
@@ -43,6 +45,19 @@ export default function ({ getPageObjects }: FtrProviderContext) {
expect(tableData).to.be(EXPECTED);
});
+ it('should display drilldown urls', async () => {
+ const baseURL = 'http://elastic.co/foo/';
+
+ await visualBuilder.clickPanelOptions('table');
+ await visualBuilder.setDrilldownUrl(`${baseURL}{{key}}`);
+
+ await retry.try(async () => {
+ const links = await findService.allByCssSelector(`a[href="${baseURL}ios"]`);
+
+ expect(links.length).to.be(1);
+ });
+ });
+
it('should display correct values on changing metrics aggregation', async () => {
const EXPECTED = 'OS Cardinality\nwin 8 12\nwin xp 9\nwin 7 8\nios 5\nosx 3';
diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts
index a0c9d806facc6..cc57d58348180 100644
--- a/test/functional/apps/visualize/_tsvb_time_series.ts
+++ b/test/functional/apps/visualize/_tsvb_time_series.ts
@@ -155,7 +155,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('Clicking on the chart', () => {
it(`should create a filter`, async () => {
- await visualBuilder.setMetricsGroupByTerms('machine.os.raw');
+ await visualBuilder.setMetricsGroupByTerms('machine.os.raw', {
+ include: 'win 7',
+ exclude: 'ios',
+ });
await visualBuilder.clickSeriesOption();
await testSubjects.click('visualizeSaveButton');
diff --git a/test/functional/fixtures/kbn_archiver/visualize.json b/test/functional/fixtures/kbn_archiver/visualize.json
index 660da856964b4..225dc0592e87d 100644
--- a/test/functional/fixtures/kbn_archiver/visualize.json
+++ b/test/functional/fixtures/kbn_archiver/visualize.json
@@ -3,6 +3,7 @@
"fieldAttrs": "{\"utc_time\":{\"customLabel\":\"UTC time\"}}",
"fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}",
"fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
+ "runtimeFieldMap":"{\"hello_world_runtime_field\":{\"type\":\"keyword\",\"script\":{\"source\":\"emit('hello world')\"}}}",
"timeFieldName": "@timestamp",
"title": "logstash-*"
},
@@ -301,4 +302,4 @@
"references": [],
"type": "index-pattern",
"version": "WzE1LDFd"
-}
\ No newline at end of file
+}
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index ea11560e37b6f..fd89a88658b3a 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -277,6 +277,13 @@ export class VisualBuilderPageObject extends FtrService {
await this.comboBox.setElement(formatterEl, formatter, { clickWithMouse: true });
}
+ public async setDrilldownUrl(value: string) {
+ const drilldownEl = await this.testSubjects.find('drilldownUrl');
+
+ await drilldownEl.clearValue();
+ await drilldownEl.type(value);
+ }
+
/**
* set duration formatter additional settings
*
@@ -568,6 +575,42 @@ export class VisualBuilderPageObject extends FtrService {
await this.testSubjects.existOrFail('euiColorPickerPopover', { timeout: 5000 });
}
+ public async setColorPickerValue(colorHex: string, nth: number = 0): Promise {
+ const picker = await this.find.allByCssSelector('.tvbColorPicker button');
+ await picker[nth].clickMouseButton();
+ await this.checkColorPickerPopUpIsPresent();
+ await this.find.setValue('.euiColorPicker input', colorHex);
+ await this.visChart.waitForVisualizationRenderingStabilized();
+ }
+
+ public async setColorRuleOperator(condition: string): Promise {
+ await this.retry.try(async () => {
+ await this.comboBox.clearInputField('colorRuleOperator');
+ await this.comboBox.set('colorRuleOperator', condition);
+ });
+ }
+
+ public async setColorRuleValue(value: number): Promise {
+ await this.retry.try(async () => {
+ const colorRuleValueInput = await this.find.byCssSelector(
+ '[data-test-subj="colorRuleValue"]'
+ );
+ await colorRuleValueInput.type(value.toString());
+ });
+ }
+
+ public async getBackgroundStyle(): Promise {
+ await this.visChart.waitForVisualizationRenderingStabilized();
+ const visualization = await this.find.byClassName('tvbVis');
+ return await visualization.getAttribute('style');
+ }
+
+ public async getMetricValueStyle(): Promise {
+ await this.visChart.waitForVisualizationRenderingStabilized();
+ const metricValue = await this.find.byCssSelector('[data-test-subj="tsvbMetricValue"]');
+ return await metricValue.getAttribute('style');
+ }
+
public async changePanelPreview(nth: number = 0): Promise {
const prevRenderingCount = await this.visChart.getVisualizationRenderingCount();
const changePreviewBtnArray = await this.testSubjects.findAll('AddActivatePanelBtn');
@@ -628,7 +671,10 @@ export class VisualBuilderPageObject extends FtrService {
return await this.find.allByCssSelector('.tvbSeriesEditor');
}
- public async setMetricsGroupByTerms(field: string) {
+ public async setMetricsGroupByTerms(
+ field: string,
+ filtering: { include?: string; exclude?: string } = {}
+ ) {
const groupBy = await this.find.byCssSelector(
'.tvbAggRow--split [data-test-subj="comboBoxInput"]'
);
@@ -636,6 +682,22 @@ export class VisualBuilderPageObject extends FtrService {
await this.common.sleep(1000);
const byField = await this.testSubjects.find('groupByField');
await this.comboBox.setElement(byField, field);
+
+ await this.setMetricsGroupByFiltering(filtering.include, filtering.exclude);
+ }
+
+ public async setMetricsGroupByFiltering(include?: string, exclude?: string) {
+ const setFilterValue = async (value: string | undefined, subjectKey: string) => {
+ if (typeof value === 'string') {
+ const valueSubject = await this.testSubjects.find(subjectKey);
+
+ await valueSubject.clearValue();
+ await valueSubject.type(value);
+ }
+ };
+
+ await setFilterValue(include, 'groupByInclude');
+ await setFilterValue(exclude, 'groupByExclude');
}
public async checkSelectedMetricsGroupByValue(value: string) {
@@ -654,4 +716,15 @@ export class VisualBuilderPageObject extends FtrService {
const dataTimeRangeMode = await this.testSubjects.find('dataTimeRangeMode');
return await this.comboBox.isOptionSelected(dataTimeRangeMode, value);
}
+
+ public async setTopHitAggregateWithOption(option: string): Promise {
+ await this.comboBox.set('topHitAggregateWithComboBox', option);
+ }
+
+ public async setTopHitOrderByField(timeField: string) {
+ await this.retry.try(async () => {
+ await this.comboBox.clearInputField('topHitOrderByFieldSelect');
+ await this.comboBox.set('topHitOrderByFieldSelect', timeField);
+ });
+ }
}
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json
index b704274a58aa4..e92dc717ae25e 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json
@@ -6,7 +6,8 @@
"types": [
"node",
"jest",
- "react"
+ "react",
+ "@emotion/react/types/css-prop"
]
},
"include": [
diff --git a/test/scripts/jenkins_build_load_testing.sh b/test/scripts/jenkins_build_load_testing.sh
index d7c7bda83c9ef..667540515fc83 100755
--- a/test/scripts/jenkins_build_load_testing.sh
+++ b/test/scripts/jenkins_build_load_testing.sh
@@ -53,6 +53,9 @@ echo "cloud.auth: ${USER_FROM_VAULT}:${PASS_FROM_VAULT}" >> cfg/metricbeat/metri
cp cfg/metricbeat/metricbeat.yml $KIBANA_DIR/metricbeat-install/metricbeat.yml
# Disable system monitoring: enabled for now to have more data
#mv $KIBANA_DIR/metricbeat-install/modules.d/system.yml $KIBANA_DIR/metricbeat-install/modules.d/system.yml.disabled
+echo " -> Building puppeteer project"
+cd puppeteer
+yarn install && yarn build
popd
# doesn't persist, also set in kibanaPipeline.groovy
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 8cf33d93a4067..dccbe8d715c51 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -6,7 +6,7 @@
"emitDeclarationOnly": true,
"declaration": true,
"declarationMap": true,
- "types": ["node", "resize-observer-polyfill"]
+ "types": ["node", "resize-observer-polyfill", "@emotion/react/types/css-prop"]
},
"include": [
"**/*",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index cc8b66848a394..0c8fec7c88cda 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -12,7 +12,10 @@
// Allows for importing from `kibana` package for the exported types.
"kibana": ["./kibana"],
"kibana/public": ["src/core/public"],
- "kibana/server": ["src/core/server"]
+ "kibana/server": ["src/core/server"],
+ "@emotion/core": [
+ "typings/@emotion"
+ ],
},
// Support .tsx files and transform JSX into calls to React.createElement
"jsx": "react",
@@ -62,7 +65,8 @@
"flot",
"jest-styled-components",
"@testing-library/jest-dom",
- "resize-observer-polyfill"
+ "resize-observer-polyfill",
+ "@emotion/react/types/css-prop"
]
}
}
diff --git a/tsconfig.json b/tsconfig.json
index f6df8fcbb6406..082325306e379 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -76,7 +76,6 @@
{ "path": "./x-pack/plugins/canvas/tsconfig.json" },
{ "path": "./x-pack/plugins/cases/tsconfig.json" },
{ "path": "./x-pack/plugins/cloud/tsconfig.json" },
- { "path": "./x-pack/plugins/console_extensions/tsconfig.json" },
{ "path": "./x-pack/plugins/data_enhanced/tsconfig.json" },
{ "path": "./x-pack/plugins/dashboard_mode/tsconfig.json" },
{ "path": "./x-pack/plugins/discover_enhanced/tsconfig.json" },
diff --git a/tsconfig.refs.json b/tsconfig.refs.json
index e08b50cc055c1..bbaf18d29ae2a 100644
--- a/tsconfig.refs.json
+++ b/tsconfig.refs.json
@@ -63,7 +63,6 @@
{ "path": "./x-pack/plugins/canvas/tsconfig.json" },
{ "path": "./x-pack/plugins/cases/tsconfig.json" },
{ "path": "./x-pack/plugins/cloud/tsconfig.json" },
- { "path": "./x-pack/plugins/console_extensions/tsconfig.json" },
{ "path": "./x-pack/plugins/dashboard_enhanced/tsconfig.json" },
{ "path": "./x-pack/plugins/data_enhanced/tsconfig.json" },
{ "path": "./x-pack/plugins/dashboard_mode/tsconfig.json" },
diff --git a/typings/@emotion/index.d.ts b/typings/@emotion/index.d.ts
new file mode 100644
index 0000000000000..2a5e63a3e29ef
--- /dev/null
+++ b/typings/@emotion/index.d.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+// Stub @emotion/core
+// Remove when @storybook has moved to @emotion v11
+// https://github.com/storybookjs/storybook/issues/13145
+export {};
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.mock.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.mock.ts
index 4e4cd4419a5a2..5e3dd2019d0a0 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.mock.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.mock.ts
@@ -16,12 +16,13 @@ const createAlertingAuthorizationMock = () => {
ensureAuthorized: jest.fn(),
filterByRuleTypeAuthorization: jest.fn(),
getFindAuthorizationFilter: jest.fn(),
+ getAugmentedRuleTypesWithAuthorization: jest.fn(),
};
return mocked;
};
export const alertingAuthorizationMock: {
- create: () => AlertingAuthorizationMock;
+ create: () => jest.Mocked>;
} = {
create: createAlertingAuthorizationMock,
};
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
index c07148f03c684..4b1fc7f1a7ccb 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
@@ -1944,4 +1944,184 @@ describe('AlertingAuthorization', () => {
`);
});
});
+
+ describe('getAugmentedRuleTypesWithAuthorization', () => {
+ const myOtherAppAlertType: RegistryAlertType = {
+ actionGroups: [],
+ actionVariables: undefined,
+ defaultActionGroupId: 'default',
+ minimumLicenseRequired: 'basic',
+ recoveryActionGroup: RecoveredActionGroup,
+ id: 'myOtherAppAlertType',
+ name: 'myOtherAppAlertType',
+ producer: 'alerts',
+ enabledInLicense: true,
+ isExportable: true,
+ };
+ const myAppAlertType: RegistryAlertType = {
+ actionGroups: [],
+ actionVariables: undefined,
+ defaultActionGroupId: 'default',
+ minimumLicenseRequired: 'basic',
+ recoveryActionGroup: RecoveredActionGroup,
+ id: 'myAppAlertType',
+ name: 'myAppAlertType',
+ producer: 'myApp',
+ enabledInLicense: true,
+ isExportable: true,
+ };
+ const mySecondAppAlertType: RegistryAlertType = {
+ actionGroups: [],
+ actionVariables: undefined,
+ defaultActionGroupId: 'default',
+ minimumLicenseRequired: 'basic',
+ recoveryActionGroup: RecoveredActionGroup,
+ id: 'mySecondAppAlertType',
+ name: 'mySecondAppAlertType',
+ producer: 'myApp',
+ enabledInLicense: true,
+ isExportable: true,
+ };
+ const setOfAlertTypes = new Set([myAppAlertType, myOtherAppAlertType, mySecondAppAlertType]);
+
+ test('it returns authorized rule types given a set of feature ids', async () => {
+ const { authorization } = mockSecurity();
+ const checkPrivileges: jest.MockedFunction<
+ ReturnType
+ > = jest.fn();
+ authorization.checkPrivilegesDynamicallyWithRequest.mockReturnValue(checkPrivileges);
+ checkPrivileges.mockResolvedValueOnce({
+ username: 'some-user',
+ hasAllRequested: false,
+ privileges: {
+ kibana: [
+ {
+ privilege: mockAuthorizationAction('myOtherAppAlertType', 'myApp', 'alert', 'find'),
+ authorized: true,
+ },
+ ],
+ },
+ });
+ const alertAuthorization = new AlertingAuthorization({
+ request,
+ authorization,
+ alertTypeRegistry,
+ features,
+ auditLogger,
+ getSpace,
+ exemptConsumerIds,
+ });
+ alertTypeRegistry.list.mockReturnValue(setOfAlertTypes);
+
+ await expect(
+ alertAuthorization.getAugmentedRuleTypesWithAuthorization(
+ ['myApp'],
+ [ReadOperations.Find, ReadOperations.Get, WriteOperations.Update],
+ AlertingAuthorizationEntity.Alert
+ )
+ ).resolves.toMatchInlineSnapshot(`
+ Object {
+ "authorizedRuleTypes": Set {
+ Object {
+ "actionGroups": Array [],
+ "actionVariables": undefined,
+ "authorizedConsumers": Object {
+ "myApp": Object {
+ "all": false,
+ "read": true,
+ },
+ },
+ "defaultActionGroupId": "default",
+ "enabledInLicense": true,
+ "id": "myOtherAppAlertType",
+ "isExportable": true,
+ "minimumLicenseRequired": "basic",
+ "name": "myOtherAppAlertType",
+ "producer": "alerts",
+ "recoveryActionGroup": Object {
+ "id": "recovered",
+ "name": "Recovered",
+ },
+ },
+ },
+ "hasAllRequested": false,
+ "username": "some-user",
+ }
+ `);
+ });
+
+ test('it returns all authorized if user has read, get and update alert privileges', async () => {
+ const { authorization } = mockSecurity();
+ const checkPrivileges: jest.MockedFunction<
+ ReturnType
+ > = jest.fn();
+ authorization.checkPrivilegesDynamicallyWithRequest.mockReturnValue(checkPrivileges);
+ checkPrivileges.mockResolvedValueOnce({
+ username: 'some-user',
+ hasAllRequested: false,
+ privileges: {
+ kibana: [
+ {
+ privilege: mockAuthorizationAction('myOtherAppAlertType', 'myApp', 'alert', 'find'),
+ authorized: true,
+ },
+ {
+ privilege: mockAuthorizationAction('myOtherAppAlertType', 'myApp', 'alert', 'get'),
+ authorized: true,
+ },
+ {
+ privilege: mockAuthorizationAction('myOtherAppAlertType', 'myApp', 'alert', 'update'),
+ authorized: true,
+ },
+ ],
+ },
+ });
+ const alertAuthorization = new AlertingAuthorization({
+ request,
+ authorization,
+ alertTypeRegistry,
+ features,
+ auditLogger,
+ getSpace,
+ exemptConsumerIds,
+ });
+ alertTypeRegistry.list.mockReturnValue(setOfAlertTypes);
+
+ await expect(
+ alertAuthorization.getAugmentedRuleTypesWithAuthorization(
+ ['myApp'],
+ [ReadOperations.Find, ReadOperations.Get, WriteOperations.Update],
+ AlertingAuthorizationEntity.Alert
+ )
+ ).resolves.toMatchInlineSnapshot(`
+ Object {
+ "authorizedRuleTypes": Set {
+ Object {
+ "actionGroups": Array [],
+ "actionVariables": undefined,
+ "authorizedConsumers": Object {
+ "myApp": Object {
+ "all": true,
+ "read": true,
+ },
+ },
+ "defaultActionGroupId": "default",
+ "enabledInLicense": true,
+ "id": "myOtherAppAlertType",
+ "isExportable": true,
+ "minimumLicenseRequired": "basic",
+ "name": "myOtherAppAlertType",
+ "producer": "alerts",
+ "recoveryActionGroup": Object {
+ "id": "recovered",
+ "name": "Recovered",
+ },
+ },
+ },
+ "hasAllRequested": false,
+ "username": "some-user",
+ }
+ `);
+ });
+ });
});
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
index 52cef9a402e35..50a1b9d84ff6d 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
@@ -124,20 +124,41 @@ export class AlertingAuthorization {
return new Set();
});
- this.allPossibleConsumers = this.featuresIds.then((featuresIds) =>
- featuresIds.size
+ this.allPossibleConsumers = this.featuresIds.then((featuresIds) => {
+ return featuresIds.size
? asAuthorizedConsumers([...this.exemptConsumerIds, ...featuresIds], {
read: true,
all: true,
})
- : {}
- );
+ : {};
+ });
}
private shouldCheckAuthorization(): boolean {
return this.authorization?.mode?.useRbacForRequest(this.request) ?? false;
}
+ /*
+ * This method exposes the private 'augmentRuleTypesWithAuthorization' to be
+ * used by the RAC/Alerts client
+ */
+ public async getAugmentedRuleTypesWithAuthorization(
+ featureIds: readonly string[],
+ operations: Array,
+ authorizationEntity: AlertingAuthorizationEntity
+ ): Promise<{
+ username?: string;
+ hasAllRequested: boolean;
+ authorizedRuleTypes: Set;
+ }> {
+ return this.augmentRuleTypesWithAuthorization(
+ this.alertTypeRegistry.list(),
+ operations,
+ authorizationEntity,
+ new Set(featureIds)
+ );
+ }
+
public async ensureAuthorized({ ruleTypeId, consumer, operation, entity }: EnsureAuthorizedOpts) {
const { authorization } = this;
@@ -339,13 +360,14 @@ export class AlertingAuthorization {
private async augmentRuleTypesWithAuthorization(
ruleTypes: Set,
operations: Array,
- authorizationEntity: AlertingAuthorizationEntity
+ authorizationEntity: AlertingAuthorizationEntity,
+ featuresIds?: Set
): Promise<{
username?: string;
hasAllRequested: boolean;
authorizedRuleTypes: Set;
}> {
- const featuresIds = await this.featuresIds;
+ const fIds = featuresIds ?? (await this.featuresIds);
if (this.authorization && this.shouldCheckAuthorization()) {
const checkPrivileges = this.authorization.checkPrivilegesDynamicallyWithRequest(
this.request
@@ -363,7 +385,7 @@ export class AlertingAuthorization {
// as we can't ask ES for the user's individual privileges we need to ask for each feature
// and ruleType in the system whether this user has this privilege
for (const ruleType of ruleTypesWithAuthorization) {
- for (const feature of featuresIds) {
+ for (const feature of fIds) {
for (const operation of operations) {
privilegeToRuleType.set(
this.authorization!.actions.alerting.get(
@@ -420,7 +442,7 @@ export class AlertingAuthorization {
return {
hasAllRequested: true,
authorizedRuleTypes: this.augmentWithAuthorizedConsumers(
- new Set([...ruleTypes].filter((ruleType) => featuresIds.has(ruleType.producer))),
+ new Set([...ruleTypes].filter((ruleType) => fIds.has(ruleType.producer))),
await this.allPossibleConsumers
),
};
diff --git a/x-pack/plugins/alerting/server/index.ts b/x-pack/plugins/alerting/server/index.ts
index 72e3325107f31..957bd89f52f36 100644
--- a/x-pack/plugins/alerting/server/index.ts
+++ b/x-pack/plugins/alerting/server/index.ts
@@ -34,6 +34,13 @@ export { FindResult } from './alerts_client';
export { PublicAlertInstance as AlertInstance } from './alert_instance';
export { parseDuration } from './lib';
export { getEsErrorMessage } from './lib/errors';
+export {
+ ReadOperations,
+ AlertingAuthorizationFilterType,
+ AlertingAuthorization,
+ WriteOperations,
+ AlertingAuthorizationEntity,
+} from './authorization';
export const plugin = (initContext: PluginInitializerContext) => new AlertingPlugin(initContext);
diff --git a/x-pack/plugins/apm/.storybook/jest_setup.js b/x-pack/plugins/apm/.storybook/jest_setup.js
new file mode 100644
index 0000000000000..32071b8aa3f62
--- /dev/null
+++ b/x-pack/plugins/apm/.storybook/jest_setup.js
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setGlobalConfig } from '@storybook/testing-react';
+import * as globalStorybookConfig from './preview';
+
+setGlobalConfig(globalStorybookConfig);
diff --git a/x-pack/plugins/apm/.storybook/preview.js b/x-pack/plugins/apm/.storybook/preview.js
new file mode 100644
index 0000000000000..18343c15a6465
--- /dev/null
+++ b/x-pack/plugins/apm/.storybook/preview.js
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiThemeProviderDecorator } from '../../../../src/plugins/kibana_react/common';
+
+export const decorators = [EuiThemeProviderDecorator];
diff --git a/x-pack/plugins/apm/common/alert_types.ts b/x-pack/plugins/apm/common/alert_types.ts
index ad233c7f6df92..9476396a7aefa 100644
--- a/x-pack/plugins/apm/common/alert_types.ts
+++ b/x-pack/plugins/apm/common/alert_types.ts
@@ -10,6 +10,8 @@ import type { ValuesType } from 'utility-types';
import type { ActionGroup } from '../../alerting/common';
import { ANOMALY_SEVERITY, ANOMALY_THRESHOLD } from './ml_constants';
+export const APM_SERVER_FEATURE_ID = 'apm';
+
export enum AlertType {
ErrorCount = 'apm.error_rate', // ErrorRate was renamed to ErrorCount but the key is kept as `error_rate` for backwards-compat.
TransactionErrorRate = 'apm.transaction_error_rate',
@@ -44,7 +46,7 @@ export const ALERT_TYPES_CONFIG: Record<
actionGroups: [THRESHOLD_MET_GROUP],
defaultActionGroupId: THRESHOLD_MET_GROUP_ID,
minimumLicenseRequired: 'basic',
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
isExportable: true,
},
[AlertType.TransactionDuration]: {
@@ -54,7 +56,7 @@ export const ALERT_TYPES_CONFIG: Record<
actionGroups: [THRESHOLD_MET_GROUP],
defaultActionGroupId: THRESHOLD_MET_GROUP_ID,
minimumLicenseRequired: 'basic',
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
isExportable: true,
},
[AlertType.TransactionDurationAnomaly]: {
@@ -64,7 +66,7 @@ export const ALERT_TYPES_CONFIG: Record<
actionGroups: [THRESHOLD_MET_GROUP],
defaultActionGroupId: THRESHOLD_MET_GROUP_ID,
minimumLicenseRequired: 'basic',
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
isExportable: true,
},
[AlertType.TransactionErrorRate]: {
@@ -74,7 +76,7 @@ export const ALERT_TYPES_CONFIG: Record<
actionGroups: [THRESHOLD_MET_GROUP],
defaultActionGroupId: THRESHOLD_MET_GROUP_ID,
minimumLicenseRequired: 'basic',
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
isExportable: true,
},
};
diff --git a/x-pack/plugins/apm/jest.config.js b/x-pack/plugins/apm/jest.config.js
index caa8256cdb7ea..5bce9bbfb5b1b 100644
--- a/x-pack/plugins/apm/jest.config.js
+++ b/x-pack/plugins/apm/jest.config.js
@@ -11,4 +11,6 @@ module.exports = {
preset: '@kbn/test',
rootDir: path.resolve(__dirname, '../../..'),
roots: ['/x-pack/plugins/apm'],
+ setupFiles: ['/x-pack/plugins/apm/.storybook/jest_setup.js'],
+ testPathIgnorePatterns: ['/x-pack/plugins/apm/e2e/'],
};
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index ae4510b10acd4..9f661f13a491e 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -7,7 +7,6 @@
"data",
"embeddable",
"features",
- "fleet",
"infra",
"licensing",
"observability",
@@ -24,11 +23,15 @@
"security",
"spaces",
"taskManager",
- "usageCollection"
+ "usageCollection",
+ "fleet"
],
"server": true,
"ui": true,
- "configPath": ["xpack", "apm"],
+ "configPath": [
+ "xpack",
+ "apm"
+ ],
"requiredBundles": [
"fleet",
"home",
@@ -38,4 +41,4 @@
"ml",
"observability"
]
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx b/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
index 35863d8099394..eef3271d5932d 100644
--- a/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
@@ -6,11 +6,15 @@
*/
import React, { useCallback, useMemo } from 'react';
-import { useParams } from 'react-router-dom';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { AlertType } from '../../../../common/alert_types';
+import {
+ AlertType,
+ APM_SERVER_FEATURE_ID,
+} from '../../../../common/alert_types';
import { getInitialAlertValues } from '../get_initial_alert_values';
import { ApmPluginStartDeps } from '../../../plugin';
+import { useServiceName } from '../../../hooks/use_service_name';
+import { ApmServiceContextProvider } from '../../../context/apm_service/apm_service_context';
interface Props {
addFlyoutVisible: boolean;
setAddFlyoutVisibility: React.Dispatch>;
@@ -19,7 +23,7 @@ interface Props {
export function AlertingFlyout(props: Props) {
const { addFlyoutVisible, setAddFlyoutVisibility, alertType } = props;
- const { serviceName } = useParams<{ serviceName?: string }>();
+ const serviceName = useServiceName();
const { services } = useKibana();
const initialValues = getInitialAlertValues(alertType, serviceName);
@@ -31,7 +35,7 @@ export function AlertingFlyout(props: Props) {
() =>
alertType &&
services.triggersActionsUi.getAddAlertFlyout({
- consumer: 'apm',
+ consumer: APM_SERVER_FEATURE_ID,
onClose: onCloseAddFlyout,
alertTypeId: alertType,
canChangeTrigger: false,
@@ -40,5 +44,11 @@ export function AlertingFlyout(props: Props) {
/* eslint-disable-next-line react-hooks/exhaustive-deps */
[alertType, onCloseAddFlyout, services.triggersActionsUi]
);
- return <>{addFlyoutVisible && addAlertFlyout};
+ return (
+ <>
+ {addFlyoutVisible && (
+ {addAlertFlyout}
+ )}
+
+ );
}
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.stories.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.stories.tsx
index 83874e9584510..23afb9646dea7 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.stories.tsx
@@ -8,7 +8,6 @@
import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import { ErrorCountAlertTrigger } from '.';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
import {
mockApmPluginContextValue,
@@ -20,19 +19,15 @@ export default {
component: ErrorCountAlertTrigger,
decorators: [
(Story: React.ComponentClass) => (
-
-
-
-
-
-
+
+
+
+
),
],
};
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
index fdfed6eb0d685..811353067ab60 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
@@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import React from 'react';
-import { useParams } from 'react-router-dom';
+import { defaults } from 'lodash';
import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { asInteger } from '../../../../common/utils/formatters';
@@ -18,6 +18,7 @@ import { ChartPreview } from '../chart_preview';
import { EnvironmentField, IsAboveField, ServiceField } from '../fields';
import { getAbsoluteTimeRange } from '../helper';
import { ServiceAlertTrigger } from '../service_alert_trigger';
+import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
export interface AlertParams {
windowSize: number;
@@ -35,49 +36,55 @@ interface Props {
export function ErrorCountAlertTrigger(props: Props) {
const { setAlertParams, setAlertProperty, alertParams } = props;
- const { serviceName } = useParams<{ serviceName?: string }>();
+
+ const { serviceName: serviceNameFromContext } = useApmServiceContext();
+
const { urlParams } = useUrlParams();
- const { start, end } = urlParams;
+ const { start, end, environment: environmentFromUrl } = urlParams;
const { environmentOptions } = useEnvironmentsFetcher({
- serviceName,
+ serviceName: serviceNameFromContext,
start,
end,
});
- const { threshold, windowSize, windowUnit, environment } = alertParams;
+ const params = defaults(
+ {
+ ...alertParams,
+ },
+ {
+ threshold: 25,
+ windowSize: 1,
+ windowUnit: 'm',
+ environment: environmentFromUrl || ENVIRONMENT_ALL.value,
+ serviceName: serviceNameFromContext,
+ }
+ );
const { data } = useFetcher(
(callApmApi) => {
- if (windowSize && windowUnit) {
+ if (params.windowSize && params.windowUnit) {
return callApmApi({
endpoint: 'GET /api/apm/alerts/chart_preview/transaction_error_count',
params: {
query: {
- ...getAbsoluteTimeRange(windowSize, windowUnit),
- environment,
- serviceName,
+ ...getAbsoluteTimeRange(params.windowSize, params.windowUnit),
+ environment: params.environment,
+ serviceName: params.serviceName,
},
},
});
}
},
- [windowSize, windowUnit, environment, serviceName]
+ [
+ params.windowSize,
+ params.windowUnit,
+ params.environment,
+ params.serviceName,
+ ]
);
- const defaults = {
- threshold: 25,
- windowSize: 1,
- windowUnit: 'm',
- environment: urlParams.environment || ENVIRONMENT_ALL.value,
- };
-
- const params = {
- ...defaults,
- ...alertParams,
- };
-
const fields = [
- void;
@@ -18,13 +17,10 @@ interface Props {
}
export function ServiceAlertTrigger(props: Props) {
- const { serviceName } = useParams<{ serviceName?: string }>();
-
const { fields, setAlertParams, defaults, chartPreview } = props;
const params: Record = {
...defaults,
- serviceName,
};
useEffect(() => {
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
index b4c78b54f329b..8f2713685127e 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
@@ -7,9 +7,8 @@
import { EuiSelect } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { map } from 'lodash';
+import { map, defaults } from 'lodash';
import React from 'react';
-import { useParams } from 'react-router-dom';
import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
import { getDurationFormatter } from '../../../../common/utils/formatters';
@@ -72,46 +71,60 @@ interface Props {
export function TransactionDurationAlertTrigger(props: Props) {
const { setAlertParams, alertParams, setAlertProperty } = props;
const { urlParams } = useUrlParams();
- const { transactionTypes, transactionType } = useApmServiceContext();
- const { serviceName } = useParams<{ serviceName?: string }>();
- const { start, end } = urlParams;
+
+ const { start, end, environment: environmentFromUrl } = urlParams;
+
+ const {
+ transactionTypes,
+ transactionType: transactionTypeFromContext,
+ serviceName: serviceNameFromContext,
+ } = useApmServiceContext();
+
+ const params = defaults(
+ {
+ ...alertParams,
+ },
+ {
+ aggregationType: 'avg',
+ environment: environmentFromUrl || ENVIRONMENT_ALL.value,
+ threshold: 1500,
+ windowSize: 5,
+ windowUnit: 'm',
+ transactionType: transactionTypeFromContext,
+ serviceName: serviceNameFromContext,
+ }
+ );
+
const { environmentOptions } = useEnvironmentsFetcher({
- serviceName,
+ serviceName: params.serviceName,
start,
end,
});
- const {
- aggregationType,
- environment,
- threshold,
- windowSize,
- windowUnit,
- } = alertParams;
const { data } = useFetcher(
(callApmApi) => {
- if (windowSize && windowUnit) {
+ if (params.windowSize && params.windowUnit) {
return callApmApi({
endpoint: 'GET /api/apm/alerts/chart_preview/transaction_duration',
params: {
query: {
- ...getAbsoluteTimeRange(windowSize, windowUnit),
- aggregationType,
- environment,
- serviceName,
- transactionType: alertParams.transactionType,
+ ...getAbsoluteTimeRange(params.windowSize, params.windowUnit),
+ aggregationType: params.aggregationType,
+ environment: params.environment,
+ serviceName: params.serviceName,
+ transactionType: params.transactionType,
},
},
});
}
},
[
- aggregationType,
- environment,
- serviceName,
- alertParams.transactionType,
- windowSize,
- windowUnit,
+ params.aggregationType,
+ params.environment,
+ params.serviceName,
+ params.transactionType,
+ params.windowSize,
+ params.windowUnit,
]
);
@@ -122,7 +135,7 @@ export function TransactionDurationAlertTrigger(props: Props) {
const yTickFormat = getResponseTimeTickFormatter(formatter);
// The threshold from the form is in ms. Convert to µs.
- const thresholdMs = threshold * 1000;
+ const thresholdMs = params.threshold * 1000;
const chartPreview = (
({ text: key, value: key }))}
@@ -206,7 +205,7 @@ export function TransactionDurationAlertTrigger(props: Props) {
return (
void;
setAlertProperty: (key: string, value: any) => void;
}
@@ -47,35 +47,36 @@ interface Props {
export function TransactionDurationAnomalyAlertTrigger(props: Props) {
const { setAlertParams, alertParams, setAlertProperty } = props;
const { urlParams } = useUrlParams();
- const { transactionTypes } = useApmServiceContext();
- const { serviceName } = useParams<{ serviceName?: string }>();
- const { start, end, transactionType } = urlParams;
+ const {
+ serviceName: serviceNameFromContext,
+ transactionType: transactionTypeFromContext,
+ transactionTypes,
+ } = useApmServiceContext();
+
+ const { start, end, environment: environmentFromUrl } = urlParams;
+
+ const params = defaults(
+ {
+ ...alertParams,
+ },
+ {
+ windowSize: 15,
+ windowUnit: 'm',
+ transactionType: transactionTypeFromContext,
+ environment: environmentFromUrl || ENVIRONMENT_ALL.value,
+ anomalySeverityType: ANOMALY_SEVERITY.CRITICAL,
+ serviceName: serviceNameFromContext,
+ }
+ );
+
const { environmentOptions } = useEnvironmentsFetcher({
- serviceName,
+ serviceName: params.serviceName,
start,
end,
});
- if (serviceName && !transactionTypes.length) {
- return null;
- }
-
- const defaults: Params = {
- windowSize: 15,
- windowUnit: 'm',
- transactionType: transactionType || transactionTypes[0],
- serviceName,
- environment: urlParams.environment || ENVIRONMENT_ALL.value,
- anomalySeverityType: ANOMALY_SEVERITY.CRITICAL,
- };
-
- const params = {
- ...defaults,
- ...alertParams,
- };
-
const fields = [
- ({ text: key, value: key }))}
@@ -107,7 +108,7 @@ export function TransactionDurationAnomalyAlertTrigger(props: Props) {
return (
, AlertParams>(
+ {
+ threshold: 30,
+ windowSize: 5,
+ windowUnit: 'm',
+ transactionType: transactionTypeFromContext,
+ environment: environmentFromUrl || ENVIRONMENT_ALL.value,
+ serviceName: serviceNameFromContext,
+ },
+ alertParams
+ );
+
const { environmentOptions } = useEnvironmentsFetcher({
- serviceName,
+ serviceName: serviceNameFromContext,
start,
end,
});
- const { threshold, windowSize, windowUnit, environment } = alertParams;
-
- const thresholdAsPercent = (threshold ?? 0) / 100;
+ const thresholdAsPercent = (params.threshold ?? 0) / 100;
const { data } = useFetcher(
(callApmApi) => {
- if (windowSize && windowUnit) {
+ if (params.windowSize && params.windowUnit) {
return callApmApi({
endpoint: 'GET /api/apm/alerts/chart_preview/transaction_error_rate',
params: {
query: {
- ...getAbsoluteTimeRange(windowSize, windowUnit),
- environment,
- serviceName,
- transactionType: alertParams.transactionType,
+ ...getAbsoluteTimeRange(params.windowSize, params.windowUnit),
+ environment: params.environment,
+ serviceName: params.serviceName,
+ transactionType: params.transactionType,
},
},
});
}
},
[
- alertParams.transactionType,
- environment,
- serviceName,
- windowSize,
- windowUnit,
+ params.transactionType,
+ params.environment,
+ params.serviceName,
+ params.windowSize,
+ params.windowUnit,
]
);
- if (serviceName && !transactionTypes.length) {
+ if (params.serviceName && !transactionTypes.length) {
return null;
}
- const defaultParams = {
- threshold: 30,
- windowSize: 5,
- windowUnit: 'm',
- transactionType: transactionType || transactionTypes[0],
- environment: urlParams.environment || ENVIRONMENT_ALL.value,
- };
-
- const params = {
- ...defaultParams,
- ...alertParams,
- };
-
const fields = [
- ({ text: key, value: key }))}
@@ -141,7 +143,7 @@ export function TransactionErrorRateAlertTrigger(props: Props) {
return (
-
-
- {ANALYZE_MESSAGE}}>
-
- {ANALYZE_DATA}
-
-
-
-
-
+ {ANALYZE_MESSAGE}}>
+
- {i18n.translate('xpack.apm.addDataButtonLabel', {
- defaultMessage: 'Add data',
- })}
-
-
-
+ {ANALYZE_DATA}
+
+
+
+ {i18n.translate('xpack.apm.addDataButtonLabel', {
+ defaultMessage: 'Add data',
+ })}
+
+
);
}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/__stories__/MapTooltip.stories.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/__stories__/MapTooltip.stories.tsx
index 1aad25fc89c0b..8263db648cd39 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/__stories__/MapTooltip.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/__stories__/MapTooltip.stories.tsx
@@ -7,53 +7,50 @@
import { storiesOf } from '@storybook/react';
import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
import { MapToolTip } from '../MapToolTip';
import { COUNTRY_NAME, TRANSACTION_DURATION_COUNTRY } from '../useLayerList';
-storiesOf('app/RumDashboard/VisitorsRegionMap', module)
- .addDecorator((storyFn) => {storyFn()} )
- .add(
- 'Tooltip',
- () => {
- const loadFeatureProps = async () => {
- return [
+storiesOf('app/RumDashboard/VisitorsRegionMap', module).add(
+ 'Tooltip',
+ () => {
+ const loadFeatureProps = async () => {
+ return [
+ {
+ getPropertyKey: () => COUNTRY_NAME,
+ getRawValue: () => 'United States',
+ },
+ {
+ getPropertyKey: () => TRANSACTION_DURATION_COUNTRY,
+ getRawValue: () => 2434353,
+ },
+ ];
+ };
+ return (
+ COUNTRY_NAME,
- getRawValue: () => 'United States',
- },
- {
- getPropertyKey: () => TRANSACTION_DURATION_COUNTRY,
- getRawValue: () => 2434353,
- },
- ];
- };
- return (
-
-
- {storyFn()}
-
-
+
+ {storyFn()}
+
);
})
.add(
@@ -67,7 +64,6 @@ storiesOf(
propTablesExclude: [
AgentConfigurationCreateEdit,
ApmPluginContext.Provider,
- EuiThemeProvider,
],
source: false,
},
diff --git a/x-pack/plugins/apm/public/components/app/Settings/agent_configurations/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/agent_configurations/index.tsx
index 1ca7f46a0b26f..32c93e43175df 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/agent_configurations/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/agent_configurations/index.tsx
@@ -18,7 +18,6 @@ import { i18n } from '@kbn/i18n';
import { isEmpty } from 'lodash';
import React from 'react';
import { useLocation } from 'react-router-dom';
-import { useTrackPageview } from '../../../../../../observability/public';
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
import { useFetcher } from '../../../../hooks/use_fetcher';
import { createAgentConfigurationHref } from '../../../shared/Links/apm/agentConfigurationLinks';
@@ -34,9 +33,6 @@ export function AgentConfigurations() {
{ preservePreviousData: false, showToastOnError: false }
);
- useTrackPageview({ app: 'apm', path: 'agent_configuration' });
- useTrackPageview({ app: 'apm', path: 'agent_configuration', delay: 15000 });
-
const hasConfigurations = !isEmpty(data.configurations);
return (
diff --git a/x-pack/plugins/apm/public/components/app/Settings/schema/confirm_switch_modal.tsx b/x-pack/plugins/apm/public/components/app/Settings/schema/confirm_switch_modal.tsx
index 9900093253d2a..5bb93c251777f 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/schema/confirm_switch_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/schema/confirm_switch_modal.tsx
@@ -15,20 +15,20 @@ import {
htmlIdGenerator,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
+import { useUiTracker } from '../../../../../../observability/public';
import { ElasticDocsLink } from '../../../shared/Links/ElasticDocsLink';
interface Props {
onConfirm: () => void;
onCancel: () => void;
unsupportedConfigs: Array<{ key: string; value: string }>;
- isLoading: boolean;
}
export function ConfirmSwitchModal({
onConfirm,
onCancel,
unsupportedConfigs,
- isLoading,
}: Props) {
+ const trackApmEvent = useUiTracker({ app: 'apm' });
const [isConfirmChecked, setIsConfirmChecked] = useState(false);
const hasUnsupportedConfigs = !!unsupportedConfigs.length;
return (
@@ -50,9 +50,13 @@ export function ConfirmSwitchModal({
}
)}
defaultFocusedButton="confirm"
- onConfirm={onConfirm}
+ onConfirm={() => {
+ trackApmEvent({
+ metric: 'confirm_data_stream_switch',
+ });
+ onConfirm();
+ }}
confirmButtonDisabled={!isConfirmChecked}
- isLoading={isLoading}
>
{
- setIsLoadingMigration(true);
- const apmPackagePolicy = await createCloudApmPackagePolicy(toasts);
+ setIsSwitchActive(false);
+ const apmPackagePolicy = await createCloudApmPackagePolicy(
+ toasts,
+ updateLocalStorage
+ );
if (!apmPackagePolicy) {
- setIsLoadingMigration(false);
return;
}
- setIsSwitchActive(false);
refetch();
}}
onCancel={() => {
- if (isLoadingMigration) {
- return;
- }
setIsSwitchActive(false);
}}
unsupportedConfigs={unsupportedConfigs}
@@ -112,8 +137,10 @@ async function getUnsupportedApmServerConfigs(
}
async function createCloudApmPackagePolicy(
- toasts: NotificationsStart['toasts']
+ toasts: NotificationsStart['toasts'],
+ updateLocalStorage: (status: FETCH_STATUS) => void
) {
+ updateLocalStorage(FETCH_STATUS.LOADING);
try {
const {
cloud_apm_package_policy: cloudApmPackagePolicy,
@@ -121,8 +148,10 @@ async function createCloudApmPackagePolicy(
endpoint: 'POST /api/apm/fleet/cloud_apm_package_policy',
signal: null,
});
+ updateLocalStorage(FETCH_STATUS.SUCCESS);
return cloudApmPackagePolicy;
} catch (error) {
+ updateLocalStorage(FETCH_STATUS.FAILURE);
toasts.addDanger({
title: i18n.translate(
'xpack.apm.settings.createApmPackagePolicy.errorToast.title',
diff --git a/x-pack/plugins/apm/public/components/app/Settings/schema/migration_in_progress_panel.tsx b/x-pack/plugins/apm/public/components/app/Settings/schema/migration_in_progress_panel.tsx
new file mode 100644
index 0000000000000..854d1dd823d23
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/Settings/schema/migration_in_progress_panel.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexItem } from '@elastic/eui';
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { EuiCard } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+
+export function MigrationInProgressPanel() {
+ return (
+
+
+
+
+ );
+}
diff --git a/x-pack/plugins/apm/public/components/app/Settings/schema/schema.stories.tsx b/x-pack/plugins/apm/public/components/app/Settings/schema/schema.stories.tsx
index 7cac4ba97e723..b22260ffabe46 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/schema/schema.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/schema/schema.stories.tsx
@@ -5,31 +5,99 @@
* 2.0.
*/
-import type { Story } from '@storybook/react';
+import type { Meta, Story } from '@storybook/react';
import React, { ComponentType } from 'react';
+import { MemoryRouter } from 'react-router-dom';
import { CoreStart } from '../../../../../../../../src/core/public';
import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
import { createCallApmApi } from '../../../../services/rest/createCallApmApi';
import { Schema } from './';
+interface Args {
+ hasCloudAgentPolicy: boolean;
+ hasCloudApmPackagePolicy: boolean;
+ cloudApmMigrationEnabled: boolean;
+ hasRequiredRole: boolean;
+ isMigrating: boolean;
+}
+
export default {
title: 'app/Settings/Schema',
component: Schema,
+ argTypes: {
+ hasCloudAgentPolicy: {
+ control: {
+ type: 'boolean',
+ options: [true, false],
+ defaultValue: true,
+ },
+ },
+ hasCloudApmPackagePolicy: {
+ control: {
+ type: 'boolean',
+ options: [true, false],
+ defaultValue: false,
+ },
+ },
+ cloudApmMigrationEnabled: {
+ control: {
+ type: 'boolean',
+ options: [true, false],
+ defaultValue: true,
+ },
+ },
+ hasRequiredRole: {
+ control: {
+ type: 'boolean',
+ options: [true, false],
+ defaultValue: true,
+ },
+ },
+ isMigrating: {
+ control: {
+ type: 'boolean',
+ options: [true, false],
+ defaultValue: false,
+ },
+ },
+ },
decorators: [
- (StoryComponent: ComponentType) => {
+ (StoryComponent: ComponentType, { args }: Meta) => {
+ if (args?.isMigrating) {
+ const expiryDate = new Date();
+ expiryDate.setMinutes(expiryDate.getMinutes() + 5);
+ window.localStorage.setItem(
+ 'apm.dataStreamsMigrationStatus',
+ JSON.stringify({
+ value: 'loading',
+ expiry: expiryDate.toISOString(),
+ })
+ );
+ } else {
+ window.localStorage.removeItem('apm.dataStreamsMigrationStatus');
+ }
const coreMock = ({
http: {
+ basePath: { prepend: () => {} },
get: () => {
- return {};
+ return {
+ has_cloud_agent_policy: args?.hasCloudAgentPolicy,
+ has_cloud_apm_package_policy: args?.hasCloudApmPackagePolicy,
+ cloud_apm_migration_enabled: args?.cloudApmMigrationEnabled,
+ has_required_role: args?.hasRequiredRole,
+ };
},
},
+ uiSettings: { get: () => '' },
} as unknown) as CoreStart;
createCallApmApi(coreMock);
return (
-
+
);
},
diff --git a/x-pack/plugins/apm/public/components/app/Settings/schema/schema_overview.tsx b/x-pack/plugins/apm/public/components/app/Settings/schema/schema_overview.tsx
index 7a874ed5b8037..a9a0b824cc828 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/schema/schema_overview.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/schema/schema_overview.tsx
@@ -7,7 +7,6 @@
import {
EuiButton,
- EuiCallOut,
EuiCard,
EuiFlexGroup,
EuiFlexItem,
@@ -24,9 +23,11 @@ import { APMLink } from '../../../shared/Links/apm/APMLink';
import { ElasticDocsLink } from '../../../shared/Links/ElasticDocsLink';
import { useFleetCloudAgentPolicyHref } from '../../../shared/Links/kibana';
import rocketLaunchGraphic from './blog-rocket-720x420.png';
+import { MigrationInProgressPanel } from './migration_in_progress_panel';
interface Props {
onSwitch: () => void;
+ isMigrating: boolean;
isMigrated: boolean;
isLoading: boolean;
isLoadingConfirmation: boolean;
@@ -36,6 +37,7 @@ interface Props {
}
export function SchemaOverview({
onSwitch,
+ isMigrating,
isMigrated,
isLoading,
isLoadingConfirmation,
@@ -58,6 +60,15 @@ export function SchemaOverview({
);
}
+ if (isMigrating && !isMigrated) {
+ return (
+ <>
+
+
-
+
-
-
-
-
-
-
);
}
diff --git a/x-pack/plugins/apm/public/components/app/correlations/index.tsx b/x-pack/plugins/apm/public/components/app/correlations/index.tsx
index 2b32ece14e5cd..9ad5088bb0bcf 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/index.tsx
@@ -104,16 +104,7 @@ export function Correlations() {
width: '20%',
});
}
- if (urlParams.transactionName) {
- properties.push({
- label: i18n.translate('xpack.apm.correlations.transactionLabel', {
- defaultMessage: 'Transaction',
- }),
- fieldName: TRANSACTION_NAME,
- val: urlParams.transactionName,
- width: '20%',
- });
- }
+
if (urlParams.environment) {
properties.push({
label: i18n.translate('xpack.apm.correlations.environmentLabel', {
@@ -125,6 +116,17 @@ export function Correlations() {
});
}
+ if (urlParams.transactionName) {
+ properties.push({
+ label: i18n.translate('xpack.apm.correlations.transactionLabel', {
+ defaultMessage: 'Transaction',
+ }),
+ fieldName: TRANSACTION_NAME,
+ val: urlParams.transactionName,
+ width: '20%',
+ });
+ }
+
return properties;
}, [serviceName, urlParams.environment, urlParams.transactionName]);
diff --git a/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx
index f9536353747ee..4bd20f51977c6 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/ml_latency_correlations.tsx
@@ -36,6 +36,7 @@ import { useCorrelations } from './use_correlations';
import { push } from '../../shared/Links/url_helpers';
import { useUiTracker } from '../../../../../observability/public';
import { asPreciseDecimal } from '../../../../common/utils/formatters';
+import { LatencyCorrelationsHelpPopover } from './ml_latency_correlations_help_popover';
const DEFAULT_PERCENTILE_THRESHOLD = 95;
const isErrorMessage = (arg: unknown): arg is Error => {
@@ -151,7 +152,7 @@ export function MlLatencyCorrelations({ onClose }: Props) {
'xpack.apm.correlations.latencyCorrelations.correlationsTable.correlationColumnDescription',
{
defaultMessage:
- 'The impact of a field on the latency of the service, ranging from 0 to 1.',
+ 'The correlation score [0-1] of an attribute; the greater the score, the more an attribute increases latency.',
}
)}
>
@@ -263,20 +264,6 @@ export function MlLatencyCorrelations({ onClose }: Props) {
return (
<>
-
-
-
-
{!isRunning && (
@@ -320,6 +307,9 @@ export function MlLatencyCorrelations({ onClose }: Props) {
+
+
{
+ setIsPopoverOpen(!isPopoverOpen);
+ }}
+ />
+ }
+ closePopover={() => setIsPopoverOpen(false)}
+ isOpen={isPopoverOpen}
+ title={i18n.translate('xpack.apm.correlations.latencyPopoverTitle', {
+ defaultMessage: 'Latency correlations',
+ })}
+ >
+
+ );
+}
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
index 8cc16dd801c25..d434a155c9cf4 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
@@ -11,7 +11,6 @@ import {
ApmPluginContext,
ApmPluginContextValue,
} from '../../../../context/apm_plugin/apm_plugin_context';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
import { ErrorDistribution } from './';
export default {
@@ -28,13 +27,11 @@ export default {
};
return (
-
-
-
-
-
-
+
+
+
+
);
},
],
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/exception_stacktrace.stories.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/exception_stacktrace.stories.tsx
index f21c189584d31..9468202edf4d6 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/exception_stacktrace.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/exception_stacktrace.stories.tsx
@@ -7,7 +7,6 @@
import { Story } from '@storybook/react';
import React, { ComponentProps, ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
import { ExceptionStacktrace } from './exception_stacktrace';
type Args = ComponentProps;
@@ -15,13 +14,6 @@ type Args = ComponentProps;
export default {
title: 'app/ErrorGroupDetails/DetailView/ExceptionStacktrace',
component: ExceptionStacktrace,
- decorators: [
- (StoryComponent: ComponentType) => (
-
-
- ),
- ],
};
export const JavaWithLongLines: Story = (args) => (
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
index 344393d42506f..225186cab12c8 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
@@ -17,7 +17,6 @@ import {
import { i18n } from '@kbn/i18n';
import React from 'react';
import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useTrackPageview } from '../../../../../observability/public';
import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher';
@@ -128,9 +127,6 @@ export function ErrorGroupDetails({
groupId,
});
- useTrackPageview({ app: 'apm', path: 'error_group_details' });
- useTrackPageview({ app: 'apm', path: 'error_group_details', delay: 15000 });
-
if (!errorGroupData || !errorDistributionData) {
return
+ {title && {title} }
+
+ {children}
+
+ );
+}
diff --git a/x-pack/plugins/apm/public/components/app/help_popover/index.tsx b/x-pack/plugins/apm/public/components/app/help_popover/index.tsx
new file mode 100644
index 0000000000000..b1d53722c7bb5
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/help_popover/index.tsx
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { HelpPopoverButton, HelpPopover } from './help_popover';
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
index cac94885511c1..ef0a5f2df0434 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useEffect } from 'react';
import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
-import { useTrackPageview } from '../../../../../observability/public';
import { useAnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
@@ -92,13 +91,6 @@ export function ServiceInventory() {
const { core } = useApmPluginContext();
const { servicesData, servicesStatus } = useServicesFetcher();
- // The page is called "service inventory" to avoid confusion with the
- // "service overview", but this is tracked in some dashboards because it's the
- // initial landing page for APM, so it stays as "services_overview" (plural.)
- // for backward compatibility.
- useTrackPageview({ app: 'apm', path: 'services_overview' });
- useTrackPageview({ app: 'apm', path: 'services_overview', delay: 15000 });
-
const {
anomalyDetectionJobsData,
anomalyDetectionJobsStatus,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx
index 6b7626514d03f..324a38ea5db39 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx
@@ -8,7 +8,6 @@
import cytoscape from 'cytoscape';
import { CoreStart } from 'kibana/public';
import React, { ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
import { createCallApmApi } from '../../../../services/rest/createCallApmApi';
@@ -38,15 +37,13 @@ export default {
createCallApmApi(coreMock);
return (
-
-
-
-
-
-
+
+
+
+
);
},
],
diff --git a/x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx
index a8f004a7295d9..f1a89043f826e 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx
@@ -5,20 +5,12 @@
* 2.0.
*/
-import React, { ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import React from 'react';
import { ServiceStatsList } from './ServiceStatsList';
export default {
title: 'app/ServiceMap/Popover/ServiceStatsList',
component: ServiceStatsList,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function Example() {
diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx
index 8bc0d7239e9c5..7ce9c3e943613 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx
@@ -6,21 +6,13 @@
*/
import cytoscape from 'cytoscape';
-import React, { ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import React from 'react';
import { Cytoscape } from '../Cytoscape';
import { Centerer } from './centerer';
export default {
title: 'app/ServiceMap/Cytoscape',
component: Cytoscape,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function Example() {
diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
index 45de632a152d4..192447ef7591a 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
@@ -16,8 +16,7 @@ import {
EuiSpacer,
EuiToolTip,
} from '@elastic/eui';
-import React, { ComponentType, useEffect, useState } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import React, { useEffect, useState } from 'react';
import { Cytoscape } from '../Cytoscape';
import { Centerer } from './centerer';
import exampleResponseHipsterStore from './example_response_hipster_store.json';
@@ -42,13 +41,6 @@ function getHeight() {
export default {
title: 'app/ServiceMap/Example data',
component: Cytoscape,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function GenerateMap() {
diff --git a/x-pack/plugins/apm/public/components/app/service_map/index.tsx b/x-pack/plugins/apm/public/components/app/service_map/index.tsx
index 582eafe7553af..22adb10512d7a 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/index.tsx
@@ -13,7 +13,6 @@ import {
} from '@elastic/eui';
import React, { PropsWithChildren, ReactNode } from 'react';
import { isActivePlatinumLicense } from '../../../../common/license_check';
-import { useTrackPageview } from '../../../../../observability/public';
import {
invalidLicenseMessage,
SERVICE_MAP_TIMEOUT_ERROR,
@@ -106,9 +105,6 @@ export function ServiceMap({
const PADDING_BOTTOM = 24;
const heightWithPadding = height - PADDING_BOTTOM;
- useTrackPageview({ app: 'apm', path: 'service_map' });
- useTrackPageview({ app: 'apm', path: 'service_map', delay: 15000 });
-
if (!license) {
return null;
}
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
index fce543b05c6c3..374b2d59ea347 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
@@ -7,7 +7,6 @@
import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
import { isRumAgentName, isIosAgentName } from '../../../../common/agent_name';
import { AnnotationsContextProvider } from '../../../context/annotations/annotations_context';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
@@ -35,9 +34,6 @@ interface ServiceOverviewProps {
export function ServiceOverview({ serviceName }: ServiceOverviewProps) {
const { agentName } = useApmServiceContext();
- useTrackPageview({ app: 'apm', path: 'service_overview' });
- useTrackPageview({ app: 'apm', path: 'service_overview', delay: 15000 });
-
// The default EuiFlexGroup breaks at 768, but we want to break at 992, so we
// observe the window width and set the flex directions of rows accordingly
const { isMedium } = useBreakPoints();
diff --git a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
index d280b36a603ba..ccb5fea72432c 100644
--- a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
@@ -6,7 +6,6 @@
*/
import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
import { APIReturnType } from '../../../services/rest/createCallApmApi';
@@ -43,9 +42,6 @@ export function TraceOverview() {
[environment, kuery, start, end]
);
- useTrackPageview({ app: 'apm', path: 'traces_overview' });
- useTrackPageview({ app: 'apm', path: 'traces_overview', delay: 15000 });
-
return (
<>
-
-
-
-
+
+
),
],
diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx
index 041c12822357c..2435e5fc5a1f6 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx
@@ -17,7 +17,6 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { Location } from 'history';
import React from 'react';
import { useLocation } from 'react-router-dom';
-import { useTrackPageview } from '../../../../../observability/public';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
import { IUrlParams } from '../../../context/url_params_context/types';
import { useUrlParams } from '../../../context/url_params_context/use_url_params';
@@ -62,8 +61,6 @@ export function TransactionOverview({ serviceName }: TransactionOverviewProps) {
// redirect to first transaction type
useRedirect(getRedirectLocation({ location, transactionType, urlParams }));
- useTrackPageview({ app: 'apm', path: 'transaction_overview' });
- useTrackPageview({ app: 'apm', path: 'transaction_overview', delay: 15000 });
const {
transactionListData,
transactionListStatus,
diff --git a/x-pack/plugins/apm/public/components/routing/app_root.tsx b/x-pack/plugins/apm/public/components/routing/app_root.tsx
index 8fc59a01eeca0..a924c1f31cbef 100644
--- a/x-pack/plugins/apm/public/components/routing/app_root.tsx
+++ b/x-pack/plugins/apm/public/components/routing/app_root.tsx
@@ -9,7 +9,7 @@ import { ApmRoute } from '@elastic/apm-rum-react';
import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
import React from 'react';
-import { Route, Router, Switch } from 'react-router-dom';
+import { Route, RouteComponentProps, Router, Switch } from 'react-router-dom';
import { DefaultTheme, ThemeProvider } from 'styled-components';
import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
import {
@@ -17,20 +17,21 @@ import {
RedirectAppLinks,
useUiSetting$,
} from '../../../../../../src/plugins/kibana_react/public';
+import { HeaderMenuPortal } from '../../../../observability/public';
import { ScrollToTopOnPathChange } from '../../components/app/Main/ScrollToTopOnPathChange';
+import { AnomalyDetectionJobsContextProvider } from '../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
import {
ApmPluginContext,
ApmPluginContextValue,
} from '../../context/apm_plugin/apm_plugin_context';
+import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
import { LicenseProvider } from '../../context/license/license_context';
import { UrlParamsProvider } from '../../context/url_params_context/url_params_context';
import { useApmBreadcrumbs } from '../../hooks/use_apm_breadcrumbs';
import { ApmPluginStartDeps } from '../../plugin';
-import { HeaderMenuPortal } from '../../../../observability/public';
import { ApmHeaderActionMenu } from '../shared/apm_header_action_menu';
-import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
-import { AnomalyDetectionJobsContextProvider } from '../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
import { apmRouteConfig } from './apm_route_config';
+import { TelemetryWrapper } from './telemetry_wrapper';
export function ApmAppRoot({
apmPluginContextValue,
@@ -62,9 +63,18 @@ export function ApmAppRoot({
- {apmRouteConfig.map((route, i) => (
- {
+ return TelemetryWrapper({ route, props });
+ }}
+ />
+ );
+ })}
diff --git a/x-pack/plugins/apm/public/components/routing/telemetry_wrapper.tsx b/x-pack/plugins/apm/public/components/routing/telemetry_wrapper.tsx
new file mode 100644
index 0000000000000..fc3fc6a338d18
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/telemetry_wrapper.tsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { RouteComponentProps } from 'react-router-dom';
+import { useTrackPageview } from '../../../../observability/public';
+import { APMRouteDefinition } from '../../application/routes';
+import { redirectTo } from './redirect_to';
+
+export function TelemetryWrapper({
+ route,
+ props,
+}: {
+ route: APMRouteDefinition;
+ props: RouteComponentProps;
+}) {
+ const { component, render, path } = route;
+ const pathAsString = path as string;
+
+ useTrackPageview({ app: 'apm', path: pathAsString });
+ useTrackPageview({ app: 'apm', path: pathAsString, delay: 15000 });
+
+ if (component) {
+ return React.createElement(component, props);
+ }
+ if (render) {
+ return <>{render(props)};
+ }
+ return <>{redirectTo('/')};
+}
diff --git a/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx b/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
index bc41fd58ea5d2..68c3edabfa44e 100644
--- a/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
@@ -7,30 +7,22 @@
import {
EuiCard,
+ EuiCodeBlock,
EuiFlexGroup,
- EuiImage,
EuiFlexItem,
+ EuiImage,
EuiSpacer,
EuiToolTip,
- EuiCodeBlock,
} from '@elastic/eui';
-import React, { ComponentType } from 'react';
-import { AgentIcon } from './index';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import React from 'react';
import { AGENT_NAMES } from '../../../../common/agent_name';
-import { getAgentIcon } from './get_agent_icon';
import { useTheme } from '../../../hooks/use_theme';
+import { getAgentIcon } from './get_agent_icon';
+import { AgentIcon } from './index';
export default {
title: 'shared/icons',
component: AgentIcon,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function AgentIcons() {
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
index ca73f6ddd05b3..4abd36a277311 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
@@ -66,7 +66,6 @@ export function AlertingPopoverAndFlyout({
const button = (
();
+ const serviceName = useServiceName();
const { search } = window.location;
const { application, http } = core;
const { basePath } = http;
@@ -41,7 +41,7 @@ export function ApmHeaderActionMenu() {
return (
-
+
{i18n.translate('xpack.apm.settingsLinkLabel', {
defaultMessage: 'Settings',
})}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx
index 0eb5b0e84ff39..6128526c577e4 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx
@@ -6,8 +6,7 @@
*/
import { TooltipInfo } from '@elastic/charts';
-import React, { ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import React from 'react';
import { getDurationFormatter } from '../../../../../common/utils/formatters';
import { MainStatsServiceInstanceItem } from '../../../app/service_overview/service_overview_instances_chart_and_table';
import { CustomTooltip } from './custom_tooltip';
@@ -25,13 +24,6 @@ function getLatencyFormatter(props: TooltipInfo) {
export default {
title: 'shared/charts/InstancesLatencyDistributionChart/CustomTooltip',
component: CustomTooltip,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function Example(props: TooltipInfo) {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
index c574645d485d5..80bfcca05aabc 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
@@ -5,8 +5,7 @@
* 2.0.
*/
-import React, { ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import React from 'react';
import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
import {
InstancesLatencyDistributionChart,
@@ -16,13 +15,6 @@ import {
export default {
title: 'shared/charts/InstancesLatencyDistributionChart',
component: InstancesLatencyDistributionChart,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function Example({ items }: InstancesLatencyDistributionChartProps) {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
index d1dcd831eadd7..ff2b95667a63a 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
@@ -8,7 +8,6 @@
import { StoryContext } from '@storybook/react';
import React, { ComponentType } from 'react';
import { MemoryRouter, Route } from 'react-router-dom';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
import {
@@ -76,20 +75,18 @@ export default {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx b/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
index b053f441e9632..7d2e2fbefc359 100644
--- a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
@@ -6,32 +6,23 @@
*/
import {
- EuiImage,
EuiCard,
+ EuiCodeBlock,
EuiFlexGroup,
EuiFlexItem,
+ EuiImage,
EuiSpacer,
- EuiCodeBlock,
EuiToolTip,
} from '@elastic/eui';
-import React, { ComponentType } from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import React from 'react';
+import { getSpanIcon, spanTypeIcons } from './get_span_icon';
import { SpanIcon } from './index';
-import { getSpanIcon } from './get_span_icon';
-import { spanTypeIcons } from './get_span_icon';
const spanTypes = Object.keys(spanTypeIcons);
export default {
title: 'shared/icons',
component: SpanIcon,
- decorators: [
- (Story: ComponentType) => (
-
-
- ),
- ],
};
export function SpanIcons() {
diff --git a/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx b/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx
index 54914580aefbd..cb826763425c2 100644
--- a/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx
@@ -18,6 +18,7 @@ import { useServiceAgentNameFetcher } from './use_service_agent_name_fetcher';
import { IUrlParams } from '../url_params_context/types';
import { APIReturnType } from '../../services/rest/createCallApmApi';
import { useServiceAlertsFetcher } from './use_service_alerts_fetcher';
+import { useServiceName } from '../../hooks/use_service_name';
export type APMServiceAlert = ValuesType<
APIReturnType<'GET /api/apm/services/{serviceName}/alerts'>['alerts']
@@ -28,6 +29,7 @@ export const APMServiceContext = createContext<{
transactionType?: string;
transactionTypes: string[];
alerts: APMServiceAlert[];
+ serviceName?: string;
}>({ transactionTypes: [], alerts: [] });
export function ApmServiceContextProvider({
@@ -36,9 +38,12 @@ export function ApmServiceContextProvider({
children: ReactNode;
}) {
const { urlParams } = useUrlParams();
- const { agentName } = useServiceAgentNameFetcher();
- const transactionTypes = useServiceTransactionTypesFetcher();
+ const serviceName = useServiceName();
+
+ const { agentName } = useServiceAgentNameFetcher(serviceName);
+
+ const transactionTypes = useServiceTransactionTypesFetcher(serviceName);
const transactionType = getTransactionType({
urlParams,
@@ -46,7 +51,7 @@ export function ApmServiceContextProvider({
agentName,
});
- const { alerts } = useServiceAlertsFetcher(transactionType);
+ const { alerts } = useServiceAlertsFetcher({ serviceName, transactionType });
return (
{
@@ -311,20 +311,21 @@ export class ApmPlugin implements Plugin {
}
public start(core: CoreStart, plugins: ApmPluginStartDeps) {
const { fleet } = plugins;
-
- const agentEnrollmentExtensionData = getApmEnrollmentFlyoutData();
-
- fleet.registerExtension({
- package: 'apm',
- view: 'agent-enrollment-flyout',
- title: agentEnrollmentExtensionData.title,
- Component: agentEnrollmentExtensionData.Component,
- });
-
- fleet.registerExtension({
- package: 'apm',
- view: 'package-detail-assets',
- Component: LazyApmCustomAssetsExtension,
- });
+ if (fleet) {
+ const agentEnrollmentExtensionData = getApmEnrollmentFlyoutData();
+
+ fleet.registerExtension({
+ package: 'apm',
+ view: 'agent-enrollment-flyout',
+ title: agentEnrollmentExtensionData.title,
+ Component: agentEnrollmentExtensionData.Component,
+ });
+
+ fleet.registerExtension({
+ package: 'apm',
+ view: 'package-detail-assets',
+ Component: LazyApmCustomAssetsExtension,
+ });
+ }
}
}
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
index 33f171ab88247..0d4d3748422ea 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
@@ -18,6 +18,7 @@ interface Args {
onPrem: boolean;
hasFleetPoliciesWithApmIntegration: boolean;
hasCloudPolicyWithApmIntegration: boolean;
+ isFleetEnabled: boolean;
}
const policyElasticAgentOnCloudAgent: APIResponseType['fleetAgents'][0] = {
@@ -47,6 +48,7 @@ function Wrapper({
apmAgent,
onPrem,
hasCloudPolicyWithApmIntegration,
+ isFleetEnabled,
}: Args) {
const http = ({
get: () => ({
@@ -56,6 +58,7 @@ function Wrapper({
? [policyElasticAgentOnCloudAgent]
: []),
],
+ isFleetEnabled,
cloudStandaloneSetup: {
apmServerUrl: 'cloud_url',
secretToken: 'foo',
@@ -80,6 +83,7 @@ Integration.args = {
onPrem: true,
hasFleetPoliciesWithApmIntegration: false,
hasCloudPolicyWithApmIntegration: false,
+ isFleetEnabled: true,
};
export default {
@@ -113,5 +117,8 @@ export default {
hasCloudPolicyWithApmIntegration: {
control: { type: 'boolean', options: [true, false] },
},
+ isFleetEnabled: {
+ control: { type: 'boolean', options: [true, false], defaultValue: true },
+ },
},
};
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts
index 90c9aab80f6f5..c6dc7265f3d3e 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts
@@ -41,6 +41,7 @@ describe('getPolicyOptions', () => {
apmServerUrl: 'cloud_url',
secretToken: 'cloud_token',
},
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: true,
@@ -65,6 +66,7 @@ describe('getPolicyOptions', () => {
apmServerUrl: 'cloud_url',
secretToken: 'cloud_token',
},
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: true,
@@ -109,6 +111,7 @@ describe('getPolicyOptions', () => {
apmServerUrl: 'cloud_url',
secretToken: 'cloud_token',
},
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: true,
@@ -151,6 +154,7 @@ describe('getPolicyOptions', () => {
const data: APIResponseType = {
fleetAgents: [],
cloudStandaloneSetup: undefined,
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: true,
@@ -173,6 +177,7 @@ describe('getPolicyOptions', () => {
const data: APIResponseType = {
fleetAgents,
cloudStandaloneSetup: undefined,
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: true,
@@ -213,6 +218,7 @@ describe('getPolicyOptions', () => {
const data: APIResponseType = {
fleetAgents: [policyElasticAgentOnCloudAgent, ...fleetAgents],
cloudStandaloneSetup: undefined,
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: true,
@@ -256,6 +262,7 @@ describe('getPolicyOptions', () => {
const data: APIResponseType = {
fleetAgents: [],
cloudStandaloneSetup: undefined,
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: false,
@@ -278,6 +285,7 @@ describe('getPolicyOptions', () => {
const data: APIResponseType = {
fleetAgents,
cloudStandaloneSetup: undefined,
+ isFleetEnabled: true,
};
const options = getPolicyOptions({
isCloudEnabled: false,
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
index 8f8afe58506a6..cb49cee108bd1 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
@@ -7,6 +7,10 @@
import { fireEvent, render, screen } from '@testing-library/react';
import { HttpStart } from 'kibana/public';
import React from 'react';
+import {
+ expectTextsInDocument,
+ expectTextsNotInDocument,
+} from '../../utils/testHelpers';
import TutorialConfigAgent from './';
const policyElasticAgentOnCloudAgent = {
@@ -32,68 +36,32 @@ const fleetAgents = [
];
describe('TutorialConfigAgent', () => {
- it('renders loading component while API is being called', () => {
- const component = render(
- {
get: jest.fn().mockReturnValue({
cloudStandaloneSetup: undefined,
fleetAgents,
+ isFleetEnabled: true,
}),
} as unknown) as HttpStart
}
@@ -112,10 +81,7 @@ describe('TutorialConfigAgent', () => {
expect(
await screen.findByText('Default Standalone configuration')
).toBeInTheDocument();
- expect(
- component.getByTestId('policySelector_onPrem')
- ).toBeInTheDocument();
- const commands = component.getByTestId('commands').innerHTML;
+ let commands = component.getByTestId('commands').innerHTML;
expect(commands).not.toEqual('');
expect(commands).toMatchInlineSnapshot(`
"java -javaagent:/path/to/elastic-apm-agent-<version>.jar \\\\
@@ -126,21 +92,238 @@ describe('TutorialConfigAgent', () => {
-Delastic.apm.application_packages=org.example \\\\
-jar my-application.jar"
`);
+
+ fireEvent.click(component.getByTestId('comboBoxToggleListButton'));
+ fireEvent.click(component.getByText('agent foo'));
+ commands = component.getByTestId('commands').innerHTML;
+ expect(commands).not.toEqual('');
+ expect(commands).toMatchInlineSnapshot(`
+ "java -javaagent:/path/to/elastic-apm-agent-<version>.jar \\\\
+ -Delastic.apm.service_name=my-application \\\\
+ -Delastic.apm.server_urls=foo \\\\
+ -Delastic.apm.secret_token=foo \\\\
+ -Delastic.apm.environment=production \\\\
+ -Delastic.apm.application_packages=org.example \\\\
+ -jar my-application.jar"
+ `);
+ });
+ describe('running on prem', () => {
+ it('selects defaul standalone by defauls', async () => {
+ const component = render(
+ {
+ throw new Error('Boom');
+ },
+ } as unknown) as HttpStart
+ }
+ basePath="http://localhost:5601"
+ isCloudEnabled
+ />
+ );
+ expect(
+ await screen.findByText('Default Standalone configuration')
+ ).toBeInTheDocument();
+ const commands = component.getByTestId('commands').innerHTML;
+ expect(commands).not.toEqual('');
+ expect(commands).toMatchInlineSnapshot(`
+ "java -javaagent:/path/to/elastic-apm-agent-<version>.jar \\\\
+ -Delastic.apm.service_name=my-application \\\\
+ -Delastic.apm.server_urls=http://localhost:8200 \\\\
+ -Delastic.apm.secret_token= \\\\
+ -Delastic.apm.environment=production \\\\
+ -Delastic.apm.application_packages=org.example \\\\
+ -jar my-application.jar"
+ `);
+ });
});
});
- describe('running on cloud', () => {
- it('selects defaul standalone by defauls', async () => {
+ describe('when fleet plugin is disabled', () => {
+ it('hides fleet links', async () => {
const component = render(
{
expect(
await screen.findByText('Default Standalone configuration')
).toBeInTheDocument();
- expect(component.getByTestId('policySelector_cloud')).toBeInTheDocument();
+ expect(
+ component.getByTestId('policySelector_onPrem')
+ ).toBeInTheDocument();
const commands = component.getByTestId('commands').innerHTML;
expect(commands).not.toEqual('');
expect(commands).toMatchInlineSnapshot(`
"java -javaagent:/path/to/elastic-apm-agent-<version>.jar \\\\
-Delastic.apm.service_name=my-application \\\\
- -Delastic.apm.server_urls=cloud_url \\\\
- -Delastic.apm.secret_token=cloud_token \\\\
+ -Delastic.apm.server_urls=http://localhost:8200 \\\\
+ -Delastic.apm.secret_token= \\\\
-Delastic.apm.environment=production \\\\
-Delastic.apm.application_packages=org.example \\\\
-jar my-application.jar"
`);
});
- it('selects policy elastic agent on cloud when available by default', async () => {
+ it('shows default standalone on cloud', async () => {
const component = render(
{
apmServerUrl: 'cloud_url',
secretToken: 'cloud_token',
},
- fleetAgents: [...fleetAgents, policyElasticAgentOnCloudAgent],
+ fleetAgents: [],
+ isFleetEnabled: false,
}),
} as unknown) as HttpStart
}
@@ -184,18 +370,16 @@ describe('TutorialConfigAgent', () => {
/>
);
expect(
- await screen.findByText('Elastic Cloud agent policy')
- ).toBeInTheDocument();
- expect(
- component.getByTestId('policySelector_policy-elastic-agent-on-cloud')
+ await screen.findByText('Default Standalone configuration')
).toBeInTheDocument();
+ expect(component.getByTestId('policySelector_cloud')).toBeInTheDocument();
const commands = component.getByTestId('commands').innerHTML;
expect(commands).not.toEqual('');
expect(commands).toMatchInlineSnapshot(`
"java -javaagent:/path/to/elastic-apm-agent-<version>.jar \\\\
-Delastic.apm.service_name=my-application \\\\
- -Delastic.apm.server_urls=apm_cloud_url \\\\
- -Delastic.apm.secret_token=apm_cloud_token \\\\
+ -Delastic.apm.server_urls=cloud_url \\\\
+ -Delastic.apm.secret_token=cloud_token \\\\
-Delastic.apm.environment=production \\\\
-Delastic.apm.application_packages=org.example \\\\
-jar my-application.jar"
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
index 755c3eca55868..d38d51f01c67b 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
@@ -46,16 +46,43 @@ interface Props {
isCloudEnabled: boolean;
}
+const INITIAL_STATE = {
+ fleetAgents: [],
+ cloudStandaloneSetup: undefined,
+ isFleetEnabled: false,
+};
+
+function getFleetLink({
+ isFleetEnabled,
+ hasFleetAgents,
+ basePath,
+}: {
+ isFleetEnabled: boolean;
+ hasFleetAgents: boolean;
+ basePath: string;
+}) {
+ if (!isFleetEnabled) {
+ return;
+ }
+
+ return hasFleetAgents
+ ? {
+ label: MANAGE_FLEET_POLICIES_LABEL,
+ href: `${basePath}/app/fleet#/policies`,
+ }
+ : {
+ label: GET_STARTED_WITH_FLEET_LABEL,
+ href: `${basePath}/app/integrations#/detail/apm-0.3.0/overview`,
+ };
+}
+
function TutorialConfigAgent({
variantId,
http,
basePath,
isCloudEnabled,
}: Props) {
- const [data, setData] = useState({
- fleetAgents: [],
- cloudStandaloneSetup: undefined,
- });
+ const [data, setData] = useState(INITIAL_STATE);
const [isLoading, setIsLoading] = useState(true);
const [selectedOption, setSelectedOption] = useState();
@@ -68,6 +95,7 @@ function TutorialConfigAgent({
setData(response as APIResponseType);
}
} catch (e) {
+ setIsLoading(false);
console.error('Error while fetching fleet agents.', e);
}
}
@@ -105,15 +133,6 @@ function TutorialConfigAgent({
});
const hasFleetAgents = !!data.fleetAgents.length;
- const fleetLink = hasFleetAgents
- ? {
- label: MANAGE_FLEET_POLICIES_LABEL,
- href: `${basePath}/app/fleet#/policies`,
- }
- : {
- label: GET_STARTED_WITH_FLEET_LABEL,
- href: `${basePath}/app/integrations#/detail/apm-0.3.0/overview`,
- };
return (
<>
@@ -125,7 +144,11 @@ function TutorialConfigAgent({
onChange={(newSelectedOption) =>
setSelectedOption(newSelectedOption)
}
- fleetLink={fleetLink}
+ fleetLink={getFleetLink({
+ isFleetEnabled: data.isFleetEnabled,
+ hasFleetAgents,
+ basePath,
+ })}
/>
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/policy_selector.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/policy_selector.tsx
index 3a0c6d70db82b..25ce7042c4c97 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/policy_selector.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/policy_selector.tsx
@@ -21,7 +21,7 @@ interface Props {
options: PolicyOption[];
selectedOption?: PolicyOption;
onChange: (selectedOption?: PolicyOption) => void;
- fleetLink: {
+ fleetLink?: {
label: string;
href: string;
};
@@ -58,9 +58,11 @@ export function PolicySelector({
{ defaultMessage: 'Choose policy' }
)}
labelAppend={
-
- {fleetLink.label}
-
+ fleetLink && (
+
+ {fleetLink.label}
+
+ )
}
helpText={i18n.translate(
'xpack.apm.tutorial.agent_config.choosePolicy.helper',
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
index 8a81b7a994e76..6fcf13345538f 100644
--- a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
@@ -42,6 +42,7 @@ function TutorialFleetInstructions({ http, basePath, isDarkTheme }: Props) {
const response = await http.get('/api/apm/fleet/has_data');
setData(response as APIResponseType);
} catch (e) {
+ setIsLoading(false);
console.error('Error while fetching fleet details.', e);
}
setIsLoading(false);
diff --git a/x-pack/plugins/apm/server/feature.ts b/x-pack/plugins/apm/server/feature.ts
index fb0610dffb92e..f3e2bba2d9789 100644
--- a/x-pack/plugins/apm/server/feature.ts
+++ b/x-pack/plugins/apm/server/feature.ts
@@ -6,8 +6,9 @@
*/
import { i18n } from '@kbn/i18n';
+import { SubFeaturePrivilegeGroupType } from '../../features/common';
import { LicenseType } from '../../licensing/common/types';
-import { AlertType } from '../common/alert_types';
+import { AlertType, APM_SERVER_FEATURE_ID } from '../common/alert_types';
import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
import {
LicensingPluginSetup,
@@ -15,14 +16,14 @@ import {
} from '../../licensing/server';
export const APM_FEATURE = {
- id: 'apm',
+ id: APM_SERVER_FEATURE_ID,
name: i18n.translate('xpack.apm.featureRegistry.apmFeatureName', {
defaultMessage: 'APM and User Experience',
}),
order: 900,
category: DEFAULT_APP_CATEGORIES.observability,
- app: ['apm', 'ux', 'kibana'],
- catalogue: ['apm'],
+ app: [APM_SERVER_FEATURE_ID, 'ux', 'kibana'],
+ catalogue: [APM_SERVER_FEATURE_ID],
management: {
insightsAndAlerting: ['triggersActions'],
},
@@ -30,9 +31,9 @@ export const APM_FEATURE = {
// see x-pack/plugins/features/common/feature_kibana_privileges.ts
privileges: {
all: {
- app: ['apm', 'ux', 'kibana'],
- api: ['apm', 'apm_write'],
- catalogue: ['apm'],
+ app: [APM_SERVER_FEATURE_ID, 'ux', 'kibana'],
+ api: [APM_SERVER_FEATURE_ID, 'apm_write', 'rac'],
+ catalogue: [APM_SERVER_FEATURE_ID],
savedObject: {
all: [],
read: [],
@@ -41,9 +42,6 @@ export const APM_FEATURE = {
rule: {
all: Object.values(AlertType),
},
- alert: {
- all: Object.values(AlertType),
- },
},
management: {
insightsAndAlerting: ['triggersActions'],
@@ -51,9 +49,9 @@ export const APM_FEATURE = {
ui: ['show', 'save', 'alerting:show', 'alerting:save'],
},
read: {
- app: ['apm', 'ux', 'kibana'],
- api: ['apm'],
- catalogue: ['apm'],
+ app: [APM_SERVER_FEATURE_ID, 'ux', 'kibana'],
+ api: [APM_SERVER_FEATURE_ID, 'rac'],
+ catalogue: [APM_SERVER_FEATURE_ID],
savedObject: {
all: [],
read: [],
@@ -62,9 +60,6 @@ export const APM_FEATURE = {
rule: {
read: Object.values(AlertType),
},
- alert: {
- read: Object.values(AlertType),
- },
},
management: {
insightsAndAlerting: ['triggersActions'],
@@ -72,6 +67,60 @@ export const APM_FEATURE = {
ui: ['show', 'alerting:show', 'alerting:save'],
},
},
+ subFeatures: [
+ {
+ name: i18n.translate('xpack.apm.featureRegistry.manageAlertsName', {
+ defaultMessage: 'Alerts',
+ }),
+ privilegeGroups: [
+ {
+ groupType: 'mutually_exclusive' as SubFeaturePrivilegeGroupType,
+ privileges: [
+ {
+ id: 'alerts_all',
+ name: i18n.translate(
+ 'xpack.apm.featureRegistry.subfeature.alertsAllName',
+ {
+ defaultMessage: 'All',
+ }
+ ),
+ includeIn: 'all' as 'all',
+ alerting: {
+ alert: {
+ all: Object.values(AlertType),
+ },
+ },
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: [],
+ },
+ {
+ id: 'alerts_read',
+ name: i18n.translate(
+ 'xpack.apm.featureRegistry.subfeature.alertsReadName',
+ {
+ defaultMessage: 'Read',
+ }
+ ),
+ includeIn: 'read' as 'read',
+ alerting: {
+ alert: {
+ read: Object.values(AlertType),
+ },
+ },
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: [],
+ },
+ ],
+ },
+ ],
+ },
+ ],
};
interface Feature {
diff --git a/x-pack/plugins/apm/server/index.test.ts b/x-pack/plugins/apm/server/index.test.ts
index 6052ec921f9f9..56c9825db5a5c 100644
--- a/x-pack/plugins/apm/server/index.test.ts
+++ b/x-pack/plugins/apm/server/index.test.ts
@@ -30,7 +30,7 @@ describe('mergeConfigs', () => {
expect(mergeConfigs(apmOssConfig, apmConfig)).toEqual({
'apm_oss.errorIndices': 'logs-apm*,apm-*-error-*',
- 'apm_oss.indexPattern': 'apm-*',
+ 'apm_oss.indexPattern': 'traces-apm*,logs-apm*,metrics-apm*,apm-*',
'apm_oss.metricsIndices': 'metrics-apm*,apm-*-metric-*',
'apm_oss.spanIndices': 'traces-apm*,apm-*-span-*',
'apm_oss.transactionIndices': 'traces-apm*,apm-*-transaction-*',
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 8ec92bfa7a1b5..9031f454f4a7f 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -74,7 +74,7 @@ export function mergeConfigs(
'apm_oss.metricsIndices': apmOssConfig.metricsIndices,
'apm_oss.sourcemapIndices': apmOssConfig.sourcemapIndices,
'apm_oss.onboardingIndices': apmOssConfig.onboardingIndices,
- 'apm_oss.indexPattern': apmOssConfig.indexPattern, // TODO: add data stream indices: traces-apm*,logs-apm*,metrics-apm*. Blocked by https://github.com/elastic/kibana/issues/87851
+ 'apm_oss.indexPattern': apmOssConfig.indexPattern,
/* eslint-enable @typescript-eslint/naming-convention */
'xpack.apm.serviceMapEnabled': apmConfig.serviceMapEnabled,
'xpack.apm.serviceMapFingerprintBucketSize':
@@ -119,12 +119,17 @@ export function mergeConfigs(
'apm_oss.metricsIndices'
] = `metrics-apm*,${mergedConfig['apm_oss.metricsIndices']}`;
+ mergedConfig[
+ 'apm_oss.indexPattern'
+ ] = `traces-apm*,logs-apm*,metrics-apm*,${mergedConfig['apm_oss.indexPattern']}`;
+
return mergedConfig;
}
export const plugin = (initContext: PluginInitializerContext) =>
new APMPlugin(initContext);
+export { APM_SERVER_FEATURE_ID } from '../common/alert_types';
export { APMPlugin } from './plugin';
export { APMPluginSetup } from './types';
export { APMServerRouteRepository } from './routes/get_global_apm_server_route_repository';
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
index 7548d6eba060a..35c80df2ca31c 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
@@ -17,7 +17,11 @@ import {
getEnvironmentEsField,
getEnvironmentLabel,
} from '../../../common/environment_filter_values';
-import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
+import {
+ AlertType,
+ APM_SERVER_FEATURE_ID,
+ ALERT_TYPES_CONFIG,
+} from '../../../common/alert_types';
import {
PROCESSOR_EVENT,
SERVICE_ENVIRONMENT,
@@ -69,7 +73,7 @@ export function registerErrorCountAlertType({
apmActionVariables.interval,
],
},
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
minimumLicenseRequired: 'basic',
isExportable: true,
executor: async ({ services, params }) => {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
index ca7806251f75e..ff202669fe1da 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -17,7 +17,11 @@ import {
getEnvironmentLabel,
getEnvironmentEsField,
} from '../../../common/environment_filter_values';
-import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
+import {
+ AlertType,
+ APM_SERVER_FEATURE_ID,
+ ALERT_TYPES_CONFIG,
+} from '../../../common/alert_types';
import {
PROCESSOR_EVENT,
SERVICE_NAME,
@@ -77,7 +81,7 @@ export function registerTransactionDurationAlertType({
apmActionVariables.interval,
],
},
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
minimumLicenseRequired: 'basic',
isExportable: true,
executor: async ({ services, params }) => {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
index 718ffd9c92167..36fd9c3fac58d 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
@@ -17,7 +17,11 @@ import {
getEnvironmentLabel,
} from '../../../common/environment_filter_values';
import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
-import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
+import {
+ AlertType,
+ ALERT_TYPES_CONFIG,
+ APM_SERVER_FEATURE_ID,
+} from '../../../common/alert_types';
import {
EVENT_OUTCOME,
PROCESSOR_EVENT,
@@ -75,7 +79,7 @@ export function registerTransactionErrorRateAlertType({
apmActionVariables.interval,
],
},
- producer: 'apm',
+ producer: APM_SERVER_FEATURE_ID,
minimumLicenseRequired: 'basic',
isExportable: true,
executor: async ({ services, params: alertParams }) => {
diff --git a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
index 9dc22844bb629..679f33707b5b5 100644
--- a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
@@ -10,7 +10,7 @@ import { of } from 'rxjs';
import { elasticsearchServiceMock } from 'src/core/server/mocks';
import type { RuleDataClient } from '../../../../../rule_registry/server';
import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../../alerting/server';
-import { APMConfig } from '../../..';
+import { APMConfig, APM_SERVER_FEATURE_ID } from '../../..';
export const createRuleTypeMocks = () => {
let alertExecutor: (...args: any[]) => Promise;
@@ -38,6 +38,9 @@ export const createRuleTypeMocks = () => {
const services = {
scopedClusterClient: elasticsearchServiceMock.createScopedClusterClient(),
+ savedObjectsClient: {
+ get: () => ({ attributes: { consumer: APM_SERVER_FEATURE_ID } }),
+ },
alertInstanceFactory: jest.fn(() => ({ scheduleActions })),
alertWithLifecycle: jest.fn(),
logger: loggerMock,
@@ -68,6 +71,13 @@ export const createRuleTypeMocks = () => {
return alertExecutor({
services,
params,
+ rule: {
+ consumer: APM_SERVER_FEATURE_ID,
+ name: 'name',
+ producer: 'producer',
+ ruleTypeId: 'ruleTypeId',
+ ruleTypeName: 'ruleTypeName',
+ },
startedAt: new Date(),
});
},
diff --git a/x-pack/plugins/apm/server/lib/fleet/create_cloud_apm_package_policy.ts b/x-pack/plugins/apm/server/lib/fleet/create_cloud_apm_package_policy.ts
index 9e3095a8d1bca..c336e5dc95ba6 100644
--- a/x-pack/plugins/apm/server/lib/fleet/create_cloud_apm_package_policy.ts
+++ b/x-pack/plugins/apm/server/lib/fleet/create_cloud_apm_package_policy.ts
@@ -14,15 +14,20 @@ import {
APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE,
APM_SERVER_SCHEMA_SAVED_OBJECT_ID,
} from '../../../common/apm_saved_object_constants';
-import { APMPluginStartDependencies } from '../../types';
+import {
+ APMPluginSetupDependencies,
+ APMPluginStartDependencies,
+} from '../../types';
import { getApmPackagePolicyDefinition } from './get_apm_package_policy_definition';
export async function createCloudApmPackgePolicy({
+ cloudPluginSetup,
fleetPluginStart,
savedObjectsClient,
esClient,
logger,
}: {
+ cloudPluginSetup: APMPluginSetupDependencies['cloud'];
fleetPluginStart: NonNullable;
savedObjectsClient: SavedObjectsClientContract;
esClient: ElasticsearchClient;
@@ -35,9 +40,10 @@ export async function createCloudApmPackgePolicy({
const apmServerSchema: Record = JSON.parse(
(attributes as { schemaJson: string }).schemaJson
);
- const apmPackagePolicyDefinition = getApmPackagePolicyDefinition(
- apmServerSchema
- );
+ const apmPackagePolicyDefinition = getApmPackagePolicyDefinition({
+ apmServerSchema,
+ cloudPluginSetup,
+ });
logger.info(`Fleet migration on Cloud - apmPackagePolicy create start`);
const apmPackagePolicy = await fleetPluginStart.packagePolicyService.create(
savedObjectsClient,
diff --git a/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.ts b/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.ts
index fb88a092cb265..291b2fa2af99d 100644
--- a/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.ts
+++ b/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.ts
@@ -5,16 +5,21 @@
* 2.0.
*/
+import { APMPluginSetupDependencies } from '../../types';
import {
POLICY_ELASTIC_AGENT_ON_CLOUD,
APM_PACKAGE_NAME,
} from './get_cloud_apm_package_policy';
+interface GetApmPackagePolicyDefinitionOptions {
+ apmServerSchema: Record;
+ cloudPluginSetup: APMPluginSetupDependencies['cloud'];
+}
export function getApmPackagePolicyDefinition(
- apmServerSchema: Record
+ options: GetApmPackagePolicyDefinitionOptions
) {
return {
- name: 'apm',
+ name: 'Elastic APM',
namespace: 'default',
enabled: true,
policy_id: POLICY_ELASTIC_AGENT_ON_CLOUD,
@@ -24,27 +29,28 @@ export function getApmPackagePolicyDefinition(
type: 'apm',
enabled: true,
streams: [],
- vars: getApmPackageInputVars(apmServerSchema),
+ vars: getApmPackageInputVars(options),
},
],
package: {
name: APM_PACKAGE_NAME,
- version: '0.3.0-dev.1',
+ version: '0.3.0',
title: 'Elastic APM',
},
};
}
-function getApmPackageInputVars(apmServerSchema: Record) {
+function getApmPackageInputVars(options: GetApmPackagePolicyDefinitionOptions) {
+ const { apmServerSchema } = options;
const apmServerConfigs = Object.entries(
apmConfigMapping
- ).map(([key, { name, type }]) => ({ key, name, type }));
+ ).map(([key, { name, type, getValue }]) => ({ key, name, type, getValue }));
const inputVars: Record<
string,
{ type: string; value: any }
- > = apmServerConfigs.reduce((acc, { key, name, type }) => {
- const value = apmServerSchema[key] ?? ''; // defaults to an empty string to be edited in Fleet UI
+ > = apmServerConfigs.reduce((acc, { key, name, type, getValue }) => {
+ const value = (getValue ? getValue(options) : apmServerSchema[key]) ?? ''; // defaults to an empty string to be edited in Fleet UI
return {
...acc,
[name]: { type, value },
@@ -55,7 +61,11 @@ function getApmPackageInputVars(apmServerSchema: Record) {
export const apmConfigMapping: Record<
string,
- { name: string; type: string }
+ {
+ name: string;
+ type: string;
+ getValue?: (options: GetApmPackagePolicyDefinitionOptions) => any;
+ }
> = {
'apm-server.host': {
name: 'host',
@@ -64,6 +74,7 @@ export const apmConfigMapping: Record<
'apm-server.url': {
name: 'url',
type: 'text',
+ getValue: ({ cloudPluginSetup }) => cloudPluginSetup?.apm?.url,
},
'apm-server.secret_token': {
name: 'secret_token',
diff --git a/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.ts b/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.ts
index 4294c5b82cd63..1365ddc28ddb2 100644
--- a/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.ts
+++ b/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.ts
@@ -10,6 +10,7 @@ import {
CoreStart,
SavedObjectsClientContract,
} from 'kibana/server';
+import { TelemetryUsageCounter } from '../../routes/typings';
import { APMPluginStartDependencies } from '../../types';
import { getInternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
import { Setup } from '../helpers/setup_request';
@@ -21,11 +22,19 @@ export async function syncAgentConfigsToApmPackagePolicies({
core,
fleetPluginStart,
setup,
+ telemetryUsageCounter,
}: {
core: { setup: CoreSetup; start: () => Promise };
fleetPluginStart: NonNullable;
setup: Setup;
+ telemetryUsageCounter?: TelemetryUsageCounter;
}) {
+ if (telemetryUsageCounter) {
+ telemetryUsageCounter.incrementCounter({
+ counterName: 'sync_agent_config_to_apm_package_policies',
+ counterType: 'success',
+ });
+ }
const coreStart = await core.start();
const esClient = coreStart.elasticsearch.client.asInternalUser;
const [
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
index 607a7e6227a9d..a2944d6241d2d 100644
--- a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
+++ b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
@@ -19,7 +19,8 @@ export async function createStaticIndexPattern(
setup: Setup,
config: APMRouteHandlerResources['config'],
savedObjectsClient: InternalSavedObjectsClient,
- spaceId: string | undefined
+ spaceId: string | undefined,
+ overwrite = false
): Promise {
return withApmSpan('create_static_index_pattern', async () => {
// don't autocreate APM index pattern if it's been disabled via the config
@@ -45,7 +46,7 @@ export async function createStaticIndexPattern(
},
{
id: APM_STATIC_INDEX_PATTERN_ID,
- overwrite: false,
+ overwrite,
namespace: spaceId,
}
)
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index 647330eade1f5..3a7eb738dd3b2 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -15,10 +15,10 @@ import {
Plugin,
PluginInitializerContext,
} from 'src/core/server';
-import { mapValues, once } from 'lodash';
+import { isEmpty, mapValues, once } from 'lodash';
import { TECHNICAL_COMPONENT_TEMPLATE_NAME } from '../../rule_registry/common/assets';
import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { APMConfig, APMXPackConfig } from '.';
+import { APMConfig, APMXPackConfig, APM_SERVER_FEATURE_ID } from '.';
import { mergeConfigs } from './index';
import { UI_SETTINGS } from '../../../../src/plugins/data/common';
import { APM_FEATURE, registerFeaturesUsage } from './feature';
@@ -104,21 +104,6 @@ export class APMPlugin
});
}
- plugins.home?.tutorials.registerTutorial(
- tutorialProvider({
- isEnabled: this.currentConfig['xpack.apm.ui.enabled'],
- indexPatternTitle: this.currentConfig['apm_oss.indexPattern'],
- cloud: plugins.cloud,
- indices: {
- errorIndices: this.currentConfig['apm_oss.errorIndices'],
- metricsIndices: this.currentConfig['apm_oss.metricsIndices'],
- onboardingIndices: this.currentConfig['apm_oss.onboardingIndices'],
- sourcemapIndices: this.currentConfig['apm_oss.sourcemapIndices'],
- transactionIndices: this.currentConfig['apm_oss.transactionIndices'],
- },
- })
- );
-
plugins.features.registerKibanaFeature(APM_FEATURE);
registerFeaturesUsage({ licensingPlugin: plugins.licensing });
@@ -188,6 +173,7 @@ export class APMPlugin
);
const ruleDataClient = ruleDataService.getRuleDataClient(
+ APM_SERVER_FEATURE_ID,
ruleDataService.getFullAssetName('observability-apm'),
() => initializeRuleDataTemplatesPromise
);
@@ -205,8 +191,24 @@ export class APMPlugin
};
}) as APMRouteHandlerResources['plugins'];
+ plugins.home?.tutorials.registerTutorial(
+ tutorialProvider({
+ isEnabled: this.currentConfig['xpack.apm.ui.enabled'],
+ indexPatternTitle: this.currentConfig['apm_oss.indexPattern'],
+ cloud: plugins.cloud,
+ isFleetPluginEnabled: !isEmpty(resourcePlugins.fleet),
+ indices: {
+ errorIndices: this.currentConfig['apm_oss.errorIndices'],
+ metricsIndices: this.currentConfig['apm_oss.metricsIndices'],
+ onboardingIndices: this.currentConfig['apm_oss.onboardingIndices'],
+ sourcemapIndices: this.currentConfig['apm_oss.sourcemapIndices'],
+ transactionIndices: this.currentConfig['apm_oss.transactionIndices'],
+ },
+ })
+ );
+
const telemetryUsageCounter = resourcePlugins.usageCollection?.setup.createUsageCounter(
- 'apm'
+ APM_SERVER_FEATURE_ID
);
registerRoutes({
diff --git a/x-pack/plugins/apm/server/routes/fleet.ts b/x-pack/plugins/apm/server/routes/fleet.ts
index 6208b42e844fa..b760014d6af89 100644
--- a/x-pack/plugins/apm/server/routes/fleet.ts
+++ b/x-pack/plugins/apm/server/routes/fleet.ts
@@ -25,6 +25,8 @@ import { createCloudApmPackgePolicy } from '../lib/fleet/create_cloud_apm_packag
import { getUnsupportedApmServerSchema } from '../lib/fleet/get_unsupported_apm_server_schema';
import { isSuperuser } from '../lib/fleet/is_superuser';
import { getInternalSavedObjectsClient } from '../lib/helpers/get_internal_saved_objects_client';
+import { setupRequest } from '../lib/helpers/setup_request';
+import { createStaticIndexPattern } from '../lib/index_pattern/create_static_index_pattern';
const hasFleetDataRoute = createApmServerRoute({
endpoint: 'GET /api/apm/fleet/has_data',
@@ -32,7 +34,7 @@ const hasFleetDataRoute = createApmServerRoute({
handler: async ({ core, plugins }) => {
const fleetPluginStart = await plugins.fleet?.start();
if (!fleetPluginStart) {
- throw Boom.internal(FLEET_REQUIRED_MESSAGE);
+ return { hasData: false };
}
const packagePolicies = await getApmPackgePolicies({
core,
@@ -56,7 +58,7 @@ const fleetAgentsRoute = createApmServerRoute({
const fleetPluginStart = await plugins.fleet?.start();
if (!fleetPluginStart) {
- throw Boom.internal(FLEET_REQUIRED_MESSAGE);
+ return { cloudStandaloneSetup, fleetAgents: [], isFleetEnabled: false };
}
// fetches package policies that contains APM integrations
const packagePolicies = await getApmPackgePolicies({
@@ -75,6 +77,7 @@ const fleetAgentsRoute = createApmServerRoute({
return {
cloudStandaloneSetup,
+ isFleetEnabled: true,
fleetAgents: fleetAgents.map((agent) => {
const packagePolicy = policiesGroupedById[agent.id];
const packagePolicyVars = packagePolicy.inputs[0]?.vars;
@@ -153,7 +156,7 @@ const createCloudApmPackagePolicyRoute = createApmServerRoute({
endpoint: 'POST /api/apm/fleet/cloud_apm_package_policy',
options: { tags: ['access:apm', 'access:apm_write'] },
handler: async (resources) => {
- const { plugins, context, config, request, logger } = resources;
+ const { plugins, context, config, request, logger, core } = resources;
const cloudApmMigrationEnabled =
config['xpack.apm.agent.migrations.enabled'];
if (!plugins.fleet || !plugins.security) {
@@ -163,20 +166,41 @@ const createCloudApmPackagePolicyRoute = createApmServerRoute({
const coreStart = await resources.core.start();
const esClient = coreStart.elasticsearch.client.asScoped(resources.request)
.asCurrentUser;
+ const cloudPluginSetup = plugins.cloud?.setup;
const fleetPluginStart = await plugins.fleet.start();
const securityPluginStart = await plugins.security.start();
const hasRequiredRole = isSuperuser({ securityPluginStart, request });
if (!hasRequiredRole || !cloudApmMigrationEnabled) {
throw Boom.forbidden(CLOUD_SUPERUSER_REQUIRED_MESSAGE);
}
- return {
- cloud_apm_package_policy: await createCloudApmPackgePolicy({
- fleetPluginStart,
- savedObjectsClient,
- esClient,
- logger,
- }),
- };
+
+ const cloudApmAackagePolicy = await createCloudApmPackgePolicy({
+ cloudPluginSetup,
+ fleetPluginStart,
+ savedObjectsClient,
+ esClient,
+ logger,
+ });
+
+ const [setup, internalSavedObjectsClient] = await Promise.all([
+ setupRequest(resources),
+ core
+ .start()
+ .then(({ savedObjects }) => savedObjects.createInternalRepository()),
+ ]);
+
+ const spaceId = plugins.spaces?.setup.spacesService.getSpaceId(request);
+
+ // force update the index pattern title with data streams
+ await createStaticIndexPattern(
+ setup,
+ config,
+ internalSavedObjectsClient,
+ spaceId,
+ true
+ );
+
+ return { cloud_apm_package_policy: cloudApmAackagePolicy };
},
});
@@ -188,11 +212,6 @@ export const apmFleetRouteRepository = createApmServerRouteRepository()
.add(getMigrationCheckRoute)
.add(createCloudApmPackagePolicyRoute);
-const FLEET_REQUIRED_MESSAGE = i18n.translate(
- 'xpack.apm.fleet_has_data.fleetRequired',
- { defaultMessage: `Fleet plugin is required` }
-);
-
const FLEET_SECURITY_REQUIRED_MESSAGE = i18n.translate(
'xpack.apm.api.fleet.fleetSecurityRequired',
{ defaultMessage: `Fleet and Security plugins are required` }
diff --git a/x-pack/plugins/apm/server/routes/register_routes/index.test.ts b/x-pack/plugins/apm/server/routes/register_routes/index.test.ts
index 158d7ee7e76a3..b9dece866fae5 100644
--- a/x-pack/plugins/apm/server/routes/register_routes/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/register_routes/index.test.ts
@@ -109,6 +109,11 @@ const initApi = (
params: {},
query: {},
body: null,
+ events: {
+ aborted$: {
+ toPromise: () => new Promise(() => {}),
+ },
+ },
...request,
},
responseMock
@@ -202,7 +207,7 @@ describe('createApi', () => {
describe('when validating', () => {
describe('_inspect', () => {
it('allows _inspect=true', async () => {
- const handlerMock = jest.fn();
+ const handlerMock = jest.fn().mockResolvedValue({});
const {
simulateRequest,
mocks: { response },
@@ -234,7 +239,7 @@ describe('createApi', () => {
});
it('rejects _inspect=1', async () => {
- const handlerMock = jest.fn();
+ const handlerMock = jest.fn().mockResolvedValue({});
const {
simulateRequest,
@@ -267,7 +272,7 @@ describe('createApi', () => {
});
it('allows omitting _inspect', async () => {
- const handlerMock = jest.fn();
+ const handlerMock = jest.fn().mockResolvedValue({});
const {
simulateRequest,
@@ -297,7 +302,11 @@ describe('createApi', () => {
simulateRequest,
mocks: { response },
} = initApi([
- { endpoint: 'GET /foo', options: { tags: [] }, handler: jest.fn() },
+ {
+ endpoint: 'GET /foo',
+ options: { tags: [] },
+ handler: jest.fn().mockResolvedValue({}),
+ },
]);
await simulateRequest({
@@ -328,7 +337,7 @@ describe('createApi', () => {
});
it('validates path parameters', async () => {
- const handlerMock = jest.fn();
+ const handlerMock = jest.fn().mockResolvedValue({});
const {
simulateRequest,
mocks: { response },
@@ -402,7 +411,7 @@ describe('createApi', () => {
});
it('validates body parameters', async () => {
- const handlerMock = jest.fn();
+ const handlerMock = jest.fn().mockResolvedValue({});
const {
simulateRequest,
mocks: { response },
@@ -448,7 +457,7 @@ describe('createApi', () => {
});
it('validates query parameters', async () => {
- const handlerMock = jest.fn();
+ const handlerMock = jest.fn().mockResolvedValue({});
const {
simulateRequest,
mocks: { response },
diff --git a/x-pack/plugins/apm/server/routes/register_routes/index.ts b/x-pack/plugins/apm/server/routes/register_routes/index.ts
index 136f3c73d8046..16e77f59f4d02 100644
--- a/x-pack/plugins/apm/server/routes/register_routes/index.ts
+++ b/x-pack/plugins/apm/server/routes/register_routes/index.ts
@@ -18,9 +18,12 @@ import {
routeValidationObject,
} from '@kbn/server-route-repository';
import { mergeRt, jsonRt } from '@kbn/io-ts-utils';
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/server';
import { pickKeys } from '../../../common/utils/pick_keys';
-import { APMRouteHandlerResources, InspectResponse } from '../typings';
+import {
+ APMRouteHandlerResources,
+ InspectResponse,
+ TelemetryUsageCounter,
+} from '../typings';
import type { ApmPluginRequestHandlerContext } from '../typings';
const inspectRt = t.exact(
@@ -29,6 +32,13 @@ const inspectRt = t.exact(
})
);
+const CLIENT_CLOSED_REQUEST = {
+ statusCode: 499,
+ body: {
+ message: 'Client closed request',
+ },
+};
+
export const inspectableEsQueriesMap = new WeakMap<
KibanaRequest,
InspectResponse
@@ -49,9 +59,7 @@ export function registerRoutes({
repository: ServerRouteRepository;
config: APMRouteHandlerResources['config'];
ruleDataClient: APMRouteHandlerResources['ruleDataClient'];
- telemetryUsageCounter?: ReturnType<
- UsageCollectionSetup['createUsageCounter']
- >;
+ telemetryUsageCounter?: TelemetryUsageCounter;
}) {
const routes = repository.getRoutes();
@@ -89,23 +97,41 @@ export function registerRoutes({
runtimeType
);
- const data: Record | undefined | null = (await handler({
- request,
- context,
- config,
- logger,
- core,
- plugins,
- params: merge(
- {
- query: {
- _inspect: false,
+ const { aborted, data } = await Promise.race([
+ handler({
+ request,
+ context,
+ config,
+ logger,
+ core,
+ plugins,
+ telemetryUsageCounter,
+ params: merge(
+ {
+ query: {
+ _inspect: false,
+ },
},
- },
- validatedParams
- ),
- ruleDataClient,
- })) as any;
+ validatedParams
+ ),
+ ruleDataClient,
+ }).then((value) => {
+ return {
+ aborted: false,
+ data: value as Record | undefined | null,
+ };
+ }),
+ request.events.aborted$.toPromise().then(() => {
+ return {
+ aborted: true,
+ data: undefined,
+ };
+ }),
+ ]);
+
+ if (aborted) {
+ return response.custom(CLIENT_CLOSED_REQUEST);
+ }
if (Array.isArray(data)) {
throw new Error('Return type cannot be an array');
@@ -118,9 +144,6 @@ export function registerRoutes({
}
: { ...data };
- // cleanup
- inspectableEsQueriesMap.delete(request);
-
if (!options.disableTelemetry && telemetryUsageCounter) {
telemetryUsageCounter.incrementCounter({
counterName: `${method.toUpperCase()} ${pathname}`,
@@ -131,6 +154,7 @@ export function registerRoutes({
return response.ok({ body });
} catch (error) {
logger.error(error);
+
if (!options.disableTelemetry && telemetryUsageCounter) {
telemetryUsageCounter.incrementCounter({
counterName: `${method.toUpperCase()} ${pathname}`,
@@ -147,16 +171,18 @@ export function registerRoutes({
},
};
- if (Boom.isBoom(error)) {
- opts.statusCode = error.output.statusCode;
+ if (error instanceof RequestAbortedError) {
+ return response.custom(merge(opts, CLIENT_CLOSED_REQUEST));
}
- if (error instanceof RequestAbortedError) {
- opts.statusCode = 499;
- opts.body.message = 'Client closed request';
+ if (Boom.isBoom(error)) {
+ opts.statusCode = error.output.statusCode;
}
return response.custom(opts);
+ } finally {
+ // cleanup
+ inspectableEsQueriesMap.delete(request);
}
}
);
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
index 05eec47893793..f50770cb5ded7 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
@@ -79,7 +79,7 @@ const deleteAgentConfigurationRoute = createApmServerRoute({
}),
handler: async (resources) => {
const setup = await setupRequest(resources);
- const { params, logger, core } = resources;
+ const { params, logger, core, telemetryUsageCounter } = resources;
const { service } = params.body;
@@ -106,6 +106,7 @@ const deleteAgentConfigurationRoute = createApmServerRoute({
core,
fleetPluginStart: await resources.plugins.fleet.start(),
setup,
+ telemetryUsageCounter,
});
logger.info(
`Updated Fleet integration policy for APM to remove the deleted agent configuration.`
@@ -128,7 +129,7 @@ const createOrUpdateAgentConfigurationRoute = createApmServerRoute({
]),
handler: async (resources) => {
const setup = await setupRequest(resources);
- const { params, logger, core } = resources;
+ const { params, logger, core, telemetryUsageCounter } = resources;
const { body, query } = params;
// if the config already exists, it is fetched and updated
@@ -162,6 +163,7 @@ const createOrUpdateAgentConfigurationRoute = createApmServerRoute({
core,
fleetPluginStart: await resources.plugins.fleet.start(),
setup,
+ telemetryUsageCounter,
});
logger.info(
`Saved latest agent settings to Fleet integration policy for APM.`
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index 98c2ee47b5633..4279cfd84328c 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -14,13 +14,16 @@ import {
} from 'src/core/server';
import { RuleDataClient } from '../../../rule_registry/server';
import { AlertingApiRequestHandlerContext } from '../../../alerting/server';
+import type { RacApiRequestHandlerContext } from '../../../rule_registry/server';
import { LicensingApiRequestHandlerContext } from '../../../licensing/server';
import { APMConfig } from '..';
import { APMPluginDependencies } from '../types';
+import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
export interface ApmPluginRequestHandlerContext extends RequestHandlerContext {
licensing: LicensingApiRequestHandlerContext;
alerting: AlertingApiRequestHandlerContext;
+ rac: RacApiRequestHandlerContext;
}
export type InspectResponse = Array<{
@@ -45,6 +48,10 @@ export interface APMRouteCreateOptions {
};
}
+export type TelemetryUsageCounter = ReturnType<
+ UsageCollectionSetup['createUsageCounter']
+>;
+
export interface APMRouteHandlerResources {
request: KibanaRequest;
context: ApmPluginRequestHandlerContext;
@@ -66,4 +73,5 @@ export interface APMRouteHandlerResources {
};
};
ruleDataClient: RuleDataClient;
+ telemetryUsageCounter?: TelemetryUsageCounter;
}
diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
index 55adc756f31af..a595ae1dc8a8b 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -46,7 +46,8 @@ export function createElasticCloudInstructions(
function getApmServerInstructionSet(
cloudSetup?: CloudSetup
): InstructionSetSchema {
- const cloudId = cloudSetup?.cloudId;
+ const deploymentId = cloudSetup?.deploymentId;
+
return {
title: i18n.translate('xpack.apm.tutorial.apmServer.title', {
defaultMessage: 'APM Server',
@@ -59,8 +60,8 @@ function getApmServerInstructionSet(
title: 'Enable the APM Server in the ESS console',
textPre: i18n.translate('xpack.apm.tutorial.elasticCloud.textPre', {
defaultMessage:
- 'To enable the APM Server go to [the Elastic Cloud console](https://cloud.elastic.co/deployments?q={cloudId}) and enable APM in the deployment settings. Once enabled, refresh this page.',
- values: { cloudId },
+ 'To enable the APM Server go to [the Elastic Cloud console](https://cloud.elastic.co/deployments/{deploymentId}/edit) and enable APM in the deployment settings. Once enabled, refresh this page.',
+ values: { deploymentId },
}),
},
],
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
index 882d45c4c21db..400da79e3d2d0 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -38,12 +38,14 @@ export function onPremInstructions({
metricsIndices,
sourcemapIndices,
onboardingIndices,
+ isFleetPluginEnabled,
}: {
errorIndices: string;
transactionIndices: string;
metricsIndices: string;
sourcemapIndices: string;
onboardingIndices: string;
+ isFleetPluginEnabled: boolean;
}): InstructionsSchema {
const EDIT_CONFIG = createEditConfig();
const START_SERVER_UNIX = createStartServerUnix();
@@ -69,12 +71,17 @@ export function onPremInstructions({
iconType: 'alert',
},
instructionVariants: [
- {
- id: INSTRUCTION_VARIANT.FLEET,
- instructions: [
- { customComponentName: 'TutorialFleetInstructions' },
- ],
- },
+ // hides fleet section when plugin is disabled
+ ...(isFleetPluginEnabled
+ ? [
+ {
+ id: INSTRUCTION_VARIANT.FLEET,
+ instructions: [
+ { customComponentName: 'TutorialFleetInstructions' },
+ ],
+ },
+ ]
+ : []),
{
id: INSTRUCTION_VARIANT.OSX,
instructions: [
diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/apm/server/tutorial/index.ts
index 9118c30b845d0..edf056a6d1be4 100644
--- a/x-pack/plugins/apm/server/tutorial/index.ts
+++ b/x-pack/plugins/apm/server/tutorial/index.ts
@@ -28,6 +28,7 @@ export const tutorialProvider = ({
indexPatternTitle,
indices,
cloud,
+ isFleetPluginEnabled,
}: {
isEnabled: boolean;
indexPatternTitle: string;
@@ -39,6 +40,7 @@ export const tutorialProvider = ({
sourcemapIndices: string;
onboardingIndices: string;
};
+ isFleetPluginEnabled: boolean;
}) => () => {
const savedObjects = [
{
@@ -104,7 +106,7 @@ It allows you to monitor the performance of thousands of applications in real ti
euiIconType: 'apmApp',
artifacts,
customStatusCheckName: 'apm_fleet_server_status_check',
- onPrem: onPremInstructions(indices),
+ onPrem: onPremInstructions({ ...indices, isFleetPluginEnabled }),
elasticCloud: createElasticCloudInstructions(cloud),
previewImagePath: '/plugins/apm/assets/apm.png',
savedObjects,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
index c8ce7717cd2d2..9d56278e2c324 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
@@ -5,7 +5,6 @@
* 2.0.
*/
-import { parse } from 'url';
import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
import { getFunctionHelp } from '../../../i18n';
@@ -43,8 +42,9 @@ export function urlparam(): ExpressionFunctionDefinition<
},
},
fn: (input, args) => {
- const query = parse(window.location.href, true).query;
- return query[args.param] || args.default;
+ const url = new URL(window.location.href);
+ const query = url.searchParams;
+ return query.get(args.param) || args.default;
},
};
}
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
index 81532816d9c83..eb394801f549c 100644
--- a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
@@ -29,7 +29,7 @@ export const FunctionReferenceGenerator: FC = ({ functionRegistry }) => {
};
return (
-
+
Generate function reference
);
diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
index 2877ccf41056d..af1850beb5290 100644
--- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
@@ -46,13 +46,13 @@ export const HelpMenu: FC = ({ functionRegistry }) => {
return (
<>
-
+
{strings.getKeyboardShortcutsLinkLabel()}
{FunctionReferenceGenerator ? (
-
) : null}
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__stories__/__snapshots__/edit_menu.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__stories__/__snapshots__/edit_menu.stories.storyshot
index cc33ae3526c0c..f2bc9c57cbcc6 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__stories__/__snapshots__/edit_menu.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__stories__/__snapshots__/edit_menu.stories.storyshot
@@ -9,7 +9,7 @@ exports[`Storyshots components/WorkpadHeader/EditMenu 2 elements selected 1`] =
>
);
diff --git a/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx b/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx
index 610399c31928b..be1516843184d 100644
--- a/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx
@@ -13,7 +13,14 @@ import routeData from 'react-router';
import { getFormMock, useFormMock, useFormDataMock } from '../__mock__/form';
import { useUpdateComment } from '../../containers/use_update_comment';
-import { basicCase, basicPush, getUserAction } from '../../containers/mock';
+import {
+ basicCase,
+ basicPush,
+ getUserAction,
+ getHostIsolationUserAction,
+ hostIsolationComment,
+ hostReleaseComment,
+} from '../../containers/mock';
import { UserActionTree } from '.';
import { TestProviders } from '../../common/mock';
import { Ecs } from '../../../common';
@@ -368,4 +375,82 @@ describe(`UserActionTree`, () => {
).toEqual(true);
});
});
+ describe('Host isolation action', () => {
+ it('renders in the cases details view', async () => {
+ const isolateAction = [getHostIsolationUserAction()];
+ const props = {
+ ...defaultProps,
+ caseUserActions: isolateAction,
+ data: { ...defaultProps.data, comments: [...basicCase.comments, hostIsolationComment()] },
+ };
+
+ const wrapper = mount(
+
-
- ),
-});
-```
-
-## Use in functional tests
-
-Functional tests are commonly used to verify that a user action yielded a successful outcome. If you surface a toast to notify the user of this successful outcome, you can place a `data-test-subj` attribute on the toast and use it to check if the toast exists inside of your functional test. This acts as a proxy for verifying the successful outcome.
-
-```js
-toastNotifications.addSuccess({
- title: 'Your document was saved',
- 'data-test-subj': 'saveDocumentSuccess',
-});
-```
diff --git a/src/plugins/kibana_legacy/public/notify/toasts/toast_notifications.test.ts b/src/plugins/kibana_legacy/public/notify/toasts/toast_notifications.test.ts
deleted file mode 100644
index c2c5d9a4fc014..0000000000000
--- a/src/plugins/kibana_legacy/public/notify/toasts/toast_notifications.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { notificationServiceMock } from '../../../../../core/public/mocks';
-import { ToastNotifications } from './toast_notifications';
-import { Toast } from 'kibana/public';
-import { BehaviorSubject } from 'rxjs';
-
-describe('ToastNotifications', () => {
- describe('interface', () => {
- function setup() {
- const toastsMock = notificationServiceMock.createStartContract().toasts;
- return { toastNotifications: new ToastNotifications(toastsMock), toastsMock };
- }
-
- describe('add method', () => {
- test('adds a toast', () => {
- const { toastNotifications, toastsMock } = setup();
- toastNotifications.add({});
- expect(toastsMock.add).toHaveBeenCalled();
- });
- });
-
- describe('remove method', () => {
- test('removes a toast', () => {
- const { toastNotifications, toastsMock } = setup();
- const fakeToast = {} as Toast;
- toastNotifications.remove(fakeToast);
- expect(toastsMock.remove).toHaveBeenCalledWith(fakeToast);
- });
- });
-
- describe('onChange method', () => {
- test('callback is called when observable changes', () => {
- const toastsMock = notificationServiceMock.createStartContract().toasts;
- const toasts$ = new BehaviorSubject- Only you have access to this document. Edit permissions. -
- - -
-
-
+
+ {i18n.translate('xpack.apm.settings.schema.confirm.descriptionText', { @@ -135,7 +139,6 @@ export function ConfirmSwitchModal({ onChange={(e) => { setIsConfirmChecked(e.target.checked); }} - disabled={isLoading} />
diff --git a/x-pack/plugins/apm/public/components/app/Settings/schema/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/schema/index.tsx index fee072470f05a..5a67ce28e9e1a 100644 --- a/x-pack/plugins/apm/public/components/app/Settings/schema/index.tsx +++ b/x-pack/plugins/apm/public/components/app/Settings/schema/index.tsx @@ -8,6 +8,8 @@ import React, { useState } from 'react'; import { i18n } from '@kbn/i18n'; import { NotificationsStart } from 'kibana/public'; +import moment from 'moment'; +import { useLocalStorage } from '../../../../hooks/useLocalStorage'; import { SchemaOverview } from './schema_overview'; import { ConfirmSwitchModal } from './confirm_switch_modal'; import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher'; @@ -19,10 +21,22 @@ import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plug type FleetMigrationCheckResponse = APIReturnType<'GET /api/apm/fleet/migration_check'>; +const APM_DATA_STREAMS_MIGRATION_STATUS_LS = { + value: '', + expiry: '', +}; + export function Schema() { + const [ + apmDataStreamsMigrationStatus, + setApmDataStreamsMigrationStatus, + ] = useLocalStorage( + 'apm.dataStreamsMigrationStatus', + APM_DATA_STREAMS_MIGRATION_STATUS_LS + ); + const { toasts } = useApmPluginContext().core.notifications; const [isSwitchActive, setIsSwitchActive] = useState(false); - const [isLoadingMigration, setIsLoadingMigration] = useState(false); const [isLoadingConfirmation, setIsLoadingConfirmation] = useState(false); const [unsupportedConfigs, setUnsupportedConfigs] = useState< Array<{ key: string; value: any }> @@ -42,6 +56,19 @@ export function Schema() { const hasCloudAgentPolicy = !!data.has_cloud_agent_policy; const hasCloudApmPackagePolicy = !!data.has_cloud_apm_package_policy; const hasRequiredRole = !!data.has_required_role; + + function updateLocalStorage(newStatus: FETCH_STATUS) { + setApmDataStreamsMigrationStatus({ + value: newStatus, + expiry: moment().add(5, 'minutes').toISOString(), + }); + } + + const { value: localStorageValue, expiry } = apmDataStreamsMigrationStatus; + const isMigrating = + localStorageValue === FETCH_STATUS.LOADING && + moment(expiry).valueOf() > moment.now(); + return ( <>- {i18n.translate( - 'xpack.apm.settings.schema.migrate.calloutNote.message', - { - defaultMessage: - 'If you have custom dashboards, machine learning jobs, or source maps that use classic APM indices, you must reconfigure them for data streams.', - } - )} -
-- {i18n.translate( - 'xpack.apm.correlations.latencyCorrelations.description', - { - defaultMessage: - 'What is slowing down my service? Correlations will help discover a slower performance in a particular cohort of your data.', - } - )} -
-
+
+
+
+
+
-
-
+
+ -
+
+Add rich, relevant search to your apps and websites. https://www.elastic.co/app-search/
+
+### Workplace Search
+
+
+
+Unify all your team's content into a personalized search experience. https://www.elastic.co/workplace-search/
## Development
1. When developing locally, Enterprise Search should be running locally alongside Kibana on `localhost:3002`.
2. Update `config/kibana.dev.yml` with `enterpriseSearch.host: 'http://localhost:3002'`
-3. For faster QA/development, run Enterprise Search on [elasticsearch-native auth](https://www.elastic.co/guide/en/app-search/current/security-and-users.html#app-search-self-managed-security-and-user-management-elasticsearch-native-realm) and log in as the `elastic` superuser on Kibana.
+
+Problems? If you're an Elastic Enterprise Search engineer, please reach out to @elastic/enterprise-search-frontend for questions or our in-depth Getting Started developer guide.
+
+Don't forget to read Kibana's [contributing documentation](https://github.com/elastic/kibana/#building-and-running-kibana-andor-contributing-code) and developer guides for more general info on the Kibana ecosystem.
### Kea
diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json
index f8b4261114a22..723b24f951434 100644
--- a/x-pack/plugins/enterprise_search/kibana.json
+++ b/x-pack/plugins/enterprise_search/kibana.json
@@ -12,5 +12,5 @@
"name": "Enterprise Search",
"githubTeam": "enterprise-search-frontend"
},
- "description": "Adds dashboards for discovering and managing Enterprise Search products"
+ "description": "Adds dashboards for discovering and managing Enterprise Search products."
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
index 0c8455e986ae1..dd99d368a0105 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
@@ -80,6 +80,7 @@ export const AnalyticsFilters: React.FC = () => {
'xpack.enterpriseSearch.appSearch.engine.analytics.filters.startDateAriaLabel',
{ defaultMessage: 'Filter by start date' }
)}
+ locale={i18n.getLocale()}
/>
}
endDateControl={
@@ -93,6 +94,7 @@ export const AnalyticsFilters: React.FC = () => {
'xpack.enterpriseSearch.appSearch.engine.analytics.filters.endDateAriaLabel',
{ defaultMessage: 'Filter by end date' }
)}
+ locale={i18n.getLocale()}
/>
}
fullWidth
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
index 3b8e1c96ff504..63952bc2a6de7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
@@ -10,7 +10,7 @@ import '../../../__mocks__/shallow_useeffect.mock';
import React from 'react';
-import { shallow } from 'enzyme';
+import { shallow, ShallowWrapper } from 'enzyme';
import { rerender } from '../../../test_helpers';
@@ -162,10 +162,18 @@ describe('MultiInputRows', () => {
});
describe('onChange', () => {
+ let wrapper: ShallowWrapper;
const onChange = jest.fn();
+ beforeEach(() => {
+ wrapper = shallow(
+
{i18n.translate('xpack.enterpriseSearch.overview.heading', {
defaultMessage: 'Welcome to Elastic Enterprise Search',
})}
+
{config.host
? i18n.translate('xpack.enterpriseSearch.overview.subheading', {
defaultMessage: 'Select a product to get started.',
@@ -75,7 +77,7 @@ export const ProductSelector: React.FC
{detailFields.length > 0 ? (
detailFields.map(({ fieldName, label }, index) => {
- const value = result[fieldName] as string;
+ const value = result[fieldName];
const dateValue = getAsLocalDateTimeString(value);
return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx
index 549faf1676a54..3ca5b619c0366 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx
@@ -117,7 +117,7 @@ export const ExampleSearchResultGroup: React.FC = () => {
data-test-subj="MediaTypeField"
>
- {mimeType(result[mediaTypeField] as string)}
+ {mimeType(result[mediaTypeField])}
)}
@@ -135,8 +135,7 @@ export const ExampleSearchResultGroup: React.FC = () => {
by {result[updatedByField]}
)}
- {getAsLocalDateTimeString(result.last_updated as string) ||
- result.last_updated}
+ {getAsLocalDateTimeString(result.last_updated) || result.last_updated}
- {usersCount > 0 ? (
-
-
+
+ )}
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
index d2e7c4089e88b..5c292187982dc 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
@@ -11,6 +11,7 @@ jest.mock('../../hooks/use_request', () => {
...module,
useGetSettings: jest.fn(),
sendGetFleetStatus: jest.fn(),
+ sendGetOneAgentPolicy: jest.fn(),
};
});
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
index f68b1b878c51c..18296134ee1a7 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
@@ -16,7 +16,7 @@ import { coreMock } from 'src/core/public/mocks';
import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
import type { AgentPolicy } from '../../../common';
-import { useGetSettings, sendGetFleetStatus } from '../../hooks/use_request';
+import { useGetSettings, sendGetFleetStatus, sendGetOneAgentPolicy } from '../../hooks/use_request';
import { FleetStatusProvider, ConfigContext } from '../../hooks';
import { useFleetServerInstructions } from '../../applications/fleet/sections/agents/agent_requirements_page/components';
@@ -79,6 +79,10 @@ describe('
+
+
+
+
+
+
+
+
+
@@ -121,7 +120,6 @@ const ExplorerPage = ({
filterPlaceHolder={filterPlaceHolder}
indexPattern={indexPattern}
queryString={queryString}
- filterIconTriggeredQuery={filterIconTriggeredQuery}
updateLanguage={updateLanguage}
/>
@@ -151,7 +149,7 @@ export class ExplorerUI extends React.Component {
selectedJobsRunning: PropTypes.bool.isRequired,
};
- state = { filterIconTriggeredQuery: undefined, language: DEFAULT_QUERY_LANG };
+ state = { language: DEFAULT_QUERY_LANG };
htmlIdGen = htmlIdGenerator();
componentDidMount() {
@@ -200,8 +198,6 @@ export class ExplorerUI extends React.Component {
}
}
- this.setState({ filterIconTriggeredQuery: `${newQueryString}` });
-
try {
const { clearSettings, settings } = getKqlQueryValues({
inputString: `${newQueryString}`,
@@ -261,6 +257,30 @@ export class ExplorerUI extends React.Component {
} = this.props.explorerState;
const { annotationsData, aggregations, error: annotationsError } = annotations;
+ const annotationsCnt = Array.isArray(annotationsData) ? annotationsData.length : 0;
+ const allAnnotationsCnt = Array.isArray(aggregations?.event?.buckets)
+ ? aggregations.event.buckets.reduce((acc, v) => acc + v.doc_count, 0)
+ : annotationsCnt;
+
+ const badge =
+ allAnnotationsCnt > annotationsCnt ? (
+
-
+
{showSwimlane && !isLoading && (
= ({ queryText, setFilters }) =
}, [queryText]);
const onChange: EuiSearchBarProps['onChange'] = ({ query, error: queryError }) => {
- if (error) {
+ if (queryError) {
setError(queryError);
} else {
setFilters(query);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/searches.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/searches.ts
index e6e6b5305b1f8..65c0d30414eed 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/searches.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/searches.ts
@@ -74,6 +74,7 @@ export function getScoresByRecord(
timestamp: {
gte: earliestMs,
lte: latestMs,
+ // @ts-ignore
format: 'epoch_millis',
},
},
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
index 67673901494c7..88ed17cba0003 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
@@ -6,7 +6,7 @@
*/
import { useContext, useState } from 'react';
-
+import { i18n } from '@kbn/i18n';
import { JobCreatorContext } from '../../../job_creator_context';
import { EVENT_RATE_FIELD_ID } from '../../../../../../../../../common/types/fields';
import { BucketSpanEstimatorData } from '../../../../../../../../../common/types/job_service';
@@ -76,10 +76,16 @@ export function useEstimateBucketSpan() {
async function estimateBucketSpan() {
setStatus(ESTIMATE_STATUS.RUNNING);
- const { name, error, message } = await ml.estimateBucketSpan(data);
+ const { name, error, message: text } = await ml.estimateBucketSpan(data);
setStatus(ESTIMATE_STATUS.NOT_RUNNING);
if (error === true) {
- getToastNotificationService().displayErrorToast(message);
+ const title = i18n.translate(
+ 'xpack.ml.newJob.wizard.pickFieldsStep.bucketSpanEstimator.errorTitle',
+ {
+ defaultMessage: 'Bucket span could not be estimated',
+ }
+ );
+ getToastNotificationService().displayWarningToast({ title, text });
} else {
jobCreator.bucketSpan = name;
jobCreatorUpdate();
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
index 6d0c3639d939c..7fcac0ad6992a 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
@@ -30,7 +30,7 @@ export const InsufficientLicensePage: FC = ({ basePath }) => (
}
@@ -38,13 +38,13 @@ export const InsufficientLicensePage: FC = ({ basePath }) => (
{value.description}
@@ -480,7 +480,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -522,7 +521,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -1489,7 +1487,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -1531,7 +1528,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -2512,7 +2508,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -2554,7 +2549,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -3582,7 +3576,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -3624,7 +3617,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -4685,7 +4677,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -4727,7 +4718,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -5755,7 +5745,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -5797,7 +5786,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -6825,7 +6813,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -6867,7 +6854,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -7895,7 +7881,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -7937,7 +7922,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -8965,7 +8949,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
@@ -9007,7 +8990,6 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTableCellContent euiTableCellContent--overflowingContent"
>
+