diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
index d20453be1c2ed..6f6f4533bb7dc 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
@@ -5,27 +5,65 @@
* 2.0.
*/
import React from 'react';
-import { EuiCallOut } from '@elastic/eui';
+import { EuiCallOut, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
-export const ReadOnlyCallout = ({ projectId }: { projectId?: string }) => {
- return (
-
- }
- iconType="document"
- >
-
- {projectId} }}
- />
-
-
- );
+export const ReadOnlyCallout = ({
+ projectId,
+ canUsePublicLocations,
+}: {
+ projectId?: string;
+ canUsePublicLocations?: boolean;
+}) => {
+ if (projectId) {
+ return (
+ <>
+
+ }
+ iconType="document"
+ >
+
+ {projectId} }}
+ />
+
+
+
+
+ );
+ }
+
+ if (!canUsePublicLocations) {
+ return (
+ <>
+
+ }
+ iconType="alert"
+ >
+
+
+
+
+
+
+ );
+ }
+
+ return null;
};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/hooks/use_selected_location.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/hooks/use_selected_location.tsx
index df9785bb9b98c..eabea42a34162 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/hooks/use_selected_location.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/hooks/use_selected_location.tsx
@@ -7,6 +7,7 @@
import { useEffect, useMemo } from 'react';
import { useDispatch, useSelector } from 'react-redux';
+import { ServiceLocation } from '../../../../../../common/runtime_types';
import { useSelectedMonitor } from './use_selected_monitor';
import { selectSelectedLocationId, setMonitorDetailsLocationAction } from '../../../state';
import { useUrlParams, useLocations } from '../../../hooks';
@@ -41,8 +42,12 @@ export const useSelectedLocation = (updateUrl = true) => {
monitor?.locations,
]);
- return useMemo(
- () => locations.find((loc) => loc.id === urlLocationId) ?? null,
- [urlLocationId, locations]
- );
+ return useMemo(() => {
+ let selLoc = locations.find((loc) => loc.id === urlLocationId) ?? null;
+ if (!selLoc) {
+ selLoc =
+ (monitor?.locations?.find((loc) => loc.id === urlLocationId) as ServiceLocation) ?? null;
+ }
+ return selLoc;
+ }, [locations, urlLocationId, monitor?.locations]);
};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/run_test_manually.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/run_test_manually.tsx
index 55fb54dd0d0dc..a05bea3f7925e 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/run_test_manually.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/run_test_manually.tsx
@@ -9,6 +9,9 @@ import { EuiButton, EuiToolTip } from '@elastic/eui';
import React from 'react';
import { i18n } from '@kbn/i18n';
import { useDispatch, useSelector } from 'react-redux';
+import { CANNOT_PERFORM_ACTION_PUBLIC_LOCATIONS } from '../common/components/permissions';
+import { useCanUsePublicLocations } from '../../../../hooks/use_capabilities';
+import { ConfigKey } from '../../../../../common/constants/monitor_management';
import { TEST_NOW_ARIA_LABEL, TEST_SCHEDULED_LABEL } from '../monitor_add_edit/form/run_test_btn';
import { useSelectedMonitor } from './hooks/use_selected_monitor';
import {
@@ -22,7 +25,13 @@ export const RunTestManually = () => {
const { monitor } = useSelectedMonitor();
const testInProgress = useSelector(manualTestRunInProgressSelector(monitor?.config_id));
- const content = testInProgress ? TEST_SCHEDULED_LABEL : TEST_NOW_ARIA_LABEL;
+ const canUsePublicLocations = useCanUsePublicLocations(monitor?.[ConfigKey.LOCATIONS]);
+
+ const content = !canUsePublicLocations
+ ? CANNOT_PERFORM_ACTION_PUBLIC_LOCATIONS
+ : testInProgress
+ ? TEST_SCHEDULED_LABEL
+ : TEST_NOW_ARIA_LABEL;
return (
@@ -31,6 +40,7 @@ export const RunTestManually = () => {
color="success"
iconType="beaker"
isLoading={!Boolean(monitor) || testInProgress}
+ isDisabled={!canUsePublicLocations}
onClick={() => {
if (monitor) {
dispatch(
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/hooks/use_can_use_public_loc_id.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/hooks/use_can_use_public_loc_id.ts
new file mode 100644
index 0000000000000..16842a401dc46
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/hooks/use_can_use_public_loc_id.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { selectOverviewState } from '../../../state';
+
+export const useCanUsePublicLocById = (configId: string) => {
+ const {
+ data: { monitors },
+ } = useSelector(selectOverviewState);
+
+ const hasManagedLocation = monitors?.filter(
+ (mon) => mon.configId === configId && mon.location.isServiceManaged
+ );
+
+ const canUsePublicLocations =
+ useKibana().services?.application?.capabilities.uptime.elasticManagedLocationsEnabled ?? true;
+
+ return hasManagedLocation ? !!canUsePublicLocations : true;
+};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx
index 0c415ce3d4fb8..6d9c97df97d52 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
import React from 'react';
import { useHistory } from 'react-router-dom';
import { FETCH_STATUS } from '@kbn/observability-shared-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
import { useCanEditSynthetics } from '../../../../../../hooks/use_capabilities';
import {
isStatusEnabled,
@@ -55,6 +56,15 @@ export function useMonitorListColumns({
return alertStatus(fields[ConfigKey.CONFIG_ID]) === FETCH_STATUS.LOADING;
};
+ const canUsePublicLocations =
+ useKibana().services?.application?.capabilities.uptime.elasticManagedLocationsEnabled ?? true;
+
+ const isPublicLocationsAllowed = (fields: EncryptedSyntheticsSavedMonitor) => {
+ const publicLocations = fields.locations.some((loc) => loc.isServiceManaged);
+
+ return publicLocations ? Boolean(canUsePublicLocations) : true;
+ };
+
const columns: Array> = [
{
align: 'left' as const,
@@ -166,14 +176,18 @@ export function useMonitorListColumns({
'data-test-subj': 'syntheticsMonitorEditAction',
isPrimary: true,
name: (fields) => (
-
+
{labels.EDIT_LABEL}
),
description: labels.EDIT_LABEL,
icon: 'pencil' as const,
type: 'icon' as const,
- enabled: (fields) => canEditSynthetics && !isActionLoading(fields),
+ enabled: (fields) =>
+ canEditSynthetics && !isActionLoading(fields) && isPublicLocationsAllowed(fields),
onClick: (fields) => {
history.push({
pathname: `/edit-monitor/${fields[ConfigKey.CONFIG_ID]}`,
@@ -184,7 +198,10 @@ export function useMonitorListColumns({
'data-test-subj': 'syntheticsMonitorDeleteAction',
isPrimary: true,
name: (fields) => (
-
+
{labels.DELETE_LABEL}
),
@@ -192,7 +209,8 @@ export function useMonitorListColumns({
icon: 'trash' as const,
type: 'icon' as const,
color: 'danger' as const,
- enabled: (fields) => canEditSynthetics && !isActionLoading(fields),
+ enabled: (fields) =>
+ canEditSynthetics && !isActionLoading(fields) && isPublicLocationsAllowed(fields),
onClick: (fields) => {
setMonitorPendingDeletion(fields);
},
@@ -207,7 +225,8 @@ export function useMonitorListColumns({
isStatusEnabled(fields[ConfigKey.ALERT_CONFIG]) ? 'bellSlash' : 'bell',
type: 'icon' as const,
color: 'danger' as const,
- enabled: (fields) => canEditSynthetics && !isActionLoading(fields),
+ enabled: (fields) =>
+ canEditSynthetics && !isActionLoading(fields) && isPublicLocationsAllowed(fields),
onClick: (fields) => {
updateAlertEnabledState({
monitor: {
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_enabled.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_enabled.tsx
index c875b923a15c7..29555c0cf1e90 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_enabled.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_enabled.tsx
@@ -10,7 +10,10 @@ import { EuiSwitch, EuiSwitchEvent, EuiLoadingSpinner } from '@elastic/eui';
import { euiStyled } from '@kbn/kibana-react-plugin/common';
import { FETCH_STATUS } from '@kbn/observability-shared-plugin/public';
import { ConfigKey, EncryptedSyntheticsMonitor } from '../../../../../../../common/runtime_types';
-import { useCanEditSynthetics } from '../../../../../../hooks/use_capabilities';
+import {
+ useCanEditSynthetics,
+ useCanUsePublicLocations,
+} from '../../../../../../hooks/use_capabilities';
import { useMonitorEnableHandler } from '../../../../hooks';
import { NoPermissionsTooltip } from '../../../common/components/permissions';
import * as labels from './labels';
@@ -32,6 +35,8 @@ export const MonitorEnabled = ({
}: Props) => {
const canEditSynthetics = useCanEditSynthetics();
+ const canUsePublicLocations = useCanUsePublicLocations(monitor?.[ConfigKey.LOCATIONS]);
+
const monitorName = monitor[ConfigKey.NAME];
const statusLabels = useMemo(() => {
return {
@@ -63,11 +68,14 @@ export const MonitorEnabled = ({
{isLoading || initialLoading ? (
) : (
-
+
{
const locationsToDisplay = locations
.map((loc) => {
+ if (loc.label) {
+ return {
+ id: loc.id,
+ label: loc.label,
+ ...getLocationStatusColor(theme, loc.id, monitorId, status),
+ };
+ }
const fullLoc = allLocations.find((l) => l.id === loc.id);
if (fullLoc) {
return {
id: fullLoc.id,
label: fullLoc.label,
- ...getLocationStatusColor(theme, fullLoc.label, monitorId, status),
+ ...getLocationStatusColor(theme, fullLoc.id, monitorId, status),
};
}
})
@@ -41,7 +48,7 @@ export const MonitorLocations = ({ locations, monitorId, status }: Props) => {
function getLocationStatusColor(
euiTheme: ReturnType,
- locationLabel: string | undefined,
+ locationId: string,
monitorId: string,
overviewStatus: OverviewStatusState | null
) {
@@ -49,7 +56,7 @@ function getLocationStatusColor(
eui: { euiColorVis9, euiColorVis0, euiColorDisabled },
} = euiTheme;
- const locById = `${monitorId}-${locationLabel}`;
+ const locById = `${monitorId}-${locationId}`;
if (overviewStatus?.downConfigs[locById]) {
return { status: 'down', color: euiColorVis9 };
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
index ad3c29a0f77bf..55dcdb3d06341 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
@@ -14,10 +14,13 @@ import {
EuiPanel,
EuiLoadingSpinner,
EuiContextMenuPanelItemDescriptor,
+ EuiToolTip,
} from '@elastic/eui';
import { FETCH_STATUS } from '@kbn/observability-shared-plugin/public';
import { useDispatch, useSelector } from 'react-redux';
import styled from 'styled-components';
+import { TEST_SCHEDULED_LABEL } from '../../../monitor_add_edit/form/run_test_btn';
+import { useCanUsePublicLocById } from '../../hooks/use_can_use_public_loc_id';
import { toggleStatusAlert } from '../../../../../../../common/runtime_types/monitor_management/alert_config';
import {
manualTestMonitorAction,
@@ -101,8 +104,7 @@ export function ActionsPopover({
}: Props) {
const euiShadow = useEuiShadow('l');
const dispatch = useDispatch();
- const location = useLocationName({ locationId });
- const locationName = location?.label || monitor.location.id;
+ const locationName = useLocationName(monitor);
const detailUrl = useMonitorDetailLocator({
configId: monitor.configId,
@@ -112,6 +114,8 @@ export function ActionsPopover({
const canEditSynthetics = useCanEditSynthetics();
+ const canUsePublicLocations = useCanUsePublicLocById(monitor.configId);
+
const labels = useMemo(
() => ({
enabledSuccessLabel: enabledSuccessLabel(monitor.name),
@@ -163,7 +167,6 @@ export function ActionsPopover({
};
const alertLoading = alertStatus(monitor.configId) === FETCH_STATUS.LOADING;
-
let popoverItems: EuiContextMenuPanelItemDescriptor[] = [
{
name: actionsMenuGoToMonitorName,
@@ -172,9 +175,17 @@ export function ActionsPopover({
},
quickInspectPopoverItem,
{
- name: runTestManually,
+ name: testInProgress ? (
+
+ {runTestManually}
+
+ ) : (
+
+ {runTestManually}
+
+ ),
icon: 'beaker',
- disabled: testInProgress,
+ disabled: testInProgress || !canUsePublicLocations,
onClick: () => {
dispatch(manualTestMonitorAction.get({ configId: monitor.configId, name: monitor.name }));
dispatch(setFlyoutConfig(null));
@@ -193,12 +204,15 @@ export function ActionsPopover({
},
{
name: (
-
+
{enableLabel}
),
icon: 'invert',
- disabled: !canEditSynthetics,
+ disabled: !canEditSynthetics || !canUsePublicLocations,
onClick: () => {
if (status !== FETCH_STATUS.LOADING) {
updateMonitorEnabledState(!monitor.isEnabled);
@@ -207,11 +221,14 @@ export function ActionsPopover({
},
{
name: (
-
+
{monitor.isStatusAlertEnabled ? disableAlertLabel : enableMonitorAlertLabel}
),
- disabled: !canEditSynthetics,
+ disabled: !canEditSynthetics || !canUsePublicLocations,
icon: alertLoading ? (
) : monitor.isStatusAlertEnabled ? (
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item.tsx
index ce6de294d7e60..8cd43387cf710 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item.tsx
@@ -64,8 +64,7 @@ export const MetricItem = ({
const [isMouseOver, setIsMouseOver] = useState(false);
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
const isErrorPopoverOpen = useSelector(selectErrorPopoverState);
- const locationName =
- useLocationName({ locationId: monitor.location.id })?.label || monitor.location?.id;
+ const locationName = useLocationName(monitor);
const { status, timestamp, ping, configIdByLocation } = useStatusByLocationOverview(
monitor.configId,
monitor.location.id
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_grid_item.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_grid_item.tsx
index 3fb27e202f996..501fcb4a4136f 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_grid_item.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_grid_item.tsx
@@ -27,8 +27,7 @@ export const OverviewGridItem = ({
monitor: MonitorOverviewItem;
onClick: (params: FlyoutParamProps) => void;
}) => {
- const locationName =
- useLocationName({ locationId: monitor.location?.id })?.label || monitor.location?.id;
+ const locationName = useLocationName(monitor);
const { timestamp } = useStatusByLocationOverview(monitor.configId, locationName);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.test.tsx
index d03b70d94768c..f798880608bcc 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.test.tsx
@@ -8,6 +8,7 @@ import React from 'react';
import { renderHook } from '@testing-library/react-hooks';
import { useLocationName } from './use_location_name';
import { WrappedHelper } from '../utils/testing';
+import { MonitorOverviewItem } from '../../../../common/runtime_types';
describe('useLocationName', () => {
beforeEach(() => {
@@ -47,16 +48,11 @@ describe('useLocationName', () => {
const { result } = renderHook(
() =>
useLocationName({
- locationId: 'us_central',
- }),
+ location: { id: 'us_central' },
+ } as MonitorOverviewItem),
{ wrapper: WrapperWithState }
);
- expect(result.current).toEqual({
- id: 'us_central',
- isServiceManaged: true,
- label: 'US Central',
- url: 'mockUrl',
- });
+ expect(result.current).toEqual('US Central');
});
it('returns the location id if matching location cannot be found', () => {
@@ -92,10 +88,10 @@ describe('useLocationName', () => {
const { result } = renderHook(
() =>
useLocationName({
- locationId: 'us_west',
- }),
+ location: { id: 'us_west' },
+ } as MonitorOverviewItem),
{ wrapper: WrapperWithState }
);
- expect(result.current).toEqual(undefined);
+ expect(result.current).toEqual('us_west');
});
});
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.tsx
index 31782083541e2..b25112b15bb10 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/hooks/use_location_name.tsx
@@ -7,9 +7,10 @@
import { useMemo, useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
+import { MonitorOverviewItem } from '../../../../common/runtime_types';
import { selectServiceLocationsState, getServiceLocations } from '../state';
-export function useLocationName({ locationId }: { locationId: string }) {
+export function useLocationName(monitor: MonitorOverviewItem) {
const dispatch = useDispatch();
const { locationsLoaded, locations } = useSelector(selectServiceLocationsState);
useEffect(() => {
@@ -17,12 +18,14 @@ export function useLocationName({ locationId }: { locationId: string }) {
dispatch(getServiceLocations());
}
});
+ const locationId = monitor?.location.id;
return useMemo(() => {
- if (!locationsLoaded) {
- return undefined;
+ if (!locationsLoaded || monitor.location.label) {
+ return monitor.location.label ?? monitor.location.id;
} else {
- return locations.find((location) => location.id === locationId);
+ const location = locations.find((loc) => loc.id === locationId);
+ return location?.label ?? (monitor.location.label || monitor.location.id);
}
- }, [locationsLoaded, locations, locationId]);
+ }, [locationsLoaded, locations, locationId, monitor]);
}
diff --git a/x-pack/plugins/synthetics/public/hooks/use_capabilities.ts b/x-pack/plugins/synthetics/public/hooks/use_capabilities.ts
index 5cde14df84f0e..082f9d9450d7c 100644
--- a/x-pack/plugins/synthetics/public/hooks/use_capabilities.ts
+++ b/x-pack/plugins/synthetics/public/hooks/use_capabilities.ts
@@ -6,7 +6,20 @@
*/
import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MonitorLocations } from '../../common/runtime_types';
export const useCanEditSynthetics = () => {
return !!useKibana().services?.application?.capabilities.uptime.save;
};
+
+export const useCanUsePublicLocations = (monLocations?: MonitorLocations) => {
+ const canUsePublicLocations =
+ useKibana().services?.application?.capabilities.uptime.elasticManagedLocationsEnabled ?? true;
+ const publicLocations = monLocations?.some((loc) => loc.isServiceManaged);
+
+ if (!publicLocations) {
+ return true;
+ }
+
+ return !!canUsePublicLocations;
+};
diff --git a/x-pack/plugins/synthetics/server/feature.ts b/x-pack/plugins/synthetics/server/feature.ts
index 36a5888928680..1a19baa01dcbe 100644
--- a/x-pack/plugins/synthetics/server/feature.ts
+++ b/x-pack/plugins/synthetics/server/feature.ts
@@ -7,6 +7,11 @@
import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
+import { i18n } from '@kbn/i18n';
+import {
+ SubFeaturePrivilegeGroupConfig,
+ SubFeaturePrivilegeGroupType,
+} from '@kbn/features-plugin/common';
import { syntheticsMonitorType, syntheticsParamType } from '../common/types/saved_objects';
import { SYNTHETICS_RULE_TYPES } from '../common/constants/synthetics_alerts';
import { privateLocationsSavedObjectName } from '../common/saved_objects/private_locations';
@@ -27,6 +32,24 @@ const ruleTypes = [
OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
];
+const elasticManagedLocationsEnabledPrivilege: SubFeaturePrivilegeGroupConfig = {
+ groupType: 'independent' as SubFeaturePrivilegeGroupType,
+ privileges: [
+ {
+ id: 'elastic_managed_locations_enabled',
+ name: i18n.translate('xpack.synthetics.features.elasticManagedLocations', {
+ defaultMessage: 'Elastic managed locations enabled',
+ }),
+ includeIn: 'all',
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: ['elasticManagedLocationsEnabled'],
+ },
+ ],
+};
+
export const uptimeFeature = {
id: PLUGIN.ID,
name: PLUGIN.NAME,
@@ -94,4 +117,12 @@ export const uptimeFeature = {
ui: ['show', 'alerting:save'],
},
},
+ subFeatures: [
+ {
+ name: i18n.translate('xpack.synthetics.features.app', {
+ defaultMessage: 'Synthetics',
+ }),
+ privilegeGroups: [elasticManagedLocationsEnabledPrivilege],
+ },
+ ],
};
diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/delete_monitor.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/delete_monitor.ts
index 4841ca581c077..0d5825dbbdd3f 100644
--- a/x-pack/plugins/synthetics/server/routes/monitor_cruds/delete_monitor.ts
+++ b/x-pack/plugins/synthetics/server/routes/monitor_cruds/delete_monitor.ts
@@ -6,6 +6,7 @@
*/
import { schema } from '@kbn/config-schema';
import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { validatePermissions } from './edit_monitor';
import { SyntheticsServerSetup } from '../../types';
import { RouteContext, SyntheticsRestApiRouteFactory } from '../types';
import { syntheticsMonitorType } from '../../../common/types/saved_objects';
@@ -39,10 +40,13 @@ export const deleteSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () =>
const { monitorId } = request.params;
try {
- const errors = await deleteMonitor({
+ const { errors, res } = await deleteMonitor({
routeContext,
monitorId,
});
+ if (res) {
+ return res;
+ }
if (errors && errors.length > 0) {
return response.ok({
@@ -68,7 +72,7 @@ export const deleteMonitor = async ({
routeContext: RouteContext;
monitorId: string;
}) => {
- const { spaceId, savedObjectsClient, server, syntheticsMonitorClient } = routeContext;
+ const { response, spaceId, savedObjectsClient, server, syntheticsMonitorClient } = routeContext;
const { logger, telemetry, stackVersion } = server;
const { monitor, monitorWithSecret } = await getMonitorToDelete(
@@ -78,6 +82,17 @@ export const deleteMonitor = async ({
spaceId
);
+ const err = await validatePermissions(routeContext, monitor.attributes.locations);
+ if (err) {
+ return {
+ res: response.forbidden({
+ body: {
+ message: err,
+ },
+ }),
+ };
+ }
+
let deletePromise;
try {
@@ -113,7 +128,7 @@ export const deleteMonitor = async ({
)
);
- return errors;
+ return { errors };
} catch (e) {
if (deletePromise) {
await deletePromise;
diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts
index d99261b49f2cf..69960d458c684 100644
--- a/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts
+++ b/x-pack/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts
@@ -8,6 +8,7 @@ import { schema } from '@kbn/config-schema';
import { SavedObjectsUpdateResponse, SavedObject } from '@kbn/core/server';
import { SavedObjectsErrorHelpers } from '@kbn/core/server';
import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
+import { getDecryptedMonitor } from '../../saved_objects/synthetics_monitor';
import { getPrivateLocations } from '../../synthetics_service/get_private_locations';
import { mergeSourceMonitor } from './helper';
import { RouteContext, SyntheticsRestApiRouteFactory } from '../types';
@@ -18,6 +19,7 @@ import {
SyntheticsMonitorWithSecretsAttributes,
SyntheticsMonitor,
ConfigKey,
+ MonitorLocations,
} from '../../../common/runtime_types';
import { SYNTHETICS_API_URLS } from '../../../common/constants';
import { validateMonitor } from './monitor_validation';
@@ -39,10 +41,10 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
}),
body: schema.any(),
},
+ writeAccess: true,
handler: async (routeContext): Promise => {
const { request, response, savedObjectsClient, server } = routeContext;
- const { encryptedSavedObjects, logger } = server;
- const encryptedSavedObjectsClient = encryptedSavedObjects.getClient();
+ const { logger } = server;
const monitor = request.body as SyntheticsMonitor;
const { monitorId } = request.params;
@@ -55,14 +57,11 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
/* Decrypting the previous monitor before editing ensures that all existing fields remain
* on the object, even in flows where decryption does not take place, such as the enabled tab
* on the monitor list table. We do not decrypt monitors in bulk for the monitor list table */
- const decryptedPreviousMonitor =
- await encryptedSavedObjectsClient.getDecryptedAsInternalUser(
- syntheticsMonitorType,
- monitorId,
- {
- namespace: previousMonitor.namespaces?.[0],
- }
- );
+ const decryptedPreviousMonitor = await getDecryptedMonitor(
+ server,
+ monitorId,
+ previousMonitor.namespaces?.[0]!
+ );
const normalizedPreviousMonitor = normalizeSecrets(decryptedPreviousMonitor).attributes;
const editedMonitor = mergeSourceMonitor(normalizedPreviousMonitor, monitor);
@@ -74,6 +73,15 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
return response.badRequest({ body: { message, attributes: { details, ...payload } } });
}
+ const err = await validatePermissions(routeContext, editedMonitor.locations);
+ if (err) {
+ return response.forbidden({
+ body: {
+ message: err,
+ },
+ });
+ }
+
const monitorWithRevision = {
...validationResult.decodedMonitor,
/* reset config hash to empty string. Ensures that the synthetics agent is able
@@ -230,3 +238,22 @@ export const syncEditedMonitor = async ({
throw e;
}
};
+
+export const validatePermissions = async (
+ { server, response, request }: RouteContext,
+ monitorLocations: MonitorLocations
+) => {
+ const hasPublicLocations = monitorLocations?.some((loc) => loc.isServiceManaged);
+ if (!hasPublicLocations) {
+ return;
+ }
+
+ const elasticManagedLocationsEnabled =
+ Boolean(
+ (await server.coreStart?.capabilities.resolveCapabilities(request)).uptime
+ .elasticManagedLocationsEnabled
+ ) ?? true;
+ if (!elasticManagedLocationsEnabled) {
+ return "You don't have permission to use public locations";
+ }
+};
diff --git a/x-pack/plugins/synthetics/server/routes/synthetics_service/get_service_locations.ts b/x-pack/plugins/synthetics/server/routes/synthetics_service/get_service_locations.ts
index 01f4946b3508f..8c4df4a2461f8 100644
--- a/x-pack/plugins/synthetics/server/routes/synthetics_service/get_service_locations.ts
+++ b/x-pack/plugins/synthetics/server/routes/synthetics_service/get_service_locations.ts
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { toClientContract } from '../settings/private_locations/helpers';
+import { getPrivateLocationsAndAgentPolicies } from '../settings/private_locations/get_private_locations';
import { SyntheticsRestApiRouteFactory } from '../types';
import { getAllLocations } from '../../synthetics_service/get_all_locations';
import { SYNTHETICS_API_URLS } from '../../../common/constants';
@@ -13,16 +15,37 @@ export const getServiceLocationsRoute: SyntheticsRestApiRouteFactory = () => ({
method: 'GET',
path: SYNTHETICS_API_URLS.SERVICE_LOCATIONS,
validate: {},
- handler: async ({ server, savedObjectsClient, syntheticsMonitorClient }): Promise => {
- const { throttling, allLocations } = await getAllLocations({
- server,
- syntheticsMonitorClient,
- savedObjectsClient,
- });
+ handler: async ({
+ request,
+ server,
+ savedObjectsClient,
+ syntheticsMonitorClient,
+ }): Promise => {
+ const elasticManagedLocationsEnabled =
+ Boolean(
+ (await server.coreStart?.capabilities.resolveCapabilities(request)).uptime
+ .elasticManagedLocationsEnabled
+ ) ?? true;
- return {
- locations: allLocations,
- throttling,
- };
+ if (elasticManagedLocationsEnabled) {
+ const { throttling, allLocations } = await getAllLocations({
+ server,
+ syntheticsMonitorClient,
+ savedObjectsClient,
+ });
+
+ return {
+ locations: allLocations,
+ throttling,
+ };
+ } else {
+ const { locations: privateLocations, agentPolicies } =
+ await getPrivateLocationsAndAgentPolicies(savedObjectsClient, syntheticsMonitorClient);
+
+ const result = toClientContract({ locations: privateLocations }, agentPolicies).locations;
+ return {
+ locations: result,
+ };
+ }
},
});
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/get_all_locations.ts b/x-pack/plugins/synthetics/server/synthetics_service/get_all_locations.ts
index 491bde96d4067..6eb6a62547156 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/get_all_locations.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/get_all_locations.ts
@@ -47,6 +47,11 @@ const getServicePublicLocations = async (
server: SyntheticsServerSetup,
syntheticsMonitorClient: SyntheticsMonitorClient
) => {
+ if (!syntheticsMonitorClient.syntheticsService.isAllowed) {
+ return {
+ locations: [],
+ };
+ }
if (syntheticsMonitorClient.syntheticsService.locations.length === 0) {
return await getServiceLocations(server);
}
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
index eae3fb0082030..561a0e5a90e4c 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
@@ -608,7 +608,7 @@ export class SyntheticsService {
await encryptedClient.createPointInTimeFinderDecryptedAsInternalUser({
type: syntheticsParamType,
perPage: 1000,
- namespaces: spaceId ? [spaceId] : undefined,
+ namespaces: spaceId ? [spaceId] : [ALL_SPACES_ID],
});
for await (const response of finder.find()) {
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 7d74a3369d08a..fb4219e6052f4 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -1317,7 +1317,6 @@
"data.search.aggs.rareTerms.aggTypesLabel": "Termes rares de {fieldName}",
"data.search.es_search.queryTimeValue": "{queryTime} ms",
"data.search.functions.geoBoundingBox.arguments.error": "Au moins un des groupes de paramètres suivants doit être fourni : {parameters}.",
- "data.search.searchSource.fetch.shardsFailedNotificationMessage": "Échec de {shardsFailed} des {shardsTotal} partitions",
"data.search.searchSource.indexPatternIdDescription": "ID dans l'index {kibanaIndexPattern}.",
"data.search.searchSource.queryTimeValue": "{queryTime} ms",
"data.search.searchSource.requestTimeValue": "{requestTime} ms",
@@ -2064,15 +2063,7 @@
"data.search.searchSource.dataViewDescription": "La vue de données qui a été interrogée.",
"data.search.searchSource.dataViewIdLabel": "ID de vue de données",
"data.search.searchSource.dataViewLabel": "Vue de données",
- "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "Les données peuvent être incomplètes parce que votre requête est arrivée à échéance.",
- "data.search.searchSource.fetch.shardsFailedModal.close": "Fermer",
- "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "Copier la réponse dans le presse-papiers",
- "data.search.searchSource.fetch.shardsFailedModal.showDetails": "Afficher les détails",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest": "Requête",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse": "Réponse",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures": "Échecs de partition",
"data.search.searchSource.fetch.shardsFailedModal.tableColReason": "Raison",
- "data.search.searchSource.fetch.shardsFailedNotificationDescription": "Les données peuvent être incomplètes ou erronées.",
"data.search.searchSource.hitsDescription": "Le nombre de documents renvoyés par la requête.",
"data.search.searchSource.hitsLabel": "Résultats",
"data.search.searchSource.hitsTotalDescription": "Le nombre de documents correspondant à la requête.",
@@ -27137,18 +27128,6 @@
"xpack.observability.slo.update.errorNotification": "Un problème est survenu lors de la mise à jour de {name}",
"xpack.observability.slo.update.successNotification": "Mise à jour réussie de {name}",
"xpack.observability.syntheticsThrottlingEnabledExperimentDescription": "Activez les paramètres de régulation dans les configurations du moniteur Synthetics. Notez qu’il est possible que la régulation ne soit pas toujours disponible pour vos moniteurs, même si le paramètre est actif. Destiné à un usage interne uniquement. {link}",
- "xpack.observability.threshold.rule.alertDetailsAppSection.criterion.subtitle": "Dernière {lookback} {timeLabel}",
- "xpack.observability.threshold.rule.alertFlyout.alertPerRedundantFilterError": "Il est possible que cette règle signale {matchedGroups} moins que prévu, car la requête de filtre comporte une correspondance pour {groupCount, plural, one {ce champ} many {ces champs} other {ces champs}}. Pour en savoir plus, consultez notre {filteringAndGroupingLink}.",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.aggregationLabel": "Agrégation {name}",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.filterLabel": "Filtre KQL {name}",
- "xpack.observability.threshold.rule.alerts.dataTimeRangeLabel": "Dernière {lookback} {timeLabel}",
- "xpack.observability.threshold.rule.alerts.dataTimeRangeLabelWithGrouping": "Dernières {lookback} {timeLabel} de données pour {id}",
- "xpack.observability.threshold.rule.threshold.errorAlertReason": "Elasticsearch a échoué lors de l'interrogation des données pour {metric}",
- "xpack.observability.threshold.rule.threshold.firedAlertReason": "{metric} est {currentValue} dans les dernières {duration}{group}. Alerte lorsque {comparator} {threshold}.",
- "xpack.observability.threshold.rule.threshold.noDataAlertReason": "{metric} n'a signalé aucune donnée dans les dernières {interval} {group}",
- "xpack.observability.threshold.rule.threshold.recoveredAlertReason": "{metric} est maintenant {comparator} un seuil de {threshold} (la valeur actuelle est {currentValue}) pour {group}",
- "xpack.observability.threshold.rule.threshold.thresholdRange": "{a} et {b}",
- "xpack.observability.threshold.rule.thresholdExtraTitle": "Alerte lorsque {comparator} {threshold}.",
"xpack.observability.transactionRateLabel": "{value} tpm",
"xpack.observability.ux.coreVitals.averageMessage": " et inférieur à {bad}",
"xpack.observability.ux.coreVitals.paletteLegend.rankPercentage": "{labelsInd} ({ranksInd} %)",
@@ -27595,81 +27574,6 @@
"xpack.observability.statusVisualization.ux.link": "Ajouter des données",
"xpack.observability.statusVisualization.ux.title": "Expérience utilisateur",
"xpack.observability.syntheticsThrottlingEnabledExperimentName": "Activer la régulation Synthetics (Expérimentale)",
- "xpack.observability.threshold.rule..charts.errorMessage": "Oups, un problème est survenu",
- "xpack.observability.threshold.rule..charts.noDataMessage": "Aucune donnée graphique disponible",
- "xpack.observability.threshold.rule..timeLabels.days": "jours",
- "xpack.observability.threshold.rule..timeLabels.hours": "heures",
- "xpack.observability.threshold.rule..timeLabels.minutes": "minutes",
- "xpack.observability.threshold.rule..timeLabels.seconds": "secondes",
- "xpack.observability.threshold.rule.alertDetailsAppSection.summaryField.rule": "Règle",
- "xpack.observability.threshold.rule.alertDetailsAppSection.thresholdTitle": "Seuil dépassé",
- "xpack.observability.threshold.rule.alertDetailUrlActionVariableDescription": "Lien vers l’affichage de résolution des problèmes d’alerte pour voir plus de contextes et de détails. La chaîne sera vide si server.publicBaseUrl n'est pas configuré.",
- "xpack.observability.threshold.rule.alertDropdownTitle": "Alertes et règles",
- "xpack.observability.threshold.rule.alertFlyout.addCondition": "Ajouter une condition",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.avg": "Moyenne",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.cardinality": "Cardinalité",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.count": "Compte du document",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.max": "Max",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.min": "Min",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.p95": "95e centile",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.p99": "99e centile",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.rate": "Taux",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.sum": "Somme",
- "xpack.observability.threshold.rule.alertFlyout.alertDescription": "Alerter quand un type de données Observability atteint ou dépasse une valeur donnée.",
- "xpack.observability.threshold.rule.alertFlyout.alertOnGroupDisappear": "Me prévenir si un groupe cesse de signaler les données",
- "xpack.observability.threshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink": "les documents",
- "xpack.observability.threshold.rule.alertFlyout.createAlertPerHelpText": "Créer une alerte pour chaque valeur unique. Par exemple : \"host.id\" ou \"cloud.region\".",
- "xpack.observability.threshold.rule.alertFlyout.createAlertPerText": "Regrouper les alertes par (facultatif)",
- "xpack.observability.threshold.rule.alertFlyout.customEquation": "Équation personnalisée",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.addCustomRow": "Ajouter une agrégation/un champ",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.deleteRowButton": "Supprimer",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.equationHelpMessage": "Prend en charge les expressions mathématiques de base",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.labelHelpMessage": "L'étiquette personnalisée s'affichera sur le graphique d'alerte et dans le titre de raison/d'alerte",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.labelLabel": "Étiquette (facultatif)",
- "xpack.observability.threshold.rule.alertFlyout.docCountNoDataDisabledHelpText": "[Ce paramètre n’est pas applicable à l’agrégateur du nombre de documents.]",
- "xpack.observability.threshold.rule.alertFlyout.error.aggregationRequired": "L'agrégation est requise.",
- "xpack.observability.threshold.rule.alertFlyout.error.equation.invalidCharacters": "Le champ d'équation prend en charge uniquement les caractères suivants : A-Z, +, -, /, *, (, ), ?, !, &, :, |, >, <, =",
- "xpack.observability.threshold.rule.alertFlyout.error.invalidFilterQuery": "La requête de filtre n'est pas valide.",
- "xpack.observability.threshold.rule.alertFlyout.error.metricRequired": "L'indicateur est requis.",
- "xpack.observability.threshold.rule.alertFlyout.error.thresholdRequired": "Le seuil est requis.",
- "xpack.observability.threshold.rule.alertFlyout.error.thresholdTypeRequired": "Les seuils doivent contenir un nombre valide.",
- "xpack.observability.threshold.rule.alertFlyout.error.timeRequred": "La taille de temps est requise.",
- "xpack.observability.threshold.rule.alertFlyout.groupDisappearHelpText": "Activez cette option pour déclencher l’action si un groupe précédemment détecté cesse de signaler des résultats. Ce n’est pas recommandé pour les infrastructures à montée en charge dynamique qui peuvent rapidement lancer ou stopper des nœuds automatiquement.",
- "xpack.observability.threshold.rule.alertFlyout.outsideRangeLabel": "N'est pas entre",
- "xpack.observability.threshold.rule.alertFlyout.removeCondition": "Retirer la condition",
- "xpack.observability.threshold.rule.alerting.noDataFormattedValue": "[AUCUNE DONNÉE]",
- "xpack.observability.threshold.rule.alerting.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\} est à l'état \\{\\{context.alertState\\}\\}\n\n Raison :\n \\{\\{context.reason\\}\\}\n ",
- "xpack.observability.threshold.rule.alerting.threshold.fired": "Alerte",
- "xpack.observability.threshold.rule.alerting.threshold.nodata": "Aucune donnée",
- "xpack.observability.threshold.rule.alerting.threshold.noDataFormattedValue": "[AUCUNE DONNÉE]",
- "xpack.observability.threshold.rule.alertsButton": "Alertes et règles",
- "xpack.observability.threshold.rule.cloudActionVariableDescription": "Objet cloud défini par ECS s'il est disponible dans la source.",
- "xpack.observability.threshold.rule.containerActionVariableDescription": "Objet conteneur défini par ECS s'il est disponible dans la source.",
- "xpack.observability.threshold.rule.createInventoryRuleButton": "Créer une règle d'inventaire",
- "xpack.observability.threshold.rule.createThresholdRuleButton": "Créer une règle de seuil",
- "xpack.observability.threshold.rule.groupByKeysActionVariableDescription": "Objet contenant les groupes qui fournissent les données",
- "xpack.observability.threshold.rule.hostActionVariableDescription": "Objet hôte défini par ECS s'il est disponible dans la source.",
- "xpack.observability.threshold.rule.infrastructureDropdownMenu": "Infrastructure",
- "xpack.observability.threshold.rule.infrastructureDropdownTitle": "Règles d'infrastructure",
- "xpack.observability.threshold.rule.labelsActionVariableDescription": "Liste d'étiquettes associées avec l'entité sur laquelle l'alerte s'est déclenchée.",
- "xpack.observability.threshold.rule.manageRules": "Gérer les règles",
- "xpack.observability.threshold.rule.metricsDropdownMenu": "Indicateurs",
- "xpack.observability.threshold.rule.metricsDropdownTitle": "Règles d'indicateurs",
- "xpack.observability.threshold.rule.orchestratorActionVariableDescription": "Objet orchestrateur défini par ECS s'il est disponible dans la source.",
- "xpack.observability.threshold.rule.reasonActionVariableDescription": "Une description concise de la raison du signalement",
- "xpack.observability.threshold.rule.sourceConfiguration.missingHttp": "Échec de chargement de la source : Aucun client HTTP disponible.",
- "xpack.observability.threshold.rule.sourceConfiguration.updateFailureBody": "Nous n'avons pas pu appliquer les modifications à la configuration des indicateurs. Réessayez plus tard.",
- "xpack.observability.threshold.rule.sourceConfiguration.updateFailureTitle": "La mise à jour de la configuration a échoué",
- "xpack.observability.threshold.rule.sourceConfiguration.updateSuccessTitle": "Les paramètres d'indicateurs ont bien été mis à jour",
- "xpack.observability.threshold.rule.tagsActionVariableDescription": "Liste de balises associées avec l'entité sur laquelle l'alerte s'est déclenchée.",
- "xpack.observability.threshold.rule.threshold.aboveRecovery": "supérieur à",
- "xpack.observability.threshold.rule.threshold.belowRecovery": "inférieur à",
- "xpack.observability.threshold.rule.threshold.betweenRecovery": "entre",
- "xpack.observability.threshold.rule.threshold.customEquation": "Équation personnalisée",
- "xpack.observability.threshold.rule.threshold.documentCount": "Nombre de documents",
- "xpack.observability.threshold.rule.timestampDescription": "Horodatage du moment où l'alerte a été détectée.",
- "xpack.observability.threshold.rule.valueActionVariableDescription": "Valeur de l'indicateur dans la condition spécifiée. Utilisation : (ctx.value.condition0, ctx.value.condition1, etc...).",
- "xpack.observability.threshold.rule.viewInAppUrlActionVariableDescription": "Lien vers la source de l’alerte",
"xpack.observability.threshold.ruleExplorer.groupByAriaLabel": "Graphique par",
"xpack.observability.threshold.ruleExplorer.groupByLabel": "Tout",
"xpack.observability.threshold.ruleName": "Seuil (Version d'évaluation technique)",
@@ -29876,8 +29780,6 @@
"xpack.securitySolution.exceptions.viewer.lastUpdated": "Mis à jour {updated}",
"xpack.securitySolution.exceptions.viewer.paginationDetails": "Affichage de {partOne} sur {partTwo}",
"xpack.securitySolution.fieldBrowser.descriptionForScreenReaderOnly": "Description pour le champ {field} :",
- "xpack.securitySolution.flyout.errorMessage": "Une erreur est survenue lors de l'affichage de {message}",
- "xpack.securitySolution.flyout.errorTitle": "Impossible d'afficher {title}",
"xpack.securitySolution.footer.autoRefreshActiveTooltip": "Lorsque le rafraîchissement automatique est activé, la chronologie vous montre les {numberOfItems} derniers événements qui correspondent à votre requête.",
"xpack.securitySolution.formattedNumber.countsLabel": "{mantissa}{scale}{hasRemainder}",
"xpack.securitySolution.header.editableTitle.editButtonAria": "Vous pouvez modifier {title} en cliquant",
@@ -33094,70 +32996,9 @@
"xpack.securitySolution.fleetIntegration.assets.name": "Hôtes",
"xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.description": "Filtre d'événement pour Cloud Security. Créé par l'intégration Elastic Defend.",
"xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.name": "Sessions non interactives",
- "xpack.securitySolution.flyout.analyzerErrorMessage": "analyseur",
"xpack.securitySolution.flyout.button.timeline": "chronologie",
- "xpack.securitySolution.flyout.correlations.caseNameColumnTitle": "Nom",
- "xpack.securitySolution.flyout.correlations.reasonColumnTitle": "Raison",
- "xpack.securitySolution.flyout.correlations.ruleColumnTitle": "Règle",
- "xpack.securitySolution.flyout.correlations.severityColumnTitle": "Sévérité",
- "xpack.securitySolution.flyout.correlations.statusColumnTitle": "Statut",
- "xpack.securitySolution.flyout.correlations.timestampColumnTitle": "Horodatage",
- "xpack.securitySolution.flyout.documentDetails.alertReasonTitle": "Raison d'alerte",
- "xpack.securitySolution.flyout.documentDetails.analyzerGraphButton": "Graph Analyseur",
- "xpack.securitySolution.flyout.documentDetails.analyzerPreviewTitle": "Aperçu de l'analyseur",
- "xpack.securitySolution.flyout.documentDetails.collapseDetailButton": "Réduire les détails de l'alerte",
- "xpack.securitySolution.flyout.documentDetails.correlationsButton": "Corrélations",
- "xpack.securitySolution.flyout.documentDetails.correlationsTitle": "Corrélations",
- "xpack.securitySolution.flyout.documentDetails.documentDescriptionTitle": "Description du document",
- "xpack.securitySolution.flyout.documentDetails.documentReasonTitle": "Motif du document",
- "xpack.securitySolution.flyout.documentDetails.entitiesButton": "Entités",
- "xpack.securitySolution.flyout.documentDetails.entitiesTitle": "Entités",
- "xpack.securitySolution.flyout.documentDetails.expandDetailButton": "Développer les détails de l'alerte",
- "xpack.securitySolution.flyout.documentDetails.highlightedFieldsTitle": "Champs en surbrillance",
- "xpack.securitySolution.flyout.documentDetails.insightsOptions": "Options des informations exploitables",
- "xpack.securitySolution.flyout.documentDetails.insightsTab": "Informations exploitables",
- "xpack.securitySolution.flyout.documentDetails.insightsTitle": "Informations exploitables",
- "xpack.securitySolution.flyout.documentDetails.investigationSectionTitle": "Investigation",
- "xpack.securitySolution.flyout.documentDetails.investigationsTab": "Investigation",
- "xpack.securitySolution.flyout.documentDetails.jsonTab": "JSON",
- "xpack.securitySolution.flyout.documentDetails.overviewTab": "Aperçu",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.prevalenceRowText": "est inhabituel",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatEnrichment": "champ enrichi avec la Threat Intelligence",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatEnrichments": "champs enrichis avec la Threat Intelligence",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatMatch": "correspondance de menace détectée",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatMatches": "correspondances de menaces détectées",
- "xpack.securitySolution.flyout.documentDetails.prevalenceButton": "Prévalence",
- "xpack.securitySolution.flyout.documentDetails.prevalenceTitle": "Prévalence",
- "xpack.securitySolution.flyout.documentDetails.riskScoreTitle": "Score de risque",
- "xpack.securitySolution.flyout.documentDetails.ruleDescriptionTitle": "Description de la règle",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.commandText": "par",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.processText": "démarré",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.ruleText": "avec la règle",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.timeText": "à",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.title": "Aperçu du visualiseur de session",
- "xpack.securitySolution.flyout.documentDetails.sessionViewButton": "Vue de session",
- "xpack.securitySolution.flyout.documentDetails.severityTitle": "Sévérité",
- "xpack.securitySolution.flyout.documentDetails.share": "Partager l'alerte",
- "xpack.securitySolution.flyout.documentDetails.tableTab": "Tableau",
- "xpack.securitySolution.flyout.documentDetails.threatIntelligenceButton": "Threat Intelligence",
- "xpack.securitySolution.flyout.documentDetails.threatIntelligenceTitle": "Threat Intelligence",
- "xpack.securitySolution.flyout.documentDetails.visualizationsTitle": "Visualisations",
- "xpack.securitySolution.flyout.documentDetails.visualizeOptions": "Options Visualize",
- "xpack.securitySolution.flyout.documentDetails.visualizeTab": "Visualiser",
- "xpack.securitySolution.flyout.documentErrorMessage": "les valeurs et champs du document",
- "xpack.securitySolution.flyout.documentErrorTitle": "informations du document",
"xpack.securitySolution.flyout.entities.failRelatedHostsDescription": "Impossible de lancer la recherche sur les hôtes associés",
"xpack.securitySolution.flyout.entities.failRelatedUsersDescription": "Impossible de lancer la recherche sur les utilisateurs associés",
- "xpack.securitySolution.flyout.entities.hostsInfoTitle": "Informations sur l’hôte",
- "xpack.securitySolution.flyout.entities.relatedEntitiesIpColumn": "Adresses IP",
- "xpack.securitySolution.flyout.entities.relatedEntitiesNameColumn": "Nom",
- "xpack.securitySolution.flyout.entities.relatedHostsTitle": "Hôtes associés",
- "xpack.securitySolution.flyout.entities.relatedUsersTitle": "Utilisateurs associés",
- "xpack.securitySolution.flyout.entities.usersInfoTitle": "Informations sur l’utilisateur",
- "xpack.securitySolution.flyout.prevalenceTableAlertCountColumnTitle": "Nombre d'alertes",
- "xpack.securitySolution.flyout.prevalenceTableDocCountColumnTitle": "Compte du document",
- "xpack.securitySolution.flyout.response.title": "Réponses",
- "xpack.securitySolution.flyout.sessionViewErrorMessage": "vue de session",
"xpack.securitySolution.footer.autoRefreshActiveDescription": "Actualisation automatique active",
"xpack.securitySolution.footer.cancel": "Annuler",
"xpack.securitySolution.footer.data": "données",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index d518dba93269b..9c1bd25593a47 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1331,7 +1331,6 @@
"data.search.aggs.rareTerms.aggTypesLabel": "{fieldName}の希少な用語",
"data.search.es_search.queryTimeValue": "{queryTime}ms",
"data.search.functions.geoBoundingBox.arguments.error": "次のパラメーターのグループの1つ以上を指定する必要があります：{parameters}。",
- "data.search.searchSource.fetch.shardsFailedNotificationMessage": "{shardsTotal}件中{shardsFailed}件のシャードでエラーが発生しました",
"data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern}インデックス内のIDです。",
"data.search.searchSource.queryTimeValue": "{queryTime}ms",
"data.search.searchSource.requestTimeValue": "{requestTime}ms",
@@ -2078,15 +2077,7 @@
"data.search.searchSource.dataViewDescription": "照会されたデータビュー。",
"data.search.searchSource.dataViewIdLabel": "データビューID",
"data.search.searchSource.dataViewLabel": "データビュー",
- "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "リクエストがタイムアウトしたため、データが不完全な可能性があります",
- "data.search.searchSource.fetch.shardsFailedModal.close": "閉じる",
- "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "応答をクリップボードにコピー",
- "data.search.searchSource.fetch.shardsFailedModal.showDetails": "詳細を表示",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest": "リクエスト",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse": "応答",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures": "シャードエラー",
"data.search.searchSource.fetch.shardsFailedModal.tableColReason": "理由",
- "data.search.searchSource.fetch.shardsFailedNotificationDescription": "データが不完全か誤りの可能性があります。",
"data.search.searchSource.hitsDescription": "クエリにより返されたドキュメントの数です。",
"data.search.searchSource.hitsLabel": "ヒット数",
"data.search.searchSource.hitsTotalDescription": "クエリに一致するドキュメントの数です。",
@@ -27137,18 +27128,6 @@
"xpack.observability.slo.update.errorNotification": "{name}の更新中にエラーが発生しました",
"xpack.observability.slo.update.successNotification": "正常に{name}を更新しました",
"xpack.observability.syntheticsThrottlingEnabledExperimentDescription": "シンセティック監視構成で調整設定を有効にします。設定が有効でも、モニターで調整を使用できない場合があります。内部使用専用です。{link}",
- "xpack.observability.threshold.rule.alertDetailsAppSection.criterion.subtitle": "最後の{lookback} {timeLabel}",
- "xpack.observability.threshold.rule.alertFlyout.alertPerRedundantFilterError": "フィルタークエリには{groupCount, plural, other {これらのフィールド}}に対する一致が含まれているため、このルールによって、想定を下回る{matchedGroups}に関するアラートが発行される場合があります。詳細については、{filteringAndGroupingLink}を参照してください。",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.aggregationLabel": "アグリゲーション{name}",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.filterLabel": "KQLフィルター{name}",
- "xpack.observability.threshold.rule.alerts.dataTimeRangeLabel": "最後の{lookback} {timeLabel}",
- "xpack.observability.threshold.rule.alerts.dataTimeRangeLabelWithGrouping": "{id}のデータの最後の{lookback} {timeLabel}",
- "xpack.observability.threshold.rule.threshold.errorAlertReason": "{metric}のデータのクエリを試行しているときに、Elasticsearchが失敗しました",
- "xpack.observability.threshold.rule.threshold.firedAlertReason": "{metric}は最後の{duration}{group}の{currentValue}です。{comparator} {threshold}のときにアラートを通知します。",
- "xpack.observability.threshold.rule.threshold.noDataAlertReason": "{metric}は最後の{interval}{group}でデータがないことを報告しました",
- "xpack.observability.threshold.rule.threshold.recoveredAlertReason": "{metric} が {comparator} に、{group} が {threshold} のしきい値（現在の値は {currentValue}）になりました",
- "xpack.observability.threshold.rule.threshold.thresholdRange": "{a}および{b}",
- "xpack.observability.threshold.rule.thresholdExtraTitle": "{comparator} {threshold}のときにアラートを通知",
"xpack.observability.transactionRateLabel": "{value} tpm",
"xpack.observability.ux.coreVitals.averageMessage": " {bad}未満",
"xpack.observability.ux.coreVitals.paletteLegend.rankPercentage": "{labelsInd}（{ranksInd}%）",
@@ -27595,81 +27574,6 @@
"xpack.observability.statusVisualization.ux.link": "データの追加",
"xpack.observability.statusVisualization.ux.title": "ユーザーエクスペリエンス",
"xpack.observability.syntheticsThrottlingEnabledExperimentName": "シンセティック調整を有効にする（実験）",
- "xpack.observability.threshold.rule..charts.errorMessage": "問題が発生しました",
- "xpack.observability.threshold.rule..charts.noDataMessage": "グラフデータがありません",
- "xpack.observability.threshold.rule..timeLabels.days": "日",
- "xpack.observability.threshold.rule..timeLabels.hours": "時間",
- "xpack.observability.threshold.rule..timeLabels.minutes": "分",
- "xpack.observability.threshold.rule..timeLabels.seconds": "秒",
- "xpack.observability.threshold.rule.alertDetailsAppSection.summaryField.rule": "ルール",
- "xpack.observability.threshold.rule.alertDetailsAppSection.thresholdTitle": "しきい値を超えました",
- "xpack.observability.threshold.rule.alertDetailUrlActionVariableDescription": "アラートトラブルシューティングビューにリンクして、さらに詳しい状況や詳細を確認できます。server.publicBaseUrlが構成されていない場合は、空の文字列になります。",
- "xpack.observability.threshold.rule.alertDropdownTitle": "アラートとルール",
- "xpack.observability.threshold.rule.alertFlyout.addCondition": "条件を追加",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.avg": "平均",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.cardinality": "基数",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.count": "ドキュメントカウント",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.max": "最高",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.min": "最低",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.p95": "95パーセンタイル",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.p99": "99パーセンタイル",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.rate": "レート",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.sum": "合計",
- "xpack.observability.threshold.rule.alertFlyout.alertDescription": "オブザーバビリティデータタイプが特定の値以上になったときにアラートを送信します。",
- "xpack.observability.threshold.rule.alertFlyout.alertOnGroupDisappear": "グループがデータのレポートを停止する場合にアラートで通知する",
- "xpack.observability.threshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink": "ドキュメント",
- "xpack.observability.threshold.rule.alertFlyout.createAlertPerHelpText": "すべての一意の値についてアラートを作成します。例：「host.id」または「cloud.region」。",
- "xpack.observability.threshold.rule.alertFlyout.createAlertPerText": "アラートのグループ化条件（オプション）",
- "xpack.observability.threshold.rule.alertFlyout.customEquation": "カスタム等式",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.addCustomRow": "集約/フィールドを追加",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.deleteRowButton": "削除",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.equationHelpMessage": "基本数学式をサポートします",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.labelHelpMessage": "カスタムラベルにはアラートグラフと理由/アラートタイトルに表示されます",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.labelLabel": "ラベル（任意）",
- "xpack.observability.threshold.rule.alertFlyout.docCountNoDataDisabledHelpText": "[この設定は、ドキュメントカウントアグリゲーターには適用されません。]",
- "xpack.observability.threshold.rule.alertFlyout.error.aggregationRequired": "集約が必要です。",
- "xpack.observability.threshold.rule.alertFlyout.error.equation.invalidCharacters": "等式フィールドでは次の文字のみを使用できます：A-Z、+、-、/、*、(、)、?、!、&、:、|、>、<、=",
- "xpack.observability.threshold.rule.alertFlyout.error.invalidFilterQuery": "フィルタークエリは無効です。",
- "xpack.observability.threshold.rule.alertFlyout.error.metricRequired": "メトリックが必要です。",
- "xpack.observability.threshold.rule.alertFlyout.error.thresholdRequired": "しきい値が必要です。",
- "xpack.observability.threshold.rule.alertFlyout.error.thresholdTypeRequired": "しきい値には有効な数値を含める必要があります。",
- "xpack.observability.threshold.rule.alertFlyout.error.timeRequred": "ページサイズが必要です。",
- "xpack.observability.threshold.rule.alertFlyout.groupDisappearHelpText": "以前に検出されたグループが結果を報告しなくなった場合は、これを有効にすると、アクションがトリガーされます。自動的に急速にノードを開始および停止することがある動的に拡張するインフラストラクチャーでは、これは推奨されません。",
- "xpack.observability.threshold.rule.alertFlyout.outsideRangeLabel": "is not between",
- "xpack.observability.threshold.rule.alertFlyout.removeCondition": "条件を削除",
- "xpack.observability.threshold.rule.alerting.noDataFormattedValue": "[データなし]",
- "xpack.observability.threshold.rule.alerting.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\}は状態\\{\\{context.alertState\\}\\}です\n\n 理由：\n \\{\\{context.reason\\}\\}\n ",
- "xpack.observability.threshold.rule.alerting.threshold.fired": "アラート",
- "xpack.observability.threshold.rule.alerting.threshold.nodata": "データなし",
- "xpack.observability.threshold.rule.alerting.threshold.noDataFormattedValue": "[データなし]",
- "xpack.observability.threshold.rule.alertsButton": "アラートとルール",
- "xpack.observability.threshold.rule.cloudActionVariableDescription": "ソースで使用可能な場合に、ECSで定義されたクラウドオブジェクト。",
- "xpack.observability.threshold.rule.containerActionVariableDescription": "ソースで使用可能な場合に、ECSで定義されたコンテナーオブジェクト。",
- "xpack.observability.threshold.rule.createInventoryRuleButton": "インベントリルールの作成",
- "xpack.observability.threshold.rule.createThresholdRuleButton": "しきい値ルールを作成",
- "xpack.observability.threshold.rule.groupByKeysActionVariableDescription": "データを報告しているグループを含むオブジェクト",
- "xpack.observability.threshold.rule.hostActionVariableDescription": "ソースで使用可能な場合に、ECSで定義されたホストオブジェクト。",
- "xpack.observability.threshold.rule.infrastructureDropdownMenu": "インフラストラクチャー",
- "xpack.observability.threshold.rule.infrastructureDropdownTitle": "インフラストラクチャールール",
- "xpack.observability.threshold.rule.labelsActionVariableDescription": "このアラートがトリガーされたエンティティに関連付けられたラベルのリスト。",
- "xpack.observability.threshold.rule.manageRules": "ルールの管理",
- "xpack.observability.threshold.rule.metricsDropdownMenu": "メトリック",
- "xpack.observability.threshold.rule.metricsDropdownTitle": "メトリックルール",
- "xpack.observability.threshold.rule.orchestratorActionVariableDescription": "ソースで使用可能な場合に、ECSで定義されたオーケストレーターオブジェクト。",
- "xpack.observability.threshold.rule.reasonActionVariableDescription": "アラートの理由の簡潔な説明",
- "xpack.observability.threshold.rule.sourceConfiguration.missingHttp": "ソースの読み込みに失敗しました：HTTPクライアントがありません。",
- "xpack.observability.threshold.rule.sourceConfiguration.updateFailureBody": "変更をメトリック構成に適用できませんでした。しばらくたってから再試行してください。",
- "xpack.observability.threshold.rule.sourceConfiguration.updateFailureTitle": "構成の更新が失敗しました",
- "xpack.observability.threshold.rule.sourceConfiguration.updateSuccessTitle": "メトリック設定は正常に更新されました",
- "xpack.observability.threshold.rule.tagsActionVariableDescription": "このアラートがトリガーされたエンティティに関連付けられたタグのリスト。",
- "xpack.observability.threshold.rule.threshold.aboveRecovery": "より大",
- "xpack.observability.threshold.rule.threshold.belowRecovery": "より小",
- "xpack.observability.threshold.rule.threshold.betweenRecovery": "の間",
- "xpack.observability.threshold.rule.threshold.customEquation": "カスタム等式",
- "xpack.observability.threshold.rule.threshold.documentCount": "ドキュメントカウント",
- "xpack.observability.threshold.rule.timestampDescription": "アラートが検出された時点のタイムスタンプ。",
- "xpack.observability.threshold.rule.valueActionVariableDescription": "指定された条件のメトリックの値。使用方法：（ctx.value.condition0、ctx.value.condition1など）。",
- "xpack.observability.threshold.rule.viewInAppUrlActionVariableDescription": "アラートソースにリンク",
"xpack.observability.threshold.ruleExplorer.groupByAriaLabel": "graph/",
"xpack.observability.threshold.ruleExplorer.groupByLabel": "すべて",
"xpack.observability.threshold.ruleName": "しきい値（テクニカルプレビュー）",
@@ -29875,8 +29779,6 @@
"xpack.securitySolution.exceptions.viewer.lastUpdated": "{updated}を更新しました",
"xpack.securitySolution.exceptions.viewer.paginationDetails": "{partOne}/{partTwo}ページを表示中",
"xpack.securitySolution.fieldBrowser.descriptionForScreenReaderOnly": "フィールド{field}の説明：",
- "xpack.securitySolution.flyout.errorMessage": "{message}の表示中にエラーが発生しました",
- "xpack.securitySolution.flyout.errorTitle": "{title}を表示できません",
"xpack.securitySolution.footer.autoRefreshActiveTooltip": "自動更新が有効な間、タイムラインはクエリに一致する直近{numberOfItems}件のイベントを表示します。",
"xpack.securitySolution.formattedNumber.countsLabel": "{mantissa}{scale}{hasRemainder}",
"xpack.securitySolution.header.editableTitle.editButtonAria": "クリックすると{title}を編集できます",
@@ -33093,70 +32995,9 @@
"xpack.securitySolution.fleetIntegration.assets.name": "ホスト",
"xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.description": "クラウドセキュリティのイベントフィルター。Elastic Defend統合によって作成。",
"xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.name": "非インタラクティブセッション",
- "xpack.securitySolution.flyout.analyzerErrorMessage": "アナライザー",
"xpack.securitySolution.flyout.button.timeline": "タイムライン",
- "xpack.securitySolution.flyout.correlations.caseNameColumnTitle": "名前",
- "xpack.securitySolution.flyout.correlations.reasonColumnTitle": "理由",
- "xpack.securitySolution.flyout.correlations.ruleColumnTitle": "ルール",
- "xpack.securitySolution.flyout.correlations.severityColumnTitle": "深刻度",
- "xpack.securitySolution.flyout.correlations.statusColumnTitle": "ステータス",
- "xpack.securitySolution.flyout.correlations.timestampColumnTitle": "タイムスタンプ",
- "xpack.securitySolution.flyout.documentDetails.alertReasonTitle": "アラートの理由",
- "xpack.securitySolution.flyout.documentDetails.analyzerGraphButton": "アナライザーグラフ",
- "xpack.securitySolution.flyout.documentDetails.analyzerPreviewTitle": "アナライザープレビュー",
- "xpack.securitySolution.flyout.documentDetails.collapseDetailButton": "アラート詳細を折りたたむ",
- "xpack.securitySolution.flyout.documentDetails.correlationsButton": "相関関係",
- "xpack.securitySolution.flyout.documentDetails.correlationsTitle": "相関関係",
- "xpack.securitySolution.flyout.documentDetails.documentDescriptionTitle": "ドキュメント説明",
- "xpack.securitySolution.flyout.documentDetails.documentReasonTitle": "ドキュメント理由",
- "xpack.securitySolution.flyout.documentDetails.entitiesButton": "エンティティ",
- "xpack.securitySolution.flyout.documentDetails.entitiesTitle": "エンティティ",
- "xpack.securitySolution.flyout.documentDetails.expandDetailButton": "アラート詳細を展開",
- "xpack.securitySolution.flyout.documentDetails.highlightedFieldsTitle": "ハイライトされたフィールド",
- "xpack.securitySolution.flyout.documentDetails.insightsOptions": "インサイトオプション",
- "xpack.securitySolution.flyout.documentDetails.insightsTab": "インサイト",
- "xpack.securitySolution.flyout.documentDetails.insightsTitle": "インサイト",
- "xpack.securitySolution.flyout.documentDetails.investigationSectionTitle": "調査",
- "xpack.securitySolution.flyout.documentDetails.investigationsTab": "調査",
- "xpack.securitySolution.flyout.documentDetails.jsonTab": "JSON",
- "xpack.securitySolution.flyout.documentDetails.overviewTab": "概要",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.prevalenceRowText": "共通しない",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatEnrichment": "脅威インテリジェンスで拡張されたフィールド",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatEnrichments": "脅威インテリジェンスで拡張されたフィールド",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatMatch": "脅威一致が検出されました",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatMatches": "脅威一致が検出されました",
- "xpack.securitySolution.flyout.documentDetails.prevalenceButton": "発生率",
- "xpack.securitySolution.flyout.documentDetails.prevalenceTitle": "発生率",
- "xpack.securitySolution.flyout.documentDetails.riskScoreTitle": "リスクスコア",
- "xpack.securitySolution.flyout.documentDetails.ruleDescriptionTitle": "ルールの説明",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.commandText": "グループ基準",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.processText": "開始済み",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.ruleText": "ルールがある",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.timeText": "に",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.title": "セッションビューアープレビュー",
- "xpack.securitySolution.flyout.documentDetails.sessionViewButton": "セッションビュー",
- "xpack.securitySolution.flyout.documentDetails.severityTitle": "深刻度",
- "xpack.securitySolution.flyout.documentDetails.share": "アラートを共有",
- "xpack.securitySolution.flyout.documentDetails.tableTab": "表",
- "xpack.securitySolution.flyout.documentDetails.threatIntelligenceButton": "脅威インテリジェンス",
- "xpack.securitySolution.flyout.documentDetails.threatIntelligenceTitle": "脅威インテリジェンス",
- "xpack.securitySolution.flyout.documentDetails.visualizationsTitle": "ビジュアライゼーション",
- "xpack.securitySolution.flyout.documentDetails.visualizeOptions": "Visualizeオプション",
- "xpack.securitySolution.flyout.documentDetails.visualizeTab": "可視化",
- "xpack.securitySolution.flyout.documentErrorMessage": "ドキュメントフィールドおよび値",
- "xpack.securitySolution.flyout.documentErrorTitle": "ドキュメント情報",
"xpack.securitySolution.flyout.entities.failRelatedHostsDescription": "関連するホストで検索を実行できませんでした",
"xpack.securitySolution.flyout.entities.failRelatedUsersDescription": "関連するユーザーで検索を実行できませんでした",
- "xpack.securitySolution.flyout.entities.hostsInfoTitle": "ホスト情報",
- "xpack.securitySolution.flyout.entities.relatedEntitiesIpColumn": "IPアドレス",
- "xpack.securitySolution.flyout.entities.relatedEntitiesNameColumn": "名前",
- "xpack.securitySolution.flyout.entities.relatedHostsTitle": "関連するホスト",
- "xpack.securitySolution.flyout.entities.relatedUsersTitle": "関連するユーザー",
- "xpack.securitySolution.flyout.entities.usersInfoTitle": "ユーザー情報",
- "xpack.securitySolution.flyout.prevalenceTableAlertCountColumnTitle": "アラート件数",
- "xpack.securitySolution.flyout.prevalenceTableDocCountColumnTitle": "ドキュメントカウント",
- "xpack.securitySolution.flyout.response.title": "対応",
- "xpack.securitySolution.flyout.sessionViewErrorMessage": "セッションビュー",
"xpack.securitySolution.footer.autoRefreshActiveDescription": "自動更新アクション",
"xpack.securitySolution.footer.cancel": "キャンセル",
"xpack.securitySolution.footer.data": "データ",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 99b6008b94bb4..75fcb531da66a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1331,7 +1331,6 @@
"data.search.aggs.rareTerms.aggTypesLabel": "{fieldName} 的稀有词",
"data.search.es_search.queryTimeValue": "{queryTime}ms",
"data.search.functions.geoBoundingBox.arguments.error": "必须至少提供一个以下参数组：{parameters}。",
- "data.search.searchSource.fetch.shardsFailedNotificationMessage": "{shardsTotal} 个分片有 {shardsFailed} 个失败",
"data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} 索引中的 ID。",
"data.search.searchSource.queryTimeValue": "{queryTime}ms",
"data.search.searchSource.requestTimeValue": "{requestTime}ms",
@@ -2078,15 +2077,7 @@
"data.search.searchSource.dataViewDescription": "被查询的数据视图。",
"data.search.searchSource.dataViewIdLabel": "数据视图 ID",
"data.search.searchSource.dataViewLabel": "数据视图",
- "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "由于您的请求超时，数据可能不完整",
- "data.search.searchSource.fetch.shardsFailedModal.close": "关闭",
- "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "将响应复制到剪贴板",
- "data.search.searchSource.fetch.shardsFailedModal.showDetails": "显示详情",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest": "请求",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse": "响应",
- "data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures": "分片错误",
"data.search.searchSource.fetch.shardsFailedModal.tableColReason": "原因",
- "data.search.searchSource.fetch.shardsFailedNotificationDescription": "数据可能不完整或有错误。",
"data.search.searchSource.hitsDescription": "查询返回的文档数目。",
"data.search.searchSource.hitsLabel": "命中数",
"data.search.searchSource.hitsTotalDescription": "与查询匹配的文档数目。",
@@ -27135,18 +27126,6 @@
"xpack.observability.slo.update.errorNotification": "更新 {name} 时出现问题",
"xpack.observability.slo.update.successNotification": "成功更新 {name}",
"xpack.observability.syntheticsThrottlingEnabledExperimentDescription": "在 Synthetics 监测配置中启用限制设置。请注意，即使该设置处于活动状态，可能仍然无法对您的监测应用限制。仅限内部使用。{link}",
- "xpack.observability.threshold.rule.alertDetailsAppSection.criterion.subtitle": "过去 {lookback} {timeLabel}",
- "xpack.observability.threshold.rule.alertFlyout.alertPerRedundantFilterError": "此规则可能针对低于预期的 {matchedGroups} 告警，因为筛选查询包含{groupCount, plural, other {这些字段}}的匹配项。有关更多信息，请参阅 {filteringAndGroupingLink}。",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.aggregationLabel": "聚合 {name}",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.filterLabel": "KQL 筛选 {name}",
- "xpack.observability.threshold.rule.alerts.dataTimeRangeLabel": "过去 {lookback} {timeLabel}",
- "xpack.observability.threshold.rule.alerts.dataTimeRangeLabelWithGrouping": "{id} 过去 {lookback} {timeLabel}的数据",
- "xpack.observability.threshold.rule.threshold.errorAlertReason": "Elasticsearch 尝试查询 {metric} 的数据时出现故障",
- "xpack.observability.threshold.rule.threshold.firedAlertReason": "过去 {duration}{group}，{metric} 为 {currentValue}。{comparator} {threshold} 时告警。",
- "xpack.observability.threshold.rule.threshold.noDataAlertReason": "对于 {group}，{metric} 在过去 {interval}中未报告数据",
- "xpack.observability.threshold.rule.threshold.recoveredAlertReason": "对于 {group}，{metric} 现在{comparator}阈值 {threshold}（当前值为 {currentValue}）",
- "xpack.observability.threshold.rule.threshold.thresholdRange": "{a} 和 {b}",
- "xpack.observability.threshold.rule.thresholdExtraTitle": "{comparator} {threshold} 时告警",
"xpack.observability.transactionRateLabel": "{value} tpm",
"xpack.observability.ux.coreVitals.averageMessage": " 且小于 {bad}",
"xpack.observability.ux.coreVitals.paletteLegend.rankPercentage": "{labelsInd} ({ranksInd}%)",
@@ -27593,81 +27572,6 @@
"xpack.observability.statusVisualization.ux.link": "添加数据",
"xpack.observability.statusVisualization.ux.title": "用户体验",
"xpack.observability.syntheticsThrottlingEnabledExperimentName": "启用 Synthetics 限制（实验性）",
- "xpack.observability.threshold.rule..charts.errorMessage": "哇哦，出问题了",
- "xpack.observability.threshold.rule..charts.noDataMessage": "没有可用图表数据",
- "xpack.observability.threshold.rule..timeLabels.days": "天",
- "xpack.observability.threshold.rule..timeLabels.hours": "小时",
- "xpack.observability.threshold.rule..timeLabels.minutes": "分钟",
- "xpack.observability.threshold.rule..timeLabels.seconds": "秒",
- "xpack.observability.threshold.rule.alertDetailsAppSection.summaryField.rule": "规则",
- "xpack.observability.threshold.rule.alertDetailsAppSection.thresholdTitle": "超出阈值",
- "xpack.observability.threshold.rule.alertDetailUrlActionVariableDescription": "链接到告警故障排除视图获取进一步的上下文和详情。如果未配置 server.publicBaseUrl，这将为空字符串。",
- "xpack.observability.threshold.rule.alertDropdownTitle": "告警和规则",
- "xpack.observability.threshold.rule.alertFlyout.addCondition": "添加条件",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.avg": "平均值",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.cardinality": "基数",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.count": "文档计数",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.max": "最大值",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.min": "最小值",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.p95": "第 95 个百分位",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.p99": "第 99 个百分位",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.rate": "比率",
- "xpack.observability.threshold.rule.alertFlyout.aggregationText.sum": "求和",
- "xpack.observability.threshold.rule.alertFlyout.alertDescription": "任何 Observability 数据类型到达或超出给定值时告警。",
- "xpack.observability.threshold.rule.alertFlyout.alertOnGroupDisappear": "组停止报告数据时提醒我",
- "xpack.observability.threshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink": "文档",
- "xpack.observability.threshold.rule.alertFlyout.createAlertPerHelpText": "为每个唯一值创建告警。例如：“host.id”或“cloud.region”。",
- "xpack.observability.threshold.rule.alertFlyout.createAlertPerText": "告警分组依据（可选）",
- "xpack.observability.threshold.rule.alertFlyout.customEquation": "定制方程",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.addCustomRow": "添加聚合/字段",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.deleteRowButton": "删除",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.equationHelpMessage": "支持基本匹配表达式",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.labelHelpMessage": "定制标签将在告警图表上以及原因/告警标题中显示",
- "xpack.observability.threshold.rule.alertFlyout.customEquationEditor.labelLabel": "标签（可选）",
- "xpack.observability.threshold.rule.alertFlyout.docCountNoDataDisabledHelpText": "[此设置不适用于文档计数聚合器。]",
- "xpack.observability.threshold.rule.alertFlyout.error.aggregationRequired": "“聚合”必填。",
- "xpack.observability.threshold.rule.alertFlyout.error.equation.invalidCharacters": "方程字段仅支持以下字符：A-Z、+、-、/、*、(、)、?、!、&、:、|、>、<、=",
- "xpack.observability.threshold.rule.alertFlyout.error.invalidFilterQuery": "筛选查询无效。",
- "xpack.observability.threshold.rule.alertFlyout.error.metricRequired": "“指标”必填。",
- "xpack.observability.threshold.rule.alertFlyout.error.thresholdRequired": "“阈值”必填。",
- "xpack.observability.threshold.rule.alertFlyout.error.thresholdTypeRequired": "阈值必须包含有效数字。",
- "xpack.observability.threshold.rule.alertFlyout.error.timeRequred": "“时间大小”必填。",
- "xpack.observability.threshold.rule.alertFlyout.groupDisappearHelpText": "启用此选项可在之前检测的组开始不报告任何数据时触发操作。不建议将此选项用于可能会快速自动启动和停止节点的动态扩展基础架构。",
- "xpack.observability.threshold.rule.alertFlyout.outsideRangeLabel": "不介于",
- "xpack.observability.threshold.rule.alertFlyout.removeCondition": "删除条件",
- "xpack.observability.threshold.rule.alerting.noDataFormattedValue": "[无数据]",
- "xpack.observability.threshold.rule.alerting.threshold.defaultActionMessage": "\\{\\{alertName\\}\\} - \\{\\{context.group\\}\\} 处于 \\{\\{context.alertState\\}\\} 状态\n\n 原因：\n \\{\\{context.reason\\}\\}\n ",
- "xpack.observability.threshold.rule.alerting.threshold.fired": "告警",
- "xpack.observability.threshold.rule.alerting.threshold.nodata": "无数据",
- "xpack.observability.threshold.rule.alerting.threshold.noDataFormattedValue": "[无数据]",
- "xpack.observability.threshold.rule.alertsButton": "告警和规则",
- "xpack.observability.threshold.rule.cloudActionVariableDescription": "ECS 定义的云对象（如果在源中可用）。",
- "xpack.observability.threshold.rule.containerActionVariableDescription": "ECS 定义的容器对象（如果在源中可用）。",
- "xpack.observability.threshold.rule.createInventoryRuleButton": "创建库存规则",
- "xpack.observability.threshold.rule.createThresholdRuleButton": "创建阈值规则",
- "xpack.observability.threshold.rule.groupByKeysActionVariableDescription": "包含正报告数据的组的对象",
- "xpack.observability.threshold.rule.hostActionVariableDescription": "ECS 定义的主机对象（如果在源中可用）。",
- "xpack.observability.threshold.rule.infrastructureDropdownMenu": "基础设施",
- "xpack.observability.threshold.rule.infrastructureDropdownTitle": "基础设施规则",
- "xpack.observability.threshold.rule.labelsActionVariableDescription": "与在其上触发此告警的实体关联的标签列表。",
- "xpack.observability.threshold.rule.manageRules": "管理规则",
- "xpack.observability.threshold.rule.metricsDropdownMenu": "指标",
- "xpack.observability.threshold.rule.metricsDropdownTitle": "指标规则",
- "xpack.observability.threshold.rule.orchestratorActionVariableDescription": "ECS 定义的 Orchestrator 对象（如果在源中可用）。",
- "xpack.observability.threshold.rule.reasonActionVariableDescription": "告警原因的简洁描述",
- "xpack.observability.threshold.rule.sourceConfiguration.missingHttp": "无法加载源：无 HTTP 客户端可用。",
- "xpack.observability.threshold.rule.sourceConfiguration.updateFailureBody": "无法对指标配置应用更改。请稍后重试。",
- "xpack.observability.threshold.rule.sourceConfiguration.updateFailureTitle": "配置更新失败",
- "xpack.observability.threshold.rule.sourceConfiguration.updateSuccessTitle": "已成功更新指标设置",
- "xpack.observability.threshold.rule.tagsActionVariableDescription": "与在其上触发此告警的实体关联的标记列表。",
- "xpack.observability.threshold.rule.threshold.aboveRecovery": "高于",
- "xpack.observability.threshold.rule.threshold.belowRecovery": "低于",
- "xpack.observability.threshold.rule.threshold.betweenRecovery": "介于",
- "xpack.observability.threshold.rule.threshold.customEquation": "定制方程",
- "xpack.observability.threshold.rule.threshold.documentCount": "文档计数",
- "xpack.observability.threshold.rule.timestampDescription": "检测到告警时的时间戳。",
- "xpack.observability.threshold.rule.valueActionVariableDescription": "指定条件中的指标值。用法：(ctx.value.condition0, ctx.value.condition1, 诸如此类)。",
- "xpack.observability.threshold.rule.viewInAppUrlActionVariableDescription": "链接到告警源",
"xpack.observability.threshold.ruleExplorer.groupByAriaLabel": "图表绘制依据",
"xpack.observability.threshold.ruleExplorer.groupByLabel": "所有内容",
"xpack.observability.threshold.ruleName": "阈值（技术预览）",
@@ -29871,8 +29775,6 @@
"xpack.securitySolution.exceptions.viewer.lastUpdated": "已更新 {updated}",
"xpack.securitySolution.exceptions.viewer.paginationDetails": "正在显示 {partOne} 个，共 {partTwo} 个",
"xpack.securitySolution.fieldBrowser.descriptionForScreenReaderOnly": "{field} 字段的描述：",
- "xpack.securitySolution.flyout.errorMessage": "显示 {message} 时出现错误",
- "xpack.securitySolution.flyout.errorTitle": "无法显示 {title}",
"xpack.securitySolution.footer.autoRefreshActiveTooltip": "自动刷新已启用时，时间线将显示匹配查询的最近 {numberOfItems} 个事件。",
"xpack.securitySolution.formattedNumber.countsLabel": "{mantissa}{scale}{hasRemainder}",
"xpack.securitySolution.header.editableTitle.editButtonAria": "通过单击，可以编辑 {title}",
@@ -33089,70 +32991,9 @@
"xpack.securitySolution.fleetIntegration.assets.name": "主机",
"xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.description": "云安全事件筛选。已由 Elastic Defend 集成创建。",
"xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.name": "非交互式会话",
- "xpack.securitySolution.flyout.analyzerErrorMessage": "分析器",
"xpack.securitySolution.flyout.button.timeline": "时间线",
- "xpack.securitySolution.flyout.correlations.caseNameColumnTitle": "名称",
- "xpack.securitySolution.flyout.correlations.reasonColumnTitle": "原因",
- "xpack.securitySolution.flyout.correlations.ruleColumnTitle": "规则",
- "xpack.securitySolution.flyout.correlations.severityColumnTitle": "严重性",
- "xpack.securitySolution.flyout.correlations.statusColumnTitle": "状态",
- "xpack.securitySolution.flyout.correlations.timestampColumnTitle": "时间戳",
- "xpack.securitySolution.flyout.documentDetails.alertReasonTitle": "告警原因",
- "xpack.securitySolution.flyout.documentDetails.analyzerGraphButton": "分析器图表",
- "xpack.securitySolution.flyout.documentDetails.analyzerPreviewTitle": "分析器预览",
- "xpack.securitySolution.flyout.documentDetails.collapseDetailButton": "折叠告警详情",
- "xpack.securitySolution.flyout.documentDetails.correlationsButton": "相关性",
- "xpack.securitySolution.flyout.documentDetails.correlationsTitle": "相关性",
- "xpack.securitySolution.flyout.documentDetails.documentDescriptionTitle": "文档描述",
- "xpack.securitySolution.flyout.documentDetails.documentReasonTitle": "文档原因",
- "xpack.securitySolution.flyout.documentDetails.entitiesButton": "实体",
- "xpack.securitySolution.flyout.documentDetails.entitiesTitle": "实体",
- "xpack.securitySolution.flyout.documentDetails.expandDetailButton": "展开告警详情",
- "xpack.securitySolution.flyout.documentDetails.highlightedFieldsTitle": "突出显示的字段",
- "xpack.securitySolution.flyout.documentDetails.insightsOptions": "洞见选项",
- "xpack.securitySolution.flyout.documentDetails.insightsTab": "洞见",
- "xpack.securitySolution.flyout.documentDetails.insightsTitle": "洞见",
- "xpack.securitySolution.flyout.documentDetails.investigationSectionTitle": "调查",
- "xpack.securitySolution.flyout.documentDetails.investigationsTab": "调查",
- "xpack.securitySolution.flyout.documentDetails.jsonTab": "JSON",
- "xpack.securitySolution.flyout.documentDetails.overviewTab": "概览",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.prevalenceRowText": "不常见",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatEnrichment": "已使用威胁情报扩充字段",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatEnrichments": "已使用威胁情报扩充字段",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatMatch": "检测到威胁匹配",
- "xpack.securitySolution.flyout.documentDetails.overviewTab.threatIntelligence.threatMatches": "检测到威胁匹配",
- "xpack.securitySolution.flyout.documentDetails.prevalenceButton": "普及率",
- "xpack.securitySolution.flyout.documentDetails.prevalenceTitle": "普及率",
- "xpack.securitySolution.flyout.documentDetails.riskScoreTitle": "风险分数",
- "xpack.securitySolution.flyout.documentDetails.ruleDescriptionTitle": "规则描述",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.commandText": "依据",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.processText": "已启动",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.ruleText": "具有规则",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.timeText": "处于",
- "xpack.securitySolution.flyout.documentDetails.sessionPreview.title": "会话查看器预览",
- "xpack.securitySolution.flyout.documentDetails.sessionViewButton": "会话视图",
- "xpack.securitySolution.flyout.documentDetails.severityTitle": "严重性",
- "xpack.securitySolution.flyout.documentDetails.share": "共享告警",
- "xpack.securitySolution.flyout.documentDetails.tableTab": "表",
- "xpack.securitySolution.flyout.documentDetails.threatIntelligenceButton": "威胁情报",
- "xpack.securitySolution.flyout.documentDetails.threatIntelligenceTitle": "威胁情报",
- "xpack.securitySolution.flyout.documentDetails.visualizationsTitle": "可视化",
- "xpack.securitySolution.flyout.documentDetails.visualizeOptions": "Visualize 选项",
- "xpack.securitySolution.flyout.documentDetails.visualizeTab": "Visualize",
- "xpack.securitySolution.flyout.documentErrorMessage": "文档字段和值",
- "xpack.securitySolution.flyout.documentErrorTitle": "文档信息",
"xpack.securitySolution.flyout.entities.failRelatedHostsDescription": "无法对相关主机执行搜索",
"xpack.securitySolution.flyout.entities.failRelatedUsersDescription": "无法对相关用户执行搜索",
- "xpack.securitySolution.flyout.entities.hostsInfoTitle": "主机信息",
- "xpack.securitySolution.flyout.entities.relatedEntitiesIpColumn": "IP 地址",
- "xpack.securitySolution.flyout.entities.relatedEntitiesNameColumn": "名称",
- "xpack.securitySolution.flyout.entities.relatedHostsTitle": "相关主机",
- "xpack.securitySolution.flyout.entities.relatedUsersTitle": "相关用户",
- "xpack.securitySolution.flyout.entities.usersInfoTitle": "用户信息",
- "xpack.securitySolution.flyout.prevalenceTableAlertCountColumnTitle": "告警计数",
- "xpack.securitySolution.flyout.prevalenceTableDocCountColumnTitle": "文档计数",
- "xpack.securitySolution.flyout.response.title": "响应",
- "xpack.securitySolution.flyout.sessionViewErrorMessage": "会话视图",
"xpack.securitySolution.footer.autoRefreshActiveDescription": "自动刷新已启用",
"xpack.securitySolution.footer.cancel": "取消",
"xpack.securitySolution.footer.data": "数据",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
index 6e2465e58c2fd..a2f3e1eb80392 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
import { AsApiContract } from '@kbn/actions-plugin/common';
-import { RuleAggregationFormattedResult } from '@kbn/alerting-plugin/common';
+import { AggregateRulesResponseBody } from '@kbn/alerting-plugin/common/routes/rule/apis/aggregate';
import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
import { mapFiltersToKql } from './map_filters_to_kql';
import {
@@ -14,6 +14,7 @@ import {
rewriteBodyRes,
rewriteTagsBodyRes,
GetRuleTagsResponse,
+ AggregateRulesResponse,
} from './aggregate_helpers';
export async function loadRuleTags({
@@ -43,7 +44,7 @@ export async function loadRuleAggregations({
ruleExecutionStatusesFilter,
ruleStatusesFilter,
tagsFilter,
-}: LoadRuleAggregationsProps): Promise {
+}: LoadRuleAggregationsProps): Promise {
const filters = mapFiltersToKql({
typesFilter,
actionTypesFilter,
@@ -51,7 +52,7 @@ export async function loadRuleAggregations({
ruleStatusesFilter,
tagsFilter,
});
- const res = await http.post>(
+ const res = await http.post(
`${INTERNAL_BASE_ALERTING_API_PATH}/rules/_aggregate`,
{
body: JSON.stringify({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_helpers.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_helpers.ts
index 61fff1e95a451..d093649f73740 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_helpers.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_helpers.ts
@@ -7,19 +7,34 @@
import { HttpSetup } from '@kbn/core/public';
import { RewriteRequestCase } from '@kbn/actions-plugin/common';
-import { RuleAggregationFormattedResult } from '@kbn/alerting-plugin/common';
+import { AggregateRulesResponseBody } from '@kbn/alerting-plugin/common/routes/rule/apis/aggregate';
import { RuleStatus } from '../../../types';
-export const rewriteBodyRes: RewriteRequestCase = ({
+export interface AggregateRulesResponse {
+ ruleExecutionStatus: Record;
+ ruleLastRunOutcome: Record;
+ ruleEnabledStatus: {
+ enabled: number;
+ disabled: number;
+ };
+ ruleMutedStatus: {
+ muted: number;
+ unmuted: number;
+ };
+ ruleSnoozedStatus: {
+ snoozed: number;
+ };
+ ruleTags: string[];
+}
+
+export const rewriteBodyRes = ({
rule_execution_status: ruleExecutionStatus,
rule_last_run_outcome: ruleLastRunOutcome,
rule_enabled_status: ruleEnabledStatus,
rule_muted_status: ruleMutedStatus,
rule_snoozed_status: ruleSnoozedStatus,
rule_tags: ruleTags,
- ...rest
-}: any) => ({
- ...rest,
+}: AggregateRulesResponseBody): AggregateRulesResponse => ({
ruleExecutionStatus,
ruleEnabledStatus,
ruleMutedStatus,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_kuery_filter.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_kuery_filter.ts
index 20d1fc9281b48..23941ae36ccc5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_kuery_filter.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate_kuery_filter.ts
@@ -4,10 +4,13 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { AsApiContract } from '@kbn/actions-plugin/common';
-import { RuleAggregationFormattedResult } from '@kbn/alerting-plugin/common';
+import { AggregateRulesResponseBody } from '@kbn/alerting-plugin/common/routes/rule/apis/aggregate';
import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
-import { LoadRuleAggregationsProps, rewriteBodyRes } from './aggregate_helpers';
+import {
+ AggregateRulesResponse,
+ LoadRuleAggregationsProps,
+ rewriteBodyRes,
+} from './aggregate_helpers';
import { mapFiltersToKueryNode } from './map_filters_to_kuery_node';
export async function loadRuleAggregationsWithKueryFilter({
@@ -18,7 +21,7 @@ export async function loadRuleAggregationsWithKueryFilter({
ruleExecutionStatusesFilter,
ruleStatusesFilter,
tagsFilter,
-}: LoadRuleAggregationsProps): Promise {
+}: LoadRuleAggregationsProps): Promise {
const filtersKueryNode = mapFiltersToKueryNode({
typesFilter,
actionTypesFilter,
@@ -28,7 +31,7 @@ export async function loadRuleAggregationsWithKueryFilter({
searchText,
});
- const res = await http.post>(
+ const res = await http.post(
`${INTERNAL_BASE_ALERTING_API_PATH}/rules/_aggregate`,
{
body: JSON.stringify({
@@ -37,5 +40,6 @@ export async function loadRuleAggregationsWithKueryFilter({
}),
}
);
+
return rewriteBodyRes(res);
}
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule/avg_pct_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_fired.ts
similarity index 90%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule/avg_pct_fired.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_fired.ts
index 7bb8874dafed9..8df0f20e88de7 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule/avg_pct_fired.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_fired.ts
@@ -6,8 +6,11 @@
*/
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
@@ -22,8 +25,8 @@ export default function ({ getService }: FtrProviderContext) {
const esDeleteAllIndices = getService('esDeleteAllIndices');
const logger = getService('log');
- describe('Threshold rule - AVG - PCT - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe('Custom Threshold rule - AVG - PCT - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -44,7 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -131,13 +134,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await waitForAlertInIndex({
esClient,
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -145,14 +148,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule/avg_pct_no_data.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_no_data.ts
similarity index 90%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule/avg_pct_no_data.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_no_data.ts
index c0138d993e6bd..d57398def6381 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule/avg_pct_no_data.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_no_data.ts
@@ -5,8 +5,11 @@
* 2.0.
*/
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
@@ -20,8 +23,8 @@ export default function ({ getService }: FtrProviderContext) {
const esClient = getService('es');
const supertest = getService('supertest');
- describe('Threshold rule - AVG - PCT - NoData', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe('Custom Threshold rule - AVG - PCT - NoData', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id-no-data';
let actionId: string;
@@ -40,7 +43,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -125,13 +128,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await waitForAlertInIndex({
esClient,
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -139,14 +142,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.nodata');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.nodata'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule/avg_us_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_us_fired.ts
similarity index 92%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule/avg_us_fired.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_us_fired.ts
index 1c35793e04337..b4570771b9f2f 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule/avg_us_fired.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_us_fired.ts
@@ -8,8 +8,11 @@
import moment from 'moment';
import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
import { format } from 'url';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../../common/ftr_provider_context';
@@ -33,8 +36,8 @@ export default function ({ getService }: FtrProviderContext) {
const kibanaUrl = format(kibanaServerConfig);
const supertest = getService('supertest');
- describe('Threshold rule - AVG - US - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe('Custom Threshold rule - AVG - US - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
@@ -60,7 +63,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
await esDeleteAllIndices([ALERT_ACTION_INDEX]);
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -149,7 +152,7 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await waitForAlertInIndex({
esClient,
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
@@ -157,7 +160,7 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -165,14 +168,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
@@ -210,7 +216,7 @@ export default function ({ getService }: FtrProviderContext) {
indexName: ALERT_ACTION_INDEX,
});
- expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.threshold');
+ expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
`https://localhost:5601/app/observability/alerts?_a=(kuery:%27kibana.alert.uuid:%20%22${alertId}%22%27%2CrangeFrom:%27${rangeFrom}%27%2CrangeTo:now%2Cstatus:all)`
);
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule/custom_eq_avg_bytes_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
similarity index 91%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule/custom_eq_avg_bytes_fired.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
index 794902f19688f..8499511391ab6 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule/custom_eq_avg_bytes_fired.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
@@ -12,8 +12,11 @@
*/
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
@@ -28,8 +31,8 @@ export default function ({ getService }: FtrProviderContext) {
const esDeleteAllIndices = getService('esDeleteAllIndices');
const logger = getService('log');
- describe('Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe('Custom Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -50,7 +53,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -139,13 +142,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await waitForAlertInIndex({
esClient,
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -153,14 +156,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule/documents_count_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/documents_count_fired.ts
similarity index 90%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule/documents_count_fired.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule/documents_count_fired.ts
index 3361f4a04e185..99f313960fa6b 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule/documents_count_fired.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/documents_count_fired.ts
@@ -6,8 +6,11 @@
*/
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
@@ -22,8 +25,8 @@ export default function ({ getService }: FtrProviderContext) {
const esDeleteAllIndices = getService('esDeleteAllIndices');
const logger = getService('log');
- describe('Threshold rule - DOCUMENTS_COUNT - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe('Custom Threshold rule - DOCUMENTS_COUNT - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -44,7 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -129,13 +132,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await waitForAlertInIndex({
esClient,
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -143,14 +146,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule/group_by_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/group_by_fired.ts
similarity index 92%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule/group_by_fired.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule/group_by_fired.ts
index 9d3e5e2bd17ad..5925907b471b6 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule/group_by_fired.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/group_by_fired.ts
@@ -13,8 +13,11 @@
import moment from 'moment';
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
@@ -35,8 +38,8 @@ export default function ({ getService }: FtrProviderContext) {
let alertId: string;
let startedAt: string;
- describe('Threshold rule - GROUP_BY - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe('Custom Threshold rule - GROUP_BY - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -57,7 +60,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -149,7 +152,7 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await waitForAlertInIndex({
esClient,
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
@@ -157,7 +160,7 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -165,14 +168,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', 'host-0');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
@@ -220,7 +226,7 @@ export default function ({ getService }: FtrProviderContext) {
indexName: ALERT_ACTION_INDEX,
});
- expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.threshold');
+ expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
`https://localhost:5601/app/observability/alerts?_a=(kuery:%27kibana.alert.uuid:%20%22${alertId}%22%27%2CrangeFrom:%27${rangeFrom}%27%2CrangeTo:now%2Cstatus:all)`
);
diff --git a/x-pack/test/alerting_api_integration/observability/threshold_rule_data_view.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule_data_view.ts
similarity index 96%
rename from x-pack/test/alerting_api_integration/observability/threshold_rule_data_view.ts
rename to x-pack/test/alerting_api_integration/observability/custom_threshold_rule_data_view.ts
index f4d26f961c234..3119a0ae46e63 100644
--- a/x-pack/test/alerting_api_integration/observability/threshold_rule_data_view.ts
+++ b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule_data_view.ts
@@ -6,7 +6,10 @@
*/
import expect from '@kbn/expect';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../common/ftr_provider_context';
@@ -20,7 +23,7 @@ export default function ({ getService }: FtrProviderContext) {
const objectRemover = new ObjectRemover(supertest);
const es = getService('es');
- describe('Threshold rule data view >', () => {
+ describe('Custom Threshold rule data view >', () => {
const DATA_VIEW_ID = 'data-view-id';
let ruleId: string;
diff --git a/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts b/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts
index a50e1b4e85c14..4bde235e97dd2 100644
--- a/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts
+++ b/x-pack/test/alerting_api_integration/observability/helpers/alerting_api_helper.ts
@@ -6,7 +6,7 @@
*/
import { MetricThresholdParams } from '@kbn/infra-plugin/common/alerting/metrics';
-import { ThresholdParams } from '@kbn/observability-plugin/common/threshold_rule/types';
+import { ThresholdParams } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
import type { SuperTest, Test } from 'supertest';
export async function createIndexConnector({
diff --git a/x-pack/test/alerting_api_integration/observability/index.ts b/x-pack/test/alerting_api_integration/observability/index.ts
index 7bc5a5caab0b2..884c17d2abfd1 100644
--- a/x-pack/test/alerting_api_integration/observability/index.ts
+++ b/x-pack/test/alerting_api_integration/observability/index.ts
@@ -10,13 +10,13 @@ export default function ({ loadTestFile }: any) {
describe('Observability Rules', () => {
describe('Rules Endpoints', () => {
loadTestFile(require.resolve('./metric_threshold_rule'));
- loadTestFile(require.resolve('./threshold_rule/avg_pct_fired'));
- loadTestFile(require.resolve('./threshold_rule/avg_pct_no_data'));
- loadTestFile(require.resolve('./threshold_rule/avg_us_fired'));
- loadTestFile(require.resolve('./threshold_rule/custom_eq_avg_bytes_fired'));
- loadTestFile(require.resolve('./threshold_rule/documents_count_fired'));
- loadTestFile(require.resolve('./threshold_rule/group_by_fired'));
- loadTestFile(require.resolve('./threshold_rule_data_view'));
+ loadTestFile(require.resolve('./custom_threshold_rule/avg_pct_fired'));
+ loadTestFile(require.resolve('./custom_threshold_rule/avg_pct_no_data'));
+ loadTestFile(require.resolve('./custom_threshold_rule/avg_us_fired'));
+ loadTestFile(require.resolve('./custom_threshold_rule/custom_eq_avg_bytes_fired'));
+ loadTestFile(require.resolve('./custom_threshold_rule/documents_count_fired'));
+ loadTestFile(require.resolve('./custom_threshold_rule/group_by_fired'));
+ loadTestFile(require.resolve('./custom_threshold_rule_data_view'));
});
describe('Synthetics', () => {
loadTestFile(require.resolve('./synthetics_rule'));
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/aggregate.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/aggregate.ts
deleted file mode 100644
index 63fdfa8d498fa..0000000000000
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/aggregate.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import expect from '@kbn/expect';
-import { Spaces } from '../../../scenarios';
-import { getUrlPrefix, getTestRuleData, ObjectRemover, getEventLog } from '../../../../common/lib';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-// eslint-disable-next-line import/no-default-export
-export default function createAggregateTests({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
- const retry = getService('retry');
-
- const getEventLogWithRetry = async (id: string) => {
- await retry.try(async () => {
- return await getEventLog({
- getService,
- spaceId: Spaces.space1.id,
- type: 'alert',
- id,
- provider: 'alerting',
- actions: new Map([['execute', { equal: 1 }]]),
- });
- });
- };
-
- describe('aggregate', () => {
- const objectRemover = new ObjectRemover(supertest);
-
- afterEach(() => objectRemover.removeAll());
-
- it('should aggregate when there are no alerts', async () => {
- const response = await supertest.get(
- `${getUrlPrefix(Spaces.space1.id)}/internal/alerting/rules/_aggregate`
- );
- expect(response.status).to.eql(200);
- expect(response.body).to.eql({
- rule_enabled_status: {
- disabled: 0,
- enabled: 0,
- },
- rule_execution_status: {
- ok: 0,
- active: 0,
- error: 0,
- pending: 0,
- unknown: 0,
- warning: 0,
- },
- rule_last_run_outcome: {
- succeeded: 0,
- warning: 0,
- failed: 0,
- },
- rule_muted_status: {
- muted: 0,
- unmuted: 0,
- },
- rule_snoozed_status: {
- snoozed: 0,
- },
- rule_tags: [],
- });
- });
-
- it('should aggregate alert status totals', async () => {
- const NumOkAlerts = 4;
- const NumActiveAlerts = 1;
- const NumErrorAlerts = 2;
-
- const okAlertIds: string[] = [];
- const activeAlertIds: string[] = [];
- const errorAlertIds: string[] = [];
-
- await Promise.all(
- [...Array(NumOkAlerts)].map(async () => {
- const okAlertId = await createTestAlert({
- rule_type_id: 'test.noop',
- schedule: { interval: '24h' },
- });
- okAlertIds.push(okAlertId);
- objectRemover.add(Spaces.space1.id, okAlertId, 'rule', 'alerting');
- })
- );
-
- await Promise.all(okAlertIds.map((id) => getEventLogWithRetry(id)));
-
- await Promise.all(
- [...Array(NumActiveAlerts)].map(async () => {
- const activeAlertId = await createTestAlert({
- rule_type_id: 'test.patternFiring',
- schedule: { interval: '24h' },
- params: {
- pattern: { instance: new Array(100).fill(true) },
- },
- });
- activeAlertIds.push(activeAlertId);
- objectRemover.add(Spaces.space1.id, activeAlertId, 'rule', 'alerting');
- })
- );
-
- await Promise.all(activeAlertIds.map((id) => getEventLogWithRetry(id)));
-
- await Promise.all(
- [...Array(NumErrorAlerts)].map(async () => {
- const errorAlertId = await createTestAlert({
- rule_type_id: 'test.throw',
- schedule: { interval: '24h' },
- });
- errorAlertIds.push(errorAlertId);
- objectRemover.add(Spaces.space1.id, errorAlertId, 'rule', 'alerting');
- })
- );
-
- await Promise.all(errorAlertIds.map((id) => getEventLogWithRetry(id)));
-
- await retry.try(async () => {
- const response = await supertest.get(
- `${getUrlPrefix(Spaces.space1.id)}/internal/alerting/rules/_aggregate`
- );
-
- expect(response.status).to.eql(200);
- expect(response.body).to.eql({
- rule_enabled_status: {
- disabled: 0,
- enabled: 7,
- },
- rule_execution_status: {
- ok: NumOkAlerts,
- active: NumActiveAlerts,
- error: NumErrorAlerts,
- pending: 0,
- unknown: 0,
- warning: 0,
- },
- rule_last_run_outcome: {
- succeeded: 5,
- warning: 0,
- failed: 2,
- },
- rule_muted_status: {
- muted: 0,
- unmuted: 7,
- },
- rule_snoozed_status: {
- snoozed: 0,
- },
- rule_tags: ['foo'],
- });
- });
- });
-
- describe('tags limit', () => {
- it('should be 50 be default', async () => {
- const numOfAlerts = 3;
- const numOfTagsPerAlert = 30;
-
- await Promise.all(
- [...Array(numOfAlerts)].map(async (_, alertIndex) => {
- const okAlertId = await createTestAlert({
- rule_type_id: 'test.noop',
- schedule: { interval: '24h' },
- tags: [...Array(numOfTagsPerAlert)].map(
- (__, i) => `tag-${i + numOfTagsPerAlert * alertIndex}`
- ),
- });
- objectRemover.add(Spaces.space1.id, okAlertId, 'rule', 'alerting');
- })
- );
-
- const response = await supertest.get(
- `${getUrlPrefix(Spaces.space1.id)}/internal/alerting/rules/_aggregate`
- );
-
- expect(response.body.rule_tags.length).to.eql(50);
- });
- });
-
- describe('legacy', () => {
- it('should aggregate alert status totals', async () => {
- const NumOkAlerts = 4;
- const NumActiveAlerts = 1;
- const NumErrorAlerts = 2;
-
- const okAlertIds: string[] = [];
- const activeAlertIds: string[] = [];
- const errorAlertIds: string[] = [];
-
- await Promise.all(
- [...Array(NumOkAlerts)].map(async () => {
- const okAlertId = await createTestAlert({
- rule_type_id: 'test.noop',
- schedule: { interval: '24h' },
- tags: ['a', 'b'],
- });
- okAlertIds.push(okAlertId);
- objectRemover.add(Spaces.space1.id, okAlertId, 'rule', 'alerting');
- })
- );
- await Promise.all(okAlertIds.map((id) => getEventLogWithRetry(id)));
-
- await Promise.all(
- [...Array(NumActiveAlerts)].map(async () => {
- const activeAlertId = await createTestAlert({
- rule_type_id: 'test.patternFiring',
- schedule: { interval: '24h' },
- params: {
- pattern: { instance: new Array(100).fill(true) },
- },
- tags: ['a', 'c', 'f'],
- });
- activeAlertIds.push(activeAlertId);
- objectRemover.add(Spaces.space1.id, activeAlertId, 'rule', 'alerting');
- })
- );
- await Promise.all(activeAlertIds.map((id) => getEventLogWithRetry(id)));
-
- await Promise.all(
- [...Array(NumErrorAlerts)].map(async () => {
- const errorAlertId = await createTestAlert({
- rule_type_id: 'test.throw',
- schedule: { interval: '24h' },
- tags: ['b', 'c', 'd'],
- });
- errorAlertIds.push(errorAlertId);
- objectRemover.add(Spaces.space1.id, errorAlertId, 'rule', 'alerting');
- })
- );
- await Promise.all(errorAlertIds.map((id) => getEventLogWithRetry(id)));
-
- await retry.try(async () => {
- const response = await supertest.get(
- `${getUrlPrefix(Spaces.space1.id)}/api/alerts/_aggregate`
- );
-
- expect(response.status).to.eql(200);
- expect(response.body).to.eql({
- alertExecutionStatus: {
- ok: NumOkAlerts,
- active: NumActiveAlerts,
- error: NumErrorAlerts,
- pending: 0,
- unknown: 0,
- warning: 0,
- },
- ruleEnabledStatus: {
- disabled: 0,
- enabled: 7,
- },
- ruleLastRunOutcome: {
- succeeded: 5,
- warning: 0,
- failed: 2,
- },
- ruleMutedStatus: {
- muted: 0,
- unmuted: 7,
- },
- ruleSnoozedStatus: {
- snoozed: 0,
- },
- ruleTags: ['a', 'b', 'c', 'd', 'f'],
- });
- });
- });
- });
- });
-
- async function createTestAlert(testAlertOverrides = {}) {
- const { body: createdAlert } = await supertest
- .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`)
- .set('kbn-xsrf', 'foo')
- .send(getTestRuleData(testAlertOverrides))
- .expect(200);
- return createdAlert.id;
- }
-}
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts
index 6dacd17642a10..7a0c24878d07f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts
@@ -14,7 +14,6 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
before(async () => await buildUp(getService));
after(async () => await tearDown(getService));
- loadTestFile(require.resolve('./aggregate'));
loadTestFile(require.resolve('./aggregate_post'));
loadTestFile(require.resolve('./create'));
loadTestFile(require.resolve('./delete'));
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/check_registered_rule_types.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/check_registered_rule_types.ts
index 40197f1e18783..e748478b18432 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/check_registered_rule_types.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/check_registered_rule_types.ts
@@ -63,7 +63,7 @@ export default function createRegisteredRuleTypeTests({ getService }: FtrProvide
'monitoring_alert_elasticsearch_version_mismatch',
'monitoring_ccr_read_exceptions',
'monitoring_shard_size',
- 'observability.rules.threshold',
+ 'observability.rules.custom_threshold',
'apm.transaction_duration',
'apm.anomaly',
'apm.error_rate',
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index d49df52bfcd1c..c786a41411a5b 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -55,7 +55,7 @@ export default function ({ getService }: FtrProviderContext) {
'file_operations_all',
'execute_operations_all',
],
- uptime: ['all', 'read', 'minimal_all', 'minimal_read'],
+ uptime: ['all', 'read', 'minimal_all', 'minimal_read', 'elastic_managed_locations_enabled'],
securitySolutionAssistant: ['all', 'read', 'minimal_all', 'minimal_read'],
securitySolutionCases: ['all', 'read', 'minimal_all', 'minimal_read', 'cases_delete'],
infrastructure: ['all', 'read', 'minimal_all', 'minimal_read'],
diff --git a/x-pack/test/api_integration/apis/security/privileges_basic.ts b/x-pack/test/api_integration/apis/security/privileges_basic.ts
index c6982b3c6d53e..6c6d32c1cb1e9 100644
--- a/x-pack/test/api_integration/apis/security/privileges_basic.ts
+++ b/x-pack/test/api_integration/apis/security/privileges_basic.ts
@@ -130,7 +130,13 @@ export default function ({ getService }: FtrProviderContext) {
'file_operations_all',
'execute_operations_all',
],
- uptime: ['all', 'read', 'minimal_all', 'minimal_read'],
+ uptime: [
+ 'all',
+ 'elastic_managed_locations_enabled',
+ 'read',
+ 'minimal_all',
+ 'minimal_read',
+ ],
securitySolutionAssistant: ['all', 'read', 'minimal_all', 'minimal_read'],
securitySolutionCases: ['all', 'read', 'minimal_all', 'minimal_read', 'cases_delete'],
infrastructure: ['all', 'read', 'minimal_all', 'minimal_read'],
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts
index 7d95f6c9ec6bc..ff3611b4ab583 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts
@@ -154,8 +154,7 @@ export default ({ getService }: FtrProviderContext) => {
await waitForSignalsToBePresent(supertest, log, 1, [id]);
const signalsOpen = await getSignalsById(supertest, log, id);
const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
- // @ts-expect-error ts upgrade v4.7.4
- expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+ expect(hits.flat(10)).to.eql([]);
});
});
@@ -283,7 +282,7 @@ export default ({ getService }: FtrProviderContext) => {
await waitForSignalsToBePresent(supertest, log, 1, [id]);
const signalsOpen = await getSignalsById(supertest, log, id);
const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
- expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+ expect(hits.flat(10)).to.eql([]);
});
});
@@ -345,7 +344,7 @@ export default ({ getService }: FtrProviderContext) => {
await waitForSignalsToBePresent(supertest, log, 1, [id]);
const signalsOpen = await getSignalsById(supertest, log, id);
const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
- expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+ expect(hits.flat(10)).to.eql([]);
});
});
@@ -525,7 +524,7 @@ export default ({ getService }: FtrProviderContext) => {
await waitForSignalsToBePresent(supertest, log, 1, [id]);
const signalsOpen = await getSignalsById(supertest, log, id);
const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
- expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+ expect(hits.flat(10)).to.eql([]);
});
});
@@ -695,7 +694,7 @@ export default ({ getService }: FtrProviderContext) => {
await waitForSignalsToBePresent(supertest, log, 1, [id]);
const signalsOpen = await getSignalsById(supertest, log, id);
const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
- expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+ expect(hits.flat(10)).to.eql([]);
});
});
diff --git a/x-pack/test/functional/apps/discover/async_scripted_fields.js b/x-pack/test/functional/apps/discover/async_scripted_fields.js
index 0d48f42c5ba1e..d86298405b72d 100644
--- a/x-pack/test/functional/apps/discover/async_scripted_fields.js
+++ b/x-pack/test/functional/apps/discover/async_scripted_fields.js
@@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }) {
const security = getService('security');
const dashboardAddPanel = getService('dashboardAddPanel');
- describe('async search with scripted fields', function () {
+ describe('search with scripted fields', function () {
this.tags(['skipFirefox']);
before(async function () {
@@ -51,7 +51,7 @@ export default function ({ getService, getPageObjects }) {
await security.testUser.restoreDefaults();
});
- it('query should show failed shards callout', async function () {
+ it('query should show incomplete results callout', async function () {
if (false) {
/* If you had to modify the scripted fields, you could un-comment all this, run it, use es_archiver to update 'kibana_scripted_fields_on_logstash'
*/
@@ -81,11 +81,11 @@ export default function ({ getService, getPageObjects }) {
'dscNoResultsInterceptedWarningsCallout_warningTitle'
);
log.debug(shardMessage);
- expect(shardMessage).to.be('1 of 3 shards failed');
+ expect(shardMessage).to.be('The data might be incomplete or wrong.');
});
});
- it('query should show failed shards badge on dashboard', async function () {
+ it('query should show incomplete results badge on dashboard', async function () {
await security.testUser.setRoles([
'test_logstash_reader',
'global_discover_all',
diff --git a/x-pack/test/functional/apps/observability_log_explorer/header_menu.ts b/x-pack/test/functional/apps/observability_log_explorer/header_menu.ts
index ee15563b7f208..7cc6f74c452e6 100644
--- a/x-pack/test/functional/apps/observability_log_explorer/header_menu.ts
+++ b/x-pack/test/functional/apps/observability_log_explorer/header_menu.ts
@@ -8,6 +8,7 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const browser = getService('browser');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const retry = getService('retry');
@@ -35,6 +36,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
describe('Discover fallback link', () => {
+ before(async () => {
+ await PageObjects.observabilityLogExplorer.navigateTo();
+ });
+
it('should render a button link ', async () => {
const discoverLink = await PageObjects.observabilityLogExplorer.getDiscoverFallbackLink();
expect(await discoverLink.isDisplayed()).to.be(true);
@@ -77,5 +82,26 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});
});
+
+ describe('Add data link', () => {
+ before(async () => {
+ await PageObjects.observabilityLogExplorer.navigateTo();
+ });
+
+ it('should render a button link ', async () => {
+ const onboardingLink = await PageObjects.observabilityLogExplorer.getOnboardingLink();
+ expect(await onboardingLink.isDisplayed()).to.be(true);
+ });
+
+ it('should navigate to the observability onboarding overview page', async () => {
+ const onboardingLink = await PageObjects.observabilityLogExplorer.getOnboardingLink();
+ onboardingLink.click();
+
+ await retry.try(async () => {
+ const url = await browser.getCurrentUrl();
+ expect(url).to.contain(`/app/observabilityOnboarding`);
+ });
+ });
+ });
});
}
diff --git a/x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/creation_runtime_mappings.ts b/x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/creation_runtime_mappings.ts
index 3f0adc5783893..ae6ac9adab2f5 100644
--- a/x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/creation_runtime_mappings.ts
+++ b/x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/creation_runtime_mappings.ts
@@ -34,7 +34,8 @@ export default function ({ getService }: FtrProviderContext) {
},
};
- describe('creation with runtime mappings', function () {
+ // Failing: See https://github.com/elastic/kibana/issues/166395
+ describe.skip('creation with runtime mappings', function () {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
await transform.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
diff --git a/x-pack/test/functional/page_objects/observability_log_explorer.ts b/x-pack/test/functional/page_objects/observability_log_explorer.ts
index 7e4b83083ace0..9e46c9bf826a3 100644
--- a/x-pack/test/functional/page_objects/observability_log_explorer.ts
+++ b/x-pack/test/functional/page_objects/observability_log_explorer.ts
@@ -323,6 +323,10 @@ export function ObservabilityLogExplorerPageObject({
return testSubjects.find('logExplorerDiscoverFallbackLink');
},
+ getOnboardingLink() {
+ return testSubjects.find('logExplorerOnboardingLink');
+ },
+
// Query Bar
getQueryBar() {
return testSubjects.find('queryInput');
diff --git a/x-pack/test/observability_functional/apps/observability/pages/rule_details_page.ts b/x-pack/test/observability_functional/apps/observability/pages/rule_details_page.ts
index 5f09137850a2d..f7f9b1eb9ff00 100644
--- a/x-pack/test/observability_functional/apps/observability/pages/rule_details_page.ts
+++ b/x-pack/test/observability_functional/apps/observability/pages/rule_details_page.ts
@@ -36,8 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
return true;
}
- // FLAKY: https://github.com/elastic/kibana/issues/165619
- describe.skip('Observability Rule Details page', function () {
+ describe('Observability Rule Details page', function () {
this.tags('includeFirefox');
let uptimeRuleId: string;
@@ -149,10 +148,14 @@ export default ({ getService }: FtrProviderContext) => {
describe('Alert summary widget component', () => {
before(async () => {
- await observability.alerts.common.navigateToRuleDetailsByRuleId(uptimeRuleId);
+ await observability.alerts.common.navigateToRuleDetailsByRuleId(logThresholdRuleId);
+ await retry.waitFor(
+ 'Rule details to be visible',
+ async () => await testSubjects.exists('ruleDetails')
+ );
});
- it('shows component on the rule detils page', async () => {
+ it('shows component on the rule details page', async () => {
await observability.components.alertSummaryWidget.getCompactComponentSelectorOrFail();
const timeRangeTitle =
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/rules_table/rules_table_auto_refresh.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/rules_table/rules_table_auto_refresh.cy.ts
index ffcfb468e0824..35e6e596131ec 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/rules_table/rules_table_auto_refresh.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/rules_table/rules_table_auto_refresh.cy.ts
@@ -22,6 +22,7 @@ import {
expectNumberOfRules,
selectRulesByName,
getRuleRow,
+ setRulesTableAutoRefreshIntervalSetting,
} from '../../../../tasks/alerts_detection_rules';
import { login, visit, visitWithoutDateRange } from '../../../../tasks/login';
@@ -30,8 +31,7 @@ import { createRule } from '../../../../tasks/api_calls/rules';
import { cleanKibana } from '../../../../tasks/common';
import { getNewRule } from '../../../../objects/rule';
-const DEFAULT_RULE_REFRESH_INTERVAL_VALUE = 60000;
-const NUM_OF_TEST_RULES = 6;
+const RULES_TABLE_REFRESH_INTERVAL_MS = 60000;
// TODO: https://github.com/elastic/kibana/issues/161540
describe(
@@ -42,82 +42,128 @@ describe(
cleanKibana();
login();
- for (let i = 1; i <= NUM_OF_TEST_RULES; ++i) {
- createRule(getNewRule({ name: `Test rule ${i}`, rule_id: `${i}`, enabled: false }));
- }
+ setRulesTableAutoRefreshIntervalSetting({
+ enabled: true,
+ refreshInterval: RULES_TABLE_REFRESH_INTERVAL_MS,
+ });
+ createRule(getNewRule({ name: 'Test rule 1', rule_id: '1', enabled: false }));
});
beforeEach(() => {
login();
});
- it('Auto refreshes rules', () => {
- mockGlobalClock();
- visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
+ it('gets deactivated when any rule selected and activated after rules unselected', () => {
+ visit(DETECTIONS_RULE_MANAGEMENT_URL);
+
+ expectNumberOfRules(RULES_MANAGEMENT_TABLE, 1);
+
+ // check refresh settings if it's enabled before selecting
+ expectAutoRefreshIsEnabled();
+
+ selectAllRules();
- expectNumberOfRules(RULES_MANAGEMENT_TABLE, NUM_OF_TEST_RULES);
+ // auto refresh should be deactivated (which means disabled without an ability to enable it) after rules selected
+ expectAutoRefreshIsDeactivated();
- // // mock 1 minute passing to make sure refresh is conducted
- cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
- cy.tick(DEFAULT_RULE_REFRESH_INTERVAL_VALUE);
- cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('be.visible');
+ clearAllRuleSelection();
- cy.contains(REFRESH_RULES_STATUS, 'Updated now');
+ // after all rules unselected, auto refresh should be reset to its previous state
+ expectAutoRefreshIsEnabled();
});
- it('should prevent table from rules refetch if any rule selected', () => {
- mockGlobalClock();
- visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
+ describe('when enabled', () => {
+ beforeEach(() => {
+ mockGlobalClock();
+ visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
- expectNumberOfRules(RULES_MANAGEMENT_TABLE, NUM_OF_TEST_RULES);
+ expectNumberOfRules(RULES_MANAGEMENT_TABLE, 1);
+ });
- selectRulesByName(['Test rule 1']);
+ it('refreshes rules after refresh interval has passed', () => {
+ cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
+ cy.tick(RULES_TABLE_REFRESH_INTERVAL_MS);
+ cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('be.visible');
- // mock 1 minute passing to make sure refresh is not conducted
- cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
- cy.tick(DEFAULT_RULE_REFRESH_INTERVAL_VALUE);
- cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
+ cy.contains(REFRESH_RULES_STATUS, 'Updated now');
+ });
- // ensure rule is still selected
- getRuleRow('Test rule 1').find(EUI_CHECKBOX).should('be.checked');
+ it('refreshes rules on window focus', () => {
+ cy.tick(RULES_TABLE_REFRESH_INTERVAL_MS / 2);
- cy.get(REFRESH_RULES_STATUS).should('have.not.text', 'Updated now');
+ cy.window().trigger('blur');
+ cy.window().trigger('focus');
+
+ cy.contains(REFRESH_RULES_STATUS, 'Updated now');
+ });
});
- it('should disable auto refresh when any rule selected and enable it after rules unselected', () => {
- visit(DETECTIONS_RULE_MANAGEMENT_URL);
+ describe('when disabled', () => {
+ beforeEach(() => {
+ mockGlobalClock();
+ visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
+ expectNumberOfRules(RULES_MANAGEMENT_TABLE, 1);
+ });
- expectNumberOfRules(RULES_MANAGEMENT_TABLE, NUM_OF_TEST_RULES);
+ it('does NOT refresh rules after refresh interval has passed', () => {
+ disableAutoRefresh();
+ cy.tick(RULES_TABLE_REFRESH_INTERVAL_MS * 2); // Make sure enough time has passed to verify auto-refresh doesn't happen
- // check refresh settings if it's enabled before selecting
- expectAutoRefreshIsEnabled();
+ cy.contains(REFRESH_RULES_STATUS, 'Updated 2 minutes ago');
+ });
- selectAllRules();
+ it('does NOT refresh rules on window focus', () => {
+ disableAutoRefresh();
+ cy.tick(RULES_TABLE_REFRESH_INTERVAL_MS * 2); // Make sure enough time has passed to verify auto-refresh doesn't happen
- // auto refresh should be deactivated (which means disabled without an ability to enable it) after rules selected
- expectAutoRefreshIsDeactivated();
+ cy.window().trigger('blur');
+ cy.window().trigger('focus');
- clearAllRuleSelection();
+ // We need to make sure window focus event doesn't cause refetching. Without some delay
+ // the following expectations always pass even. It happens since 'focus' event gets handled
+ // in an async way so the status text is updated with some delay.
+ // eslint-disable-next-line cypress/no-unnecessary-waiting
+ cy.wait(1000);
- // after all rules unselected, auto refresh should be reset to its previous state
- expectAutoRefreshIsEnabled();
- });
+ // By using a custom timeout make sure it doesn't wait too long due to global timeout configuration
+ // so the expected text appears after a refresh and the test passes while it shouldn't.
+ cy.contains(REFRESH_RULES_STATUS, 'Updated 2 minutes ago', { timeout: 10000 });
+ });
- it('should not enable auto refresh after rules were unselected if auto refresh was disabled', () => {
- visit(DETECTIONS_RULE_MANAGEMENT_URL);
+ it('does NOT get enabled after rules were unselected', () => {
+ disableAutoRefresh();
+ cy.tick(RULES_TABLE_REFRESH_INTERVAL_MS * 2); // Make sure enough time has passed to verify auto-refresh doesn't happen
- expectNumberOfRules(RULES_MANAGEMENT_TABLE, NUM_OF_TEST_RULES);
+ selectAllRules();
- disableAutoRefresh();
+ expectAutoRefreshIsDeactivated();
- selectAllRules();
+ clearAllRuleSelection();
- expectAutoRefreshIsDeactivated();
+ // after all rules unselected, auto refresh should still be disabled
+ expectAutoRefreshIsDisabled();
+ });
+ });
- clearAllRuleSelection();
+ describe('when one rule is selected', () => {
+ it('does NOT refresh after refresh interval has passed', () => {
+ mockGlobalClock();
+ visitWithoutDateRange(DETECTIONS_RULE_MANAGEMENT_URL);
+
+ expectNumberOfRules(RULES_MANAGEMENT_TABLE, 1);
+
+ selectRulesByName(['Test rule 1']);
+
+ // mock 1 minute passing to make sure refresh is not conducted
+ cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
+ cy.tick(RULES_TABLE_REFRESH_INTERVAL_MS * 2); // Make sure enough time has passed
+ cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
+
+ // ensure rule is still selected
+ getRuleRow('Test rule 1').find(EUI_CHECKBOX).should('be.checked');
- // after all rules unselected, auto refresh should still be disabled
- expectAutoRefreshIsDisabled();
+ cy.get(REFRESH_RULES_STATUS).should('have.not.text', 'Updated now');
+ });
});
}
);
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts
index 969934eb5fee1..02c25f751e6a6 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts
@@ -268,13 +268,13 @@ describe(
cy.get(DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_INSIGHTS_THREAT_INTELLIGENCE_VALUES)
.eq(0)
.should('be.visible')
- .and('have.text', '0 threat match detected'); // TODO work on getting proper IoC data to get proper data here
+ .and('have.text', '0 threat matches detected'); // TODO work on getting proper IoC data to get proper data here
// field with threat enrichement
cy.get(DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_INSIGHTS_THREAT_INTELLIGENCE_VALUES)
.eq(1)
.should('be.visible')
- .and('have.text', '0 field enriched with threat intelligence'); // TODO work on getting proper IoC data to get proper data here
+ .and('have.text', '0 fields enriched with threat intelligence'); // TODO work on getting proper IoC data to get proper data here
});
cy.log('should navigate to left panel Threat Intelligence tab');
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/alerts_detection_rules.ts b/x-pack/test/security_solution_cypress/cypress/tasks/alerts_detection_rules.ts
index cb920e8093be1..304e35e6826bf 100644
--- a/x-pack/test/security_solution_cypress/cypress/tasks/alerts_detection_rules.ts
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/alerts_detection_rules.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
+import { DEFAULT_RULES_TABLE_REFRESH_SETTING } from '@kbn/security-solution-plugin/common/constants';
import {
COLLAPSED_ACTION_BTN,
CUSTOM_RULES_BTN,
@@ -64,6 +65,7 @@ import { PAGE_CONTENT_SPINNER } from '../screens/common/page';
import { goToRuleEditSettings } from './rule_details';
import { goToActionsStepTab } from './create_new_rule';
+import { setKibanaSetting } from './api_calls/kibana_advanced_settings';
export const getRulesManagementTableRows = () => cy.get(RULES_MANAGEMENT_TABLE).find(RULES_ROW);
@@ -516,3 +518,29 @@ const unselectRuleByName = (ruleName: string) => {
cy.log(`Make sure rule "${ruleName}" has been unselected`);
getRuleRow(ruleName).find(EUI_CHECKBOX).should('not.be.checked');
};
+
+/**
+ * Set Kibana `securitySolution:rulesTableRefresh` setting looking like
+ *
+ * ```
+ * { "on": true, "value": 60000 }
+ * ```
+ *
+ * @param enabled whether the auto-refresh is enabled
+ * @param refreshInterval refresh interval in milliseconds
+ */
+export const setRulesTableAutoRefreshIntervalSetting = ({
+ enabled,
+ refreshInterval,
+}: {
+ enabled: boolean;
+ refreshInterval: number; // milliseconds
+}) => {
+ setKibanaSetting(
+ DEFAULT_RULES_TABLE_REFRESH_SETTING,
+ JSON.stringify({
+ on: enabled,
+ value: refreshInterval,
+ })
+ );
+};
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/kibana_advanced_settings.ts b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/kibana_advanced_settings.ts
index f86cd0186c8c2..2c982adad5275 100644
--- a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/kibana_advanced_settings.ts
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/kibana_advanced_settings.ts
@@ -5,30 +5,27 @@
* 2.0.
*/
+import { SECURITY_SOLUTION_SHOW_RELATED_INTEGRATIONS_ID } from '@kbn/management-settings-ids';
+import { ENABLE_EXPANDABLE_FLYOUT_SETTING } from '@kbn/security-solution-plugin/common/constants';
import { rootRequest } from '../common';
-const kibanaSettings = (body: Cypress.RequestBody) => {
+export const setKibanaSetting = (key: string, value: boolean | number | string) => {
rootRequest({
method: 'POST',
url: 'internal/kibana/settings',
- body,
+ body: { changes: { [key]: value } },
headers: { 'kbn-xsrf': 'cypress-creds', 'x-elastic-internal-origin': 'security-solution' },
});
};
-const relatedIntegrationsBody = (status: boolean): Cypress.RequestBody => {
- return { changes: { 'securitySolution:showRelatedIntegrations': status } };
-};
-
export const enableRelatedIntegrations = () => {
- kibanaSettings(relatedIntegrationsBody(true));
+ setKibanaSetting(SECURITY_SOLUTION_SHOW_RELATED_INTEGRATIONS_ID, true);
};
export const disableRelatedIntegrations = () => {
- kibanaSettings(relatedIntegrationsBody(false));
+ setKibanaSetting(SECURITY_SOLUTION_SHOW_RELATED_INTEGRATIONS_ID, false);
};
export const disableExpandableFlyout = () => {
- const body = { changes: { 'securitySolution:enableExpandableFlyout': false } };
- kibanaSettings(body);
+ setKibanaSetting(ENABLE_EXPANDABLE_FLYOUT_SETTING, false);
};
diff --git a/x-pack/test/security_solution_cypress/cypress/tsconfig.json b/x-pack/test/security_solution_cypress/cypress/tsconfig.json
index ec9ce83a98f03..b82ce28aa8f04 100644
--- a/x-pack/test/security_solution_cypress/cypress/tsconfig.json
+++ b/x-pack/test/security_solution_cypress/cypress/tsconfig.json
@@ -37,6 +37,7 @@
"@kbn/config-schema",
"@kbn/lists-plugin",
"@kbn/securitysolution-list-constants",
- "@kbn/security-plugin"
+ "@kbn/security-plugin",
+ "@kbn/management-settings-ids"
]
}
diff --git a/x-pack/test_serverless/api_integration/services/alerting_api.ts b/x-pack/test_serverless/api_integration/services/alerting_api.ts
index 8eb771d7eb11d..668dcdab82aa0 100644
--- a/x-pack/test_serverless/api_integration/services/alerting_api.ts
+++ b/x-pack/test_serverless/api_integration/services/alerting_api.ts
@@ -11,7 +11,7 @@ import type {
} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { MetricThresholdParams } from '@kbn/infra-plugin/common/alerting/metrics';
-import { ThresholdParams } from '@kbn/observability-plugin/common/threshold_rule/types';
+import { ThresholdParams } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
import { FtrProviderContext } from '../ftr_provider_context';
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/alerting/alert_documents.ts b/x-pack/test_serverless/api_integration/test_suites/common/alerting/alert_documents.ts
index 12d23a3c6d78e..799d87f65e10f 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/alerting/alert_documents.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/alerting/alert_documents.ts
@@ -19,9 +19,7 @@ export default function ({ getService }: FtrProviderContext) {
const esClient = getService('es');
const objectRemover = new ObjectRemover(supertest);
- // FLAKY: https://github.com/elastic/kibana/issues/165779
- // FLAKY: https://github.com/elastic/kibana/issues/165388
- describe.skip('Alert documents', () => {
+ describe('Alert documents', () => {
const RULE_TYPE_ID = '.es-query';
const ALERT_INDEX = '.alerts-stack.alerts-default';
let ruleId: string;
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/alerting/helpers/alerting_wait_for_helpers.ts b/x-pack/test_serverless/api_integration/test_suites/common/alerting/helpers/alerting_wait_for_helpers.ts
index 7b86988e879c3..5422d6a7b8cee 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/alerting/helpers/alerting_wait_for_helpers.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/alerting/helpers/alerting_wait_for_helpers.ts
@@ -23,7 +23,7 @@ export async function waitForDocumentInIndex({
indexName: string;
num?: number;
}): Promise {
- return pRetry(
+ return await pRetry(
async () => {
const response = await esClient.search({ index: indexName });
if (response.hits.hits.length < num) {
@@ -74,7 +74,7 @@ export async function waitForAlertInIndex({
ruleId: string;
num: number;
}): Promise>> {
- return pRetry(
+ return await pRetry(
async () => {
const response = await esClient.search({
index: indexName,
@@ -115,7 +115,7 @@ export async function waitForAllTasksIdle({
esClient: Client;
filter: Date;
}): Promise {
- return pRetry(
+ return await pRetry(
async () => {
const response = await esClient.search({
index: '.kibana_task_manager',
@@ -167,7 +167,7 @@ export async function waitForAllTasks({
taskType: string;
attempts: number;
}): Promise {
- return pRetry(
+ return await pRetry(
async () => {
const response = await esClient.search({
index: '.kibana_task_manager',
@@ -225,7 +225,7 @@ export async function waitForDisabled({
ruleId: string;
filter: Date;
}): Promise {
- return pRetry(
+ return await pRetry(
async () => {
const response = await esClient.search({
index: '.kibana_task_manager',
@@ -280,7 +280,7 @@ export async function waitForExecutionEventLog({
ruleId: string;
num?: number;
}): Promise {
- return pRetry(
+ return await pRetry(
async () => {
const response = await esClient.search({
index: '.kibana-event-log*',
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/alerting/rules.ts b/x-pack/test_serverless/api_integration/test_suites/common/alerting/rules.ts
index dd6060a397059..e9d3c85f21028 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/alerting/rules.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/alerting/rules.ts
@@ -35,8 +35,7 @@ export default function ({ getService }: FtrProviderContext) {
const esClient = getService('es');
const esDeleteAllIndices = getService('esDeleteAllIndices');
- // Failing: See https://github.com/elastic/kibana/issues/164017
- describe.skip('Alerting rules', () => {
+ describe('Alerting rules', () => {
const RULE_TYPE_ID = '.es-query';
const ALERT_ACTION_INDEX = 'alert-action-es-query';
let actionId: string;
@@ -119,22 +118,6 @@ export default function ({ getService }: FtrProviderContext) {
});
expect(resp.hits.hits.length).to.be(1);
- await waitForAllTasksIdle({
- esClient,
- filter: testStart,
- });
-
- await disableRule({
- supertest,
- ruleId,
- });
-
- await waitForDisabled({
- esClient,
- ruleId,
- filter: testStart,
- });
-
const document = resp.hits.hits[0];
expect(document._source).to.eql({
alertActionGroup: 'query matched',
@@ -157,7 +140,7 @@ export default function ({ getService }: FtrProviderContext) {
expect(eventLogResp.hits.hits.length).to.be(1);
const eventLogDocument = eventLogResp.hits.hits[0]._source;
- await validateEventLog(eventLogDocument, {
+ validateEventLog(eventLogDocument, {
ruleId,
ruleTypeId: RULE_TYPE_ID,
outcome: 'success',
@@ -928,7 +911,8 @@ function validateEventLog(event: any, params: ValidateEventLogParams) {
expect(event?.kibana?.alert?.rule?.execution?.metrics?.number_of_triggered_actions).to.be(1);
expect(event?.kibana?.alert?.rule?.execution?.metrics?.number_of_searches).to.be(1);
- expect(event?.kibana?.alert?.rule?.execution?.metrics?.es_search_duration_ms).to.be(0);
+ // Sometimes fast enough that it will report 0ms
+ expect(event?.kibana?.alert?.rule?.execution?.metrics?.es_search_duration_ms >= 0).to.be.ok();
expect(
event?.kibana?.alert?.rule?.execution?.metrics?.total_search_duration_ms
).to.be.greaterThan(0);
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/avg_pct_fired.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_fired.ts
similarity index 90%
rename from x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/avg_pct_fired.ts
rename to x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_fired.ts
index 77114463eb89f..f75faa2b2f686 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/avg_pct_fired.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_fired.ts
@@ -6,8 +6,11 @@
*/
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../../../ftr_provider_context';
@@ -22,8 +25,8 @@ export default function ({ getService }: FtrProviderContext) {
// Blocked API: index_not_found_exception: no such index [.alerts-observability.threshold.alerts-default]
// Issue: https://github.com/elastic/kibana/issues/165138
- describe.skip('Threshold rule - AVG - PCT - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe.skip('Custom Threshold rule - AVG - PCT - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -49,7 +52,7 @@ export default function ({ getService }: FtrProviderContext) {
.set('kbn-xsrf', 'foo')
.set('x-elastic-internal-origin', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -131,13 +134,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await alertingApi.waitForAlertInIndex({
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -145,14 +148,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/avg_pct_no_data.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts
similarity index 90%
rename from x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/avg_pct_no_data.ts
rename to x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts
index cbfdf251ba602..fbcb7a1404293 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/avg_pct_no_data.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts
@@ -5,8 +5,11 @@
* 2.0.
*/
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../../../ftr_provider_context';
@@ -19,8 +22,8 @@ export default function ({ getService }: FtrProviderContext) {
// Blocked API: index_not_found_exception: no such index [.alerts-observability.threshold.alerts-default]
// Issue: https://github.com/elastic/kibana/issues/165138
- describe.skip('Threshold rule - AVG - PCT - NoData', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe.skip('Custom Threshold rule - AVG - PCT - NoData', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id-no-data';
let actionId: string;
@@ -44,7 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
.set('kbn-xsrf', 'foo')
.set('x-elastic-internal-origin', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -124,13 +127,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await alertingApi.waitForAlertInIndex({
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -138,14 +141,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.nodata');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.nodata'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/custom_eq_avg_bytes_fired.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
similarity index 91%
rename from x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/custom_eq_avg_bytes_fired.ts
rename to x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
index 81b57e492f100..3e996e555b092 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/custom_eq_avg_bytes_fired.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
@@ -12,8 +12,11 @@
*/
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../../../ftr_provider_context';
@@ -27,8 +30,8 @@ export default function ({ getService }: FtrProviderContext) {
const dataViewApi = getService('dataViewApi');
// Issue: https://github.com/elastic/kibana/issues/165138
- describe.skip('Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe.skip('Custom Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -54,7 +57,7 @@ export default function ({ getService }: FtrProviderContext) {
.set('kbn-xsrf', 'foo')
.set('x-elastic-internal-origin', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -138,13 +141,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await alertingApi.waitForAlertInIndex({
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -152,14 +155,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/documents_count_fired.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts
similarity index 90%
rename from x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/documents_count_fired.ts
rename to x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts
index ad0624a91dfb1..1fa95b8cab8a9 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/documents_count_fired.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts
@@ -6,8 +6,11 @@
*/
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../../../ftr_provider_context';
@@ -21,8 +24,8 @@ export default function ({ getService }: FtrProviderContext) {
const dataViewApi = getService('dataViewApi');
// Issue: https://github.com/elastic/kibana/issues/165138
- describe.skip('Threshold rule - DOCUMENTS_COUNT - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe.skip('Custom Threshold rule - DOCUMENTS_COUNT - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -48,7 +51,7 @@ export default function ({ getService }: FtrProviderContext) {
.set('kbn-xsrf', 'foo')
.set('x-elastic-internal-origin', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -128,13 +131,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await alertingApi.waitForAlertInIndex({
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -142,14 +145,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/group_by_fired.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts
similarity index 92%
rename from x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/group_by_fired.ts
rename to x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts
index 5cadfbc6b3d9d..8bd8312a5184a 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/group_by_fired.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts
@@ -14,8 +14,11 @@
import { kbnTestConfig } from '@kbn/test';
import moment from 'moment';
import { cleanup, generate } from '@kbn/infra-forge';
-import { Aggregators, Comparator } from '@kbn/observability-plugin/common/threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/threshold/threshold_executor';
+import {
+ Aggregators,
+ Comparator,
+} from '@kbn/observability-plugin/common/custom_threshold_rule/types';
+import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/custom_threshold_executor';
import expect from '@kbn/expect';
import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/observability-plugin/common/constants';
import { FtrProviderContext } from '../../../ftr_provider_context';
@@ -31,8 +34,8 @@ export default function ({ getService }: FtrProviderContext) {
let startedAt: string;
// Issue: https://github.com/elastic/kibana/issues/165138
- describe.skip('Threshold rule - GROUP_BY - FIRED', () => {
- const THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
+ describe.skip('Custom Threshold rule - GROUP_BY - FIRED', () => {
+ const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
const ALERT_ACTION_INDEX = 'alert-action-threshold';
const DATA_VIEW_ID = 'data-view-id';
let infraDataIndex: string;
@@ -58,7 +61,7 @@ export default function ({ getService }: FtrProviderContext) {
.set('kbn-xsrf', 'foo')
.set('x-elastic-internal-origin', 'foo');
await esClient.deleteByQuery({
- index: THRESHOLD_RULE_ALERT_INDEX,
+ index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
query: { term: { 'kibana.alert.rule.uuid': ruleId } },
});
await esClient.deleteByQuery({
@@ -145,7 +148,7 @@ export default function ({ getService }: FtrProviderContext) {
it('should set correct information in the alert document', async () => {
const resp = await alertingApi.waitForAlertInIndex({
- indexName: THRESHOLD_RULE_ALERT_INDEX,
+ indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
ruleId,
});
alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
@@ -153,7 +156,7 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.category',
- 'Threshold (Technical Preview)'
+ 'Custom threshold (BETA)'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'alerts');
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
@@ -161,14 +164,17 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
expect(resp.hits.hits[0]._source).property(
'kibana.alert.rule.rule_type_id',
- 'observability.rules.threshold'
+ 'observability.rules.custom_threshold'
);
expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
expect(resp.hits.hits[0]._source)
.property('kibana.alert.rule.tags')
.contain('observability');
- expect(resp.hits.hits[0]._source).property('kibana.alert.action_group', 'threshold.fired');
+ expect(resp.hits.hits[0]._source).property(
+ 'kibana.alert.action_group',
+ 'custom_threshold.fired'
+ );
expect(resp.hits.hits[0]._source).property('tags').contain('observability');
expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', 'host-0');
expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
@@ -216,7 +222,7 @@ export default function ({ getService }: FtrProviderContext) {
});
const { protocol, hostname, port } = kbnTestConfig.getUrlParts();
- expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.threshold');
+ expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
`${protocol}://${hostname}:${port}/app/observability/alerts?_a=(kuery:%27kibana.alert.uuid:%20%22${alertId}%22%27%2CrangeFrom:%27${rangeFrom}%27%2CrangeTo:now%2Cstatus:all)`
);
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/index.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts
similarity index 93%
rename from x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/index.ts
rename to x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts
index dbb8968d2d946..944068af6a21b 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/threshold_rule/index.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts
@@ -8,7 +8,7 @@
import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
- describe('Threshold Rule', function () {
+ describe('Custom Threshold Rule', function () {
loadTestFile(require.resolve('./avg_pct_fired'));
loadTestFile(require.resolve('./avg_pct_no_data'));
loadTestFile(require.resolve('./documents_count_fired'));
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts b/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts
index d9643f91d70ae..a3a5ab552ee3f 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts
@@ -9,6 +9,6 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('Serverless observability API - feature flags', function () {
- loadTestFile(require.resolve('./threshold_rule'));
+ loadTestFile(require.resolve('./custom_threshold_rule'));
});
}
diff --git a/x-pack/test_serverless/functional/test_suites/observability/observability_log_explorer/header_menu.ts b/x-pack/test_serverless/functional/test_suites/observability/observability_log_explorer/header_menu.ts
index 0b40780aace2b..5e3d235f10c53 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/observability_log_explorer/header_menu.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/observability_log_explorer/header_menu.ts
@@ -8,6 +8,7 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const browser = getService('browser');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const retry = getService('retry');
@@ -36,6 +37,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
describe('Discover fallback link', () => {
+ before(async () => {
+ await PageObjects.observabilityLogExplorer.navigateTo();
+ });
+
it('should render a button link ', async () => {
const discoverLink = await PageObjects.observabilityLogExplorer.getDiscoverFallbackLink();
expect(await discoverLink.isDisplayed()).to.be(true);
@@ -78,5 +83,26 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});
});
+
+ describe('Add data link', () => {
+ before(async () => {
+ await PageObjects.observabilityLogExplorer.navigateTo();
+ });
+
+ it('should render a button link ', async () => {
+ const onboardingLink = await PageObjects.observabilityLogExplorer.getOnboardingLink();
+ expect(await onboardingLink.isDisplayed()).to.be(true);
+ });
+
+ it('should navigate to the observability onboarding overview page', async () => {
+ const onboardingLink = await PageObjects.observabilityLogExplorer.getOnboardingLink();
+ onboardingLink.click();
+
+ await retry.try(async () => {
+ const url = await browser.getCurrentUrl();
+ expect(url).to.contain(`/app/observabilityOnboarding`);
+ });
+ });
+ });
});
}
diff --git a/x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts b/x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
index 33d7c582835d2..1db2cc6e0119f 100644
--- a/x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
@@ -20,6 +20,12 @@ export default defineCypressConfig({
viewportHeight: 946,
viewportWidth: 1680,
numTestsKeptInMemory: 10,
+ env: {
+ KIBANA_USERNAME: 'system_indices_superuser',
+ KIBANA_PASSWORD: 'changeme',
+ ELASTICSEARCH_USERNAME: 'system_indices_superuser',
+ ELASTICSEARCH_PASSWORD: 'changeme',
+ },
e2e: {
experimentalRunAllSpecs: true,
experimentalMemoryManagement: true,
diff --git a/yarn.lock b/yarn.lock
index e9c20dd8ff99a..8416457ad4a45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2950,6 +2950,13 @@
resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
+"@kayahr/text-encoding@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@kayahr/text-encoding/-/text-encoding-1.2.0.tgz#9d75de6b40d7694e524c8ce39fc6e08994680746"
+ integrity sha512-61R84DjOQvO4bakOl4Vwuw0wU3FLbFtfUf4ApJquQ2+N3AY2VlN0j9te8rpGFHx2mzvhWKetyDgVZiLeU2/dhA==
+ dependencies:
+ tslib "^2.5.2"
+
"@kbn/aad-fixtures-plugin@link:x-pack/test/alerting_api_integration/common/plugins/aad":
version "0.0.0"
uid ""
@@ -23394,10 +23401,10 @@ opener@^1.5.2:
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-openpgp@5.3.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/openpgp/-/openpgp-5.3.0.tgz#e8fc97e538865b8c095dbd91c7be4203bd1dd1df"
- integrity sha512-qjCj0vYpV3dmmkE+vURiJ5kVAJwrMk8BPukvpWJiHcTNWKwPVsRS810plIe4klIcHVf1ScgUQwqtBbv99ff+kQ==
+openpgp@5.10.1:
+ version "5.10.1"
+ resolved "https://registry.yarnpkg.com/openpgp/-/openpgp-5.10.1.tgz#3b137470187b79281719ced16fb9e60b822cfd24"
+ integrity sha512-SR5Ft+ej51d0+p53ld5Ney0Yiz0y8Mh1YYLJrvpRMbTaNhvS1QcDX0Oq1rW9sjBnQXtgrpWw2Zve3rm7K5C/pw==
dependencies:
asn1.js "^5.0.0"
@@ -29154,6 +29161,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+tslib@^2.5.2:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+ integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
tslib@~2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"