+
+
+ }
+ description={
+ <>
+ -
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.ts b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.ts
index a695b95b8de85..6a710dae744ba 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.ts
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.ts
@@ -9,12 +9,10 @@ export { validateName } from './validate_name';
export { validateProxy } from './validate_proxy';
export { validateSeeds } from './validate_seeds';
export { validateSeed } from './validate_seed';
-export { validateServerName } from './validate_server_name';
export type { ClusterErrors } from './validate_cluster';
export { validateCluster } from './validate_cluster';
export {
- isCloudUrlEnabled,
- validateCloudUrl,
- convertProxyConnectionToCloudUrl,
- convertCloudUrlToProxyConnection,
+ isCloudAdvancedOptionsEnabled,
+ validateCloudRemoteAddress,
+ convertCloudRemoteAddressToProxyConnection,
} from './validate_cloud_url';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.test.ts b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.test.ts
index 5990b29474da2..5bdfd23f5cfdb 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.test.ts
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.test.ts
@@ -6,135 +6,93 @@
*/
import {
- isCloudUrlEnabled,
- validateCloudUrl,
- convertCloudUrlToProxyConnection,
- convertProxyConnectionToCloudUrl,
+ isCloudAdvancedOptionsEnabled,
+ validateCloudRemoteAddress,
+ convertCloudRemoteAddressToProxyConnection,
i18nTexts,
} from './validate_cloud_url';
-describe('Cloud url', () => {
+describe('Cloud remote address', () => {
describe('validation', () => {
it('errors when the url is empty', () => {
- const actual = validateCloudUrl('');
+ const actual = validateCloudRemoteAddress('');
expect(actual).toBe(i18nTexts.urlEmpty);
});
it('errors when the url is invalid', () => {
- const actual = validateCloudUrl('invalid%url');
+ const actual = validateCloudRemoteAddress('invalid%url');
expect(actual).toBe(i18nTexts.urlInvalid);
});
});
- describe('is cloud url', () => {
- it('true for a new cluster', () => {
- const actual = isCloudUrlEnabled();
- expect(actual).toBe(true);
+ describe('is advanced options toggle enabled', () => {
+ it('false for a new cluster', () => {
+ const actual = isCloudAdvancedOptionsEnabled();
+ expect(actual).toBe(false);
});
- it('true when proxy connection is empty', () => {
- const actual = isCloudUrlEnabled({
+ it('false when proxy address is empty', () => {
+ const actual = isCloudAdvancedOptionsEnabled({
name: 'test',
proxyAddress: '',
- serverName: '',
securityModel: 'certificate',
});
- expect(actual).toBe(true);
+ expect(actual).toBe(false);
});
- it('true when proxy address is the same as server name and default port', () => {
- const actual = isCloudUrlEnabled({
+ it('false when proxy address is the same as server name', () => {
+ const actual = isCloudAdvancedOptionsEnabled({
name: 'test',
proxyAddress: 'some-proxy:9400',
serverName: 'some-proxy',
securityModel: 'certificate',
});
- expect(actual).toBe(true);
+ expect(actual).toBe(false);
});
- it('false when proxy address is the same as server name but not default port', () => {
- const actual = isCloudUrlEnabled({
+ it('true when proxy address is not the same as server name', () => {
+ const actual = isCloudAdvancedOptionsEnabled({
name: 'test',
- proxyAddress: 'some-proxy:1234',
- serverName: 'some-proxy',
+ proxyAddress: 'some-proxy:9400',
+ serverName: 'some-server-name',
securityModel: 'certificate',
});
- expect(actual).toBe(false);
+ expect(actual).toBe(true);
});
- it('true when proxy address is not the same as server name', () => {
- const actual = isCloudUrlEnabled({
+ it('true when socket connections is not the default value', () => {
+ const actual = isCloudAdvancedOptionsEnabled({
name: 'test',
proxyAddress: 'some-proxy:9400',
- serverName: 'some-server-name',
+ serverName: 'some-proxy-name',
+ proxySocketConnections: 19,
securityModel: 'certificate',
});
- expect(actual).toBe(false);
+ expect(actual).toBe(true);
});
});
- describe('conversion from cloud url', () => {
+ describe('conversion from cloud remote address', () => {
it('empty url to empty proxy connection values', () => {
- const actual = convertCloudUrlToProxyConnection('');
+ const actual = convertCloudRemoteAddressToProxyConnection('');
expect(actual).toEqual({ proxyAddress: '', serverName: '' });
});
it('url with protocol and port to proxy connection values', () => {
- const actual = convertCloudUrlToProxyConnection('http://test.com:1234');
- expect(actual).toEqual({ proxyAddress: 'test.com:9400', serverName: 'test.com' });
+ const actual = convertCloudRemoteAddressToProxyConnection('http://test.com:1234');
+ expect(actual).toEqual({ proxyAddress: 'test.com:1234', serverName: 'test.com' });
});
it('url with protocol and no port to proxy connection values', () => {
- const actual = convertCloudUrlToProxyConnection('http://test.com');
+ const actual = convertCloudRemoteAddressToProxyConnection('http://test.com');
expect(actual).toEqual({ proxyAddress: 'test.com:9400', serverName: 'test.com' });
});
it('url with no protocol to proxy connection values', () => {
- const actual = convertCloudUrlToProxyConnection('test.com');
+ const actual = convertCloudRemoteAddressToProxyConnection('test.com');
expect(actual).toEqual({ proxyAddress: 'test.com:9400', serverName: 'test.com' });
});
+
it('invalid url to empty proxy connection values', () => {
- const actual = convertCloudUrlToProxyConnection('invalid%url');
+ const actual = convertCloudRemoteAddressToProxyConnection('invalid%url');
expect(actual).toEqual({ proxyAddress: '', serverName: '' });
});
});
-
- describe('conversion to cloud url', () => {
- it('empty proxy address to empty cloud url', () => {
- const actual = convertProxyConnectionToCloudUrl({
- name: 'test',
- proxyAddress: '',
- serverName: 'test',
- securityModel: 'certificate',
- });
- expect(actual).toEqual('');
- });
-
- it('empty server name to empty cloud url', () => {
- const actual = convertProxyConnectionToCloudUrl({
- name: 'test',
- proxyAddress: 'test',
- serverName: '',
- securityModel: 'certificate',
- });
- expect(actual).toEqual('');
- });
-
- it('different proxy address and server name to empty cloud url', () => {
- const actual = convertProxyConnectionToCloudUrl({
- name: 'test',
- proxyAddress: 'test',
- serverName: 'another-test',
- securityModel: 'certificate',
- });
- expect(actual).toEqual('');
- });
-
- it('valid proxy connection to cloud url', () => {
- const actual = convertProxyConnectionToCloudUrl({
- name: 'test',
- proxyAddress: 'test-proxy:9400',
- serverName: 'test-proxy',
- securityModel: 'certificate',
- });
- expect(actual).toEqual('test-proxy');
- });
- });
});
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx
index deb0148f36edf..54f050a789b9f 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx
@@ -13,14 +13,14 @@ import { isAddressValid } from './validate_address';
export const i18nTexts = {
urlEmpty: (
{i18n.translate('xpack.observabilityAiAssistant.disclaimer.title', {
defaultMessage: 'Welcome to the AI Assistant for Observability',
diff --git a/x-pack/plugins/observability_ai_assistant/public/types.ts b/x-pack/plugins/observability_ai_assistant/public/types.ts
index 3a4c4fbc59d7d..2846a01b049c7 100644
--- a/x-pack/plugins/observability_ai_assistant/public/types.ts
+++ b/x-pack/plugins/observability_ai_assistant/public/types.ts
@@ -32,6 +32,7 @@ import type {
TriggersAndActionsUIPublicPluginSetup,
TriggersAndActionsUIPublicPluginStart,
} from '@kbn/triggers-actions-ui-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
import type { StreamingChatResponseEventWithoutError } from '../common/conversation_complete';
import type {
ContextDefinition,
@@ -112,6 +113,7 @@ export type ChatRegistrationRenderFunction = ({}: {
export interface ConfigSchema {}
export interface ObservabilityAIAssistantPluginSetupDependencies {
+ data: DataPublicPluginSetup;
dataViews: DataViewsPublicPluginSetup;
features: FeaturesPluginSetup;
lens: LensPublicSetup;
@@ -122,6 +124,7 @@ export interface ObservabilityAIAssistantPluginSetupDependencies {
}
export interface ObservabilityAIAssistantPluginStartDependencies {
+ data: DataPublicPluginStart;
dataViews: DataViewsPublicPluginStart;
features: FeaturesPluginStart;
lens: LensPublicStart;
diff --git a/x-pack/plugins/observability_ai_assistant/tsconfig.json b/x-pack/plugins/observability_ai_assistant/tsconfig.json
index 13af731fd49db..177e87be3de66 100644
--- a/x-pack/plugins/observability_ai_assistant/tsconfig.json
+++ b/x-pack/plugins/observability_ai_assistant/tsconfig.json
@@ -68,7 +68,8 @@
"@kbn/visualization-utils",
"@kbn/field-types",
"@kbn/es-types",
- "@kbn/esql-utils"
+ "@kbn/esql-utils",
+ "@kbn/data-plugin"
],
"exclude": ["target/**/*"]
}
From f76e7ecef529710c0fd3d4e5dbf21792d2e3bd6c Mon Sep 17 00:00:00 2001
From: Miriam <31922082+MiriamAparicio@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:20:20 +0000
Subject: [PATCH 05/23] [INFRA] Add alerts count to hosts data (#176034)
Closes https://github.com/elastic/kibana/issues/175567
#### What has been done
- create alerts infra client to retrieve alerts data
- add endpoint to get the alerts count for hosts
- merged alerts count with hosts data
- add alertsCount badge to hosts table
- sort by alert count by clicking on the column title
- If no hosts have active alerts, the column should be hidden.
- Default hosts sorting is alerts count and cpu desc
https://github.com/elastic/kibana/assets/31922082/96794041-d129-49e2-920c-80b45c624144
---
x-pack/plugins/infra/common/constants.ts | 1 +
.../http_api/infra/get_infra_metrics.ts | 15 ++--
.../metrics/hosts/components/tabs/config.ts | 1 -
.../hosts/hooks/use_hosts_table.test.ts | 4 +
.../metrics/hosts/hooks/use_hosts_table.tsx | 49 ++++++++--
.../hosts/hooks/use_hosts_table_url_state.ts | 4 +-
.../pages/metrics/hosts/translations.ts | 4 +
.../lib/adapters/framework/adapter_types.ts | 6 +-
.../infra/server/routes/infra/index.ts | 13 ++-
.../lib/helpers/get_infra_alerts_client.ts | 45 ++++++++++
.../server/routes/infra/lib/host/get_hosts.ts | 20 ++++-
.../infra/lib/host/get_hosts_alerts_count.ts | 89 +++++++++++++++++++
.../infra/server/routes/infra/lib/mapper.ts | 22 +++--
.../infra/server/routes/infra/lib/types.ts | 2 +
.../api_integration/apis/metrics_ui/infra.ts | 38 +++++++-
.../test/functional/apps/infra/hosts_view.ts | 70 ++++++++-------
.../page_objects/infra_hosts_view.ts | 31 +++++--
17 files changed, 351 insertions(+), 63 deletions(-)
create mode 100644 x-pack/plugins/infra/server/routes/infra/lib/helpers/get_infra_alerts_client.ts
create mode 100644 x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts
diff --git a/x-pack/plugins/infra/common/constants.ts b/x-pack/plugins/infra/common/constants.ts
index 2a4e9b5e21eae..e4621f63793c2 100644
--- a/x-pack/plugins/infra/common/constants.ts
+++ b/x-pack/plugins/infra/common/constants.ts
@@ -11,6 +11,7 @@ export const METRICS_APP = 'metrics';
export const LOGS_APP = 'logs';
export const METRICS_FEATURE_ID = 'infrastructure';
+export const INFRA_ALERT_FEATURE_ID = 'infrastructure';
export const LOGS_FEATURE_ID = 'logs';
export type InfraFeatureId = typeof METRICS_FEATURE_ID | typeof LOGS_FEATURE_ID;
diff --git a/x-pack/plugins/infra/common/http_api/infra/get_infra_metrics.ts b/x-pack/plugins/infra/common/http_api/infra/get_infra_metrics.ts
index f0b0f4eb7f0ab..1c6076b277a55 100644
--- a/x-pack/plugins/infra/common/http_api/infra/get_infra_metrics.ts
+++ b/x-pack/plugins/infra/common/http_api/infra/get_infra_metrics.ts
@@ -53,11 +53,16 @@ export const GetInfraMetricsRequestBodyPayloadRT = rt.intersection([
}),
]);
-export const InfraAssetMetricsItemRT = rt.type({
- name: rt.string,
- metrics: rt.array(InfraAssetMetricsRT),
- metadata: rt.array(InfraAssetMetadataRT),
-});
+export const InfraAssetMetricsItemRT = rt.intersection([
+ rt.type({
+ name: rt.string,
+ metrics: rt.array(InfraAssetMetricsRT),
+ metadata: rt.array(InfraAssetMetadataRT),
+ }),
+ rt.partial({
+ alertsCount: rt.number,
+ }),
+]);
export const GetInfraMetricsResponsePayloadRT = rt.type({
type: rt.literal('host'),
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/config.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/config.ts
index cf4374cae94fa..253bb59f79d66 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/config.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/config.ts
@@ -11,5 +11,4 @@ import type { ValidFeatureId } from '@kbn/rule-data-utils';
export const ALERTS_PER_PAGE = 10;
export const ALERTS_TABLE_ID = 'xpack.infra.hosts.alerts.table';
-export const INFRA_ALERT_FEATURE_ID = 'infrastructure';
export const infraAlertFeatureIds: ValidFeatureId[] = [AlertConsumers.INFRASTRUCTURE];
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts
index 1d7ea3bd82538..9534406d5dcfa 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts
@@ -72,6 +72,7 @@ const mockHostNode: InfraAssetMetricsItem[] = [
{ name: 'cloud.provider', value: 'aws' },
],
name: 'host-0',
+ alertsCount: 0,
},
{
metrics: [
@@ -109,6 +110,7 @@ const mockHostNode: InfraAssetMetricsItem[] = [
{ name: 'host.ip', value: '243.86.94.22' },
],
name: 'host-1',
+ alertsCount: 0,
},
];
@@ -161,6 +163,7 @@ describe('useHostTable hook', () => {
diskSpaceUsage: 0.2040001,
memoryFree: 34359.738368,
normalizedLoad1m: 239.2040001,
+ alertsCount: 0,
},
{
name: 'host-1',
@@ -178,6 +181,7 @@ describe('useHostTable hook', () => {
diskSpaceUsage: 0.5400000214576721,
memoryFree: 9.194304,
normalizedLoad1m: 100,
+ alertsCount: 0,
},
];
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
index 446a0c577bca9..c54877bd11a20 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
@@ -13,6 +13,8 @@ import { isEqual } from 'lodash';
import { isNumber } from 'lodash/fp';
import { CloudProvider } from '@kbn/custom-icons';
import { findInventoryModel } from '@kbn/metrics-data-access-plugin/common';
+import { EuiToolTip } from '@elastic/eui';
+import { EuiBadge } from '@elastic/eui';
import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
import { createInventoryMetricFormatter } from '../../inventory_view/lib/create_inventory_metric_formatter';
import { EntryTitle } from '../components/table/entry_title';
@@ -44,6 +46,7 @@ interface HostMetadata {
export type HostNodeRow = HostMetadata &
HostMetrics & {
name: string;
+ alertsCount?: number;
};
/**
@@ -54,7 +57,7 @@ const formatMetric = (type: InfraAssetMetricType, value: number | undefined | nu
};
const buildItemsList = (nodes: InfraAssetMetricsItem[]): HostNodeRow[] => {
- return nodes.map(({ metrics, metadata, name }) => {
+ return nodes.map(({ metrics, metadata, name, alertsCount }) => {
const metadataKeyValue = metadata.reduce(
(acc, curr) => ({
...acc,
@@ -79,12 +82,14 @@ const buildItemsList = (nodes: InfraAssetMetricsItem[]): HostNodeRow[] => {
}),
{} as HostMetrics
),
+
+ alertsCount: alertsCount ?? 0,
};
});
};
-const isTitleColumn = (cell: any): cell is HostNodeRow['title'] => {
- return typeof cell === 'object' && cell && 'name' in cell;
+const isTitleColumn = (cell: HostNodeRow[keyof HostNodeRow]): cell is HostNodeRow['title'] => {
+ return cell !== null && typeof cell === 'object' && cell && 'name' in cell;
};
const sortValues = (aValue: any, bValue: any, { direction }: Sorting) => {
@@ -124,6 +129,8 @@ export const useHostsTable = () => {
const [selectedItems, setSelectedItems] = useState([]);
const { hostNodes } = useHostsViewContext();
+ const displayAlerts = hostNodes.some((item) => 'alertsCount' in item);
+
const { value: formulas } = useAsync(() => inventoryModel.metrics.getFormulas());
const [{ detailsItemId, pagination, sorting }, setProperties] = useHostsTableUrlState();
@@ -221,6 +228,39 @@ export const useHostsTable = () => {
},
],
},
+ ...(displayAlerts
+ ? [
+ {
+ name: TABLE_COLUMN_LABEL.alertsCount,
+ field: 'alertsCount',
+ sortable: true,
+ 'data-test-subj': 'hostsView-tableRow-alertsCount',
+ render: (alertsCount: HostNodeRow['alertsCount'], row: HostNodeRow) => {
+ if (!alertsCount) {
+ return null;
+ }
+ return (
+
+ {
+ setProperties({ detailsItemId: row.id === detailsItemId ? null : row.id });
+ }}
+ onClickAriaLabel={TABLE_COLUMN_LABEL.alertsCount}
+ iconOnClick={() => {
+ setProperties({ detailsItemId: row.id === detailsItemId ? null : row.id });
+ }}
+ iconOnClickAriaLabel={TABLE_COLUMN_LABEL.alertsCount}
+ >
+ {alertsCount}
+
+
+ );
+ },
+ },
+ ]
+ : []),
{
name: TABLE_COLUMN_LABEL.title,
field: 'title',
@@ -315,7 +355,6 @@ export const useHostsTable = () => {
'data-test-subj': 'hostsView-tableRow-rx',
render: (avg: number) => formatMetric('rx', avg),
align: 'right',
- width: '120px',
},
{
name: (
@@ -330,7 +369,6 @@ export const useHostsTable = () => {
'data-test-subj': 'hostsView-tableRow-tx',
render: (avg: number) => formatMetric('tx', avg),
align: 'right',
- width: '120px',
},
],
[
@@ -344,6 +382,7 @@ export const useHostsTable = () => {
formulas?.tx.value,
reportHostEntryClick,
setProperties,
+ displayAlerts,
]
);
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table_url_state.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table_url_state.ts
index c1dcafefaccc3..dd53bd96dc185 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table_url_state.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table_url_state.ts
@@ -18,8 +18,8 @@ import { DEFAULT_PAGE_SIZE, LOCAL_STORAGE_PAGE_SIZE_KEY } from '../constants';
export const GET_DEFAULT_TABLE_PROPERTIES: TableProperties = {
detailsItemId: null,
sorting: {
- direction: 'asc',
- field: 'name',
+ direction: 'desc',
+ field: 'alertsCount',
},
pagination: {
pageIndex: 0,
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/translations.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/translations.ts
index 304b1980d965c..9be99e1d70a8b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/translations.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/translations.ts
@@ -8,6 +8,10 @@
import { i18n } from '@kbn/i18n';
export const TABLE_COLUMN_LABEL = {
+ alertsCount: i18n.translate('xpack.infra.hostsViewPage.table.alertsColumnHeader', {
+ defaultMessage: 'Active alerts',
+ }),
+
title: i18n.translate('xpack.infra.hostsViewPage.table.nameColumnHeader', {
defaultMessage: 'Name',
}),
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
index 56b8fe29c85d6..398eaa0ccf3b8 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
@@ -22,7 +22,10 @@ import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin
import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
import { PluginSetupContract as AlertingPluginContract } from '@kbn/alerting-plugin/server';
import { MlPluginSetup } from '@kbn/ml-plugin/server';
-import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
+import {
+ RuleRegistryPluginSetupContract,
+ RuleRegistryPluginStartContract,
+} from '@kbn/rule-registry-plugin/server';
import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';
import { LogsSharedPluginSetup, LogsSharedPluginStart } from '@kbn/logs-shared-plugin/server';
import { VersionedRouteConfig } from '@kbn/core-http-server';
@@ -59,6 +62,7 @@ export interface InfraServerPluginStartDeps {
dataViews: DataViewsPluginStart;
logsShared: LogsSharedPluginStart;
profilingDataAccess?: ProfilingDataAccessPluginStart;
+ ruleRegistry: RuleRegistryPluginStartContract;
apmDataAccess: ApmDataAccessPluginStart;
}
diff --git a/x-pack/plugins/infra/server/routes/infra/index.ts b/x-pack/plugins/infra/server/routes/infra/index.ts
index d98e8034e6207..4d8fd931082c1 100644
--- a/x-pack/plugins/infra/server/routes/infra/index.ts
+++ b/x-pack/plugins/infra/server/routes/infra/index.ts
@@ -14,6 +14,7 @@ import {
GetInfraMetricsResponsePayloadRT,
} from '../../../common/http_api/infra';
import { InfraBackendLibs } from '../../lib/infra_types';
+import { getInfraAlertsClient } from './lib/helpers/get_infra_alerts_client';
import { getHosts } from './lib/host/get_hosts';
export const initInfraMetricsRoute = (libs: InfraBackendLibs) => {
@@ -35,10 +36,20 @@ export const initInfraMetricsRoute = (libs: InfraBackendLibs) => {
try {
const searchClient = data.search.asScoped(request);
+ const alertsClient = await getInfraAlertsClient({
+ getStartServices: libs.getStartServices,
+ request,
+ });
const soClient = savedObjects.getScopedClient(request);
const source = await libs.sources.getSourceConfiguration(soClient, params.sourceId);
- const hosts = await getHosts({ searchClient, sourceConfig: source.configuration, params });
+ const hosts = await getHosts({
+ searchClient,
+ alertsClient,
+ sourceConfig: source.configuration,
+ params,
+ });
+
return response.ok({
body: GetInfraMetricsResponsePayloadRT.encode(hosts),
});
diff --git a/x-pack/plugins/infra/server/routes/infra/lib/helpers/get_infra_alerts_client.ts b/x-pack/plugins/infra/server/routes/infra/lib/helpers/get_infra_alerts_client.ts
new file mode 100644
index 0000000000000..7110a822fb8a4
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/infra/lib/helpers/get_infra_alerts_client.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { isEmpty } from 'lodash';
+import { ESSearchRequest, InferSearchResponseOf } from '@kbn/es-types';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common';
+import { KibanaRequest } from '@kbn/core/server';
+import type { InfraPluginStartServicesAccessor } from '../../../../types';
+
+type RequiredParams = ESSearchRequest & {
+ size: number;
+ track_total_hits: boolean | number;
+};
+
+export type InfraAlertsClient = Awaited>;
+
+export async function getInfraAlertsClient({
+ getStartServices,
+ request,
+}: {
+ getStartServices: InfraPluginStartServicesAccessor;
+ request: KibanaRequest;
+}) {
+ const [, { ruleRegistry }] = await getStartServices();
+ const alertsClient = await ruleRegistry.getRacClientWithRequest(request);
+ const infraAlertsIndices = await alertsClient.getAuthorizedAlertsIndices(['infrastructure']);
+
+ if (!infraAlertsIndices || isEmpty(infraAlertsIndices)) {
+ throw Error('No alert indices exist for "infrastrucuture"');
+ }
+
+ return {
+ search(
+ searchParams: TParams
+ ): Promise> {
+ return alertsClient.find({
+ ...searchParams,
+ index: infraAlertsIndices.join(','),
+ }) as Promise;
+ },
+ };
+}
diff --git a/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts.ts b/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts.ts
index 6d44224661750..6eab207f7fbae 100644
--- a/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts.ts
+++ b/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts.ts
@@ -11,6 +11,7 @@ import { mapToApiResponse } from '../mapper';
import { hasFilters } from '../utils';
import { GetHostsArgs } from '../types';
import { getAllHosts } from './get_all_hosts';
+import { getHostsAlertsCount } from './get_hosts_alerts_count';
export const getHosts = async (args: GetHostsArgs): Promise => {
const runFilterQuery = hasFilters(args.params.query);
@@ -23,8 +24,23 @@ export const getHosts = async (args: GetHostsArgs): Promise {
diff --git a/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts b/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts
new file mode 100644
index 0000000000000..d1e17e8d133ee
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts
@@ -0,0 +1,89 @@
+/*
+ * 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 { kqlQuery, termQuery, termsQuery } from '@kbn/observability-plugin/server';
+import {
+ ALERT_RULE_PRODUCER,
+ ALERT_STATUS,
+ ALERT_STATUS_ACTIVE,
+ ALERT_UUID,
+} from '@kbn/rule-data-utils';
+import { INFRA_ALERT_FEATURE_ID } from '../../../../../common/constants';
+import { BUCKET_KEY, MAX_SIZE } from '../constants';
+import { InfraAlertsClient } from '../helpers/get_infra_alerts_client';
+
+export type HostAlertsResponse = Array<{
+ name: string;
+ alertsCount: number;
+}>;
+
+export async function getHostsAlertsCount({
+ alertsClient,
+ hostNamesShortList,
+ kuery,
+ from,
+ to,
+ maxNumHosts = MAX_SIZE,
+}: {
+ alertsClient: InfraAlertsClient;
+ hostNamesShortList: string[];
+ kuery?: string;
+ from: string;
+ to: string;
+ maxNumHosts?: number;
+}): Promise {
+ const rangeQuery = [
+ {
+ range: {
+ 'kibana.alert.time_range': {
+ gte: from,
+ lte: to,
+ format: 'strict_date_optional_time',
+ },
+ },
+ },
+ ];
+ const params = {
+ size: 0,
+ track_total_hits: false,
+ query: {
+ bool: {
+ filter: [
+ ...termQuery(ALERT_RULE_PRODUCER, INFRA_ALERT_FEATURE_ID),
+ ...termQuery(ALERT_STATUS, ALERT_STATUS_ACTIVE),
+ ...termsQuery(BUCKET_KEY, ...hostNamesShortList),
+ ...rangeQuery,
+ ...kqlQuery(kuery),
+ ],
+ },
+ },
+ aggs: {
+ hosts: {
+ terms: {
+ field: BUCKET_KEY,
+ size: maxNumHosts,
+ },
+ aggs: {
+ alerts_count: {
+ cardinality: {
+ field: ALERT_UUID,
+ },
+ },
+ },
+ },
+ },
+ };
+
+ const result = await alertsClient.search(params);
+
+ const filterAggBuckets = result.aggregations?.hosts.buckets ?? [];
+
+ return filterAggBuckets.map((bucket) => ({
+ name: bucket.key as string,
+ alertsCount: bucket.alerts_count.value,
+ }));
+}
diff --git a/x-pack/plugins/infra/server/routes/infra/lib/mapper.ts b/x-pack/plugins/infra/server/routes/infra/lib/mapper.ts
index 89d2e71b364f9..cc922d42c8991 100644
--- a/x-pack/plugins/infra/server/routes/infra/lib/mapper.ts
+++ b/x-pack/plugins/infra/server/routes/infra/lib/mapper.ts
@@ -20,10 +20,12 @@ import {
HostsMetricsSearchValueRT,
} from './types';
import { METADATA_AGGREGATION_NAME } from './constants';
+import { HostAlertsResponse } from './host/get_hosts_alerts_count';
export const mapToApiResponse = (
params: GetInfraMetricsRequestBodyPayload,
- buckets?: HostsMetricsSearchBucket[] | undefined
+ buckets?: HostsMetricsSearchBucket[] | undefined,
+ alertsCountResponse?: HostAlertsResponse
): GetInfraMetricsResponsePayload => {
if (!buckets) {
return {
@@ -32,12 +34,20 @@ export const mapToApiResponse = (
};
}
- const hosts = buckets.map((bucket) => {
- const metrics = convertMetricBucket(params, bucket);
- const metadata = convertMetadataBucket(bucket);
+ const hosts = buckets
+ .map((bucket) => {
+ const metrics = convertMetricBucket(params, bucket);
+ const metadata = convertMetadataBucket(bucket);
- return { name: bucket.key as string, metrics, metadata };
- });
+ const cpuValue = metrics.find((metric) => metric.name === 'cpu')?.value ?? 0;
+ const alerts = alertsCountResponse?.find((item) => item.name === bucket.key);
+
+ return { name: bucket.key as string, metrics, metadata, cpuValue, ...alerts };
+ })
+ .sort((a, b) => {
+ return b.cpuValue - a.cpuValue;
+ })
+ .map(({ cpuValue, ...rest }) => rest);
return {
type: params.type,
diff --git a/x-pack/plugins/infra/server/routes/infra/lib/types.ts b/x-pack/plugins/infra/server/routes/infra/lib/types.ts
index d9800112e7dfe..ab097e91b2b09 100644
--- a/x-pack/plugins/infra/server/routes/infra/lib/types.ts
+++ b/x-pack/plugins/infra/server/routes/infra/lib/types.ts
@@ -12,6 +12,7 @@ import { InfraStaticSourceConfiguration } from '../../../../common/source_config
import { GetInfraMetricsRequestBodyPayload } from '../../../../common/http_api/infra';
import { BasicMetricValueRT, TopMetricsTypeRT } from '../../../lib/metrics/types';
+import { InfraAlertsClient } from './helpers/get_infra_alerts_client';
export const FilteredMetricsTypeRT = rt.type({
doc_count: rt.number,
@@ -76,6 +77,7 @@ export interface HostsMetricsAggregationQueryConfig {
export interface GetHostsArgs {
searchClient: ISearchClient;
+ alertsClient: InfraAlertsClient;
sourceConfig: InfraStaticSourceConfiguration;
params: GetInfraMetricsRequestBodyPayload;
}
diff --git a/x-pack/test/api_integration/apis/metrics_ui/infra.ts b/x-pack/test/api_integration/apis/metrics_ui/infra.ts
index baa907c25575f..c3465c68ae7fe 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/infra.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/infra.ts
@@ -165,8 +165,8 @@ export default function ({ getService }: FtrProviderContext) {
const names = (response.body as GetInfraMetricsResponsePayload).nodes.map((p) => p.name);
expect(names).eql([
- 'gke-observability-8--observability-8--bc1afd95-f0zc',
'gke-observability-8--observability-8--bc1afd95-ngmh',
+ 'gke-observability-8--observability-8--bc1afd95-f0zc',
'gke-observability-8--observability-8--bc1afd95-nhhw',
]);
});
@@ -208,8 +208,9 @@ export default function ({ getService }: FtrProviderContext) {
const names = (response.body as GetInfraMetricsResponsePayload).nodes.map((p) => p.name);
expect(names).eql([
- 'gke-observability-8--observability-8--bc1afd95-f0zc',
'gke-observability-8--observability-8--bc1afd95-ngmh',
+ 'gke-observability-8--observability-8--bc1afd95-f0zc',
+ ,
]);
});
@@ -269,5 +270,38 @@ export default function ({ getService }: FtrProviderContext) {
);
});
});
+
+ describe('Host with active alerts', () => {
+ before(async () => {
+ await Promise.all([
+ esArchiver.load('x-pack/test/functional/es_archives/infra/alerts'),
+ esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ ]);
+ });
+
+ after(async () => {
+ await Promise.all([
+ esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts'),
+ esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ ]);
+ });
+
+ describe('fetch hosts', () => {
+ it('should return metrics for a host with alert count', async () => {
+ const body: GetInfraMetricsRequestBodyPayload = {
+ ...basePayload,
+ range: {
+ from: '2018-10-17T19:42:21.208Z',
+ to: '2018-10-17T19:58:03.952Z',
+ },
+ limit: 1,
+ };
+ const response = await makeRequest({ body, expectedHTTPCode: 200 });
+
+ expect(response.body.nodes).length(1);
+ expect(response.body.nodes[0].alertsCount).eql(2);
+ });
+ });
+ });
});
}
diff --git a/x-pack/test/functional/apps/infra/hosts_view.ts b/x-pack/test/functional/apps/infra/hosts_view.ts
index 260b48c26f0fc..a185023c9b33d 100644
--- a/x-pack/test/functional/apps/infra/hosts_view.ts
+++ b/x-pack/test/functional/apps/infra/hosts_view.ts
@@ -34,6 +34,7 @@ const END_HOST_PROCESSES_DATE = moment.utc(DATES.metricsAndLogs.hosts.processesD
const tableEntries = [
{
+ alertsCount: 2,
title: 'demo-stack-apache-01',
cpuUsage: '1.2%',
normalizedLoad: '0.5%',
@@ -44,36 +45,29 @@ const tableEntries = [
tx: '0 bit/s',
},
{
- title: 'demo-stack-client-01',
- cpuUsage: '0.5%',
- normalizedLoad: '0.1%',
- memoryUsage: '13.8%',
- memoryFree: '3.3 GB',
- diskSpaceUsage: '16.9%',
- rx: '0 bit/s',
- tx: '0 bit/s',
- },
- {
- title: 'demo-stack-haproxy-01',
- cpuUsage: '0.8%',
+ alertsCount: 2,
+ title: 'demo-stack-mysql-01',
+ cpuUsage: '0.9%',
normalizedLoad: '0%',
- memoryUsage: '16.5%',
+ memoryUsage: '18.2%',
memoryFree: '3.2 GB',
- diskSpaceUsage: '16.3%',
+ diskSpaceUsage: '17.8%',
rx: '0 bit/s',
tx: '0 bit/s',
},
{
- title: 'demo-stack-mysql-01',
- cpuUsage: '0.9%',
+ alertsCount: 2,
+ title: 'demo-stack-redis-01',
+ cpuUsage: '0.8%',
normalizedLoad: '0%',
- memoryUsage: '18.2%',
- memoryFree: '3.2 GB',
- diskSpaceUsage: '17.8%',
+ memoryUsage: '15.9%',
+ memoryFree: '3.3 GB',
+ diskSpaceUsage: '16.3%',
rx: '0 bit/s',
tx: '0 bit/s',
},
{
+ alertsCount: 0,
title: 'demo-stack-nginx-01',
cpuUsage: '0.8%',
normalizedLoad: '1.4%',
@@ -84,15 +78,27 @@ const tableEntries = [
tx: '0 bit/s',
},
{
- title: 'demo-stack-redis-01',
+ alertsCount: 0,
+ title: 'demo-stack-haproxy-01',
cpuUsage: '0.8%',
normalizedLoad: '0%',
- memoryUsage: '15.9%',
- memoryFree: '3.3 GB',
+ memoryUsage: '16.5%',
+ memoryFree: '3.2 GB',
diskSpaceUsage: '16.3%',
rx: '0 bit/s',
tx: '0 bit/s',
},
+ {
+ alertsCount: 0,
+ title: 'demo-stack-client-01',
+ cpuUsage: '0.5%',
+ normalizedLoad: '0.1%',
+ memoryUsage: '13.8%',
+ memoryFree: '3.3 GB',
+ diskSpaceUsage: '16.9%',
+ rx: '0 bit/s',
+ tx: '0 bit/s',
+ },
];
export default ({ getPageObjects, getService }: FtrProviderContext) => {
@@ -610,10 +616,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await Promise.all(
[
{ metric: 'hostsCount', value: '3' },
- { metric: 'cpuUsage', value: '0.8%' },
+ { metric: 'cpuUsage', value: '0.9%' },
{ metric: 'normalizedLoad1m', value: '0.2%' },
- { metric: 'memoryUsage', value: '16.3%' },
- { metric: 'diskUsage', value: '16.9%' },
+ { metric: 'memoryUsage', value: '17.5%' },
+ { metric: 'diskUsage', value: '17.2%' },
].map(async ({ metric, value }) => {
await retry.try(async () => {
const tileValue = await pageObjects.infraHostsView.getKPITileValue(metric);
@@ -626,12 +632,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
it('should update the alerts count on a search submit', async () => {
const alertsCount = await pageObjects.infraHostsView.getAlertsCount();
- expect(alertsCount).to.be('2');
+ expect(alertsCount).to.be('6');
});
it('should update the alerts table content on a search submit', async () => {
- const ACTIVE_ALERTS = 2;
- const RECOVERED_ALERTS = 2;
+ const ACTIVE_ALERTS = 6;
+ const RECOVERED_ALERTS = 4;
const ALL_ALERTS = ACTIVE_ALERTS + RECOVERED_ALERTS;
const COLUMNS = 11;
@@ -708,7 +714,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.infraHostsView.sortByCpuUsage();
let hostRows = await pageObjects.infraHostsView.getHostsTableData();
const hostDataFirtPage = await pageObjects.infraHostsView.getHostsRowData(hostRows[0]);
- expect(hostDataFirtPage).to.eql(tableEntries[1]);
+ expect(hostDataFirtPage).to.eql(tableEntries[5]);
await pageObjects.infraHostsView.paginateTo(2);
hostRows = await pageObjects.infraHostsView.getHostsTableData();
@@ -725,7 +731,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.infraHostsView.paginateTo(2);
hostRows = await pageObjects.infraHostsView.getHostsTableData();
const hostDataLastPage = await pageObjects.infraHostsView.getHostsRowData(hostRows[0]);
- expect(hostDataLastPage).to.eql(tableEntries[1]);
+ expect(hostDataLastPage).to.eql(tableEntries[5]);
});
it('should sort by text field asc', async () => {
@@ -737,14 +743,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.infraHostsView.paginateTo(2);
hostRows = await pageObjects.infraHostsView.getHostsTableData();
const hostDataLastPage = await pageObjects.infraHostsView.getHostsRowData(hostRows[0]);
- expect(hostDataLastPage).to.eql(tableEntries[5]);
+ expect(hostDataLastPage).to.eql(tableEntries[2]);
});
it('should sort by text field desc', async () => {
await pageObjects.infraHostsView.sortByTitle();
let hostRows = await pageObjects.infraHostsView.getHostsTableData();
const hostDataFirtPage = await pageObjects.infraHostsView.getHostsRowData(hostRows[0]);
- expect(hostDataFirtPage).to.eql(tableEntries[5]);
+ expect(hostDataFirtPage).to.eql(tableEntries[2]);
await pageObjects.infraHostsView.paginateTo(2);
hostRows = await pageObjects.infraHostsView.getHostsTableData();
diff --git a/x-pack/test/functional/page_objects/infra_hosts_view.ts b/x-pack/test/functional/page_objects/infra_hosts_view.ts
index 60c4f0727e7c0..31ae75c4000d6 100644
--- a/x-pack/test/functional/page_objects/infra_hosts_view.ts
+++ b/x-pack/test/functional/page_objects/infra_hosts_view.ts
@@ -66,10 +66,29 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
const cells = await row.findAllByCssSelector('[data-test-subj*="hostsView-tableRow-"]');
// Retrieve content for each cell
- const [title, cpuUsage, normalizedLoad, memoryUsage, memoryFree, diskSpaceUsage, rx, tx] =
- await Promise.all(cells.map((cell) => this.getHostsCellContent(cell)));
-
- return { title, cpuUsage, normalizedLoad, memoryUsage, memoryFree, diskSpaceUsage, rx, tx };
+ const [
+ alertsCount,
+ title,
+ cpuUsage,
+ normalizedLoad,
+ memoryUsage,
+ memoryFree,
+ diskSpaceUsage,
+ rx,
+ tx,
+ ] = await Promise.all(cells.map((cell) => this.getHostsCellContent(cell)));
+
+ return {
+ alertsCount,
+ title,
+ cpuUsage,
+ normalizedLoad,
+ memoryUsage,
+ memoryFree,
+ diskSpaceUsage,
+ rx,
+ tx,
+ };
},
async getHostsCellContent(cell: WebElementWrapper) {
@@ -235,11 +254,11 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
// Sorting
getCpuUsageHeader() {
- return testSubjects.find('tableHeaderCell_cpu_2');
+ return testSubjects.find('tableHeaderCell_cpu_3');
},
getTitleHeader() {
- return testSubjects.find('tableHeaderCell_title_1');
+ return testSubjects.find('tableHeaderCell_title_2');
},
async sortByCpuUsage() {
From 07b910f02c3d34174ee15bb745fbc897975cd464 Mon Sep 17 00:00:00 2001
From: Kevin Qualters <56408403+kqualters-elastic@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:01:44 -0500
Subject: [PATCH 06/23] [Security Solution] Update mappings script to be able
to be run directly and from yarn again (#176880)
## Summary
This pr https://github.com/elastic/kibana/pull/168047 broke the mappings
script so that it can only be run directly, and not from package.json.
This pr changes it so that the script works in both scenarios.
---
.../scripts/mappings/mappings_loader_script.ts | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/x-pack/plugins/security_solution/scripts/mappings/mappings_loader_script.ts b/x-pack/plugins/security_solution/scripts/mappings/mappings_loader_script.ts
index 7997401f35e70..d8767d21a677c 100644
--- a/x-pack/plugins/security_solution/scripts/mappings/mappings_loader_script.ts
+++ b/x-pack/plugins/security_solution/scripts/mappings/mappings_loader_script.ts
@@ -11,7 +11,14 @@ import path from 'path';
import yargs from 'yargs';
import { execSync } from 'child_process';
-const CONFIG_PATH = '../../../../../test/functional/config.base.js';
+const requireMain = require.main;
+let appDir = process.cwd();
+if (requireMain) {
+ appDir = path.dirname(requireMain.filename);
+}
+
+const CONFIG_PATH = path.resolve(appDir, '../../../../../test/functional/config.base.js');
+const ES_ARCHIVER_PATH = path.resolve(appDir, '../../../../../scripts/es_archiver');
const loadAllIndices = (esUrl: string, kibanaUrl: string, mappingsDir: string) => {
const exec = (cmd: string) => execSync(cmd, { stdio: 'inherit' });
@@ -40,7 +47,7 @@ const loadAllIndices = (esUrl: string, kibanaUrl: string, mappingsDir: string) =
return;
}
exec(
- `node ../../../../../scripts/es_archiver load ${fullPath} --config "${CONFIG_PATH}" --es-url=${esUrl} --kibana-url=${kibanaUrl}`
+ `node ${ES_ARCHIVER_PATH} load ${fullPath} --config "${CONFIG_PATH}" --es-url=${esUrl} --kibana-url=${kibanaUrl}`
);
});
});
From 2ebd8dd83ef8a6863bd84ce2435cfc42105b8de6 Mon Sep 17 00:00:00 2001
From: Coen Warmer
Date: Thu, 15 Feb 2024 17:03:40 +0100
Subject: [PATCH 07/23] Make sure container doesn't overflow (#177024)
## Summary
Fixes an issue where due to flexbox'es fantastic API every container
needs a `min-width` set, otherwise it won't honor `width: 100%` when a
child element overflows.
Also cleans up some stuff.
---
.../public/components/chat/chat_body.tsx | 1 +
.../public/components/page_template.tsx | 1 +
.../conversations/conversation_view.tsx | 126 +++++++++---------
3 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx b/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx
index a89419c366a2d..83eae35e59f97 100644
--- a/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx
+++ b/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx
@@ -154,6 +154,7 @@ export function ChatBody({
}
const containerClassName = css`
+ min-width: 0;
max-height: 100%;
max-width: ${startedFrom === 'conversationView'
? 1200 - 250 + 'px' // page template max width - conversation list width.
diff --git a/x-pack/plugins/observability_ai_assistant/public/components/page_template.tsx b/x-pack/plugins/observability_ai_assistant/public/components/page_template.tsx
index 94c36f463aaf4..7cab8d586c83e 100644
--- a/x-pack/plugins/observability_ai_assistant/public/components/page_template.tsx
+++ b/x-pack/plugins/observability_ai_assistant/public/components/page_template.tsx
@@ -36,6 +36,7 @@ export function ObservabilityAIAssistantPageTemplate({ children }: { children: R
contentProps: {
className: pageSectionContentClassName,
},
+ paddingSize: 'none',
}}
>
{children}
diff --git a/x-pack/plugins/observability_ai_assistant/public/routes/conversations/conversation_view.tsx b/x-pack/plugins/observability_ai_assistant/public/routes/conversations/conversation_view.tsx
index 0f49389c1c60d..91f884dbd84c9 100644
--- a/x-pack/plugins/observability_ai_assistant/public/routes/conversations/conversation_view.tsx
+++ b/x-pack/plugins/observability_ai_assistant/public/routes/conversations/conversation_view.tsx
@@ -24,10 +24,6 @@ import { useObservabilityAIAssistantParams } from '../../hooks/use_observability
import { useObservabilityAIAssistantRouter } from '../../hooks/use_observability_ai_assistant_router';
import { ChatInlineEditingContent } from '../../components/chat/chat_inline_edit';
-const containerClassName = css`
- max-width: 100%;
-`;
-
const SECOND_SLOT_CONTAINER_WIDTH = 400;
export function ConversationView() {
@@ -120,6 +116,10 @@ export function ConversationView() {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
+ const containerClassName = css`
+ max-width: 100%;
+ `;
+
const conversationListContainerName = css`
min-width: 250px;
width: 250px;
@@ -150,67 +150,65 @@ export function ConversationView() {
`;
return (
- <>
-
-
- {
- if (conversationId) {
- observabilityAIAssistantRouter.push('/conversations/new', {
- path: {},
- query: {},
- });
- } else {
- // clear the chat
- chatBodyKeyRef.current = v4();
- forceUpdate();
- }
- }}
- onClickChat={(id) => {
- navigateToConversation(id, false);
- }}
- onClickDeleteConversation={(id) => {
- if (conversationId === id) {
- navigateToConversation(undefined, false);
- }
- }}
+
+
+ {
+ if (conversationId) {
+ observabilityAIAssistantRouter.push('/conversations/new', {
+ path: {},
+ query: {},
+ });
+ } else {
+ // clear the chat
+ chatBodyKeyRef.current = v4();
+ forceUpdate();
+ }
+ }}
+ onClickChat={(id) => {
+ navigateToConversation(id, false);
+ }}
+ onClickDeleteConversation={(id) => {
+ if (conversationId === id) {
+ navigateToConversation(undefined, false);
+ }
+ }}
+ />
+
+
+ {!chatService.value ? (
+
+
+
+
+ ) : null}
+
+ {chatService.value && (
+
+
-
- {!chatService.value ? (
-
-
-
-
- ) : null}
-
- {chatService.value && (
-
-
- )}
-
-
+
+
Date: Thu, 15 Feb 2024 17:06:15 +0100
Subject: [PATCH 08/23] [Logs Explorer] Expose customization events (#176825)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## 📓 Summary
This work is a follow-up of the newly introduced [support to logs backed
data views](https://github.com/elastic/kibana/pull/176078) in Logs
Explorer.
In [a
comment](https://github.com/elastic/kibana/pull/176078#discussion_r1486811951)
from the PR mentioned above, we discussed delegating to the consumers
## Example
When creating the controller to pass into the LogsExplorer component, we
can specify the event for handling the discover navigation as follow:
```ts
createLogsExplorerController({
customizations: {
events: {
onUknownDataViewSelection: (context) => { /* ... */ },
},
},
});
```
A use case for such usage is, for instance, that some consumers might
want to prompt the user somehow before performing the navigation, or
simply they don't want to do any navigation.
---------
Co-authored-by: Marco Antonio Ghiani
---
.../logs_explorer/common/index.ts | 3 ++
.../dataset_selector/dataset_selector.tsx | 11 ++++++-
.../sub_components/data_view_menu_item.tsx | 2 +-
.../components/dataset_selector/types.ts | 9 ++++-
.../public/controller/create_controller.ts | 5 +--
.../custom_dataset_selector.tsx | 10 +++++-
.../customizations/logs_explorer_profile.tsx | 1 +
.../public/customizations/types.ts | 8 +++++
.../public/hooks/use_data_views.tsx | 17 ++++++++--
.../logs_explorer/public/index.ts | 1 +
.../src/services/discover_service.ts | 33 ++++---------------
.../src/services/selection_service.ts | 12 +++----
.../src/state_machine.ts | 15 +++++----
.../discover_navigation_handler.ts | 30 +++++++++++++++++
.../logs_explorer_customizations/index.ts | 10 +++++-
.../public/routes/main/main_route.tsx | 8 +++--
16 files changed, 125 insertions(+), 50 deletions(-)
create mode 100644 x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/discover_navigation_handler.ts
diff --git a/x-pack/plugins/observability_solution/logs_explorer/common/index.ts b/x-pack/plugins/observability_solution/logs_explorer/common/index.ts
index 0f593cb8ad072..9eb381441cc55 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/common/index.ts
+++ b/x-pack/plugins/observability_solution/logs_explorer/common/index.ts
@@ -16,6 +16,9 @@ export {
AllDatasetSelection,
datasetSelectionPlainRT,
hydrateDatasetSelection,
+ isDatasetSelection,
+ isDataViewSelection,
+ isUnresolvedDatasetSelection,
UnresolvedDatasetSelection,
} from './dataset_selection';
export type { DatasetSelectionPlain } from './dataset_selection';
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx
index 507f4d83f8957..36b9e337a5a90 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx
@@ -44,6 +44,7 @@ export function DatasetSelector({
discoverEsqlUrlProps,
integrations,
integrationsError,
+ isDataViewAvailable,
isEsqlEnabled,
isLoadingDataViews,
isLoadingIntegrations,
@@ -164,8 +165,16 @@ export function DatasetSelector({
'data-test-subj': getDataViewTestSubj(dataView.title),
name: => {
- const { data, dataViews, discover } = plugins;
+ const { data, dataViews } = plugins;
const datasetsClient = new DatasetsService().start({
http: core.http,
@@ -70,7 +70,8 @@ export const createLogsExplorerControllerFactory =
const machine = createLogsExplorerControllerStateMachine({
datasetsClient,
- plugins: { dataViews, discover },
+ dataViews,
+ events: customizations.events,
initialContext,
query: discoverServices.data.query,
toasts: core.notifications.toasts,
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/customizations/custom_dataset_selector.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/customizations/custom_dataset_selector.tsx
index b298a2363a983..4623d73852240 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/customizations/custom_dataset_selector.tsx
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/customizations/custom_dataset_selector.tsx
@@ -8,6 +8,7 @@
import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
import React from 'react';
import { DatasetSelector } from '../components/dataset_selector';
+import { LogsExplorerController } from '../controller';
import { DatasetsProvider, useDatasetsContext } from '../hooks/use_datasets';
import { useDatasetSelection } from '../hooks/use_dataset_selection';
import { DataViewsProvider, useDataViewsContext } from '../hooks/use_data_views';
@@ -52,6 +53,7 @@ export const CustomDatasetSelector = withProviders(({ logsExplorerControllerStat
dataViews,
error: dataViewsError,
isLoading: isLoadingDataViews,
+ isDataViewAvailable,
loadDataViews,
reloadDataViews,
searchDataViews,
@@ -68,6 +70,7 @@ export const CustomDatasetSelector = withProviders(({ logsExplorerControllerStat
dataViews={dataViews}
dataViewsError={dataViewsError}
discoverEsqlUrlProps={discoverEsqlUrlProps}
+ isDataViewAvailable={isDataViewAvailable}
integrations={integrations}
integrationsError={integrationsError}
isEsqlEnabled={isEsqlEnabled}
@@ -98,12 +101,14 @@ export const CustomDatasetSelector = withProviders(({ logsExplorerControllerStat
export default CustomDatasetSelector;
export type CustomDatasetSelectorBuilderProps = CustomDatasetSelectorProps & {
+ controller: LogsExplorerController;
datasetsClient: IDatasetsClient;
dataViews: DataViewsPublicPluginStart;
};
function withProviders(Component: React.FunctionComponent) {
return function ComponentWithProviders({
+ controller,
datasetsClient,
dataViews,
logsExplorerControllerStateService,
@@ -111,7 +116,10 @@ function withProviders(Component: React.FunctionComponent
-
+
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/customizations/logs_explorer_profile.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/customizations/logs_explorer_profile.tsx
index ac5eb2d6d81c6..e00bbfa03b7d5 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/customizations/logs_explorer_profile.tsx
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/customizations/logs_explorer_profile.tsx
@@ -64,6 +64,7 @@ export const createLogsExplorerProfileCustomizations =
return (
= (props: Props) => React.ReactNode;
@@ -25,8 +26,15 @@ export interface LogsExplorerFlyoutContentProps {
doc: LogDocument;
}
+export type OnUknownDataViewSelectionHandler = (context: LogsExplorerControllerContext) => void;
+
+export interface LogsExplorerCustomizationEvents {
+ onUknownDataViewSelection?: OnUknownDataViewSelectionHandler;
+}
+
export interface LogsExplorerCustomizations {
flyout?: {
renderContent?: RenderContentCustomization;
};
+ events?: LogsExplorerCustomizationEvents;
}
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/hooks/use_data_views.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/hooks/use_data_views.tsx
index a71375ff2ea25..60af9d3591adf 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/hooks/use_data_views.tsx
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/hooks/use_data_views.tsx
@@ -8,12 +8,15 @@
import { useCallback } from 'react';
import createContainer from 'constate';
import { useInterpret, useSelector } from '@xstate/react';
-import { DataViewListItem, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { DataViewDescriptor } from '../../common/data_views/models/data_view_descriptor';
import { SortOrder } from '../../common/latest';
import { createDataViewsStateMachine } from '../state_machines/data_views';
+import { LogsExplorerCustomizations } from '../controller';
interface DataViewsContextDeps {
dataViewsService: DataViewsPublicPluginStart;
+ events: LogsExplorerCustomizations['events'];
}
export interface SearchDataViewsParams {
@@ -21,12 +24,12 @@ export interface SearchDataViewsParams {
sortOrder: SortOrder;
}
-export type DataViewSelectionHandler = (dataView: DataViewListItem) => void;
export type SearchDataViews = (params: SearchDataViewsParams) => void;
export type LoadDataViews = () => void;
export type ReloadDataViews = () => void;
+export type IsDataViewAvailable = (dataView: DataViewDescriptor) => boolean;
-const useDataViews = ({ dataViewsService }: DataViewsContextDeps) => {
+const useDataViews = ({ dataViewsService, events }: DataViewsContextDeps) => {
const dataViewsStateService = useInterpret(() =>
createDataViewsStateMachine({
dataViews: dataViewsService,
@@ -39,6 +42,13 @@ const useDataViews = ({ dataViewsService }: DataViewsContextDeps) => {
const isLoading = useSelector(dataViewsStateService, (state) => state.matches('loading'));
+ const isDataViewAvailable: IsDataViewAvailable = useCallback(
+ (dataView) =>
+ dataView.isLogsDataType() ||
+ (dataView.isUnknownDataType() && Boolean(events?.onUknownDataViewSelection)),
+ [events?.onUknownDataViewSelection]
+ );
+
const loadDataViews = useCallback(
() => dataViewsStateService.send({ type: 'LOAD_DATA_VIEWS' }),
[dataViewsStateService]
@@ -81,6 +91,7 @@ const useDataViews = ({ dataViewsService }: DataViewsContextDeps) => {
dataViews,
// Actions
+ isDataViewAvailable,
loadDataViews,
reloadDataViews,
searchDataViews,
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/index.ts b/x-pack/plugins/observability_solution/logs_explorer/public/index.ts
index 6e452f8904828..c768b3a7cb3f3 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/index.ts
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/index.ts
@@ -17,6 +17,7 @@ export type {
} from './controller';
export type {
LogsExplorerCustomizations,
+ LogsExplorerCustomizationEvents,
LogsExplorerFlyoutContentProps,
} from './customizations/types';
export type { LogsExplorerControllerContext } from './state_machines/logs_explorer_controller';
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/discover_service.ts b/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/discover_service.ts
index d67c74097d701..96fbe4ff34440 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/discover_service.ts
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/discover_service.ts
@@ -5,11 +5,10 @@
* 2.0.
*/
-import { DiscoverStart } from '@kbn/discover-plugin/public';
import { isEmpty } from 'lodash';
import { ActionFunction, actions, InvokeCallback } from 'xstate';
-import { getDiscoverColumnsWithFallbackFieldsFromDisplayOptions } from '../../../../utils/convert_discover_app_state';
-import { DataViewSelection, isDataViewSelection } from '../../../../../common/dataset_selection';
+import { LogsExplorerCustomizations } from '../../../../controller';
+import { isDataViewSelection } from '../../../../../common/dataset_selection';
import {
getChartDisplayOptionsFromDiscoverAppState,
getDiscoverAppStateFromContext,
@@ -110,32 +109,14 @@ export const updateDiscoverAppStateFromContext: ActionFunction<
context.discoverStateContainer.appState.update(getDiscoverAppStateFromContext(context));
};
-export const redirectToDiscoverAction =
+export const redirectToDiscover =
(
- discover: DiscoverStart
+ events?: LogsExplorerCustomizations['events']
): ActionFunction =>
(context, event) => {
if (event.type === 'UPDATE_DATASET_SELECTION' && isDataViewSelection(event.data)) {
- return redirectToDiscover({ context, datasetSelection: event.data, discover });
+ if (events?.onUknownDataViewSelection) {
+ return events.onUknownDataViewSelection({ ...context, datasetSelection: event.data });
+ }
}
};
-
-export const redirectToDiscover = ({
- context,
- datasetSelection,
- discover,
-}: {
- discover: DiscoverStart;
- context: LogsExplorerControllerContext;
- datasetSelection: DataViewSelection;
-}) => {
- return discover.locator?.navigate({
- breakdownField: context.chart.breakdownField ?? undefined,
- columns: getDiscoverColumnsWithFallbackFieldsFromDisplayOptions(context),
- dataViewSpec: datasetSelection.selection.dataView.toDataviewSpec(),
- filters: context.filters,
- query: context.query,
- refreshInterval: context.refreshInterval,
- timeRange: context.time,
- });
-};
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/selection_service.ts b/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/selection_service.ts
index 281b446869276..bcf6bfce7730b 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/selection_service.ts
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/services/selection_service.ts
@@ -5,8 +5,8 @@
* 2.0.
*/
-import { DiscoverStart } from '@kbn/discover-plugin/public';
import { InvokeCreator } from 'xstate';
+import { LogsExplorerCustomizations } from '../../../../controller';
import { Dataset } from '../../../../../common/datasets';
import {
isDataViewSelection,
@@ -16,17 +16,16 @@ import {
} from '../../../../../common/dataset_selection';
import { IDatasetsClient } from '../../../../services/datasets';
import { LogsExplorerControllerContext, LogsExplorerControllerEvent } from '../types';
-import { redirectToDiscover } from './discover_service';
interface LogsExplorerControllerSelectionServiceDeps {
datasetsClient: IDatasetsClient;
- discover: DiscoverStart;
+ events?: LogsExplorerCustomizations['events'];
}
export const initializeSelection =
({
datasetsClient,
- discover,
+ events,
}: LogsExplorerControllerSelectionServiceDeps): InvokeCreator<
LogsExplorerControllerContext,
LogsExplorerControllerEvent
@@ -39,9 +38,10 @@ export const initializeSelection =
*/
if (
isDataViewSelection(context.datasetSelection) &&
- context.datasetSelection.selection.dataView.isUnknownDataType()
+ context.datasetSelection.selection.dataView.isUnknownDataType() &&
+ events?.onUknownDataViewSelection
) {
- return redirectToDiscover({ context, datasetSelection: context.datasetSelection, discover });
+ return events?.onUknownDataViewSelection(context);
}
/**
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/state_machine.ts b/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/state_machine.ts
index 3354fbbcd7a02..da393ef99213c 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/state_machine.ts
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/state_machines/logs_explorer_controller/src/state_machine.ts
@@ -8,7 +8,8 @@
import { IToasts } from '@kbn/core/public';
import { QueryStart } from '@kbn/data-plugin/public';
import { actions, createMachine, interpret, InterpreterFrom, raise } from 'xstate';
-import { LogsExplorerStartDeps } from '../../../types';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { LogsExplorerCustomizations } from '../../../controller';
import { ControlPanelRT } from '../../../../common/control_panels';
import {
AllDatasetSelection,
@@ -28,7 +29,7 @@ import {
} from './services/control_panels';
import { changeDataView, createAdHocDataView } from './services/data_view_service';
import {
- redirectToDiscoverAction,
+ redirectToDiscover,
subscribeToDiscoverState,
updateContextFromDiscoverAppState,
updateContextFromDiscoverDataState,
@@ -319,7 +320,8 @@ export const createPureLogsExplorerControllerStateMachine = (
export interface LogsExplorerControllerStateMachineDependencies {
datasetsClient: IDatasetsClient;
- plugins: Pick;
+ dataViews: DataViewsPublicPluginStart;
+ events?: LogsExplorerCustomizations['events'];
initialContext?: LogsExplorerControllerContext;
query: QueryStart;
toasts: IToasts;
@@ -327,7 +329,8 @@ export interface LogsExplorerControllerStateMachineDependencies {
export const createLogsExplorerControllerStateMachine = ({
datasetsClient,
- plugins: { dataViews, discover },
+ dataViews,
+ events,
initialContext = DEFAULT_CONTEXT,
query,
toasts,
@@ -336,14 +339,14 @@ export const createLogsExplorerControllerStateMachine = ({
actions: {
notifyCreateDataViewFailed: createCreateDataViewFailedNotifier(toasts),
notifyDatasetSelectionRestoreFailed: createDatasetSelectionRestoreFailedNotifier(toasts),
- redirectToDiscover: redirectToDiscoverAction(discover),
+ redirectToDiscover: redirectToDiscover(events),
updateTimefilterFromContext: updateTimefilterFromContext(query),
},
services: {
changeDataView: changeDataView({ dataViews }),
createAdHocDataView: createAdHocDataView(),
initializeControlPanels: initializeControlPanels(),
- initializeSelection: initializeSelection({ datasetsClient, discover }),
+ initializeSelection: initializeSelection({ datasetsClient, events }),
subscribeControlGroup: subscribeControlGroup(),
updateControlPanels: updateControlPanels(),
discoverStateService: subscribeToDiscoverState(),
diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/discover_navigation_handler.ts b/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/discover_navigation_handler.ts
new file mode 100644
index 0000000000000..8ffd223201c99
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/discover_navigation_handler.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { isDataViewSelection } from '@kbn/logs-explorer-plugin/common';
+import {
+ getDiscoverColumnsWithFallbackFieldsFromDisplayOptions,
+ LogsExplorerCustomizationEvents,
+} from '@kbn/logs-explorer-plugin/public';
+
+export const createOnUknownDataViewSelectionHandler = (
+ discover: DiscoverStart
+): LogsExplorerCustomizationEvents['onUknownDataViewSelection'] => {
+ return (context) => {
+ if (isDataViewSelection(context.datasetSelection))
+ discover.locator?.navigate({
+ breakdownField: context.chart.breakdownField ?? undefined,
+ columns: getDiscoverColumnsWithFallbackFieldsFromDisplayOptions(context),
+ dataViewSpec: context.datasetSelection.selection.dataView.toDataviewSpec(),
+ filters: context.filters,
+ query: context.query,
+ refreshInterval: context.refreshInterval,
+ timeRange: context.time,
+ });
+ };
+};
diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/index.ts b/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/index.ts
index 1a10437340344..9e8c3061d6f55 100644
--- a/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/index.ts
+++ b/x-pack/plugins/observability_solution/observability_logs_explorer/public/logs_explorer_customizations/index.ts
@@ -6,15 +6,23 @@
*/
import { CreateLogsExplorerController } from '@kbn/logs-explorer-plugin/public';
+import { PluginKibanaContextValue } from '../utils/use_kibana';
+import { createOnUknownDataViewSelectionHandler } from './discover_navigation_handler';
import { renderFlyoutContent } from './flyout_content';
export const createLogsExplorerControllerWithCustomizations =
- (createLogsExplorerController: CreateLogsExplorerController): CreateLogsExplorerController =>
+ (
+ createLogsExplorerController: CreateLogsExplorerController,
+ services: PluginKibanaContextValue
+ ): CreateLogsExplorerController =>
(args) =>
createLogsExplorerController({
...args,
customizations: {
...args.customizations,
+ events: {
+ onUknownDataViewSelection: createOnUknownDataViewSelectionHandler(services.discover),
+ },
flyout: {
renderContent: renderFlyoutContent,
},
diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/public/routes/main/main_route.tsx b/x-pack/plugins/observability_solution/observability_logs_explorer/public/routes/main/main_route.tsx
index b9468354955e2..be071eb1dfcc3 100644
--- a/x-pack/plugins/observability_solution/observability_logs_explorer/public/routes/main/main_route.tsx
+++ b/x-pack/plugins/observability_solution/observability_logs_explorer/public/routes/main/main_route.tsx
@@ -35,8 +35,12 @@ export const ObservabilityLogsExplorerMainRoute = () => {
const urlStateStorageContainer = useKbnUrlStateStorageFromRouterContext();
const createLogsExplorerController = useMemo(
- () => createLogsExplorerControllerWithCustomizations(logsExplorer.createLogsExplorerController),
- [logsExplorer.createLogsExplorerController]
+ () =>
+ createLogsExplorerControllerWithCustomizations(
+ logsExplorer.createLogsExplorerController,
+ services
+ ),
+ [logsExplorer.createLogsExplorerController, services]
);
return (
From 591d2512e2ef4ba0c7756af6426e6ad17260a2be Mon Sep 17 00:00:00 2001
From: Melissa Alvarez
Date: Thu, 15 Feb 2024 09:10:44 -0700
Subject: [PATCH 09/23] [ML] Data Frame Analytics Creation functional tests:
ensure test consistency (#176939)
## Summary
Fixes https://github.com/elastic/kibana/issues/147020
As discussed, in this PR, the chart color assertions are temporarily
disabled as the colors can vary quite a bit on each run and cause
flakiness.
Created an [issue](https://github.com/elastic/kibana/issues/176938) for
creating a better solution.
### Checklist
Delete any items that are not applicable to this PR.
- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
### Risk Matrix
Delete this section if it is not applicable to this PR.
Before closing this PR, invite QA, stakeholders, and other developers to
identify risks that should be tested prior to the change/feature
release.
When forming the risk matrix, consider some of the following examples
and how they may potentially impact the change:
---
.../classification_creation_saved_search.ts | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts
index 307678384d470..eb81e2d8de15a 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts
@@ -14,8 +14,7 @@ export default function ({ getService }: FtrProviderContext) {
const ml = getService('ml');
const editedDescription = 'Edited description';
- // FLAKY: https://github.com/elastic/kibana/issues/147020
- describe.skip('classification saved search creation', function () {
+ describe('classification saved search creation', function () {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote_small');
await ml.testResources.createDataViewIfNeeded('ft_farequote_small', '@timestamp');
@@ -684,16 +683,20 @@ export default function ({ getService }: FtrProviderContext) {
await ml.dataFrameAnalyticsResults.assertResultsTableNotEmpty();
await ml.testExecution.logTestStep('displays the ROC curve chart');
- await ml.commonUI.assertColorsInCanvasElement(
- 'mlDFAnalyticsClassificationExplorationRocCurveChart',
- testData.expected.rocCurveColorState,
- ['#000000'],
- undefined,
- undefined,
- // increased tolerance for ROC curve chart up from 10 to 20
- // since the returned colors vary quite a bit on each run.
- 20
- );
+
+ // NOTE: Temporarily disabling these assertions since the colors can vary quite a bit on each run and cause flakiness
+ // Tracking in https://github.com/elastic/kibana/issues/176938
+
+ // await ml.commonUI.assertColorsInCanvasElement(
+ // 'mlDFAnalyticsClassificationExplorationRocCurveChart',
+ // testData.expected.rocCurveColorState,
+ // ['#000000'],
+ // undefined,
+ // undefined,
+ // // increased tolerance for ROC curve chart up from 10 to 20
+ // // since the returned colors vary quite a bit on each run.
+ // 20
+ // );
await ml.commonUI.resetAntiAliasing();
});
From 0d787a01f3fb9f16fca811be8dbc1d7a08241b96 Mon Sep 17 00:00:00 2001
From: Ash <1849116+ashokaditya@users.noreply.github.com>
Date: Thu, 15 Feb 2024 17:48:06 +0100
Subject: [PATCH 10/23] [8.13][Security Solution][Endpoint] Add missing tests
for bidirectional connector response actions (#176824)
## Summary
Tests for responder action item on alert action menu.
for changes in elastic/kibana/pull/176405
### Checklist
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
---------
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
.../use_responder_action_data.test.ts | 140 ++++++++++++++++++
.../edit_connector_flyout/index.test.tsx | 34 ++++-
2 files changed, 171 insertions(+), 3 deletions(-)
create mode 100644 x-pack/plugins/security_solution/public/detections/components/endpoint_responder/use_responder_action_data.test.ts
diff --git a/x-pack/plugins/security_solution/public/detections/components/endpoint_responder/use_responder_action_data.test.ts b/x-pack/plugins/security_solution/public/detections/components/endpoint_responder/use_responder_action_data.test.ts
new file mode 100644
index 0000000000000..5613cf551b464
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/components/endpoint_responder/use_responder_action_data.test.ts
@@ -0,0 +1,140 @@
+/*
+ * 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 { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
+import { useResponderActionData } from './use_responder_action_data';
+import { renderHook } from '@testing-library/react-hooks';
+import { useGetEndpointDetails } from '../../../management/hooks';
+import { HostStatus } from '../../../../common/endpoint/types';
+
+jest.mock('../../../common/hooks/use_experimental_features');
+jest.mock('../../../management/hooks', () => ({
+ useGetEndpointDetails: (jest.fn() as jest.Mock).mockImplementation(() => ({ enabled: false })),
+ useWithShowResponder: jest.fn(),
+}));
+
+const useGetEndpointDetailsMock = useGetEndpointDetails as jest.Mock;
+const useIsExperimentalFeatureEnabledMock = useIsExperimentalFeatureEnabled as jest.Mock;
+
+describe('#useResponderActionData', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('should return `responder` menu item as `disabled` if agentType is not `endpoint` and feature flag is enabled', () => {
+ useIsExperimentalFeatureEnabledMock.mockReturnValue(false);
+
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'some-agent-type-id',
+ // @ts-expect-error this is for testing purpose
+ agentType: 'some_agent_type',
+ eventData: [],
+ })
+ );
+ expect(result.current.isDisabled).toEqual(true);
+ });
+
+ describe('when agentType is `endpoint`', () => {
+ it.each(Object.values(HostStatus).filter((status) => status !== 'unenrolled'))(
+ 'should return `responder` menu item as `enabled `if agentType is `endpoint` when endpoint is %s',
+ (hostStatus) => {
+ useGetEndpointDetailsMock.mockReturnValue({
+ data: {
+ host_status: hostStatus,
+ },
+ isFetching: false,
+ error: undefined,
+ });
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'endpoint-id',
+ agentType: 'endpoint',
+ })
+ );
+ expect(result.current.isDisabled).toEqual(false);
+ }
+ );
+
+ it('should return responder menu item `disabled` if agentType is `endpoint` when endpoint is `unenrolled`', () => {
+ useGetEndpointDetailsMock.mockReturnValue({
+ data: {
+ host_status: 'unenrolled',
+ },
+ isFetching: false,
+ error: undefined,
+ });
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'endpoint-id',
+ agentType: 'endpoint',
+ })
+ );
+ expect(result.current.isDisabled).toEqual(true);
+ });
+
+ it('should return responder menu item `disabled` if agentType is `endpoint` when endpoint data has error', () => {
+ useGetEndpointDetailsMock.mockReturnValue({
+ data: {
+ host_status: 'online',
+ },
+ isFetching: false,
+ error: new Error('uh oh!'),
+ });
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'endpoint-id',
+ agentType: 'endpoint',
+ })
+ );
+ expect(result.current.isDisabled).toEqual(true);
+ });
+
+ it('should return responder menu item `disabled` if agentType is `endpoint` and endpoint data is fetching', () => {
+ useGetEndpointDetailsMock.mockReturnValue({
+ data: undefined,
+ isFetching: true,
+ error: undefined,
+ });
+
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'endpoint-id',
+ agentType: 'endpoint',
+ })
+ );
+ expect(result.current.isDisabled).toEqual(true);
+ });
+ });
+
+ describe('when agentType is `sentinel_one`', () => {
+ it('should return `responder` menu item as `disabled` if agentType is `sentinel_one` and feature flag is disabled', () => {
+ useIsExperimentalFeatureEnabledMock.mockReturnValue(false);
+
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'sentinel-one-id',
+ agentType: 'sentinel_one',
+ eventData: [],
+ })
+ );
+ expect(result.current.isDisabled).toEqual(true);
+ });
+
+ it('should return `responder` menu item as `enabled `if agentType is `sentinel_one` and feature flag is enabled', () => {
+ useIsExperimentalFeatureEnabledMock.mockReturnValue(true);
+ const { result } = renderHook(() =>
+ useResponderActionData({
+ endpointId: 'sentinel-one-id',
+ agentType: 'sentinel_one',
+ eventData: [],
+ })
+ );
+ expect(result.current.isDisabled).toEqual(false);
+ });
+ });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/edit_connector_flyout/index.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/edit_connector_flyout/index.test.tsx
index 001cab3fc0720..3bdeb84e4bc19 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/edit_connector_flyout/index.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/edit_connector_flyout/index.test.tsx
@@ -12,7 +12,7 @@ import userEvent from '@testing-library/user-event';
import { act, waitFor } from '@testing-library/react';
import EditConnectorFlyout from '.';
import { ActionConnector, EditConnectorTabs, GenericValidationResult } from '../../../../types';
-import { technicalPreviewBadgeProps } from '../beta_badge_props';
+import { betaBadgeProps, technicalPreviewBadgeProps } from '../beta_badge_props';
import { AppMockRenderer, createAppMockRenderer } from '../../test_utils';
const updateConnectorResponse = {
@@ -311,7 +311,7 @@ describe('EditConnectorFlyout', () => {
expect(getByTestId('preconfiguredBadge')).toBeInTheDocument();
});
- it('does not show tech preview badge when isExperimental is false', async () => {
+ it('does not show `tech preview` badge when isExperimental is false', async () => {
const { queryByText } = appMockRenderer.render(
{
expect(queryByText(technicalPreviewBadgeProps.label)).not.toBeInTheDocument();
});
- it('shows tech preview badge when isExperimental is true', async () => {
+ it('shows `tech preview` badge when isExperimental is true', async () => {
actionTypeRegistry.get.mockReturnValue({ ...actionTypeModel, isExperimental: true });
const { getByText } = appMockRenderer.render(
{
await act(() => Promise.resolve());
expect(getByText(technicalPreviewBadgeProps.label)).toBeInTheDocument();
});
+
+ it('does not show `beta` badge when `isBeta` is `false`', async () => {
+ actionTypeRegistry.get.mockReturnValue({ ...actionTypeModel, isBeta: false });
+ const { queryByText } = appMockRenderer.render(
+
---
.../server/routes/lib/rewrite_rule.test.ts | 3 +
.../server/routes/lib/rewrite_rule.ts | 2 +
.../server/routes/update_rule.test.ts | 10 ++
.../alerting/server/routes/update_rule.ts | 10 +-
.../server/rules_client/methods/update.ts | 3 +-
.../server/rules_client/tests/update.test.ts | 12 ++
.../lib/rule_api/common_transformations.ts | 2 +
.../application/lib/rule_api/create.test.ts | 9 ++
.../public/application/lib/rule_api/create.ts | 2 +
.../application/lib/rule_api/update.test.ts | 5 +-
.../public/application/lib/rule_api/update.ts | 15 +-
.../sections/rule_form/rule_form.test.tsx | 21 +++
.../sections/rule_form/rule_form.tsx | 143 ++++++++++++------
.../sections/rule_form/rule_reducer.test.ts | 17 +++
.../sections/rule_form/rule_reducer.ts | 29 ++++
15 files changed, 232 insertions(+), 51 deletions(-)
diff --git a/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.test.ts b/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.test.ts
index 7a348e583ac6c..826ee952a6bb6 100644
--- a/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.test.ts
@@ -62,6 +62,9 @@ const sampleRule: SanitizedRule & { activeSnoozes?: string[] } =
},
nextRun: DATE_2020,
revision: 0,
+ alertDelay: {
+ active: 10,
+ },
};
describe('rewriteRule', () => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.ts b/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.ts
index 953211a5ef4f7..d0e59278b13c5 100644
--- a/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.ts
@@ -37,6 +37,7 @@ export const rewriteRule = ({
activeSnoozes,
lastRun,
nextRun,
+ alertDelay,
...rest
}: SanitizedRule & { activeSnoozes?: string[] }) => ({
...rest,
@@ -78,4 +79,5 @@ export const rewriteRule = ({
...(lastRun ? { last_run: rewriteRuleLastRun(lastRun) } : {}),
...(nextRun ? { next_run: nextRun } : {}),
...(apiKeyCreatedByUser !== undefined ? { api_key_created_by_user: apiKeyCreatedByUser } : {}),
+ ...(alertDelay !== undefined ? { alert_delay: alertDelay } : {}),
});
diff --git a/x-pack/plugins/alerting/server/routes/update_rule.test.ts b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
index 5a4b3a19c0d7c..b48e6d72bef3f 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
@@ -59,6 +59,9 @@ describe('updateRuleRoute', () => {
},
],
notifyWhen: RuleNotifyWhen.CHANGE,
+ alertDelay: {
+ active: 10,
+ },
};
const updateRequest: AsApiContract['data']> = {
@@ -73,6 +76,9 @@ describe('updateRuleRoute', () => {
alerts_filter: mockedAlert.actions[0].alertsFilter,
},
],
+ alert_delay: {
+ active: 10,
+ },
};
const updateResult: AsApiContract> = {
@@ -86,6 +92,7 @@ describe('updateRuleRoute', () => {
connector_type_id: actionTypeId,
alerts_filter: alertsFilter,
})),
+ alert_delay: mockedAlert.alertDelay,
};
it('updates a rule with proper parameters', async () => {
@@ -135,6 +142,9 @@ describe('updateRuleRoute', () => {
"uuid": "1234-5678",
},
],
+ "alertDelay": Object {
+ "active": 10,
+ },
"name": "abc",
"notifyWhen": "onActionGroupChange",
"params": Object {
diff --git a/x-pack/plugins/alerting/server/routes/update_rule.ts b/x-pack/plugins/alerting/server/routes/update_rule.ts
index d24af256de613..9419d84d06341 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule.ts
@@ -52,16 +52,22 @@ const bodySchema = schema.object({
)
)
),
+ alert_delay: schema.maybe(
+ schema.object({
+ active: schema.number(),
+ })
+ ),
});
const rewriteBodyReq: RewriteRequestCase> = (result) => {
- const { notify_when: notifyWhen, actions, ...rest } = result.data;
+ const { notify_when: notifyWhen, alert_delay: alertDelay, actions, ...rest } = result.data;
return {
...result,
data: {
...rest,
notifyWhen,
actions: rewriteActionsReq(actions),
+ alertDelay,
},
};
};
@@ -83,6 +89,7 @@ const rewriteBodyRes: RewriteResponseCase> = ({
isSnoozedUntil,
lastRun,
nextRun,
+ alertDelay,
...rest
}) => ({
...rest,
@@ -115,6 +122,7 @@ const rewriteBodyRes: RewriteResponseCase> = ({
...(lastRun ? { last_run: rewriteRuleLastRun(lastRun) } : {}),
...(nextRun ? { next_run: nextRun } : {}),
...(apiKeyCreatedByUser !== undefined ? { api_key_created_by_user: apiKeyCreatedByUser } : {}),
+ ...(alertDelay ? { alert_delay: alertDelay } : {}),
});
export const updateRuleRoute = (
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/update.ts b/x-pack/plugins/alerting/server/rules_client/methods/update.ts
index 33afee4c20d26..1255173beefe4 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/update.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/update.ts
@@ -17,7 +17,7 @@ import {
} from '../../types';
import { validateRuleTypeParams, getRuleNotifyWhenType } from '../../lib';
import { WriteOperations, AlertingAuthorizationEntity } from '../../authorization';
-import { parseDuration, getRuleCircuitBreakerErrorMessage } from '../../../common';
+import { parseDuration, getRuleCircuitBreakerErrorMessage, AlertDelay } from '../../../common';
import { retryIfConflicts } from '../../lib/retry_if_conflicts';
import { bulkMarkApiKeysForInvalidation } from '../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation';
import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
@@ -51,6 +51,7 @@ export interface UpdateOptions {
params: Params;
throttle?: string | null;
notifyWhen?: RuleNotifyWhenType | null;
+ alertDelay?: AlertDelay;
};
allowMissingConnectorSecrets?: boolean;
shouldIncrementRevision?: ShouldIncrementRevision;
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
index be3221c8ed2f1..7384ab467a8e9 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
@@ -279,6 +279,9 @@ describe('update()', () => {
scheduledTaskId: 'task-123',
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
+ alertDelay: {
+ active: 5,
+ },
},
references: [
{
@@ -334,6 +337,9 @@ describe('update()', () => {
},
},
],
+ alertDelay: {
+ active: 10,
+ },
},
});
expect(result).toMatchInlineSnapshot(`
@@ -364,6 +370,9 @@ describe('update()', () => {
},
},
],
+ "alertDelay": Object {
+ "active": 5,
+ },
"createdAt": 2019-02-12T21:01:22.479Z,
"enabled": true,
"id": "1",
@@ -422,6 +431,9 @@ describe('update()', () => {
"uuid": "102",
},
],
+ "alertDelay": Object {
+ "active": 10,
+ },
"alertTypeId": "myType",
"apiKey": null,
"apiKeyCreatedByUser": null,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
index 64949d9014c50..b00b874b079ef 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
@@ -77,6 +77,7 @@ export const transformRule: RewriteRequestCase = ({
active_snoozes: activeSnoozes,
last_run: lastRun,
next_run: nextRun,
+ alert_delay: alertDelay,
...rest
}: any) => ({
ruleTypeId,
@@ -99,6 +100,7 @@ export const transformRule: RewriteRequestCase = ({
...(lastRun ? { lastRun: transformLastRun(lastRun) } : {}),
...(nextRun ? { nextRun } : {}),
...(apiKeyCreatedByUser !== undefined ? { apiKeyCreatedByUser } : {}),
+ ...(alertDelay ? { alertDelay } : {}),
...rest,
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
index 76e5fd7f09207..b27d9cad0c056 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
@@ -52,6 +52,9 @@ describe('createRule', () => {
execution_status: { status: 'pending', last_execution_date: '2021-04-01T21:33:13.250Z' },
create_at: '2021-04-01T21:33:13.247Z',
updated_at: '2021-04-01T21:33:13.247Z',
+ alert_delay: {
+ active: 10,
+ },
};
const ruleToCreate: Omit<
RuleUpdates,
@@ -96,6 +99,9 @@ describe('createRule', () => {
updatedAt: new Date('2021-04-01T21:33:13.247Z'),
apiKeyOwner: '',
revision: 0,
+ alertDelay: {
+ active: 10,
+ },
};
http.post.mockResolvedValueOnce(resolvedValue);
@@ -148,6 +154,9 @@ describe('createRule', () => {
tags: [],
updatedAt: '2021-04-01T21:33:13.247Z',
updatedBy: undefined,
+ alertDelay: {
+ active: 10,
+ },
});
});
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
index 2304ee8c48930..48fa1783f3c1f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
@@ -23,6 +23,7 @@ type RuleCreateBody = Omit<
const rewriteBodyRequest: RewriteResponseCase = ({
ruleTypeId,
actions,
+ alertDelay,
...res
}): any => ({
...res,
@@ -43,6 +44,7 @@ const rewriteBodyRequest: RewriteResponseCase = ({
: {}),
})
),
+ ...(alertDelay ? { alert_delay: alertDelay } : {}),
});
export async function createRule({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
index 8b3ebc3f96e52..591cdc83e86cf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
@@ -27,6 +27,9 @@ describe('updateRule', () => {
apiKey: null,
apiKeyOwner: null,
revision: 0,
+ alertDelay: {
+ active: 10,
+ },
};
const resolvedValue: Rule = {
...ruleToUpdate,
@@ -51,7 +54,7 @@ describe('updateRule', () => {
Array [
"/api/alerting/rule/12%2F3",
Object {
- "body": "{\\"name\\":\\"test\\",\\"tags\\":[\\"foo\\"],\\"schedule\\":{\\"interval\\":\\"1m\\"},\\"params\\":{},\\"actions\\":[]}",
+ "body": "{\\"name\\":\\"test\\",\\"tags\\":[\\"foo\\"],\\"schedule\\":{\\"interval\\":\\"1m\\"},\\"params\\":{},\\"actions\\":[],\\"alert_delay\\":{\\"active\\":10}}",
},
]
`);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
index 52158bfa2f034..80346ff2f65da 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
@@ -13,9 +13,13 @@ import { transformRule } from './common_transformations';
type RuleUpdatesBody = Pick<
RuleUpdates,
- 'name' | 'tags' | 'schedule' | 'actions' | 'params' | 'throttle' | 'notifyWhen'
+ 'name' | 'tags' | 'schedule' | 'actions' | 'params' | 'throttle' | 'notifyWhen' | 'alertDelay'
>;
-const rewriteBodyRequest: RewriteResponseCase = ({ actions, ...res }): any => ({
+const rewriteBodyRequest: RewriteResponseCase = ({
+ actions,
+ alertDelay,
+ ...res
+}): any => ({
...res,
actions: actions.map(
({ group, id, params, frequency, uuid, alertsFilter, useAlertDataForTemplate }) => ({
@@ -34,6 +38,7 @@ const rewriteBodyRequest: RewriteResponseCase = ({ actions, ...
...(uuid && { uuid }),
})
),
+ ...(alertDelay ? { alert_delay: alertDelay } : {}),
});
export async function updateRule({
@@ -42,14 +47,16 @@ export async function updateRule({
id,
}: {
http: HttpSetup;
- rule: Pick;
+ rule: Pick;
id: string;
}): Promise {
const res = await http.put>(
`${BASE_ALERTING_API_PATH}/rule/${encodeURIComponent(id)}`,
{
body: JSON.stringify(
- rewriteBodyRequest(pick(rule, ['name', 'tags', 'schedule', 'params', 'actions']))
+ rewriteBodyRequest(
+ pick(rule, ['name', 'tags', 'schedule', 'params', 'actions', 'alertDelay'])
+ )
),
}
);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
index 24592566d5465..8902b4d472ad2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
@@ -375,6 +375,9 @@ describe('rule_form', () => {
enabled: false,
mutedInstanceIds: [],
...(!showRulesList ? { ruleTypeId: ruleType.id } : {}),
+ alertDelay: {
+ active: 1,
+ },
} as unknown as Rule;
wrapper = mountWithIntl(
@@ -1034,6 +1037,24 @@ describe('rule_form', () => {
expect(wrapper.find(ActionForm).props().hasFieldsForAAD).toEqual(true);
});
+
+ it('renders rule alert delay', async () => {
+ const getAlertDelayInput = () => {
+ return wrapper.find('[data-test-subj="alertDelayInput"] input').first();
+ };
+
+ await setup();
+ expect(getAlertDelayInput().props().value).toEqual(1);
+
+ getAlertDelayInput().simulate('change', { target: { value: '2' } });
+ expect(getAlertDelayInput().props().value).toEqual(2);
+
+ getAlertDelayInput().simulate('change', { target: { value: '20' } });
+ expect(getAlertDelayInput().props().value).toEqual(20);
+
+ getAlertDelayInput().simulate('change', { target: { value: '999' } });
+ expect(getAlertDelayInput().props().value).toEqual(999);
+ });
});
describe('rule_form create rule non ruleing consumer and producer', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
index 98e2547dabdd3..b0b052544b625 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
@@ -215,6 +215,7 @@ export const RuleForm = ({
? getDurationUnitValue(rule.schedule.interval)
: defaultScheduleIntervalUnit
);
+ const [alertDelay, setAlertDelay] = useState(rule.alertDelay?.active ?? 1);
const [defaultActionGroupId, setDefaultActionGroupId] = useState(undefined);
const [availableRuleTypes, setAvailableRuleTypes] = useState([]);
@@ -328,6 +329,12 @@ export const RuleForm = ({
}
}, [rule.schedule.interval, defaultScheduleInterval, defaultScheduleIntervalUnit]);
+ useEffect(() => {
+ if (rule.alertDelay) {
+ setAlertDelay(rule.alertDelay.active);
+ }
+ }, [rule.alertDelay]);
+
useEffect(() => {
if (!flyoutBodyOverflowRef.current) {
// We're using this as a reliable way to reset the scroll position
@@ -393,6 +400,10 @@ export const RuleForm = ({
[dispatch]
);
+ const setAlertDelayProperty = (key: string, value: any) => {
+ dispatch({ command: { type: 'setAlertDelayProperty' }, payload: { key, value } });
+ };
+
useEffect(() => {
const searchValue = searchText ? searchText.trim().toLocaleLowerCase() : null;
setFilteredRuleTypes(
@@ -766,51 +777,95 @@ export const RuleForm = ({
) : null}
{hideInterval !== true && (
-
- 0}
- error={errors['schedule.interval']}
- >
-
-
- 0}
- value={ruleInterval || ''}
- name="interval"
- data-test-subj="intervalInput"
- onChange={(e) => {
- const value = e.target.value;
- if (value === '' || INTEGER_REGEX.test(value)) {
- const parsedValue = value === '' ? '' : parseInt(value, 10);
- setRuleInterval(parsedValue || undefined);
- setScheduleProperty('interval', `${parsedValue}${ruleIntervalUnit}`);
- }
- }}
- />
-
-
- {
- setRuleIntervalUnit(e.target.value);
- setScheduleProperty('interval', `${ruleInterval}${e.target.value}`);
- }}
- data-test-subj="intervalInputUnit"
- />
-
-
-
-
+ <>
+
+ 0}
+ error={errors['schedule.interval']}
+ >
+
+
+ 0}
+ value={ruleInterval || ''}
+ name="interval"
+ data-test-subj="intervalInput"
+ onChange={(e) => {
+ const value = e.target.value;
+ if (value === '' || INTEGER_REGEX.test(value)) {
+ const parsedValue = value === '' ? '' : parseInt(value, 10);
+ setRuleInterval(parsedValue || undefined);
+ setScheduleProperty('interval', `${parsedValue}${ruleIntervalUnit}`);
+ }
+ }}
+ />
+
+
+ {
+ setRuleIntervalUnit(e.target.value);
+ setScheduleProperty('interval', `${ruleInterval}${e.target.value}`);
+ }}
+ data-test-subj="intervalInputUnit"
+ />
+
+
+
+
+
+
+
+
{shouldShowConsumerSelect && (
<>
{
index?: number;
}
+interface AlertDelayPayload {
+ key: Key;
+ value: AlertDelay[Key] | null;
+ index?: number;
+}
+
export type RuleReducerAction =
| {
command: CommandType<'setRule'>;
@@ -94,6 +102,10 @@ export type RuleReducerAction =
| {
command: CommandType<'setRuleActionAlertsFilter'>;
payload: Payload;
+ }
+ | {
+ command: CommandType<'setAlertDelayProperty'>;
+ payload: AlertDelayPayload;
};
export type InitialRuleReducer = Reducer<{ rule: InitialRule }, RuleReducerAction>;
@@ -281,5 +293,22 @@ export const ruleReducer = (
};
}
}
+ case 'setAlertDelayProperty': {
+ const { key, value } = action.payload as Payload;
+ if (rule.alertDelay && isEqual(rule.alertDelay[key], value)) {
+ return state;
+ } else {
+ return {
+ ...state,
+ rule: {
+ ...rule,
+ alertDelay: {
+ ...rule.alertDelay,
+ [key]: value,
+ },
+ },
+ };
+ }
+ }
}
};
From 9488c93b3d7adc7a6617ff98b3c61769e147b0b4 Mon Sep 17 00:00:00 2001
From: Ersin Erdal <92688503+ersin-erdal@users.noreply.github.com>
Date: Thu, 15 Feb 2024 18:25:20 +0100
Subject: [PATCH 12/23] Notify the response ops when there is change on
connector config (#175981)
Resolves: #175018
This Pr adds an integration test to check the changes on connectorTypes
config, secrets and params schemas.
I used `validate.schema` field as all the connector types have it.
ConnectorTypes has config, secrets and params schemas on
`validate.schema` whereas SubActionConnectorTypes has only config and
secrets.
They have multiple params schema as well but only registered and used
during action execution.
e.g.
https://github.com/ersin-erdal/kibana/blob/main/x-pack/plugins/stack_connectors/server/connector_types/bedrock/bedrock.ts#L57
And here is the explanation why they are not listed in a definition:
https://github.com/ersin-erdal/kibana/blob/main/x-pack/plugins/actions/server/sub_action_framework/validators.ts#L38
We need to do some refactoring to list those schemas on the connector
types.
---------
Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
.../actions/jest.integration.config.js | 2 +-
.../connector_types.test.ts.snap | 11170 ++++++++++++++++
.../integration_tests/connector_types.test.ts | 60 +
.../server/integration_tests/lib/index.ts | 8 +
.../lib/setup_test_servers.ts | 37 +
.../mocks/connector_types.ts | 32 +
x-pack/plugins/actions/server/types.ts | 8 +-
x-pack/plugins/actions/tsconfig.json | 3 +-
.../rules_client/methods/get_alert_state.ts | 29 +-
.../tests/get_alert_state.test.ts | 65 +
10 files changed, 11400 insertions(+), 14 deletions(-)
create mode 100644 x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
create mode 100644 x-pack/plugins/actions/server/integration_tests/connector_types.test.ts
create mode 100644 x-pack/plugins/actions/server/integration_tests/lib/index.ts
create mode 100644 x-pack/plugins/actions/server/integration_tests/lib/setup_test_servers.ts
create mode 100644 x-pack/plugins/actions/server/integration_tests/mocks/connector_types.ts
diff --git a/x-pack/plugins/actions/jest.integration.config.js b/x-pack/plugins/actions/jest.integration.config.js
index 41bd46b12005e..daea840925756 100644
--- a/x-pack/plugins/actions/jest.integration.config.js
+++ b/x-pack/plugins/actions/jest.integration.config.js
@@ -6,7 +6,7 @@
*/
module.exports = {
- preset: '@kbn/test/jest_integration_node',
+ preset: '@kbn/test/jest_integration',
rootDir: '../../..',
roots: ['/x-pack/plugins/actions'],
};
diff --git a/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap b/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
new file mode 100644
index 0000000000000..11624752650e4
--- /dev/null
+++ b/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
@@ -0,0 +1,11170 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Connector type config checks detect connector type changes for: .bedrock 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "defaultModel": Object {
+ "flags": Object {
+ "default": "anthropic.claude-v2:1",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .bedrock 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "accessKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "secret": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .bedrock 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ "unknown": true,
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .cases-webhook 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "createCommentJson": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "createCommentMethod": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": "put",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "post",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "put",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "patch",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "createCommentUrl": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "createIncidentJson": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "createIncidentMethod": Object {
+ "flags": Object {
+ "default": "post",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "post",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "put",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "createIncidentResponseKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "createIncidentUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "getIncidentResponseExternalTitleKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "getIncidentUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "hasAuth": Object {
+ "flags": Object {
+ "default": true,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ "headers": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "value": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "name": "entries",
+ },
+ ],
+ "type": "record",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "updateIncidentJson": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "updateIncidentMethod": Object {
+ "flags": Object {
+ "default": "put",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "post",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "patch",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "put",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "updateIncidentUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "viewIncidentUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .cases-webhook 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "user": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .cases-webhook 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "pushToService",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comments": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comment": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "commentId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "id": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "severity": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "status": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "tags": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "title": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .d3security 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "url": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .d3security 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "token": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .d3security 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ "unknown": true,
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .email 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "clientId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "from": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "hasAuth": Object {
+ "flags": Object {
+ "default": true,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ "host": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "oauthTokenUrl": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "port": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "limit": 1,
+ },
+ "name": "min",
+ },
+ Object {
+ "args": Object {
+ "limit": 65535,
+ },
+ "name": "max",
+ },
+ ],
+ "type": "number",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "secure": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "type": "boolean",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "service": Object {
+ "flags": Object {
+ "default": "other",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "tenantId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .email 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "clientSecret": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "user": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .email 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "bcc": Object {
+ "flags": Object {
+ "default": Array [],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ "cc": Object {
+ "flags": Object {
+ "default": Array [],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ "kibanaFooterLink": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "path": Object {
+ "flags": Object {
+ "default": "/",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "text": Object {
+ "flags": Object {
+ "default": "Go to Elastic",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ "message": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "messageHTML": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "subject": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "to": Object {
+ "flags": Object {
+ "default": Array [],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .gen-ai 1`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiProvider": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "Azure OpenAI",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiProvider": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "OpenAI",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "defaultModel": Object {
+ "flags": Object {
+ "default": "gpt-4",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .gen-ai 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .gen-ai 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ "unknown": true,
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .index 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "executionTimeField": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "index": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "refresh": Object {
+ "flags": Object {
+ "default": false,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .index 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {},
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .index 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "documents": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "value": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "type": "any",
+ },
+ },
+ "name": "entries",
+ },
+ ],
+ "type": "record",
+ },
+ ],
+ "type": "array",
+ },
+ "indexOverride": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .jira 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "projectKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .jira 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiToken": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "email": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .jira 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getFields",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getIncident",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "externalId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "handshake",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "pushToService",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comments": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comment": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "commentId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "issueType": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "labels": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "parent": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "priority": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "summary": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "issueTypes",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "fieldsByIssueType",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "issues",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "title": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "issue",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .opsgenie 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .opsgenie 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .opsgenie 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ "unknown": true,
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .pagerduty 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .pagerduty 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "routingKey": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .pagerduty 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "class": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "component": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "customDetails": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "value": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "type": "any",
+ },
+ },
+ "name": "entries",
+ },
+ ],
+ "type": "record",
+ },
+ "dedupKey": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "eventAction": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "trigger",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "resolve",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "acknowledge",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "group": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "links": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "href": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "text": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ "severity": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "critical",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "error",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "warning",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "info",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "source": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "summary": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "timestamp": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .resilient 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "orgId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .resilient 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiKeyId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "apiKeySecret": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .resilient 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getFields",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getIncident",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "externalId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "handshake",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "pushToService",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comments": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comment": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "commentId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incidentTypes": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "number",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "severityCode": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "type": "number",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "incidentTypes",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "severity",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .sentinelone 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "url": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .sentinelone 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "token": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .sentinelone 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ "unknown": true,
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .server-log 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {},
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .server-log 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {},
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .server-log 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "level": Object {
+ "flags": Object {
+ "default": "info",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "trace",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "debug",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "info",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "warn",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "error",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "fatal",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "message": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "clientId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "isOAuth": Object {
+ "flags": Object {
+ "default": false,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ "jwtKeyId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "userIdentifierValue": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "usesTableApi": Object {
+ "flags": Object {
+ "default": true,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "clientSecret": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "privateKey": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "privateKeyPassword": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "username": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getFields",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getIncident",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "externalId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "handshake",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "pushToService",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comments": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comment": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "commentId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "category": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "correlation_display": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "correlation_id": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": "{{rule.id}}:{{alert.id}}",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "impact": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "severity": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "short_description": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subcategory": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "urgency": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getChoices",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fields": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "closeIncident",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "correlation_id": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": "{{rule.id}}:{{alert.id}}",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow-itom 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "clientId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "isOAuth": Object {
+ "flags": Object {
+ "default": false,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ "jwtKeyId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "userIdentifierValue": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow-itom 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "clientSecret": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "privateKey": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "privateKeyPassword": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "username": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow-itom 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "addEvent",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "additional_info": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "event_class": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "message_key": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": "{{rule.id}}:{{alert.id}}",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "metric_name": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "node": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "resource": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "severity": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "source": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "time_of_event": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "type": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getChoices",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fields": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow-sir 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "clientId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "isOAuth": Object {
+ "flags": Object {
+ "default": false,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ "jwtKeyId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "userIdentifierValue": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "usesTableApi": Object {
+ "flags": Object {
+ "default": true,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow-sir 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "clientSecret": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "privateKey": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "privateKeyPassword": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "username": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .servicenow-sir 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getFields",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getIncident",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "externalId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "handshake",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "pushToService",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comments": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comment": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "commentId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "category": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "correlation_display": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "correlation_id": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": "{{rule.id}}:{{alert.id}}",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "dest_ip": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "malware_hash": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "malware_url": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "priority": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "short_description": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "source_ip": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "subcategory": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "getChoices",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fields": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .slack 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {},
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .slack 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "webhookUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .slack 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "message": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .slack_api 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "allowedChannels": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "rules": Array [
+ Object {
+ "args": Object {
+ "limit": 25,
+ },
+ "name": "max",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .slack_api 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "token": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .slack_api 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "validChannelId",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "channelId": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "postMessage",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "channelIds": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "rules": Array [
+ Object {
+ "args": Object {
+ "limit": 1,
+ },
+ "name": "max",
+ },
+ ],
+ "type": "array",
+ },
+ "channels": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "rules": Array [
+ Object {
+ "args": Object {
+ "limit": 1,
+ },
+ "name": "max",
+ },
+ ],
+ "type": "array",
+ },
+ "text": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "postBlockkit",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "channelIds": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "rules": Array [
+ Object {
+ "args": Object {
+ "limit": 1,
+ },
+ "name": "max",
+ },
+ ],
+ "type": "array",
+ },
+ "channels": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ ],
+ "rules": Array [
+ Object {
+ "args": Object {
+ "limit": 1,
+ },
+ "name": "max",
+ },
+ ],
+ "type": "array",
+ },
+ "text": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .swimlane 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "appId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "connectorType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "all",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "alerts",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "cases",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "mappings": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "alertIdConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "caseIdConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "caseNameConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "commentsConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "descriptionConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "ruleNameConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "severityConfig": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "fieldType": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "id": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "name": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .swimlane 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiToken": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .swimlane 3`] = `
+Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "allow": Array [
+ "pushToService",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comments": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "items": Array [
+ Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "comment": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "commentId": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ ],
+ "type": "array",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "incident": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "alertId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "caseId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "caseName": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "description": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "externalId": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "ruleName": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "severity": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ ],
+ "type": "alternatives",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .teams 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {},
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .teams 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "webhookUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .teams 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "message": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .tines 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "url": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .tines 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "email": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "token": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .tines 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "subAction": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "subActionParams": Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ "unknown": true,
+ },
+ "keys": Object {},
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .torq 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "webhookIntegrationUrl": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .torq 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "token": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .torq 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "body": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .webhook 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "authType": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "webhook-authentication-basic",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "webhook-authentication-ssl",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "ca": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "certType": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "ssl-crt-key",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "ssl-pfx",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "hasAuth": Object {
+ "flags": Object {
+ "default": true,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ "headers": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "key": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "value": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "name": "entries",
+ },
+ ],
+ "type": "record",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "method": Object {
+ "flags": Object {
+ "default": "post",
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "post",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "put",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "url": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "verificationMode": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "none",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "certificate",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ "full",
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .webhook 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "crt": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "key": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "pfx": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "user": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .webhook 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "body": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .xmatters 1`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "configUrl": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "usesBasic": Object {
+ "flags": Object {
+ "default": true,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "type": "boolean",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .xmatters 2`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "password": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "secretsUrl": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ "user": Object {
+ "flags": Object {
+ "default": null,
+ "error": [Function],
+ "presence": "optional",
+ },
+ "matches": Array [
+ Object {
+ "schema": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ Object {
+ "schema": Object {
+ "allow": Array [
+ null,
+ ],
+ "flags": Object {
+ "error": [Function],
+ "only": true,
+ },
+ "type": "any",
+ },
+ },
+ ],
+ "type": "alternatives",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .xmatters 3`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "alertActionGroupName": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "date": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "ruleName": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "severity": Object {
+ "flags": Object {
+ "error": [Function],
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "signalId": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "spaceId": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ "tags": Object {
+ "flags": Object {
+ "default": [Function],
+ "error": [Function],
+ "presence": "optional",
+ },
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
+ },
+ ],
+ "type": "string",
+ },
+ },
+ "preferences": Object {
+ "stripUnknown": Object {
+ "objects": false,
+ },
+ },
+ "type": "object",
+}
+`;
diff --git a/x-pack/plugins/actions/server/integration_tests/connector_types.test.ts b/x-pack/plugins/actions/server/integration_tests/connector_types.test.ts
new file mode 100644
index 0000000000000..6a2382ea3088f
--- /dev/null
+++ b/x-pack/plugins/actions/server/integration_tests/connector_types.test.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 type { TestElasticsearchUtils, TestKibanaUtils } from '@kbn/core-test-helpers-kbn-server';
+import { ActionTypeRegistry } from '../action_type_registry';
+import { setupTestServers } from './lib';
+import { connectorTypes } from './mocks/connector_types';
+
+jest.mock('../action_type_registry', () => {
+ const actual = jest.requireActual('../action_type_registry');
+ return {
+ ...actual,
+ ActionTypeRegistry: jest.fn().mockImplementation((opts) => {
+ return new actual.ActionTypeRegistry(opts);
+ }),
+ };
+});
+
+describe('Connector type config checks', () => {
+ let esServer: TestElasticsearchUtils;
+ let kibanaServer: TestKibanaUtils;
+ let actionTypeRegistry: ActionTypeRegistry;
+
+ beforeAll(async () => {
+ const setupResult = await setupTestServers();
+ esServer = setupResult.esServer;
+ kibanaServer = setupResult.kibanaServer;
+
+ const mockedActionTypeRegistry = jest.requireMock('../action_type_registry');
+ expect(mockedActionTypeRegistry.ActionTypeRegistry).toHaveBeenCalledTimes(1);
+ actionTypeRegistry = mockedActionTypeRegistry.ActionTypeRegistry.mock.results[0].value;
+ });
+
+ afterAll(async () => {
+ if (kibanaServer) {
+ await kibanaServer.stop();
+ }
+ if (esServer) {
+ await esServer.stop();
+ }
+ });
+
+ test('ensure connector types list up to date', () => {
+ expect(connectorTypes).toEqual(actionTypeRegistry.getAllTypes());
+ });
+
+ for (const connectorTypeId of connectorTypes) {
+ test(`detect connector type changes for: ${connectorTypeId}`, async () => {
+ const connectorType = actionTypeRegistry.get(connectorTypeId);
+
+ expect(connectorType?.validate.config.schema.getSchema!().describe()).toMatchSnapshot();
+ expect(connectorType.validate.secrets.schema.getSchema!().describe()).toMatchSnapshot();
+ expect(connectorType.validate.params.schema.getSchema!().describe()).toMatchSnapshot();
+ });
+ }
+});
diff --git a/x-pack/plugins/actions/server/integration_tests/lib/index.ts b/x-pack/plugins/actions/server/integration_tests/lib/index.ts
new file mode 100644
index 0000000000000..c9e6e4c7649bd
--- /dev/null
+++ b/x-pack/plugins/actions/server/integration_tests/lib/index.ts
@@ -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 { setupTestServers } from './setup_test_servers';
diff --git a/x-pack/plugins/actions/server/integration_tests/lib/setup_test_servers.ts b/x-pack/plugins/actions/server/integration_tests/lib/setup_test_servers.ts
new file mode 100644
index 0000000000000..4b722d5460213
--- /dev/null
+++ b/x-pack/plugins/actions/server/integration_tests/lib/setup_test_servers.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 { createTestServers, createRootWithCorePlugins } from '@kbn/core-test-helpers-kbn-server';
+
+export async function setupTestServers(settings = {}) {
+ const { startES } = createTestServers({
+ adjustTimeout: (t) => jest.setTimeout(t),
+ settings: {
+ es: {
+ license: 'trial',
+ },
+ },
+ });
+
+ const esServer = await startES();
+
+ const root = createRootWithCorePlugins(settings, { oss: false });
+
+ await root.preboot();
+ const coreSetup = await root.setup();
+ const coreStart = await root.start();
+
+ return {
+ esServer,
+ kibanaServer: {
+ root,
+ coreSetup,
+ coreStart,
+ stop: async () => await root.shutdown(),
+ },
+ };
+}
diff --git a/x-pack/plugins/actions/server/integration_tests/mocks/connector_types.ts b/x-pack/plugins/actions/server/integration_tests/mocks/connector_types.ts
new file mode 100644
index 0000000000000..473f5b72ce59b
--- /dev/null
+++ b/x-pack/plugins/actions/server/integration_tests/mocks/connector_types.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const connectorTypes: string[] = [
+ '.email',
+ '.index',
+ '.pagerduty',
+ '.swimlane',
+ '.server-log',
+ '.slack',
+ '.slack_api',
+ '.webhook',
+ '.cases-webhook',
+ '.xmatters',
+ '.servicenow',
+ '.servicenow-sir',
+ '.servicenow-itom',
+ '.jira',
+ '.resilient',
+ '.teams',
+ '.torq',
+ '.opsgenie',
+ '.tines',
+ '.gen-ai',
+ '.bedrock',
+ '.d3security',
+ '.sentinelone',
+];
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index 343d9b3dde4f6..e2ef2675a59e9 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -16,6 +16,7 @@ import {
SavedObjectReference,
Logger,
} from '@kbn/core/server';
+import { AnySchema } from 'joi';
import { ActionTypeRegistry } from './action_type_registry';
import { PluginSetupContract, PluginStartContract } from './plugin';
import { ActionsClient } from './actions_client';
@@ -101,11 +102,12 @@ export type ExecutorType<
options: ActionTypeExecutorOptions
) => Promise>;
-export interface ValidatorType {
+export interface ValidatorType {
schema: {
- validate(value: unknown): Type;
+ validate(value: unknown): T;
+ getSchema?: () => AnySchema;
};
- customValidator?: (value: Type, validatorServices: ValidatorServices) => void;
+ customValidator?: (value: T, validatorServices: ValidatorServices) => void;
}
export interface ValidatorServices {
diff --git a/x-pack/plugins/actions/tsconfig.json b/x-pack/plugins/actions/tsconfig.json
index 63c296d2d35e0..92a1074c95115 100644
--- a/x-pack/plugins/actions/tsconfig.json
+++ b/x-pack/plugins/actions/tsconfig.json
@@ -44,7 +44,8 @@
"@kbn/core-elasticsearch-server-mocks",
"@kbn/core-logging-server-mocks",
"@kbn/serverless",
- "@kbn/actions-types"
+ "@kbn/actions-types",
+ "@kbn/core-test-helpers-kbn-server"
],
"exclude": [
"target/**/*",
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts b/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts
index 6497428e1c2f2..4da913a06fe79 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-server';
import { RuleTaskState } from '../../types';
import { taskInstanceToAlertTaskInstance } from '../../task_runner/alert_task_instance';
import { ReadOperations, AlertingAuthorizationEntity } from '../../authorization';
@@ -18,18 +19,28 @@ export async function getAlertState(
context: RulesClientContext,
{ id }: GetAlertStateParams
): Promise {
- const alert = await get(context, { id });
+ const rule = await get(context, { id });
await context.authorization.ensureAuthorized({
- ruleTypeId: alert.alertTypeId,
- consumer: alert.consumer,
+ ruleTypeId: rule.alertTypeId,
+ consumer: rule.consumer,
operation: ReadOperations.GetRuleState,
entity: AlertingAuthorizationEntity.Rule,
});
- if (alert.scheduledTaskId) {
- const { state } = taskInstanceToAlertTaskInstance(
- await context.taskManager.get(alert.scheduledTaskId),
- alert
- );
- return state;
+ if (rule.scheduledTaskId) {
+ try {
+ const { state } = taskInstanceToAlertTaskInstance(
+ await context.taskManager.get(rule.scheduledTaskId),
+ rule
+ );
+ return state;
+ } catch (e) {
+ if (SavedObjectsErrorHelpers.isNotFoundError(e)) {
+ context.logger.warn(`Task (${rule.scheduledTaskId}) not found`);
+ } else {
+ context.logger.warn(
+ `An error occurred when getting the task state for (${rule.scheduledTaskId})`
+ );
+ }
+ }
}
}
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
index 63d86843512c0..951e85c023523 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
@@ -22,6 +22,7 @@ import { AlertingAuthorization } from '../../authorization/alerting_authorizatio
import { ActionsAuthorization } from '@kbn/actions-plugin/server';
import { getBeforeSetup } from './lib';
import { RULE_SAVED_OBJECT_TYPE } from '../../saved_objects';
+import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-server';
const taskManager = taskManagerMock.createStart();
const ruleTypeRegistry = ruleTypeRegistryMock.create();
@@ -175,6 +176,70 @@ describe('getAlertState()', () => {
expect(taskManager.get).toHaveBeenCalledWith(scheduledTaskId);
});
+ test('logs a warning if the task not found', async () => {
+ const rulesClient = new RulesClient(rulesClientParams);
+
+ const scheduledTaskId = 'task-123';
+
+ unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
+ id: '1',
+ type: RULE_SAVED_OBJECT_TYPE,
+ attributes: {
+ alertTypeId: '123',
+ schedule: { interval: '10s' },
+ params: {
+ bar: true,
+ },
+ actions: [],
+ enabled: true,
+ scheduledTaskId,
+ mutedInstanceIds: [],
+ muteAll: true,
+ },
+ references: [],
+ });
+
+ taskManager.get.mockRejectedValueOnce(SavedObjectsErrorHelpers.createGenericNotFoundError());
+
+ await rulesClient.getAlertState({ id: '1' });
+
+ expect(rulesClientParams.logger.warn).toHaveBeenCalledTimes(1);
+ expect(rulesClientParams.logger.warn).toHaveBeenCalledWith('Task (task-123) not found');
+ });
+
+ test('logs a warning if the taskManager throws an error', async () => {
+ const rulesClient = new RulesClient(rulesClientParams);
+
+ const scheduledTaskId = 'task-123';
+
+ unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
+ id: '1',
+ type: RULE_SAVED_OBJECT_TYPE,
+ attributes: {
+ alertTypeId: '123',
+ schedule: { interval: '10s' },
+ params: {
+ bar: true,
+ },
+ actions: [],
+ enabled: true,
+ scheduledTaskId,
+ mutedInstanceIds: [],
+ muteAll: true,
+ },
+ references: [],
+ });
+
+ taskManager.get.mockRejectedValueOnce(SavedObjectsErrorHelpers.createBadRequestError());
+
+ await rulesClient.getAlertState({ id: '1' });
+
+ expect(rulesClientParams.logger.warn).toHaveBeenCalledTimes(1);
+ expect(rulesClientParams.logger.warn).toHaveBeenCalledWith(
+ 'An error occurred when getting the task state for (task-123)'
+ );
+ });
+
describe('authorization', () => {
beforeEach(() => {
unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
From 912c260108dddd78c574ec4cd6f9f19331f2b0ac Mon Sep 17 00:00:00 2001
From: "Quynh Nguyen (Quinn)" <43350163+qn895@users.noreply.github.com>
Date: Thu, 15 Feb 2024 12:11:43 -0600
Subject: [PATCH 13/23] [ML] Fixes Single Metric Viewer's zoom settings in URL
are not restored if URL specifies a forecast ID (#176969)
## Summary
Fix https://github.com/elastic/kibana/issues/168583
After
https://github.com/elastic/kibana/assets/43350163/9fd1f43a-ca70-4495-b872-57cbcf421db9
### Checklist
Delete any items that are not applicable to this PR.
- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
### Risk Matrix
Delete this section if it is not applicable to this PR.
Before closing this PR, invite QA, stakeholders, and other developers to
identify risks that should be tested prior to the change/feature
release.
When forming the risk matrix, consider some of the following examples
and how they may potentially impact the change:
| Risk | Probability | Severity | Mitigation/Notes |
|---------------------------|-------------|----------|-------------------------|
| Multiple Spaces—unexpected behavior in non-default Kibana Space.
| Low | High | Integration tests will verify that all features are still
supported in non-default Kibana Space and when user switches between
spaces. |
| Multiple nodes—Elasticsearch polling might have race conditions
when multiple Kibana nodes are polling for the same tasks. | High | Low
| Tasks are idempotent, so executing them multiple times will not result
in logical error, but will degrade performance. To test for this case we
add plenty of unit tests around this logic and document manual testing
procedure. |
| Code should gracefully handle cases when feature X or plugin Y are
disabled. | Medium | High | Unit tests will verify that any feature flag
or plugin combination still results in our service operational. |
| [See more potential risk
examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) |
### For maintainers
- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
---------
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
.../application/timeseriesexplorer/timeseriesexplorer.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 76c0ffb038971..cb1f18fd82358 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -447,9 +447,13 @@ export class TimeSeriesExplorer extends React.Component {
stateUpdate.contextAggregationInterval,
bounds
);
+
if (
- focusRange === undefined ||
- this.previousSelectedForecastId !== this.props.selectedForecastId
+ // If the user's focus range is not defined (i.e. no 'zoom' parameter restored from the appState URL),
+ // then calculate the default focus range to use
+ zoom === undefined &&
+ (focusRange === undefined ||
+ this.previousSelectedForecastId !== this.props.selectedForecastId)
) {
focusRange = calculateDefaultFocusRange(
autoZoomDuration,
From f5e3b942db8ee43b135feba7c068c1fc4ae80111 Mon Sep 17 00:00:00 2001
From: Davis McPhee
Date: Thu, 15 Feb 2024 14:12:06 -0400
Subject: [PATCH 14/23] Fix flaky test from #173292 and #173784 (#176978)
## Summary
This PR fixes the flaky test from #173292 and #173784.
Flaky test runner x95:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5193.
Resolves #173292.
Resolves #173784.
### Checklist
- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [x] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
### For maintainers
- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
Co-authored-by: Julia Rechkunova
---
.../use_fetch_occurances_range.ts | 5 ++++-
test/functional/apps/discover/group1/_discover.ts | 7 +++++--
.../test_suites/common/discover/group1/_discover.ts | 11 ++++++-----
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/plugins/discover/public/application/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts b/src/plugins/discover/public/application/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts
index 90efad593d519..e5306344f1058 100644
--- a/src/plugins/discover/public/application/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts
+++ b/src/plugins/discover/public/application/main/components/no_results/no_results_suggestions/use_fetch_occurances_range.ts
@@ -66,7 +66,10 @@ export const useFetchOccurrencesRange = (params: Params): Result => {
abortSignal: abortControllerRef.current?.signal,
});
} catch (error) {
- //
+ if (error.name !== 'AbortError') {
+ // eslint-disable-next-line no-console
+ console.error(error);
+ }
}
}
diff --git a/test/functional/apps/discover/group1/_discover.ts b/test/functional/apps/discover/group1/_discover.ts
index 0210c7d8cc7f2..34679964e3c94 100644
--- a/test/functional/apps/discover/group1/_discover.ts
+++ b/test/functional/apps/discover/group1/_discover.ts
@@ -170,8 +170,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
it('should show matches when time range is expanded', async () => {
- await PageObjects.discover.expandTimeRangeAsSuggestedInNoResultsMessage();
- await PageObjects.discover.waitUntilSearchingHasFinished();
+ await retry.waitFor('view all matches to load', async () => {
+ await PageObjects.discover.expandTimeRangeAsSuggestedInNoResultsMessage();
+ await PageObjects.discover.waitUntilSearchingHasFinished();
+ return !(await testSubjects.exists('discoverNoResultsViewAllMatches'));
+ });
await retry.try(async function () {
expect(await PageObjects.discover.hasNoResults()).to.be(false);
expect(await PageObjects.discover.getHitCountInt()).to.be.above(0);
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts
index 1b5b3c8f6ff52..32fa8d5d6a8af 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts
@@ -152,9 +152,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});
- // FLAKY: https://github.com/elastic/kibana/issues/173292
- // FLAKY: https://github.com/elastic/kibana/issues/173784
- describe.skip('query #2, which has an empty time range', () => {
+ describe('query #2, which has an empty time range', () => {
const fromTime = 'Jun 11, 1999 @ 09:22:11.000';
const toTime = 'Jun 12, 1999 @ 11:21:04.000';
@@ -177,8 +175,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
it('should show matches when time range is expanded', async () => {
- await PageObjects.discover.expandTimeRangeAsSuggestedInNoResultsMessage();
- await PageObjects.discover.waitUntilSearchingHasFinished();
+ await retry.waitFor('view all matches to load', async () => {
+ await PageObjects.discover.expandTimeRangeAsSuggestedInNoResultsMessage();
+ await PageObjects.discover.waitUntilSearchingHasFinished();
+ return !(await testSubjects.exists('discoverNoResultsViewAllMatches'));
+ });
await retry.try(async function () {
expect(await PageObjects.discover.hasNoResults()).to.be(false);
expect(await PageObjects.discover.getHitCountInt()).to.be.above(0);
From e84128e147744bbdfaff8667332763cbc5bafad5 Mon Sep 17 00:00:00 2001
From: Coen Warmer
Date: Thu, 15 Feb 2024 19:13:34 +0100
Subject: [PATCH 15/23] Better styling for connectors (#177048)
---
.../public/routes/components/settings_tab.tsx | 1 +
.../connector_selector_base.tsx | 25 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/plugins/ai_assistant_management/observability/public/routes/components/settings_tab.tsx b/src/plugins/ai_assistant_management/observability/public/routes/components/settings_tab.tsx
index ab68cb3abb306..f0a5650d41f70 100644
--- a/src/plugins/ai_assistant_management/observability/public/routes/components/settings_tab.tsx
+++ b/src/plugins/ai_assistant_management/observability/public/routes/components/settings_tab.tsx
@@ -162,6 +162,7 @@ export function SettingsTab() {
)}
>
-
+
({
value: connector.id,
inputDisplay: (
-
+
{i18n.translate(
@@ -102,18 +103,16 @@ export function ConnectorSelectorBase(props: ConnectorSelectorBaseProps) {
)}
-
-
- {connector.name}
-
+
+
),
- dropdownDisplay: (
-
- {connector.name}
-
- ),
+ dropdownDisplay: {connector.name} ,
}))}
onChange={(id) => {
props.selectConnector(id);
From 167cc236b6d397020a0c8847cb5154ad4e2b341d Mon Sep 17 00:00:00 2001
From: Marta Bondyra <4283304+mbondyra@users.noreply.github.com>
Date: Thu, 15 Feb 2024 19:14:45 +0100
Subject: [PATCH 16/23] [Lens] fix tests console errors (#176506)
## Summary
Removes these console.errors from when we run tests. Rewrites all
chart_switch and almost all editor frame tests to react testing library.
Slightly improves some mocks.
---
.../datasources/common/field_item.test.tsx | 3 +-
.../dimension_panel/dimension_panel.test.tsx | 117 +-
.../datasources/form_based/utils.test.tsx | 6 +-
.../editor_frame/data_panel_wrapper.tsx | 4 +-
.../editor_frame/editor_frame.test.tsx | 1024 +++++++----------
.../workspace_panel/chart_switch.test.tsx | 599 +++-------
.../workspace_panel/chart_switch.tsx | 6 +-
.../lens/public/mocks/datasource_mock.tsx | 2 +-
.../public/mocks/expression_renderer_mock.tsx | 4 +-
.../plugins/lens/public/mocks/store_mocks.tsx | 2 +-
.../lens/public/mocks/visualization_mock.tsx | 29 +-
.../__snapshots__/load_initial.test.tsx.snap | 4 +-
.../state_management/load_initial.test.tsx | 2 +-
13 files changed, 685 insertions(+), 1117 deletions(-)
diff --git a/x-pack/plugins/lens/public/datasources/common/field_item.test.tsx b/x-pack/plugins/lens/public/datasources/common/field_item.test.tsx
index 72686f0faf69f..afd178a64ece5 100644
--- a/x-pack/plugins/lens/public/datasources/common/field_item.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/common/field_item.test.tsx
@@ -140,7 +140,8 @@ describe('Lens Field Item', () => {
},
documentField,
],
- } as IndexPattern;
+ isTimeBased: jest.fn(),
+ } as unknown as IndexPattern;
defaultProps = {
indexPattern,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.test.tsx
index 86ac619e9dcaa..dedd7c2f38ef5 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.test.tsx
@@ -7,7 +7,8 @@
import { ReactWrapper, ShallowWrapper } from 'enzyme';
import React, { ChangeEvent } from 'react';
-import { act } from 'react-dom/test-utils';
+import { screen, act, render, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
import { findTestSubject } from '@elastic/eui/lib/test';
import {
EuiComboBox,
@@ -282,6 +283,30 @@ describe('FormBasedDimensionEditor', () => {
jest.clearAllMocks();
});
+ const renderDimensionPanel = (propsOverrides = {}) => {
+ const Wrapper: React.FC<{
+ children: React.ReactNode;
+ }> = ({ children }) => {
+ return {children} ;
+ };
+
+ const rtlRender = render(
+ false}
- />
- );
-
- expect(getFieldSelectComboBox(wrapper).prop('options')!).toHaveLength(0);
+ renderDimensionPanel({
+ columnId: 'col2',
+ filterOperations: () => false,
+ });
+ userEvent.click(screen.getByRole('button', { name: /open list of options/i }));
+ expect(screen.getByText(/There aren't any options available/)).toBeInTheDocument();
});
it('should list all field names and document as a whole in prioritized order', () => {
- wrapper = mountWithServices(;
let mockDatasource2: DatasourceMock;
- let expressionRendererMock: ReactExpressionRendererType;
+ let visualizationMap: VisualizationMap;
+ let datasourceMap: DatasourceMap;
beforeEach(() => {
- mockVisualization = {
- ...createMockVisualization(),
- id: 'testVis',
- visualizationTypes: [
- {
- icon: 'empty',
- id: 'testVis',
- label: faker.lorem.word(),
- groupLabel: 'testVisGroup',
- },
- ],
- };
- mockVisualization2 = {
- ...createMockVisualization(),
- id: 'testVis2',
- visualizationTypes: [
- {
- icon: 'empty',
- id: 'testVis2',
- label: 'TEST2',
- groupLabel: 'testVis2Group',
- },
- ],
- };
-
- mockVisualization.getLayerIds.mockReturnValue(['first']);
- mockVisualization2.getLayerIds.mockReturnValue(['second']);
+ mockVisualization = createMockVisualization();
+ mockVisualization2 = createMockVisualization('testVis2', ['second']);
mockDatasource = createMockDatasource();
mockDatasource2 = createMockDatasource('testDatasource2');
+ mockDatasource.getLayers.mockReturnValue(['first']);
+ mockDatasource.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
+ {
+ state: {},
+ table: {
+ columns: [],
+ isMultiRow: true,
+ layerId: 'first',
+ changeType: 'unchanged',
+ },
+ keptLayerIds: [],
+ },
+ ]);
+
+ visualizationMap = {
+ testVis: mockVisualization,
+ testVis2: mockVisualization2,
+ };
- expressionRendererMock = createExpressionRendererMock();
+ datasourceMap = {
+ testDatasource: mockDatasource,
+ testDatasource2: mockDatasource2,
+ };
});
- describe('initialization', () => {
- it('should not render something before all datasources are initialized', async () => {
- const props = {
- ...getDefaultProps(),
- visualizationMap: {
- testVis: mockVisualization,
- },
- datasourceMap: {
- testDatasource: mockDatasource,
- },
-
- ExpressionRenderer: expressionRendererMock,
- };
- const { lensStore } = await mountWithProvider( = {},
+ { preloadedStateOverrides }: { preloadedStateOverrides: Partial } = {
+ preloadedStateOverrides: {},
+ }
+ ) => {
+ const { store, ...rtlRender } = renderWithReduxStore(
+ {
return {
- ...createMockVisualization(),
- id,
- getVisualizationTypeId: jest.fn((_state) => id),
- visualizationTypes: [
+ ...createMockVisualization(id),
+ getSuggestions: jest.fn((options) => [
{
- icon: 'empty',
- id,
- label: `Label ${id}`,
- groupLabel: `${id}Group`,
+ score: 1,
+ title: '',
+ state: `suggestion ${id}`,
+ previewIcon: 'empty',
},
- ],
- initialize: jest.fn((_addNewLayer, state) => {
- return state || `${id} initial state`;
- }),
- getSuggestions: jest.fn((options) => {
- return [
- {
- score: 1,
- title: '',
- state: `suggestion ${id}`,
- previewIcon: 'empty',
- },
- ];
- }),
+ ]),
};
}
+ let visualizationMap = mockVisualizationMap();
+ let datasourceMap = mockDatasourceMap();
+ let datasourceStates = mockDatasourceStates();
+ let frame = mockFrame(['a']);
+
+ beforeEach(() => {
+ visualizationMap = mockVisualizationMap();
+ datasourceMap = mockDatasourceMap();
+ datasourceStates = mockDatasourceStates();
+ frame = mockFrame(['a']);
+ });
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
/**
* There are three visualizations. Each one has the same suggestion behavior:
@@ -145,44 +137,66 @@ describe('chart_switch', () => {
} as FramePublicAPI;
}
- function showFlyout(instance: ReactWrapper) {
- instance.find('button[data-test-subj="lnsChartSwitchPopover"]').first().simulate('click');
- }
-
- function switchTo(subType: string, instance: ReactWrapper) {
- showFlyout(instance);
- instance.find(`[data-test-subj="lnsChartSwitchPopover_${subType}"]`).first().simulate('click');
- }
-
- function getMenuItem(subType: string, instance: ReactWrapper) {
- showFlyout(instance);
- return instance.find(`[data-test-subj="lnsChartSwitchPopover_${subType}"]`).first();
- }
- it('should use suggested state if there is a suggestion from the target visualization', async () => {
- const visualizationMap = mockVisualizationMap();
- const { instance, lensStore } = await mountWithProvider(
+ const renderChartSwitch = (
+ propsOverrides: Partial = {},
+ { preloadedStateOverrides }: { preloadedStateOverrides: Partial } = {
+ preloadedStateOverrides: {},
+ }
+ ) => {
+ const { store, ...rtlRender } = renderWithReduxStore(
;
datasourceLayers.a.getTableSpec = jest.fn().mockReturnValue([]);
- const visualizationMap = mockVisualizationMap();
+
visualizationMap.visC.getSuggestions = jest.fn().mockReturnValue([]);
visualizationMap.visC.switchVisualizationType = jest.fn(() => 'switched');
- const datasourceMap = mockDatasourceMap();
- const { instance } = await mountWithProvider(
- (false);
const dispatchLens = useLensDispatch();
const activeDatasourceId = useLensSelector(selectActiveDatasourceId);
@@ -494,7 +494,7 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
});
function getTopSuggestion(
- props: Props,
+ props: ChartSwitchProps,
visualizationId: string,
datasourceStates: DatasourceStates,
visualization: VisualizationState,
diff --git a/x-pack/plugins/lens/public/mocks/datasource_mock.tsx b/x-pack/plugins/lens/public/mocks/datasource_mock.tsx
index 207c6562be557..daf56218bcd07 100644
--- a/x-pack/plugins/lens/public/mocks/datasource_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/datasource_mock.tsx
@@ -51,7 +51,7 @@ export function createMockDatasource(
removeLayer: jest.fn((state, layerId) => ({ newState: state, removedLayerIds: [layerId] })),
cloneLayer: jest.fn((_state, _layerId, _newLayerId, getNewId) => {}),
removeColumn: jest.fn((props) => {}),
- getLayers: jest.fn((_state) => []),
+ getLayers: jest.fn((_state) => ['a']),
uniqueLabels: jest.fn((_state, dataViews) => ({})),
getDropProps: jest.fn(),
onDrop: jest.fn(),
diff --git a/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx b/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
index 42187662e0213..842d6ccbb713f 100644
--- a/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
@@ -12,5 +12,7 @@ export function createExpressionRendererMock(): jest.Mock<
React.ReactElement,
[ReactExpressionRendererProps]
> {
- return jest.fn(({ expression }) => {expression || 'Expression renderer mock'});
+ return jest.fn(({ expression }) => (
+ {expression || 'Expression renderer mock'}
+ ));
}
diff --git a/x-pack/plugins/lens/public/mocks/store_mocks.tsx b/x-pack/plugins/lens/public/mocks/store_mocks.tsx
index 0d78a07d3dfce..ad028bfe107f0 100644
--- a/x-pack/plugins/lens/public/mocks/store_mocks.tsx
+++ b/x-pack/plugins/lens/public/mocks/store_mocks.tsx
@@ -69,7 +69,7 @@ export const renderWithReduxStore = (
{
preloadedState,
storeDeps,
- }: { preloadedState: Partial; storeDeps?: LensStoreDeps } = {
+ }: { preloadedState?: Partial; storeDeps?: LensStoreDeps } = {
preloadedState: {},
storeDeps: mockStoreDeps(),
}
diff --git a/x-pack/plugins/lens/public/mocks/visualization_mock.tsx b/x-pack/plugins/lens/public/mocks/visualization_mock.tsx
index b368f994756eb..663345c824095 100644
--- a/x-pack/plugins/lens/public/mocks/visualization_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/visualization_mock.tsx
@@ -6,39 +6,42 @@
*/
import React from 'react';
import { LayerTypes } from '@kbn/expression-xy-plugin/public';
+import { toExpression } from '@kbn/interpreter';
+import faker from 'faker';
import { Visualization, VisualizationMap } from '../types';
-export function createMockVisualization(id = 'testVis'): jest.Mocked {
- const layerId = 'layer1';
-
+export function createMockVisualization(
+ id = 'testVis',
+ layerIds = ['layer1']
+): jest.Mocked {
return {
id,
clearLayer: jest.fn((state, _layerId, _indexPatternId) => state),
removeLayer: jest.fn(),
- getLayerIds: jest.fn((_state) => [layerId]),
+ getLayerIds: jest.fn((_state) => layerIds),
getSupportedLayers: jest.fn(() => [{ type: LayerTypes.DATA, label: 'Data Layer' }]),
getLayerType: jest.fn((_state, _layerId) => LayerTypes.DATA),
visualizationTypes: [
{
icon: 'empty',
id,
- label: 'TEST',
+ label: faker.lorem.word(),
groupLabel: `${id}Group`,
},
],
appendLayer: jest.fn(),
- getVisualizationTypeId: jest.fn((_state) => 'empty'),
+ getVisualizationTypeId: jest.fn((_state) => id),
getDescription: jest.fn((_state) => ({ label: '' })),
switchVisualizationType: jest.fn((_, x) => x),
getSuggestions: jest.fn((_options) => []),
getRenderEventCounters: jest.fn((_state) => []),
- initialize: jest.fn((_addNewLayer, _state) => ({ newState: 'newState' })),
+ initialize: jest.fn((_addNewLayer, _state) => `${id} initial state`),
getConfiguration: jest.fn((props) => ({
groups: [
{
groupId: 'a',
groupLabel: 'a',
- layerId,
+ layerId: layerIds[0],
supportsMoreColumns: true,
accessors: [],
filterOperations: jest.fn(() => true),
@@ -46,7 +49,15 @@ export function createMockVisualization(id = 'testVis'): jest.Mocked 'expression'),
+ toExpression: jest.fn((state, datasourceLayers, attrs, datasourceExpressionsByLayers = {}) =>
+ toExpression({
+ type: 'expression',
+ chain: [
+ ...(datasourceExpressionsByLayers.first?.chain ?? []),
+ { type: 'function', function: 'testVis', arguments: {} },
+ ],
+ })
+ ),
toPreviewExpression: jest.fn((_state, _frame) => 'expression'),
getUserMessages: jest.fn((_state) => []),
setDimension: jest.fn(),
diff --git a/x-pack/plugins/lens/public/state_management/__snapshots__/load_initial.test.tsx.snap b/x-pack/plugins/lens/public/state_management/__snapshots__/load_initial.test.tsx.snap
index 4c09cefdd6de9..68d4e7d57e983 100644
--- a/x-pack/plugins/lens/public/state_management/__snapshots__/load_initial.test.tsx.snap
+++ b/x-pack/plugins/lens/public/state_management/__snapshots__/load_initial.test.tsx.snap
@@ -100,9 +100,7 @@ Object {
},
"visualization": Object {
"activeId": "testVis",
- "state": Object {
- "newState": "newState",
- },
+ "state": "testVis initial state",
},
},
}
diff --git a/x-pack/plugins/lens/public/state_management/load_initial.test.tsx b/x-pack/plugins/lens/public/state_management/load_initial.test.tsx
index ef9d84062a720..130e1294b9c95 100644
--- a/x-pack/plugins/lens/public/state_management/load_initial.test.tsx
+++ b/x-pack/plugins/lens/public/state_management/load_initial.test.tsx
@@ -199,7 +199,7 @@ describe('Initializing the store', () => {
expect(store.getState()).toEqual({
lens: expect.objectContaining({
visualization: {
- state: { newState: 'newState' }, // new vis gets initialized
+ state: 'testVis initial state', // new vis gets initialized
activeId: 'testVis',
},
activeDatasourceId: 'testDatasource2', // resets to first on the list
From 7f5486e1e6f4841d146a624ced3d5f2466ca6237 Mon Sep 17 00:00:00 2001
From: Ying Mao
Date: Thu, 15 Feb 2024 13:21:37 -0500
Subject: [PATCH 17/23] [Response Ops][Task Manager ] Adding ability for ad-hoc
task instance to specify timeout override (#175731)
Resolves https://github.com/elastic/kibana/issues/174353
## Summary
Adds ability for task instance to specify a timeout override that will
be used in place of the task type timeout when running an ad-hoc task.
In the future we may consider allowing timeout overrides for recurring
tasks but this PR limits usage to only ad-hoc task runs.
This timeout override is planned for use by backfill rule execution
tasks so the only usages in this PR are in the functional tests.
---
x-pack/plugins/task_manager/server/task.ts | 5 +
.../server/task_running/task_runner.test.ts | 85 ++++++++++++-
.../server/task_running/task_runner.ts | 25 ++--
.../server/task_validator.test.ts | 113 ++++++++++++++++++
.../task_manager/server/task_validator.ts | 51 ++++++--
.../sample_task_plugin/server/init_routes.ts | 1 +
.../sample_task_plugin/server/plugin.ts | 31 +++++
.../check_registered_task_types.ts | 1 +
.../task_manager/task_management.ts | 37 ++++++
9 files changed, 333 insertions(+), 16 deletions(-)
diff --git a/x-pack/plugins/task_manager/server/task.ts b/x-pack/plugins/task_manager/server/task.ts
index b7b86c50c8b08..728d175e8b98f 100644
--- a/x-pack/plugins/task_manager/server/task.ts
+++ b/x-pack/plugins/task_manager/server/task.ts
@@ -345,6 +345,11 @@ export interface TaskInstance {
* Indicates the number of skipped executions.
*/
numSkippedRuns?: number;
+
+ /*
+ * Optionally override the timeout defined in the task type for this specific task instance
+ */
+ timeoutOverride?: string;
}
/**
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
index 6735b3c0602b8..1e22e15a7f1e4 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
@@ -250,7 +250,7 @@ describe('TaskManagerRunner', () => {
expect(instance.enabled).not.toBeDefined();
});
- test('calculates retryAt by timeout if it exceeds the schedule when running a recurring task', async () => {
+ test('calculates retryAt by task type timeout if it exceeds the schedule when running a recurring task', async () => {
const timeoutMinutes = 1;
const intervalSeconds = 20;
const id = _.random(1, 20).toString();
@@ -286,6 +286,44 @@ describe('TaskManagerRunner', () => {
expect(instance.enabled).not.toBeDefined();
});
+ test('does not calculate retryAt by task instance timeout if defined for a recurring task', async () => {
+ const timeoutMinutes = 1;
+ const timeoutOverrideSeconds = 90;
+ const intervalSeconds = 20;
+ const id = _.random(1, 20).toString();
+ const initialAttempts = _.random(0, 2);
+ const { runner, store } = await pendingStageSetup({
+ instance: {
+ id,
+ attempts: initialAttempts,
+ schedule: {
+ interval: `${intervalSeconds}s`,
+ },
+ timeoutOverride: `${timeoutOverrideSeconds}s`,
+ enabled: true,
+ },
+ definitions: {
+ bar: {
+ title: 'Bar!',
+ timeout: `${timeoutMinutes}m`,
+ createTaskRunner: () => ({
+ run: async () => undefined,
+ }),
+ },
+ },
+ });
+
+ await runner.markTaskAsRunning();
+
+ expect(store.update).toHaveBeenCalledTimes(1);
+ const instance = store.update.mock.calls[0][0];
+
+ expect(instance.retryAt!.getTime()).toEqual(
+ instance.startedAt!.getTime() + timeoutMinutes * 60 * 1000
+ );
+ expect(instance.enabled).not.toBeDefined();
+ });
+
test('sets startedAt, status, attempts and retryAt when claiming a task', async () => {
const timeoutMinutes = 1;
const id = _.random(1, 20).toString();
@@ -329,6 +367,51 @@ describe('TaskManagerRunner', () => {
expect(instance.enabled).not.toBeDefined();
});
+ test('test sets retryAt to task instance timeout override when defined when claiming an ad hoc task', async () => {
+ const timeoutSeconds = 60;
+ const timeoutOverrideSeconds = 90;
+ const id = _.random(1, 20).toString();
+ const initialAttempts = _.random(0, 2);
+ const { runner, store } = await pendingStageSetup({
+ instance: {
+ id,
+ enabled: true,
+ attempts: initialAttempts,
+ timeoutOverride: `${timeoutOverrideSeconds}s`,
+ schedule: undefined,
+ },
+ definitions: {
+ bar: {
+ title: 'Bar!',
+ timeout: `${timeoutSeconds}s`,
+ createTaskRunner: () => ({
+ run: async () => undefined,
+ }),
+ },
+ },
+ });
+
+ await runner.markTaskAsRunning();
+
+ expect(store.update).toHaveBeenCalledTimes(1);
+ const instance = store.update.mock.calls[0][0];
+
+ expect(instance.attempts).toEqual(initialAttempts + 1);
+ expect(instance.status).toBe('running');
+ expect(instance.startedAt!.getTime()).toEqual(Date.now());
+
+ const minRunAt = Date.now();
+ const maxRunAt = minRunAt + baseDelay * Math.pow(2, initialAttempts - 1);
+ expect(instance.retryAt!.getTime()).toBeGreaterThanOrEqual(
+ minRunAt + timeoutOverrideSeconds * 1000
+ );
+ expect(instance.retryAt!.getTime()).toBeLessThanOrEqual(
+ maxRunAt + timeoutOverrideSeconds * 1000
+ );
+
+ expect(instance.enabled).not.toBeDefined();
+ });
+
test('sets retryAt when there is an error', async () => {
const id = _.random(1, 20).toString();
const initialAttempts = _.random(1, 3);
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
index faea2bfb7e446..2c1242629952c 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
@@ -260,10 +260,25 @@ export class TaskManagerRunner implements TaskRunner {
// this allows us to catch tasks that remain in Pending/Finalizing without being
// cleaned up
isReadyToRun(this.instance) ? this.instance.task.startedAt : this.instance.timestamp,
- this.definition.timeout
+ this.timeout
)!;
}
+ /*
+ * Gets the timeout of the current task. Uses the timeout
+ * defined by the task type unless this is an ad-hoc task that specifies an override
+ */
+ public get timeout() {
+ if (this.instance.task.schedule) {
+ // recurring tasks should use timeout in task type
+ return this.definition.timeout;
+ }
+
+ return this.instance.task.timeoutOverride
+ ? this.instance.task.timeoutOverride
+ : this.definition.timeout;
+ }
+
/**
* Gets the duration of the current task run
*/
@@ -521,17 +536,13 @@ export class TaskManagerRunner implements TaskRunner {
attempts,
retryAt:
(this.instance.task.schedule
- ? maxIntervalFromDate(
- now,
- this.instance.task.schedule.interval,
- this.definition.timeout
- )
+ ? maxIntervalFromDate(now, this.instance.task.schedule.interval, this.timeout)
: this.getRetryDelay({
attempts,
// Fake an error. This allows retry logic when tasks keep timing out
// and lets us set a proper "retryAt" value each time.
error: new Error('Task timeout'),
- addDuration: this.definition.timeout,
+ addDuration: this.timeout,
})) ?? null,
// This is a safe conversion as we're setting the startAt above
},
diff --git a/x-pack/plugins/task_manager/server/task_validator.test.ts b/x-pack/plugins/task_manager/server/task_validator.test.ts
index 52822adf6f49f..01eb7097d15c2 100644
--- a/x-pack/plugins/task_manager/server/task_validator.test.ts
+++ b/x-pack/plugins/task_manager/server/task_validator.test.ts
@@ -322,6 +322,49 @@ describe('TaskValidator', () => {
expect(result).toEqual(task);
});
+ it(`should return the task with timeoutOverride as-is whenever schedule is not defined and override is valid`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const taskValidator = new TaskValidator({
+ logger: mockLogger(),
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({ timeoutOverride: '1s' });
+ const result = taskValidator.getValidatedTaskInstanceForUpdating(task);
+ expect(result).toEqual(task);
+ });
+
+ it(`should return the task with timeoutOverride stripped whenever schedule and override are defined`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const taskValidator = new TaskValidator({
+ logger: mockLogger(),
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({
+ schedule: { interval: '1d' },
+ timeoutOverride: '1s',
+ });
+ const { timeoutOverride, ...taskWithoutOverride } = task;
+ const result = taskValidator.getValidatedTaskInstanceForUpdating(task);
+ expect(result).toEqual(taskWithoutOverride);
+ });
+
+ it(`should return the task with timeoutOverride stripped whenever override is invalid`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const taskValidator = new TaskValidator({
+ logger: mockLogger(),
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({
+ timeoutOverride: 'foo',
+ });
+ const { timeoutOverride, ...taskWithoutOverride } = task;
+ const result = taskValidator.getValidatedTaskInstanceForUpdating(task);
+ expect(result).toEqual(taskWithoutOverride);
+ });
+
// TODO: Remove skip once all task types have defined their state schema.
// https://github.com/elastic/kibana/issues/159347
it.skip(`should fail to validate the state schema when the task type doesn't have stateSchemaByVersion defined`, () => {
@@ -394,4 +437,74 @@ describe('TaskValidator', () => {
).toThrowErrorMatchingInlineSnapshot(`"[bar]: definition for this key is missing"`);
});
});
+
+ describe('validateTimeoutOverride()', () => {
+ it(`should validate when specifying a valid timeout override field with no schedule`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const taskValidator = new TaskValidator({
+ logger: mockLogger(),
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({
+ timeoutOverride: '1s',
+ state: { foo: 'foo' },
+ });
+ expect(taskValidator.validateTimeoutOverride(task)).toEqual(task);
+ });
+
+ it(`should validate when specifying a schedule and no timeout override`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const taskValidator = new TaskValidator({
+ logger: mockLogger(),
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({
+ schedule: { interval: '1d' },
+ state: { foo: 'foo' },
+ });
+ expect(taskValidator.validateTimeoutOverride(task)).toEqual(task);
+ });
+
+ it(`should fail to validate when specifying a valid timeout override field and recurring schedule`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const logger = mockLogger();
+ const taskValidator = new TaskValidator({
+ logger,
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({
+ timeoutOverride: '1s',
+ schedule: { interval: '1d' },
+ state: { foo: 'foo' },
+ });
+
+ const { timeoutOverride, ...taskWithoutOverride } = task;
+ expect(taskValidator.validateTimeoutOverride(task)).toEqual(taskWithoutOverride);
+ expect(logger.warn).toHaveBeenCalledWith(
+ `[TaskValidator] cannot specify timeout override 1s when scheduling a recurring task`
+ );
+ });
+
+ it(`should fail to validate when specifying an invalid timeout override field`, () => {
+ const definitions = new TaskTypeDictionary(mockLogger());
+ const logger = mockLogger();
+ const taskValidator = new TaskValidator({
+ logger,
+ definitions,
+ allowReadingInvalidState: false,
+ });
+ const task = taskManagerMock.createTask({
+ timeoutOverride: 'foo',
+ state: { foo: 'foo' },
+ });
+ const { timeoutOverride, ...taskWithoutOverride } = task;
+ expect(taskValidator.validateTimeoutOverride(task)).toEqual(taskWithoutOverride);
+ expect(logger.warn).toHaveBeenCalledWith(
+ `[TaskValidator] Invalid timeout override "foo". Timeout must be of the form "{number}{cadence}" where number is an integer. Example: 5m. This timeout override will be ignored.`
+ );
+ });
+ });
});
diff --git a/x-pack/plugins/task_manager/server/task_validator.ts b/x-pack/plugins/task_manager/server/task_validator.ts
index 61d9a903dd5b4..ddc7304e4e31e 100644
--- a/x-pack/plugins/task_manager/server/task_validator.ts
+++ b/x-pack/plugins/task_manager/server/task_validator.ts
@@ -5,11 +5,13 @@
* 2.0.
*/
-import { max, memoize } from 'lodash';
+import { max, memoize, omit } from 'lodash';
import type { Logger } from '@kbn/core/server';
import type { ObjectType } from '@kbn/config-schema';
import { TaskTypeDictionary } from './task_type_dictionary';
import type { TaskInstance, ConcreteTaskInstance, TaskDefinition } from './task';
+import { isInterval, parseIntervalAsMillisecond } from './lib/intervals';
+import { isErr, tryAsResult } from './lib/result_type';
interface TaskValidatorOpts {
allowReadingInvalidState: boolean;
@@ -98,34 +100,67 @@ export class TaskValidator {
task: T,
options: { validate: boolean } = { validate: true }
): T {
+ const taskWithValidatedTimeout = this.validateTimeoutOverride(task);
+
if (!options.validate) {
- return task;
+ return taskWithValidatedTimeout;
}
// In the scenario the task is unused / deprecated and Kibana needs to manipulate the task,
// we'll do a pass-through for those
- if (!this.definitions.has(task.taskType)) {
- return task;
+ if (!this.definitions.has(taskWithValidatedTimeout.taskType)) {
+ return taskWithValidatedTimeout;
}
- const taskTypeDef = this.definitions.get(task.taskType);
+ const taskTypeDef = this.definitions.get(taskWithValidatedTimeout.taskType);
const latestStateSchema = this.cachedGetLatestStateSchema(taskTypeDef);
// TODO: Remove once all task types have defined their state schema.
// https://github.com/elastic/kibana/issues/159347
// Otherwise, failures on read / write would occur. (don't forget to unskip test)
if (!latestStateSchema) {
- return task;
+ return taskWithValidatedTimeout;
}
// We are doing a write operation which must validate against the latest state schema
return {
- ...task,
- state: this.getValidatedStateSchema(task.state, task.taskType, latestStateSchema, 'forbid'),
+ ...taskWithValidatedTimeout,
+ state: this.getValidatedStateSchema(
+ taskWithValidatedTimeout.state,
+ taskWithValidatedTimeout.taskType,
+ latestStateSchema,
+ 'forbid'
+ ),
stateVersion: latestStateSchema?.version,
};
}
+ public validateTimeoutOverride(task: T): T {
+ if (task.timeoutOverride) {
+ if (
+ !isInterval(task.timeoutOverride) ||
+ isErr(tryAsResult(() => parseIntervalAsMillisecond(task.timeoutOverride!)))
+ ) {
+ this.logger.warn(
+ `[TaskValidator] Invalid timeout override "${task.timeoutOverride}". Timeout must be of the form "{number}{cadence}" where number is an integer. Example: 5m. This timeout override will be ignored.`
+ );
+
+ return omit(task, 'timeoutOverride') as T;
+ }
+ }
+
+ // Only allow timeoutOverride if schedule is not defined
+ if (!!task.timeoutOverride && !!task.schedule) {
+ this.logger.warn(
+ `[TaskValidator] cannot specify timeout override ${task.timeoutOverride} when scheduling a recurring task`
+ );
+
+ return omit(task, 'timeoutOverride') as T;
+ }
+
+ return task;
+ }
+
private migrateTaskState(
state: ConcreteTaskInstance['state'],
currentVersion: number | undefined,
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
index 01f8cd6ba4bc9..b1c8d6dd028b2 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
@@ -62,6 +62,7 @@ export function initRoutes(
params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
state: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
id: schema.maybe(schema.string()),
+ timeoutOverride: schema.maybe(schema.string()),
}),
}),
},
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
index 0e3a2bb993fe7..52c747d0ec786 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
@@ -167,6 +167,37 @@ export class SampleTaskManagerFixturePlugin
},
}),
},
+ sampleAdHocTaskTimingOut: {
+ title: 'Sample Ad-Hoc Task that Times Out',
+ description: 'A sample task that times out.',
+ maxAttempts: 3,
+ timeout: '1s',
+ createTaskRunner: ({ taskInstance }: { taskInstance: ConcreteTaskInstance }) => {
+ let isCancelled: boolean = false;
+ return {
+ async run() {
+ // wait for 15 seconds
+ await new Promise((r) => setTimeout(r, 15000));
+
+ if (!isCancelled) {
+ const [{ elasticsearch }] = await core.getStartServices();
+ await elasticsearch.client.asInternalUser.index({
+ index: '.kibana_task_manager_test_result',
+ body: {
+ type: 'task',
+ taskType: 'sampleAdHocTaskTimingOut',
+ taskId: taskInstance.id,
+ },
+ refresh: true,
+ });
+ }
+ },
+ async cancel() {
+ isCancelled = true;
+ },
+ };
+ },
+ },
sampleRecurringTaskWhichHangs: {
title: 'Sample Recurring Task that Hangs for a minute',
description: 'A sample task that Hangs for a minute on each run.',
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts
index 3b71c99df2e5b..e5d5e8fbd6fb7 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts
@@ -20,6 +20,7 @@ export default function ({ getService }: FtrProviderContext) {
}
const TEST_TYPES = [
+ 'sampleAdHocTaskTimingOut',
'lowPriorityTask',
'sampleOneTimeTaskThrowingError',
'sampleRecurringTaskTimingOut',
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
index f897e0fa05035..a430993933c8b 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
@@ -791,6 +791,43 @@ export default function ({ getService }: FtrProviderContext) {
});
});
+ it('should fail to schedule recurring task with timeout override', async () => {
+ const task = await scheduleTask({
+ taskType: 'sampleRecurringTaskTimingOut',
+ schedule: { interval: '1s' },
+ timeoutOverride: '30s',
+ params: {},
+ });
+
+ expect(task.timeoutOverride).to.be(undefined);
+ });
+
+ it('should allow timeout override for ad hoc tasks', async () => {
+ const task = await scheduleTask({
+ taskType: 'sampleAdHocTaskTimingOut',
+ timeoutOverride: '30s',
+ params: {},
+ });
+
+ expect(task.timeoutOverride).to.be('30s');
+
+ // this task type is set to time out after 1s but the task runner
+ // will wait 15 seconds and then index a document if it hasn't timed out
+ // this test overrides the timeout to 30s and checks if the expected
+ // document was indexed. presence of indexed document means the task
+ // timeout override was respected
+ await retry.try(async () => {
+ const [scheduledTask] = (await currentTasks()).docs;
+ expect(scheduledTask?.id).to.eql(task.id);
+ });
+
+ await retry.try(async () => {
+ const docs: RawDoc[] = await historyDocs(task.id);
+ expect(docs.length).to.eql(1);
+ expect(docs[0]._source.taskType).to.eql('sampleAdHocTaskTimingOut');
+ });
+ });
+
it('should bulk update schedules for multiple tasks', async () => {
const initialTime = Date.now();
const tasks = await Promise.all([
From 19cc3797d36b08bc96fbaa21ece34f037add8559 Mon Sep 17 00:00:00 2001
From: Davis McPhee
Date: Thu, 15 Feb 2024 14:28:55 -0400
Subject: [PATCH 18/23] Unskip flaky test from #167643 (#176942)
## Summary
This PR unskips the tests skipped in #167643.
Flaky test runner x50:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5186.
Resolves #167643.
### Checklist
- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [x] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
### For maintainers
- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
Co-authored-by: Julia Rechkunova
---
.../test_suites/common/examples/partial_results/index.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x-pack/test_serverless/functional/test_suites/common/examples/partial_results/index.ts b/x-pack/test_serverless/functional/test_suites/common/examples/partial_results/index.ts
index c5a5bb2995217..415174adf0d0a 100644
--- a/x-pack/test_serverless/functional/test_suites/common/examples/partial_results/index.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/examples/partial_results/index.ts
@@ -12,8 +12,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const PageObjects = getPageObjects(['common', 'svlCommonPage']);
- // FLAKY: https://github.com/elastic/kibana/issues/167643
- describe.skip('Partial Results Example', function () {
+ describe('Partial Results Example', function () {
before(async () => {
await PageObjects.svlCommonPage.loginAsAdmin();
await PageObjects.common.navigateToApp('partialResultsExample');
From b4836ace2fb3d6c38df24294732b09be8f713d9f Mon Sep 17 00:00:00 2001
From: Davis McPhee
Date: Thu, 15 Feb 2024 14:29:23 -0400
Subject: [PATCH 19/23] Unskip flaky test from #175579 (#176981)
## Summary
This PR unskips the tests skipped in #175579.
Flaky test runner x50:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5194.
Resolves #175579.
### Checklist
- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [x] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
### For maintainers
- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
Co-authored-by: Julia Rechkunova
---
.../test/examples/search_examples/partial_results_example.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x-pack/test/examples/search_examples/partial_results_example.ts b/x-pack/test/examples/search_examples/partial_results_example.ts
index 83eb900ef0ff4..269b2e79ab38f 100644
--- a/x-pack/test/examples/search_examples/partial_results_example.ts
+++ b/x-pack/test/examples/search_examples/partial_results_example.ts
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['common']);
const retry = getService('retry');
- // FLAKY: https://github.com/elastic/kibana/issues/175579
- describe.skip('Partial results example', () => {
+ describe('Partial results example', () => {
before(async () => {
await PageObjects.common.navigateToApp('searchExamples');
await testSubjects.click('/search');
From e136a9318215d5913a5e957aec5d9ad0b8132506 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper
Date: Thu, 15 Feb 2024 12:30:08 -0600
Subject: [PATCH 20/23] [RAM] Fix bug where select all rules bypasses filters
(#176962)
## Summary
Fixes #176867
A bug introduced in https://github.com/elastic/kibana/pull/174954
bypassed most filters when using Select All on the Rules List. This was
because the names of the filter properties changed, and no longer
matched what the `useBulkEditSelect` hook was expecting.
Because all of these types were optional, it didn't trigger any type
errors.
This syncs up the type definitions with the new filter store hook, and
adds a functional test to make sure filters are working on bulk actions
when clicking the select all button.
### Checklist
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
---
.../hooks/use_bulk_edit_select.test.tsx | 15 ++--
.../hooks/use_bulk_edit_select.tsx | 55 ++++--------
.../rules_list/components/rules_list.tsx | 3 +-
.../rules_list/bulk_actions.ts | 87 ++++++++++++++++++-
4 files changed, 111 insertions(+), 49 deletions(-)
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx
index 07bf3516fbdef..1a5e3f278eb5e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx
@@ -45,8 +45,7 @@ describe('useBulkEditSelectTest', () => {
useBulkEditSelect({
items,
totalItemCount: 4,
- tagsFilter: ['test: 123'],
- searchText: 'rules*',
+ filters: { tags: ['test: 123'], searchText: 'rules*' },
})
);
@@ -58,8 +57,7 @@ describe('useBulkEditSelectTest', () => {
useBulkEditSelect({
items,
totalItemCount: 4,
- tagsFilter: ['test: 123'],
- searchText: 'rules*',
+ filters: { tags: ['test: 123'], searchText: 'rules*' },
})
);
@@ -107,8 +105,7 @@ describe('useBulkEditSelectTest', () => {
useBulkEditSelect({
items,
totalItemCount: 4,
- tagsFilter: ['test: 123'],
- searchText: 'rules*',
+ filters: { tags: ['test: 123'], searchText: 'rules*' },
})
);
@@ -124,8 +121,10 @@ describe('useBulkEditSelectTest', () => {
useBulkEditSelect({
items,
totalItemCount: 4,
- tagsFilter: ['test: 123'],
- searchText: 'rules*',
+ filters: {
+ tags: ['test: 123'],
+ searchText: 'rules*',
+ },
})
);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx
index 84e762cbe93f8..fe70b4fa0e3bc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.tsx
@@ -7,7 +7,7 @@
import { useReducer, useMemo, useCallback } from 'react';
import { fromKueryExpression, nodeBuilder } from '@kbn/es-query';
import { mapFiltersToKueryNode } from '../lib/rule_api/map_filters_to_kuery_node';
-import { RuleTableItem, RuleStatus } from '../../types';
+import { RuleTableItem, RulesListFilters } from '../../types';
interface BulkEditSelectionState {
selectedIds: Set;
@@ -73,27 +73,11 @@ const reducer = (state: BulkEditSelectionState, action: Action) => {
interface UseBulkEditSelectProps {
totalItemCount: number;
items: RuleTableItem[];
- typesFilter?: string[];
- actionTypesFilter?: string[];
- tagsFilter?: string[];
- ruleExecutionStatusesFilter?: string[];
- ruleLastRunOutcomesFilter?: string[];
- ruleStatusesFilter?: RuleStatus[];
- searchText?: string;
+ filters?: RulesListFilters;
}
export function useBulkEditSelect(props: UseBulkEditSelectProps) {
- const {
- totalItemCount = 0,
- items = [],
- typesFilter,
- actionTypesFilter,
- tagsFilter,
- ruleExecutionStatusesFilter,
- ruleLastRunOutcomesFilter,
- ruleStatusesFilter,
- searchText,
- } = props;
+ const { totalItemCount = 0, items = [], filters } = props;
const [state, dispatch] = useReducer(reducer, {
...initialState,
@@ -187,15 +171,20 @@ export function useBulkEditSelect(props: UseBulkEditSelectProps) {
const getFilterKueryNode = useCallback(
(idsToExclude?: string[]) => {
- const ruleFilterKueryNode = mapFiltersToKueryNode({
- typesFilter,
- actionTypesFilter,
- tagsFilter,
- ruleExecutionStatusesFilter,
- ruleLastRunOutcomesFilter,
- ruleStatusesFilter,
- searchText,
- });
+ const ruleFilterKueryNode = mapFiltersToKueryNode(
+ filters
+ ? {
+ typesFilter: filters.types,
+ actionTypesFilter: filters.actionTypes,
+ tagsFilter: filters.tags,
+ ruleExecutionStatusesFilter: filters.ruleExecutionStatuses,
+ ruleLastRunOutcomesFilter: filters.ruleLastRunOutcomes,
+ ruleParamsFilter: filters.ruleParams,
+ ruleStatusesFilter: filters.ruleStatuses,
+ searchText: filters.searchText,
+ }
+ : {}
+ );
if (idsToExclude && idsToExclude.length) {
const excludeFilter = fromKueryExpression(
@@ -209,15 +198,7 @@ export function useBulkEditSelect(props: UseBulkEditSelectProps) {
return ruleFilterKueryNode;
},
- [
- typesFilter,
- actionTypesFilter,
- tagsFilter,
- ruleExecutionStatusesFilter,
- ruleLastRunOutcomesFilter,
- ruleStatusesFilter,
- searchText,
- ]
+ [filters]
);
const getFilter = useCallback(() => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
index 9b66a65949674..b381035fbfc61 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
@@ -363,8 +363,7 @@ export const RulesList = ({
} = useBulkEditSelect({
totalItemCount: rulesState.totalItemCount,
items: tableItems,
- ...filters,
- typesFilter: rulesTypesFilter,
+ filters: { ...filters, types: rulesTypesFilter },
});
const handleUpdateFiltersEffect = useCallback(
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rules_list/bulk_actions.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rules_list/bulk_actions.ts
index 4c545e20cb687..c8cf8903a4275 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rules_list/bulk_actions.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/rules_list/bulk_actions.ts
@@ -14,7 +14,12 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
-import { createAlert, scheduleRule, snoozeAlert } from '../../../lib/alert_api_actions';
+import {
+ createAlert,
+ createAlertManualCleanup,
+ scheduleRule,
+ snoozeAlert,
+} from '../../../lib/alert_api_actions';
import { ObjectRemover } from '../../../lib/object_remover';
export default ({ getPageObjects, getService }: FtrProviderContext) => {
@@ -30,7 +35,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await testSubjects.click('rulesTab');
}
- describe('rules list', () => {
+ describe('rules list bulk actions', () => {
before(async () => {
await pageObjects.common.navigateToApp('triggersActions');
await testSubjects.click('rulesTab');
@@ -206,5 +211,83 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
expect(toastTitle).to.eql('Updated API key for 1 rule.');
});
});
+
+ it('should apply filters to bulk actions when using the select all button', async () => {
+ const rule1 = await createAlert({
+ supertest,
+ objectRemover,
+ overwrites: { name: 'a' },
+ });
+ const rule2 = await createAlertManualCleanup({
+ supertest,
+ overwrites: { name: 'b', rule_type_id: 'test.always-firing' },
+ });
+ const rule3 = await createAlert({
+ supertest,
+ objectRemover,
+ overwrites: { name: 'c' },
+ });
+
+ await refreshAlertsList();
+ expect(await testSubjects.getVisibleText('totalRulesCount')).to.be('3 rules');
+
+ await testSubjects.click('ruleTypeFilterButton');
+ await testSubjects.existOrFail('ruleTypetest.noopFilterOption');
+ await testSubjects.click('ruleTypetest.noopFilterOption');
+ await testSubjects.click(`checkboxSelectRow-${rule1.id}`);
+ await testSubjects.click('selectAllRulesButton');
+
+ await testSubjects.click('showBulkActionButton');
+ await testSubjects.click('bulkDisable');
+ await testSubjects.existOrFail('untrackAlertsModal');
+ await testSubjects.click('confirmModalConfirmButton');
+
+ await retry.try(async () => {
+ const toastTitle = await toasts.getTitleAndDismiss();
+ expect(toastTitle).to.eql('Disabled 2 rules');
+ });
+
+ await testSubjects.click('rules-list-clear-filter');
+ await refreshAlertsList();
+
+ await pageObjects.triggersActionsUI.searchAlerts(rule1.name);
+ expect(await testSubjects.getVisibleText('statusDropdown')).to.be('Disabled');
+ await pageObjects.triggersActionsUI.searchAlerts(rule2.name);
+ expect(await testSubjects.getVisibleText('statusDropdown')).to.be('Enabled');
+ await pageObjects.triggersActionsUI.searchAlerts(rule3.name);
+ expect(await testSubjects.getVisibleText('statusDropdown')).to.be('Disabled');
+
+ await testSubjects.click('rules-list-clear-filter');
+ await refreshAlertsList();
+
+ await testSubjects.click('ruleStatusFilterButton');
+ await testSubjects.existOrFail('ruleStatusFilterOption-enabled');
+ await testSubjects.click('ruleStatusFilterOption-enabled');
+ await testSubjects.click(`checkboxSelectRow-${rule2.id}`);
+ await testSubjects.click('selectAllRulesButton');
+
+ await testSubjects.click('showBulkActionButton');
+ await testSubjects.click('bulkDelete');
+ await testSubjects.existOrFail('rulesDeleteConfirmation');
+ await testSubjects.click('confirmModalConfirmButton');
+
+ await retry.try(async () => {
+ const toastTitle = await toasts.getTitleAndDismiss();
+ expect(toastTitle).to.eql('Deleted 1 rule');
+ });
+
+ await testSubjects.click('rules-list-clear-filter');
+ await refreshAlertsList();
+
+ await retry.try(
+ async () => {
+ expect(await testSubjects.getVisibleText('totalRulesCount')).to.be('2 rules');
+ },
+ async () => {
+ // If the delete fails, make sure rule2 gets cleaned up
+ objectRemover.add(rule2.id, 'alert', 'alerts');
+ }
+ );
+ });
});
};
From 8e7e5b23ec4f3b148c6a6e33f5b157d6266b710b Mon Sep 17 00:00:00 2001
From: Ersin Erdal <92688503+ersin-erdal@users.noreply.github.com>
Date: Thu, 15 Feb 2024 20:54:05 +0100
Subject: [PATCH 21/23] Revert changes in PR#175981 (#177054)
Reverts changes in https://github.com/elastic/kibana/pull/175981
---
.../rules_client/methods/get_alert_state.ts | 29 +++------
.../tests/get_alert_state.test.ts | 65 -------------------
2 files changed, 9 insertions(+), 85 deletions(-)
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts b/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts
index 4da913a06fe79..6497428e1c2f2 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/get_alert_state.ts
@@ -5,7 +5,6 @@
* 2.0.
*/
-import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-server';
import { RuleTaskState } from '../../types';
import { taskInstanceToAlertTaskInstance } from '../../task_runner/alert_task_instance';
import { ReadOperations, AlertingAuthorizationEntity } from '../../authorization';
@@ -19,28 +18,18 @@ export async function getAlertState(
context: RulesClientContext,
{ id }: GetAlertStateParams
): Promise {
- const rule = await get(context, { id });
+ const alert = await get(context, { id });
await context.authorization.ensureAuthorized({
- ruleTypeId: rule.alertTypeId,
- consumer: rule.consumer,
+ ruleTypeId: alert.alertTypeId,
+ consumer: alert.consumer,
operation: ReadOperations.GetRuleState,
entity: AlertingAuthorizationEntity.Rule,
});
- if (rule.scheduledTaskId) {
- try {
- const { state } = taskInstanceToAlertTaskInstance(
- await context.taskManager.get(rule.scheduledTaskId),
- rule
- );
- return state;
- } catch (e) {
- if (SavedObjectsErrorHelpers.isNotFoundError(e)) {
- context.logger.warn(`Task (${rule.scheduledTaskId}) not found`);
- } else {
- context.logger.warn(
- `An error occurred when getting the task state for (${rule.scheduledTaskId})`
- );
- }
- }
+ if (alert.scheduledTaskId) {
+ const { state } = taskInstanceToAlertTaskInstance(
+ await context.taskManager.get(alert.scheduledTaskId),
+ alert
+ );
+ return state;
}
}
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
index 951e85c023523..63d86843512c0 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
@@ -22,7 +22,6 @@ import { AlertingAuthorization } from '../../authorization/alerting_authorizatio
import { ActionsAuthorization } from '@kbn/actions-plugin/server';
import { getBeforeSetup } from './lib';
import { RULE_SAVED_OBJECT_TYPE } from '../../saved_objects';
-import { SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-server';
const taskManager = taskManagerMock.createStart();
const ruleTypeRegistry = ruleTypeRegistryMock.create();
@@ -176,70 +175,6 @@ describe('getAlertState()', () => {
expect(taskManager.get).toHaveBeenCalledWith(scheduledTaskId);
});
- test('logs a warning if the task not found', async () => {
- const rulesClient = new RulesClient(rulesClientParams);
-
- const scheduledTaskId = 'task-123';
-
- unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
- id: '1',
- type: RULE_SAVED_OBJECT_TYPE,
- attributes: {
- alertTypeId: '123',
- schedule: { interval: '10s' },
- params: {
- bar: true,
- },
- actions: [],
- enabled: true,
- scheduledTaskId,
- mutedInstanceIds: [],
- muteAll: true,
- },
- references: [],
- });
-
- taskManager.get.mockRejectedValueOnce(SavedObjectsErrorHelpers.createGenericNotFoundError());
-
- await rulesClient.getAlertState({ id: '1' });
-
- expect(rulesClientParams.logger.warn).toHaveBeenCalledTimes(1);
- expect(rulesClientParams.logger.warn).toHaveBeenCalledWith('Task (task-123) not found');
- });
-
- test('logs a warning if the taskManager throws an error', async () => {
- const rulesClient = new RulesClient(rulesClientParams);
-
- const scheduledTaskId = 'task-123';
-
- unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
- id: '1',
- type: RULE_SAVED_OBJECT_TYPE,
- attributes: {
- alertTypeId: '123',
- schedule: { interval: '10s' },
- params: {
- bar: true,
- },
- actions: [],
- enabled: true,
- scheduledTaskId,
- mutedInstanceIds: [],
- muteAll: true,
- },
- references: [],
- });
-
- taskManager.get.mockRejectedValueOnce(SavedObjectsErrorHelpers.createBadRequestError());
-
- await rulesClient.getAlertState({ id: '1' });
-
- expect(rulesClientParams.logger.warn).toHaveBeenCalledTimes(1);
- expect(rulesClientParams.logger.warn).toHaveBeenCalledWith(
- 'An error occurred when getting the task state for (task-123)'
- );
- });
-
describe('authorization', () => {
beforeEach(() => {
unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
From d2f566970c22220ba0130ae9446078d30ec8c995 Mon Sep 17 00:00:00 2001
From: Davis McPhee
Date: Thu, 15 Feb 2024 16:08:13 -0400
Subject: [PATCH 22/23] Fix flaky test from #172781 (#176972)
## Summary
This PR fixes the flaky test skipped in #172781.
Flaky test runner x95:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5187.
Resolves #172781.
### Checklist
- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [x] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
### For maintainers
- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
---
.../existing_fields.ts | 2 +-
.../page_objects/unified_field_list.ts | 16 ++++++++++++++++
.../existing_fields.ts | 5 ++---
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/test/examples/unified_field_list_examples/existing_fields.ts b/test/examples/unified_field_list_examples/existing_fields.ts
index 341c440b3c8a8..2967e877383f1 100644
--- a/test/examples/unified_field_list_examples/existing_fields.ts
+++ b/test/examples/unified_field_list_examples/existing_fields.ts
@@ -73,7 +73,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
await PageObjects.timePicker.setAbsoluteRange(TEST_START_TIME, TEST_END_TIME);
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
- await PageObjects.unifiedFieldList.toggleSidebarSection('meta');
+ await PageObjects.unifiedFieldList.openSidebarSection('meta');
});
after(async () => {
diff --git a/test/functional/page_objects/unified_field_list.ts b/test/functional/page_objects/unified_field_list.ts
index 5e2d1039d7697..378b20cc02e24 100644
--- a/test/functional/page_objects/unified_field_list.ts
+++ b/test/functional/page_objects/unified_field_list.ts
@@ -88,6 +88,22 @@ export class UnifiedFieldListPageObject extends FtrService {
);
}
+ public async openSidebarSection(sectionName: SidebarSectionName) {
+ const openedSectionSelector = `${this.getSidebarSectionSelector(
+ sectionName,
+ true
+ )}.euiAccordion-isOpen`;
+
+ if (await this.find.existsByCssSelector(openedSectionSelector)) {
+ return;
+ }
+
+ await this.retry.waitFor(`${sectionName} fields section to open`, async () => {
+ await this.toggleSidebarSection(sectionName);
+ return await this.find.existsByCssSelector(openedSectionSelector);
+ });
+ }
+
public async waitUntilFieldPopoverIsOpen() {
await this.retry.waitFor('popover is open', async () => {
return Boolean(await this.find.byCssSelector('[data-popover-open="true"]'));
diff --git a/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/existing_fields.ts b/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/existing_fields.ts
index 4725b39bd9db1..05400dbac1b38 100644
--- a/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/existing_fields.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/existing_fields.ts
@@ -78,7 +78,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
await PageObjects.timePicker.setAbsoluteRange(TEST_START_TIME, TEST_END_TIME);
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
- await PageObjects.unifiedFieldList.toggleSidebarSection('meta');
+ await PageObjects.unifiedFieldList.openSidebarSection('meta');
});
after(async () => {
@@ -92,8 +92,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
await kibanaServer.savedObjects.cleanStandardList();
});
- // FLAKY: https://github.com/elastic/kibana/issues/172781
- describe.skip('existence', () => {
+ describe('existence', () => {
it('should find which fields exist in the sample documents', async () => {
const sidebarFields = await PageObjects.unifiedFieldList.getAllFieldNames();
expect(sidebarFields.sort()).to.eql([...metaFields, ...fieldsWithData].sort());
From cec949ed0abfe4cd2a9f74d55c0d3212e96db328 Mon Sep 17 00:00:00 2001
From: "Christiane (Tina) Heiligers"
Date: Thu, 15 Feb 2024 13:09:11 -0700
Subject: [PATCH 23/23] Deprecates SavedObjectType migrations and schemas in
favor of modelVersions (#176970)
fix https://github.com/elastic/kibana/issues/176776
Saved objects `modelVersions` support BWC and ZDT and replace
`SavedObjectsType.schemas` and `SavedObjectsType.migrations` properties.
This PR marks these two properties as deprecated.
The public facing docs have also been updated to the "new" way of
implementing saved object changes.
### Checklist
Delete any items that are not applicable to this PR.
- [x] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [x]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
---
...objects-service-use-case-examples.asciidoc | 761 ++++++++++++++++++
.../core/saved-objects-service.asciidoc | 513 +++++++-----
.../src/saved_objects_type.ts | 4 +-
3 files changed, 1068 insertions(+), 210 deletions(-)
create mode 100644 docs/developer/architecture/core/saved-objects-service-use-case-examples.asciidoc
diff --git a/docs/developer/architecture/core/saved-objects-service-use-case-examples.asciidoc b/docs/developer/architecture/core/saved-objects-service-use-case-examples.asciidoc
new file mode 100644
index 0000000000000..2b2cbde0b3f1a
--- /dev/null
+++ b/docs/developer/architecture/core/saved-objects-service-use-case-examples.asciidoc
@@ -0,0 +1,761 @@
+[[saved-objects-service-use-case-examples]]
+=== Use-case examples
+
+These are example of the migration scenario currently supported (out of
+the box) by the system.
+
+*note:* _more complex scenarios (e.g field mutation by copy/sync) could
+already be implemented, but without the proper tooling exposed from
+Core, most of the work related to sync and compatibility would have to
+be implemented in the domain layer of the type owners, which is why
+we’re not documenting them yet._
+
+==== Adding a non-indexed field without default value
+
+We are currently in model version 1, and our type has 2 indexed fields
+defined: `foo` and `bar`.
+
+The definition of the type at version 1 would look like:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ // initial (and current) model version
+ 1: {
+ changes: [],
+ schemas: {
+ // FC schema defining the known fields (indexed or not) for this version
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ { unknowns: 'ignore' } // note the `unknown: ignore` which is how we're evicting the unknown fields
+ ),
+ // schema that will be used to validate input during `create` and `bulkCreate`
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ )
+ },
+ },
+ },
+ mappings: {
+ properties: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ },
+ },
+};
+----
+
+From here, say we want to introduce a new `dolly` field that is not
+indexed, and that we don’t need to populate with a default value.
+
+To achieve that, we need to introduce a new model version, with the only
+thing to do will be to define the associated schemas to include this new
+field.
+
+The added model version would look like:
+
+[source,ts]
+----
+// the new model version adding the `dolly` field
+let modelVersion2: SavedObjectsModelVersion = {
+ // not an indexed field, no data backfill, so changes are actually empty
+ changes: [],
+ schemas: {
+ // the only addition in this model version: taking the new field into account for the schemas
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ { unknowns: 'ignore' } // note the `unknown: ignore` which is how we're evicting the unknown fields
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ )
+ },
+};
+----
+
+The full type definition after the addition of the new model version:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 1: {
+ changes: [],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ )
+ },
+ },
+ 2: {
+ changes: [],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ )
+ },
+ },
+ },
+ mappings: {
+ properties: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ },
+ },
+};
+----
+
+==== Adding an indexed field without default value
+
+This scenario is fairly close to the previous one. The difference being
+that working with an indexed field means adding a `mappings_addition`
+change and to also update the root mappings accordingly.
+
+To reuse the previous example, let’s say the `dolly` field we want to
+add would need to be indexed instead.
+
+In that case, the new version needs to do the following: - add a
+`mappings_addition` type change to define the new mappings - update the
+root `mappings` accordingly - add the updated schemas as we did for the
+previous example
+
+The new version definition would look like:
+
+[source,ts]
+----
+let modelVersion2: SavedObjectsModelVersion = {
+ // add a change defining the mapping for the new field
+ changes: [
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ dolly: { type: 'text' },
+ },
+ },
+ ],
+ schemas: {
+ // adding the new field to the forwardCompatibility schema
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ )
+ },
+};
+----
+
+As said, we will also need to update the root mappings definition:
+
+[source,ts]
+----
+mappings: {
+ properties: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ dolly: { type: 'text' },
+ },
+},
+----
+
+the full type definition after the addition of the model version 2 would
+be:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 1: {
+ changes: [
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ },
+ },
+ ],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ )
+ },
+ },
+ 2: {
+ changes: [
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ dolly: { type: 'text' },
+ },
+ },
+ ],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ )
+ },
+ },
+ },
+ mappings: {
+ properties: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ dolly: { type: 'text' },
+ },
+ },
+};
+----
+
+==== Adding an indexed field with a default value
+
+Now a slightly different scenario where we’d like to populate the newly
+introduced field with a default value.
+
+In that case, we’d need to add an additional `data_backfill` change to
+populate the new field’s value (in addition to the `mappings_addition`
+one):
+
+[source,ts]
+----
+let modelVersion2: SavedObjectsModelVersion = {
+ changes: [
+ // setting the `dolly` field's default value.
+ {
+ type: 'data_backfill',
+ transform: (document) => {
+ return { attributes: { dolly: 'default_value' } };
+ },
+ },
+ // define the mappings for the new field
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ dolly: { type: 'text' },
+ },
+ },
+ ],
+ schemas: {
+ // define `dolly` as an know field in the schema
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ )
+ },
+};
+----
+
+The full type definition would look like:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 1: {
+ changes: [
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ },
+ },
+ ],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string() },
+ )
+ },
+ },
+ 2: {
+ changes: [
+ {
+ type: 'data_backfill',
+ transform: (document) => {
+ return { attributes: { dolly: 'default_value' } };
+ },
+ },
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ dolly: { type: 'text' },
+ },
+ },
+ ],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { foo: schema.string(), bar: schema.string(), dolly: schema.string() },
+ )
+ },
+ },
+ },
+ mappings: {
+ properties: {
+ foo: { type: 'text' },
+ bar: { type: 'text' },
+ dolly: { type: 'text' },
+ },
+ },
+};
+----
+
+*Note:* _if the field was non-indexed, we would just not use the
+`mappings_addition` change or update the mappings (as done in example
+1)_
+
+==== Removing an existing field
+
+We are currently in model version 1, and our type has 2 indexed fields
+defined: `kept` and `removed`.
+
+The definition of the type at version 1 would look like:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ // initial (and current) model version
+ 1: {
+ changes: [],
+ schemas: {
+ // FC schema defining the known fields (indexed or not) for this version
+ forwardCompatibility: schema.object(
+ { kept: schema.string(), removed: schema.string() },
+ { unknowns: 'ignore' } // note the `unknown: ignore` which is how we're evicting the unknown fields
+ ),
+ // schema that will be used to validate input during `create` and `bulkCreate`
+ create: schema.object(
+ { kept: schema.string(), removed: schema.string() },
+ )
+ },
+ },
+ },
+ mappings: {
+ properties: {
+ kept: { type: 'text' },
+ removed: { type: 'text' },
+ },
+ },
+};
+----
+
+From here, say we want to remove the `removed` field, as our application
+doesn’t need it anymore since a recent change.
+
+The first thing to understand here is the impact toward backward
+compatibility: Say that Kibana version `X` was still using this field,
+and that we stopped utilizing the field in version `X+1`.
+
+We can’t remove the data in version `X+1`, as we need to be able to
+rollback to the prior version at *any time*. If we were to delete the
+data of this `removed` field during the upgrade to version `X+1`, and if
+then, for any reason, we’d need to rollback to version `X`, it would
+cause a data loss, as version `X` was still using this field, but it
+would no longer present in our document after the rollback.
+
+Which is why we need to perform any field removal as a 2-step operation:
+- release `X`: Kibana still utilize the field - release `X+1`: Kibana no
+longer utilize the field, but the data is still present in the documents
+- release `X+2`: The data is effectively deleted from the documents.
+
+That way, any prior-version rollback (`X+2` to `X+1` *or* `X+1` to `X`
+is safe in term of data integrity)
+
+The main question then, is what’s the best way of having our application
+layer simply ignore this `removed` field during version `X+1`, as we
+don’t want this field (now non-utilized) to be returned from the
+persistence layer, as it could ``pollute'' the higher-layers where the
+field is effectively no longer used or even known.
+
+This can easily be done by introducing a new version and using the
+`forwardCompatibility` schema to ``shallow'' the field.
+
+The `X+1` model version would look like:
+
+[source,ts]
+----
+// the new model version ignoring the `removed` field
+let modelVersion2: SavedObjectsModelVersion = {
+ changes: [],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { kept: schema.string() }, // `removed` is no longer defined here
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { kept: schema.string() }, // `removed` is no longer defined here
+ )
+ },
+};
+----
+
+The full type definition after the addition of the new model version:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ // initial (and current) model version
+ 1: {
+ changes: [],
+ schemas: {
+ // FC schema defining the known fields (indexed or not) for this version
+ forwardCompatibility: schema.object(
+ { kept: schema.string(), removed: schema.string() },
+ { unknowns: 'ignore' } // note the `unknown: ignore` which is how we're evicting the unknown fields
+ ),
+ // schema that will be used to validate input during `create` and `bulkCreate`
+ create: schema.object(
+ { kept: schema.string(), removed: schema.string() },
+ )
+ },
+ },
+ 2: {
+ changes: [],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { kept: schema.string() }, // `removed` is no longer defined here
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { kept: schema.string() }, // `removed` is no longer defined here
+ )
+ },
+ }
+ },
+ mappings: {
+ properties: {
+ kept: { type: 'text' },
+ removed: { type: 'text' },
+ },
+ },
+};
+----
+
+then, in a *later* release, we can then deploy the change that will
+effectively remove the data from the documents:
+
+[source,ts]
+----
+// the new model version ignoring the `removed` field
+let modelVersion3: SavedObjectsModelVersion = {
+ changes: [ // define a data_removal change to delete the field
+ {
+ type: 'data_removal',
+ removedAttributePaths: ['removed']
+ }
+ ],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { kept: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { kept: schema.string() },
+ )
+ },
+};
+----
+
+The full type definition after the data removal would look like:
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ namespaceType: 'single',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ // initial (and current) model version
+ 1: {
+ changes: [],
+ schemas: {
+ // FC schema defining the known fields (indexed or not) for this version
+ forwardCompatibility: schema.object(
+ { kept: schema.string(), removed: schema.string() },
+ { unknowns: 'ignore' } // note the `unknown: ignore` which is how we're evicting the unknown fields
+ ),
+ // schema that will be used to validate input during `create` and `bulkCreate`
+ create: schema.object(
+ { kept: schema.string(), removed: schema.string() },
+ )
+ },
+ },
+ 2: {
+ changes: [],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { kept: schema.string() }, // `removed` is no longer defined here
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { kept: schema.string() }, // `removed` is no longer defined here
+ )
+ },
+ },
+ 3: {
+ changes: [ // define a data_removal change to delete the field
+ {
+ type: 'data_removal',
+ removedAttributePaths: ['removed']
+ }
+ ],
+ schemas: {
+ forwardCompatibility: schema.object(
+ { kept: schema.string() },
+ { unknowns: 'ignore' }
+ ),
+ create: schema.object(
+ { kept: schema.string() },
+ )
+ },
+ }
+ },
+ mappings: {
+ properties: {
+ kept: { type: 'text' },
+ removed: { type: 'text' },
+ },
+ },
+};
+----
+
+=== Testing model versions
+
+Model versions definitions are more structured than the legacy migration
+functions, which makes them harder to test without the proper tooling.
+This is why a set of testing tools and utilities are exposed from the
+`@kbn/core-test-helpers-model-versions` package, to help properly test
+the logic associated with model version and their associated
+transformations.
+
+==== Tooling for unit tests
+
+For unit tests, the package exposes utilities to easily test the impact
+of transforming documents from a model version to another one, either
+upward or backward.
+
+===== Model version test migrator
+
+The `createModelVersionTestMigrator` helper allows to create a test
+migrator that can be used to test model version changes between
+versions, by transforming documents the same way the migration algorithm
+would during an upgrade.
+
+*Example:*
+
+[source,ts]
+----
+import {
+ createModelVersionTestMigrator,
+ type ModelVersionTestMigrator
+} from '@kbn/core-test-helpers-model-versions';
+
+const mySoTypeDefinition = someSoType();
+
+describe('mySoTypeDefinition model version transformations', () => {
+ let migrator: ModelVersionTestMigrator;
+
+ beforeEach(() => {
+ migrator = createModelVersionTestMigrator({ type: mySoTypeDefinition });
+ });
+
+ describe('Model version 2', () => {
+ it('properly backfill the expected fields when converting from v1 to v2', () => {
+ const obj = createSomeSavedObject();
+
+ const migrated = migrator.migrate({
+ document: obj,
+ fromVersion: 1,
+ toVersion: 2,
+ });
+
+ expect(migrated.properties).toEqual(expectedV2Properties);
+ });
+
+ it('properly removes the expected fields when converting from v2 to v1', () => {
+ const obj = createSomeSavedObject();
+
+ const migrated = migrator.migrate({
+ document: obj,
+ fromVersion: 2,
+ toVersion: 1,
+ });
+
+ expect(migrated.properties).toEqual(expectedV1Properties);
+ });
+ });
+});
+----
+
+==== Tooling for integration tests
+
+During integration tests, we can boot a real Elasticsearch cluster,
+allowing us to manipulate SO documents in a way almost similar to how it
+would be done on production runtime. With integration tests, we can even
+simulate the cohabitation of two Kibana instances with different model
+versions to assert the behavior of their interactions.
+
+===== Model version test bed
+
+The package exposes a `createModelVersionTestBed` function that can be
+used to fully setup a test bed for model version integration testing. It
+can be used to start and stop the ES server, and to initiate the
+migration between the two versions we’re testing.
+
+*Example:*
+
+[source,ts]
+----
+import {
+ createModelVersionTestBed,
+ type ModelVersionTestKit
+} from '@kbn/core-test-helpers-model-versions';
+
+describe('myIntegrationTest', () => {
+ const testbed = createModelVersionTestBed();
+ let testkit: ModelVersionTestKit;
+
+ beforeAll(async () => {
+ await testbed.startES();
+ });
+
+ afterAll(async () => {
+ await testbed.stopES();
+ });
+
+ beforeEach(async () => {
+ // prepare the test, preparing the index and performing the SO migration
+ testkit = await testbed.prepareTestKit({
+ savedObjectDefinitions: [{
+ definition: mySoTypeDefinition,
+ // the model version that will be used for the "before" version
+ modelVersionBefore: 1,
+ // the model version that will be used for the "after" version
+ modelVersionAfter: 2,
+ }]
+ })
+ });
+
+ afterEach(async () => {
+ if(testkit) {
+ // delete the indices between each tests to perform a migration again
+ await testkit.tearsDown();
+ }
+ });
+
+ it('can be used to test model version cohabitation', async () => {
+ // last registered version is `1` (modelVersionBefore)
+ const repositoryV1 = testkit.repositoryBefore;
+ // last registered version is `2` (modelVersionAfter)
+ const repositoryV2 = testkit.repositoryAfter;
+
+ // do something with the two repositories, e.g
+ await repositoryV1.create(someAttrs, { id });
+ const v2docReadFromV1 = await repositoryV2.get('my-type', id);
+ expect(v2docReadFromV1.attributes).toEqual(whatIExpect);
+ });
+});
+----
+
+*Limitations:*
+
+Because the test bed is only creating the parts of Core required to
+instantiate the two SO repositories, and because we’re not able to
+properly load all plugins (for proper isolation), the integration test
+bed currently has some limitations:
+
+* no extensions are enabled
+** no security
+** no encryption
+** no spaces
+* all SO types will be using the same SO index
+
+=== Limitations and edge cases in serverless environments
+
+The serverless environment, and the fact that upgrade in such
+environments are performed in a way where, at some point, the old and
+new version of the application are living in cohabitation, leads to some
+particularities regarding the way the SO APIs works, and to some
+limitations / edge case that we need to document
+
+==== Using the `fields` option of the `find` savedObjects API
+
+By default, the `find` API (as any other SO API returning documents)
+will migrate all documents before returning them, to ensure that
+documents can be used by both versions during a cohabitation (e.g an old
+node searching for documents already migrated, or a new node searching
+for documents not yet migrated).
+
+However, when using the `fields` option of the `find` API, the documents
+can’t be migrated, as some model version changes can’t be applied
+against a partial set of attributes. For this reason, when the `fields`
+option is provided, the documents returned from `find` will *not* be
+migrated.
+
+Which is why, when using this option, the API consumer needs to make
+sure that _all_ the fields passed to the `fields` option *were already
+present in the prior model version*. Otherwise, it may lead to
+inconsistencies during upgrades, where newly introduced or backfilled
+fields may not necessarily appear in the documents returned from the
+`search` API when the option is used.
+
+(_note_: both the previous and next version of Kibana must follow this
+rule then)
+
+==== Using `bulkUpdate` for fields with large `json` blobs
+
+The savedObjects `bulkUpdate` API will update documents client-side and
+then reindex the updated documents. These update operations are done
+in-memory, and cause memory constraint issues when updating many objects
+with large `json` blobs stored in some fields. As such, we recommend
+against using `bulkUpdate` for savedObjects that: - use arrays (as these
+tend to be large objects) - store large `json` blobs in some fields
+
diff --git a/docs/developer/architecture/core/saved-objects-service.asciidoc b/docs/developer/architecture/core/saved-objects-service.asciidoc
index eb9f1c7fd4516..71ece4ae3d735 100644
--- a/docs/developer/architecture/core/saved-objects-service.asciidoc
+++ b/docs/developer/architecture/core/saved-objects-service.asciidoc
@@ -47,6 +47,11 @@ export const dashboardVisualization: SavedObjectsType = {
name: 'dashboard_visualization', // <1>
hidden: true,
namespaceType: 'multiple-isolated', // <2>
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 1: modelVersion1,
+ 2: modelVersion2,
+ },
mappings: {
dynamic: false,
properties: {
@@ -58,10 +63,7 @@ export const dashboardVisualization: SavedObjectsType = {
},
},
},
- migrations: {
- '1.0.0': migratedashboardVisualizationToV1,
- '2.0.0': migratedashboardVisualizationToV2,
- },
+ // ...other mandatory properties
};
----
<1> Since the name of a Saved Object type may form part of the URL path for the
@@ -95,33 +97,32 @@ Each Saved Object type can define it's own {es} field mappings.
Because multiple Saved Object types can share the same index, mappings defined
by a type will be nested under a top-level field that matches the type name.
-For example, the mappings defined by the `dashboard_visualization` Saved
+For example, the mappings defined by the `search` Saved
Object type:
-.src/plugins/my_plugin/server/saved_objects/dashboard_visualization.ts
+https://github.com/elastic/kibana/blob/main/src/plugins/saved_search/server/saved_objects/search.ts#L19-L70[.src/plugins/saved_search/server/saved_objects/search.ts]
[source,typescript]
----
import { SavedObjectsType } from 'src/core/server';
-
-export const dashboardVisualization: SavedObjectsType = {
- name: 'dashboard_visualization',
- ...
+// ... other imports
+export function getSavedSearchObjectType: SavedObjectsType = { // <1>
+ name: 'search',
+ hidden: false,
+ namespaceType: 'multiple-isolated',
mappings: {
+ dynamic: false,
properties: {
- dynamic: false,
- description: {
- type: 'text',
- },
- hits: {
- type: 'integer',
- },
+ title: { type: 'text' },
+ description: { type: 'text' },
},
},
- migrations: { ... },
+ modelVersions: { ... },
+ // ...other optional properties
};
----
+<1> Simplification
-Will result in the following mappings being applied to the `.kibana` index:
+Will result in the following mappings being applied to the `.kibana_analytics` index:
[source,json]
----
{
@@ -129,14 +130,14 @@ Will result in the following mappings being applied to the `.kibana` index:
"dynamic": "strict",
"properties": {
...
- "dashboard_vizualization": {
+ "search": {
"dynamic": false,
"properties": {
- "description": {
+ "title": {
"type": "text",
},
- "hits": {
- "type": "integer",
+ "description": {
+ "type": "text",
},
},
}
@@ -157,242 +158,336 @@ Saved Object types should never use `dynamic: true` as this can cause an
arbitrary amount of fields to be added to the `.kibana` index.
[[saved-objects-service-writing-migrations]]
-==== Writing Migrations
+==== Writing Migrations by defining model versions
-Saved Objects support schema changes between Kibana versions, which we call
-migrations. Migrations are applied when a Kibana installation is upgraded from
-one version to the next, when exports are imported via the Saved Objects
-Management UI, or when a new object is created via the HTTP API.
+Saved Objects support changes using `modelVersions``. The modelVersion API is a new way to define transformations
+(_``migrations''_) for your savedObject types, and will replace the
+``legacy'' migration API after Kibana version `8.10.0`. The legacy migration API has been deprecated, meaning it is no longer possible to register migrations using the legacy system.
-Each Saved Object type may define migrations for its schema. Migrations are
-specified by the Kibana version number, receive an input document, and must
-return the fully migrated document to be persisted to Elasticsearch.
+Model versions are decoupled from the stack version and satisfy the requirements for zero downtime and backward-compatibility.
-Let's say we want to define two migrations:
-- In version 1.1.0, we want to drop the `subtitle` field and append it to the
- title
-- In version 1.4.0, we want to add a new `id` field to every panel with a newly
- generated UUID.
+Each Saved Object type may define model versions for its schema and are bound to a given https://github.com/elastic/kibana/blob/9b330e493216e8dde3166451e4714966f63f5ab7/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts#L22-L27[savedObject type]. Changes to a saved object type are
+specified by defining a new model.
-First, the current `mappings` should always reflect the latest or "target"
-schema. Next, we should define a migration function for each step in the schema
-evolution:
+=== Defining model versions
-src/plugins/my_plugin/server/saved_objects/dashboard_visualization.ts
-[source,typescript]
+As for old migrations, model versions are bound to a given
+https://github.com/elastic/kibana/blob/9b330e493216e8dde3166451e4714966f63f5ab7/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts#L22-L27[savedObject
+type]
+
+When registering a SO type, a new
+https://github.com/elastic/kibana/blob/9a6a2ccdff619f827b31c40dd9ed30cb27203da7/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts#L138-L177[modelVersions]
+property is available. This attribute is a map of
+https://github.com/elastic/kibana/blob/9a6a2ccdff619f827b31c40dd9ed30cb27203da7/packages/core/saved-objects/core-saved-objects-server/src/model_version/model_version.ts#L12-L20[SavedObjectsModelVersion]
+which is the top-level type/container to define model versions.
+
+This map follows a similar `{ [version number] => version definition }`
+format as the old migration map, however a given SO type’s model version
+is now identified by a single integer.
+
+The first version must be numbered as version 1, incrementing by one for
+each new version.
+
+That way: - SO type versions are decoupled from stack versioning - SO
+type versions are independent between types
+
+_a *valid* version numbering:_
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 1: modelVersion1, // valid: start with version 1
+ 2: modelVersion2, // valid: no gap between versions
+ },
+ // ...other mandatory properties
+};
----
-import { SavedObjectsType, SavedObjectMigrationFn } from 'src/core/server';
-import uuid from 'uuid';
-interface DashboardVisualizationPre110 {
- title: string;
- subtitle: string;
- panels: Array<{}>;
-}
-interface DashboardVisualization110 {
- title: string;
- panels: Array<{}>;
-}
+_an *invalid* version numbering:_
-interface DashboardVisualization140 {
- title: string;
- panels: Array<{ id: string }>;
-}
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 2: modelVersion2, // invalid: first version must be 1
+ 4: modelVersion3, // invalid: skipped version 3
+ },
+ // ...other mandatory properties
+};
+----
-const migrateDashboardVisualization110: SavedObjectMigrationFn<
- DashboardVisualizationPre110, // <1>
- DashboardVisualization110
-> = (doc) => {
- const { subtitle, ...attributesWithoutSubtitle } = doc.attributes;
- return {
- ...doc, // <2>
- attributes: {
- ...attributesWithoutSubtitle,
- title: `${doc.attributes.title} - ${doc.attributes.subtitle}`,
+=== Structure of a model version
+
+https://github.com/elastic/kibana/blob/9b330e493216e8dde3166451e4714966f63f5ab7/packages/core/saved-objects/core-saved-objects-server/src/model_version/model_version.ts#L12-L20[Model
+versions] are not just functions as the previous migrations were, but
+structured objects describing how the version behaves and what changed
+since the last one.
+
+_A base example of what a model version can look like:_
+
+[source,ts]
+----
+const myType: SavedObjectsType = {
+ name: 'test',
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {
+ 1: {
+ changes: [
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ someNewField: { type: 'text' },
+ },
+ },
+ {
+ type: 'data_backfill',
+ transform: someBackfillFunction,
+ },
+ ],
+ schemas: {
+ forwardCompatibility: fcSchema,
+ create: createSchema,
+ },
},
- };
+ },
+ // ...other mandatory properties
};
+----
+
+*Note:* Having multiple changes of the same type for a given version is
+supported by design to allow merging different sources (to prepare for
+an eventual higher-level API)
-const migrateDashboardVisualization140: SavedObjectMigrationFn<
- DashboardVisualization110,
- DashboardVisualization140
-> = (doc) => {
- const outPanels = doc.attributes.panels?.map((panel) => {
- return { ...panel, id: uuid.v4() };
- });
- return {
- ...doc,
- attributes: {
- ...doc.attributes,
- panels: outPanels,
+_This definition would be perfectly valid:_
+
+[source,ts]
+----
+const version1: SavedObjectsModelVersion = {
+ changes: [
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ someNewField: { type: 'text' },
+ },
+ },
+ {
+ type: 'mappings_addition',
+ addedMappings: {
+ anotherNewField: { type: 'text' },
+ },
},
- };
+ ],
};
+----
-export const dashboardVisualization: SavedObjectsType = {
- name: 'dashboard_visualization', // <1>
- /** ... */
- migrations: {
- // Takes a pre 1.1.0 doc, and converts it to 1.1.0
- '1.1.0': migrateDashboardVisualization110,
+It’s currently composed of two main properties:
+
+==== changes
+
+https://github.com/elastic/kibana/blob/9b330e493216e8dde3166451e4714966f63f5ab7/packages/core/saved-objects/core-saved-objects-server/src/model_version/model_version.ts#L21-L51[link
+to the TS doc for `changes`]
+
+Describes the list of changes applied during this version.
+
+*Important:* This is the part that replaces the old migration system,
+and allows defining when a version adds new mapping, mutates the
+documents, or other type-related changes.
+
+The current types of changes are:
+
+===== - mappings_addition
+
+Used to define new mappings introduced in a given version.
- // Takes a 1.1.0 doc, and converts it to 1.4.0
- '1.4.0': migrateDashboardVisualization140, // <3>
+_Usage example:_
+
+[source,ts]
+----
+const change: SavedObjectsModelMappingsAdditionChange = {
+ type: 'mappings_addition',
+ addedMappings: {
+ newField: { type: 'text' },
+ existingNestedField: {
+ properties: {
+ newNestedProp: { type: 'keyword' },
+ },
+ },
},
};
----
-<1> It is useful to define an interface for each version of the schema. This
-allows TypeScript to ensure that you are properly handling the input and output
-types correctly as the schema evolves.
-<2> Returning a shallow copy is necessary to avoid type errors when using
-different types for the input and output shape.
-<3> Migrations do not have to be defined for every version. The version number
-of a migration must always be the earliest Kibana version in which this
-migration was released. So if you are creating a migration which will be
-part of the v7.10.0 release, but will also be backported and released as
-v7.9.3, the migration version should be: 7.9.3.
-Migrations should be written defensively, an exception in a migration function
-will prevent a Kibana upgrade from succeeding and will cause downtime for our
-users. Having said that, if a document is encountered that is not in the
-expected shape, migrations are encouraged to throw an exception to abort the
-upgrade. In most scenarios, it is better to fail an upgrade than to silently
-ignore a corrupt document which can cause unexpected behaviour at some future
-point in time.
+*note:* _When adding mappings, the root `type.mappings` must also be
+updated accordingly (as it was done previously)._
-WARNING: Do not attempt to change the `migrationVersion`, `id`, or `type` fields
-within a migration function, this is not supported.
+===== - mappings_deprecation
-It is critical that you have extensive tests to ensure that migrations behave
-as expected with all possible input documents. Given how simple it is to test
-all the branch conditions in a migration function and the high impact of a bug
-in this code, there's really no reason not to aim for 100% test code coverage.
+Used to flag mappings as no longer being used and ready to be removed.
-==== Type visibility
-It is recommended that plugins only expose Saved Object types that are necessary.
-That is so to provide better backward compatibility.
+_Usage example:_
-There are two options to register a type: either as completely unexposed to the global Saved Objects HTTP APIs and client or to only expose it to the client but not to the APIs.
-
-===== Hidden types
+[source,ts]
+----
+let change: SavedObjectsModelMappingsDeprecationChange = {
+ type: 'mappings_deprecation',
+ deprecatedMappings: ['someDeprecatedField', 'someNested.deprecatedField'],
+};
+----
-In case when the type is not hidden, it will be exposed via the global Saved Objects HTTP API.
-That brings the limitation of introducing backward incompatible changes as there might be a service consuming the API.
+*note:* _It is currently not possible to remove fields from an existing
+index’s mapping (without reindexing into another index), so the mappings
+flagged with this change type won’t be deleted for now, but this should
+still be used to allow our system to clean the mappings once upstream
+(ES) unblock us._
-This is a formal limitation not prohibiting backward incompatible changes in the migrations.
-But in case of such changes on the hidden types, they can be resolved and encapsulated on the intermediate layer in the plugin API.
+===== - data_backfill
-Hence, the main idea is that all the interactions with the Saved Objects should be done via the plugin API rather than via the Saved Objects HTTP API.
+Used to populate fields (indexed or not) added in the same version.
-By default, the hidden types will not be accessible in the Saved Objects client.
-To make them accessible, they should be explicitly listed in the `includedHiddenTypes` parameters upon client creation.
+_Usage example:_
-[source,typescript]
+[source,ts]
+----
+let change: SavedObjectsModelDataBackfillChange = {
+ type: 'data_backfill',
+ transform: (document) => {
+ return { attributes: { someAddedField: 'defaultValue' } };
+ },
+};
----
-import { CoreStart, Plugin } from '@kbn/core/server';
-class SomePlugin implements Plugin {
- // ...
+*note:* _Even if no check is performed to ensure it, this type of model
+change should only be used to backfill newly introduced fields._
- public start({ savedObjects }: CoreStart) {
- // ...
+===== - data_removal
- const savedObjectsClient = savedObjects.getScopedClient(
- request,
- { includedHiddenTypes: ['dashboard_visualization'] }
- );
+Used to remove data (unset fields) from all documents of the type.
- // ...
- }
-}
+_Usage example:_
+
+[source,ts]
+----
+let change: SavedObjectsModelDataRemovalChange = {
+ type: 'data_removal',
+ attributePaths: ['someRootAttributes', 'some.nested.attribute'],
+};
----
-===== Hidden from the HTTP APIs
+*note:* _Due to backward compatibility, field utilization must be
+stopped in a prior release before actual data removal (in case of
+rollback). Please refer to the field removal migration example below in
+this document_
-When a saved object is registered as hidden from the HTTP APIs, it will remain exposed to the global Saved Objects client:
+===== - unsafe_transform
-[source,typescript]
-----
-import { SavedObjectsType } from 'src/core/server';
+Used to execute an arbitrary transformation function.
-export const myCustomVisualization: SavedObjectsType = {
- name: 'my_custom_visualization', // <1>
- hidden: false,
- hiddenFromHttpApis: true, // <2>
- namespaceType: 'multiple-isolated',
- mappings: {
- dynamic: false,
- properties: {
- description: {
- type: 'text',
- },
- hits: {
- type: 'integer',
- },
- },
- },
- migrations: {
- '1.0.0': migrateMyCustomVisualizationToV1,
- '2.0.0': migrateMyCustomVisualizationToV2,
+_Usage example:_
+
+[source,ts]
+----
+let change: SavedObjectsModelUnsafeTransformChange = {
+ type: 'unsafe_transform',
+ transformFn: (document) => {
+ document.attributes.someAddedField = 'defaultValue';
+ return { document };
},
};
----
-<1> MyCustomVisualization types have their own domain-specific HTTP API's that leverage the global Saved Objects client
-<2> This field determines "hidden from http apis" behavior -- any attempts to use the global Saved Objects HTTP APIs will throw errors
+*note:* _Using such transformations is potentially unsafe, given the
+migration system will have no knowledge of which kind of operations will
+effectively be executed against the documents. Those should only be used
+when there’s no other way to cover one’s migration needs._ *Please reach
+out to the development team if you think you need to use this, as you
+theoretically shouldn’t.*
+
+==== schemas
+
+https://github.com/elastic/kibana/blob/9b330e493216e8dde3166451e4714966f63f5ab7/packages/core/saved-objects/core-saved-objects-server/src/model_version/schemas.ts#L11-L16[link
+to the TS doc for `schemas`]
+
+The schemas associated with this version. Schemas are used to validate
+or convert SO documents at various stages of their lifecycle.
-=== Client side usage
+The currently available schemas are:
-==== References
+===== forwardCompatibility
-When a Saved Object declares `references` to other Saved Objects, the
-Saved Objects Export API will automatically export the target object with all
-of its references. This makes it easy for users to export the entire
-reference graph of an object.
+This is a new concept introduced by model versions. This schema is used
+for inter-version compatibility.
-If a Saved Object can't be used on its own, that is, it needs other objects
-to exist for a feature to function correctly, that Saved Object should declare
-references to all the objects it requires. For example, a `dashboard`
-object might have panels for several `visualization` objects. When these
-`visualization` objects don't exist, the dashboard cannot be rendered
-correctly. The `dashboard` object should declare references to all its
-visualizations.
+When retrieving a savedObject document from an index, if the version of
+the document is higher than the latest version known of the Kibana
+instance, the document will go through the `forwardCompatibility` schema
+of the associated model version.
-However, `visualization` objects can continue to be rendered or embedded into
-other dashboards even if the `dashboard` it was originally embedded into
-doesn't exist. As a result, `visualization` objects should not declare
-references to `dashboard` objects.
+*Important:* These conversion mechanism shouldn’t assert the data
+itself, and only strip unknown fields to convert the document to the
+*shape* of the document at the given version.
-For each referenced object, an `id`, `type` and `name` are added to the
-`references` array:
+Basically, this schema should keep all the known fields of a given
+version, and remove all the unknown fields, without throwing.
-[source, typescript]
+Forward compatibility schema can be implemented in two different ways.
+
+[arabic]
+. Using `config-schema`
+
+_Example of schema for a version having two fields: someField and
+anotherField_
+
+[source,ts]
----
-router.get(
- { path: '/some-path', validate: false },
- async (context, req, res) => {
- const object = await context.core.savedObjects.client.create(
- 'dashboard',
- {
- title: 'my dashboard',
- panels: [
- { visualization: 'vis1' }, // <1>
- ],
- indexPattern: 'indexPattern1'
- },
- { references: [
- { id: '...', type: 'visualization', name: 'vis1' },
- { id: '...', type: 'index_pattern', name: 'indexPattern1' },
- ]
- }
- )
- ...
- }
+const versionSchema = schema.object(
+ {
+ someField: schema.maybe(schema.string()),
+ anotherField: schema.maybe(schema.string()),
+ },
+ { unknowns: 'ignore' }
);
----
-<1> Note how `dashboard.panels[0].visualization` stores the `name` property of
-the reference (not the `id` directly) to be able to uniquely identify this
-reference. This guarantees that the id the reference points to always remains
-up to date. If a visualization `id` was directly stored in
-`dashboard.panels[0].visualization` there is a risk that this `id` gets
-updated without updating the reference in the references array.
+
+*Important:* Note the `{ unknowns: 'ignore' }` in the schema’s options.
+This is required when using `config-schema` based schemas, as this what
+will evict the additional fields without throwing an error.
+
+[arabic, start=2]
+. Using a plain javascript function
+
+_Example of schema for a version having two fields: someField and
+anotherField_
+
+[source,ts]
+----
+const versionSchema: SavedObjectModelVersionEvictionFn = (attributes) => {
+ const knownFields = ['someField', 'anotherField'];
+ return pick(attributes, knownFields);
+}
+----
+
+*note:* _Even if highly recommended, implementing this schema is not
+strictly required. Type owners can manage unknown fields and
+inter-version compatibility themselves in their service layer instead._
+
+===== create
+
+This is a direct replacement for
+https://github.com/elastic/kibana/blob/9b330e493216e8dde3166451e4714966f63f5ab7/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts#L75-L82[the
+old SavedObjectType.schemas] definition, now directly included in the
+model version definition.
+
+As a refresher the `create` schema is a `@kbn/config-schema` object-type
+schema, and is used to validate the properties of the document during
+`create` and `bulkCreate` operations.
+
+*note:* _Implementing this schema is optional, but still recommended, as
+otherwise there will be no validating when importing objects_
+
+For implementation examples, refer to <>.
+
+include::saved-objects-service-use-case-examples.asciidoc[leveloffset=+1]
diff --git a/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts b/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts
index 716b31406649c..53b52d04f376b 100644
--- a/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts
+++ b/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts
@@ -70,6 +70,7 @@ export interface SavedObjectsType {
mappings: SavedObjectsTypeMappingDefinition;
/**
* An optional map of {@link SavedObjectMigrationFn | migrations} or a function returning a map of {@link SavedObjectMigrationFn | migrations} to be used to migrate the type.
+ * @deprecated Use {@link SavedObjectsType.modelVersions | modelVersions} instead.
*/
migrations?: SavedObjectMigrationMap | (() => SavedObjectMigrationMap);
/**
@@ -78,6 +79,7 @@ export interface SavedObjectsType {
* When provided, calls to {@link SavedObjectsClient.create | create} will be validated against this schema.
*
* See {@link SavedObjectsValidationMap} for more details.
+ * @deprecated Use {@link SavedObjectsType.modelVersions | modelVersions} instead.
*/
schemas?: SavedObjectsValidationMap | (() => SavedObjectsValidationMap);
/**
@@ -177,7 +179,7 @@ export interface SavedObjectsType {
modelVersions?: SavedObjectsModelVersionMap | SavedObjectsModelVersionMapProvider;
/**
- * Allows to opt-in to the new model version API.
+ * Allows to opt-in to the model version API.
*
* Must be a valid semver version (with the patch version being necessarily 0)
*
-
-
+
+
+ )}
+
);
}
From 1c2321e1018f259a2eeb811a8f5a7141115f339f Mon Sep 17 00:00:00 2001
From: Marco Antonio Ghiani {DataPanelComponent(datasourceProps)}
+
+ {DataPanelComponent(datasourceProps)}
+
)}
);
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
index 7cd48d6beb03d..d99f6418870fa 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
@@ -7,31 +7,18 @@
import React, { useEffect } from 'react';
import { ReactWrapper } from 'enzyme';
-import faker from 'faker';
-
-// Tests are executed in a jsdom environment who does not have sizing methods,
-// thus the AutoSizer will always compute a 0x0 size space
-// Mock the AutoSizer inside EuiSelectable (Chart Switch) and return some dimensions > 0
-jest.mock('react-virtualized-auto-sizer', () => {
- return function (props: {
- children: (dimensions: { width: number; height: number }) => React.ReactNode;
- disableHeight?: boolean;
- }) {
- const { children, disableHeight, ...otherProps } = props;
- return (
- // js-dom may complain that a non-DOM attributes are used when appending props
- // Handle the disableHeight case using native DOM styling
-
- {children({ width: 100, height: 100 })}
-
- );
- };
-});
+import { screen, fireEvent, within, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
-import { EuiPanel, EuiToolTip } from '@elastic/eui';
import { EditorFrame, EditorFrameProps } from './editor_frame';
-import { DatasourcePublicAPI, DatasourceSuggestion, Visualization } from '../../types';
-import { act } from 'react-dom/test-utils';
+import {
+ DatasourceMap,
+ DatasourcePublicAPI,
+ DatasourceSuggestion,
+ Visualization,
+ VisualizationMap,
+} from '../../types';
+import { act } from '@testing-library/react';
import { coreMock } from '@kbn/core/public/mocks';
import {
createMockVisualization,
@@ -42,15 +29,13 @@ import {
renderWithReduxStore,
} from '../../mocks';
import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
-import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
import { DragDrop, useDragDropContext } from '@kbn/dom-drag-drop';
import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
import { mockDataPlugin, mountWithProvider } from '../../mocks';
-import { setState } from '../../state_management';
+import { LensAppState, setState } from '../../state_management';
import { getLensInspectorService } from '../../lens_inspector_service';
-import { toExpression } from '@kbn/interpreter';
import { createIndexPatternServiceMock } from '../../mocks/data_views_service_mock';
import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
@@ -105,6 +90,7 @@ function getDefaultProps() {
indexPatternService: createIndexPatternServiceMock(),
getUserMessages: () => [],
addUserMessages: () => () => {},
+ ExpressionRenderer: createExpressionRendererMock(),
};
return defaultProps;
}
@@ -116,207 +102,172 @@ describe('editor_frame', () => {
let mockVisualization2: jest.Mocked{children({ width: 100, height: 100 })}
;
- };
-});
-import { Visualization, FramePublicAPI, DatasourcePublicAPI } from '../../../types';
-import { ChartSwitch } from './chart_switch';
-import { applyChanges } from '../../../state_management';
+import {
+ Visualization,
+ FramePublicAPI,
+ DatasourcePublicAPI,
+ SuggestionRequest,
+} from '../../../types';
+import { ChartSwitch, ChartSwitchProps } from './chart_switch';
+import { LensAppState, applyChanges } from '../../../state_management';
describe('chart_switch', () => {
function generateVisualization(id: string): jest.Mocked