mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
[Synthetics] Implement private location run once (#162582)
## Summary
Implement private location run once mode , user will be able to do run
once or test now for private locations as well.
This implemented a task manager which will clean up temporarily created
package policies created for the purpose of run once and test now mode.
<img width="1718" alt="image"
src="e5ac3a52-516f-48eb-953f-fa573d825a57">
This commit is contained in:
Shahzad
GitHub
parent
2279dcec87
commit
4eac242818
28 changed files with 373 additions and 198 deletions
|
|
@ -13,14 +13,11 @@ import { v4 as uuidv4 } from 'uuid';
|
|||
import { useFetcher } from '@kbn/observability-shared-plugin/public';
|
||||
import { TestNowModeFlyout, TestRun } from '../../test_now_mode/test_now_mode_flyout';
|
||||
import { format } from './formatter';
|
||||
import {
|
||||
Locations,
|
||||
MonitorFields as MonitorFieldsType,
|
||||
} from '../../../../../../common/runtime_types';
|
||||
import { MonitorFields as MonitorFieldsType } from '../../../../../../common/runtime_types';
|
||||
import { runOnceMonitor } from '../../../state/manual_test_runs/api';
|
||||
|
||||
export const RunTestButton = () => {
|
||||
const { watch, formState, getValues, handleSubmit } = useFormContext();
|
||||
const { formState, getValues, handleSubmit } = useFormContext();
|
||||
|
||||
const [inProgress, setInProgress] = useState(false);
|
||||
const [testRun, setTestRun] = useState<TestRun>();
|
||||
|
|
@ -51,13 +48,7 @@ export const RunTestButton = () => {
|
|||
}
|
||||
}, [testRun?.id]);
|
||||
|
||||
const locations = watch('locations') as Locations;
|
||||
|
||||
const { tooltipContent, isDisabled } = useTooltipContent(
|
||||
locations,
|
||||
formState.isValid,
|
||||
inProgress
|
||||
);
|
||||
const { tooltipContent, isDisabled } = useTooltipContent(formState.isValid, inProgress);
|
||||
|
||||
return (
|
||||
<>
|
||||
|
|
@ -94,22 +85,12 @@ export const RunTestButton = () => {
|
|||
);
|
||||
};
|
||||
|
||||
const useTooltipContent = (
|
||||
locations: Locations,
|
||||
isValid: boolean,
|
||||
isTestRunInProgress?: boolean
|
||||
) => {
|
||||
const isAnyPublicLocationSelected = locations?.some((loc) => loc.isServiceManaged);
|
||||
const isOnlyPrivateLocations = (locations?.length ?? 0) > 0 && !isAnyPublicLocationSelected;
|
||||
|
||||
let tooltipContent =
|
||||
isOnlyPrivateLocations || (isValid && !isAnyPublicLocationSelected)
|
||||
? PRIVATE_AVAILABLE_LABEL
|
||||
: TEST_NOW_DESCRIPTION;
|
||||
const useTooltipContent = (isValid: boolean, isTestRunInProgress?: boolean) => {
|
||||
let tooltipContent = !isValid ? INVALID_DESCRIPTION : TEST_NOW_DESCRIPTION;
|
||||
|
||||
tooltipContent = isTestRunInProgress ? TEST_SCHEDULED_LABEL : tooltipContent;
|
||||
|
||||
const isDisabled = isTestRunInProgress || !isAnyPublicLocationSelected;
|
||||
const isDisabled = isTestRunInProgress || !isValid;
|
||||
|
||||
return { tooltipContent, isDisabled };
|
||||
};
|
||||
|
|
@ -118,6 +99,10 @@ const TEST_NOW_DESCRIPTION = i18n.translate('xpack.synthetics.testRun.descriptio
|
|||
defaultMessage: 'Test your monitor and verify the results before saving',
|
||||
});
|
||||
|
||||
const INVALID_DESCRIPTION = i18n.translate('xpack.synthetics.testRun.invalid', {
|
||||
defaultMessage: 'Monitor has to be valid to run test, please fix above required fields.',
|
||||
});
|
||||
|
||||
export const TEST_SCHEDULED_LABEL = i18n.translate(
|
||||
'xpack.synthetics.monitorList.testNow.scheduled',
|
||||
{
|
||||
|
|
@ -125,13 +110,6 @@ export const TEST_SCHEDULED_LABEL = i18n.translate(
|
|||
}
|
||||
);
|
||||
|
||||
export const PRIVATE_AVAILABLE_LABEL = i18n.translate(
|
||||
'xpack.synthetics.app.testNow.available.private',
|
||||
{
|
||||
defaultMessage: `You can't manually start tests on a private location.`,
|
||||
}
|
||||
);
|
||||
|
||||
export const TEST_NOW_ARIA_LABEL = i18n.translate(
|
||||
'xpack.synthetics.monitorList.testNow.AriaLabel',
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,39 +9,20 @@ import { EuiButton, EuiToolTip } from '@elastic/eui';
|
|||
import React from 'react';
|
||||
import { i18n } from '@kbn/i18n';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
import {
|
||||
TEST_NOW_ARIA_LABEL,
|
||||
TEST_SCHEDULED_LABEL,
|
||||
PRIVATE_AVAILABLE_LABEL,
|
||||
} from '../monitor_add_edit/form/run_test_btn';
|
||||
import { TEST_NOW_ARIA_LABEL, TEST_SCHEDULED_LABEL } from '../monitor_add_edit/form/run_test_btn';
|
||||
import { useSelectedMonitor } from './hooks/use_selected_monitor';
|
||||
import {
|
||||
manualTestMonitorAction,
|
||||
manualTestRunInProgressSelector,
|
||||
} from '../../state/manual_test_runs';
|
||||
import { useGetUrlParams } from '../../hooks/use_url_params';
|
||||
|
||||
export const RunTestManually = () => {
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const { monitor } = useSelectedMonitor();
|
||||
|
||||
const hasPublicLocation = monitor?.locations.some((loc) => loc.isServiceManaged);
|
||||
|
||||
const { locationId } = useGetUrlParams();
|
||||
|
||||
const isSelectedLocationPrivate = monitor?.locations.some(
|
||||
(loc) => loc.isServiceManaged === false && loc.id === locationId
|
||||
);
|
||||
|
||||
const testInProgress = useSelector(manualTestRunInProgressSelector(monitor?.config_id));
|
||||
|
||||
const content =
|
||||
!hasPublicLocation || isSelectedLocationPrivate
|
||||
? PRIVATE_AVAILABLE_LABEL
|
||||
: testInProgress
|
||||
? TEST_SCHEDULED_LABEL
|
||||
: TEST_NOW_ARIA_LABEL;
|
||||
const content = testInProgress ? TEST_SCHEDULED_LABEL : TEST_NOW_ARIA_LABEL;
|
||||
|
||||
return (
|
||||
<EuiToolTip content={content} key={content}>
|
||||
|
|
@ -49,7 +30,6 @@ export const RunTestManually = () => {
|
|||
data-test-subj="syntheticsRunTestManuallyButton"
|
||||
color="success"
|
||||
iconType="beaker"
|
||||
isDisabled={!hasPublicLocation || isSelectedLocationPrivate}
|
||||
isLoading={!Boolean(monitor) || testInProgress}
|
||||
onClick={() => {
|
||||
if (monitor) {
|
||||
|
|
|
|||
|
|
@ -14,13 +14,11 @@ 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 { toggleStatusAlert } from '../../../../../../../common/runtime_types/monitor_management/alert_config';
|
||||
import { PRIVATE_AVAILABLE_LABEL } from '../../../monitor_add_edit/form/run_test_btn';
|
||||
import {
|
||||
manualTestMonitorAction,
|
||||
manualTestRunInProgressSelector,
|
||||
|
|
@ -106,8 +104,6 @@ export function ActionsPopover({
|
|||
const location = useLocationName({ locationId });
|
||||
const locationName = location?.label || monitor.location.id;
|
||||
|
||||
const isPrivateLocation = !Boolean(location?.isServiceManaged);
|
||||
|
||||
const detailUrl = useMonitorDetailLocator({
|
||||
configId: monitor.configId,
|
||||
locationId: locationId ?? monitor.location.id,
|
||||
|
|
@ -176,15 +172,9 @@ export function ActionsPopover({
|
|||
},
|
||||
quickInspectPopoverItem,
|
||||
{
|
||||
name: isPrivateLocation ? (
|
||||
<EuiToolTip content={PRIVATE_AVAILABLE_LABEL}>
|
||||
<span>{runTestManually}</span>
|
||||
</EuiToolTip>
|
||||
) : (
|
||||
runTestManually
|
||||
),
|
||||
name: runTestManually,
|
||||
icon: 'beaker',
|
||||
disabled: testInProgress || isPrivateLocation,
|
||||
disabled: testInProgress,
|
||||
onClick: () => {
|
||||
dispatch(manualTestMonitorAction.get({ configId: monitor.configId, name: monitor.name }));
|
||||
dispatch(setFlyoutConfig(null));
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@ export function useRunOnceErrors({
|
|||
serviceError,
|
||||
errors,
|
||||
locations,
|
||||
showErrors = true,
|
||||
}: {
|
||||
showErrors?: boolean;
|
||||
testRunId: string;
|
||||
serviceError?: Error;
|
||||
errors: ServiceLocationErrors;
|
||||
|
|
@ -24,10 +22,6 @@ export function useRunOnceErrors({
|
|||
}) {
|
||||
const [locationErrors, setLocationErrors] = useState<ServiceLocationErrors>([]);
|
||||
const [runOnceServiceError, setRunOnceServiceError] = useState<Error | undefined | null>(null);
|
||||
const publicLocations = useMemo(
|
||||
() => (locations ?? []).filter((loc) => loc.isServiceManaged),
|
||||
[locations]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
setLocationErrors([]);
|
||||
|
|
@ -49,12 +43,12 @@ export function useRunOnceErrors({
|
|||
}, [serviceError]);
|
||||
|
||||
const locationsById: Record<string, Locations[number]> = useMemo(
|
||||
() => (publicLocations as Locations).reduce((acc, cur) => ({ ...acc, [cur.id]: cur }), {}),
|
||||
[publicLocations]
|
||||
() => (locations as Locations).reduce((acc, cur) => ({ ...acc, [cur.id]: cur }), {}),
|
||||
[locations]
|
||||
);
|
||||
|
||||
const expectPings =
|
||||
publicLocations.length - (locationErrors ?? []).filter(({ locationId }) => !!locationId).length;
|
||||
locations.length - (locationErrors ?? []).filter(({ locationId }) => !!locationId).length;
|
||||
|
||||
const locationErrorReasons = useMemo(() => {
|
||||
return (locationErrors ?? [])
|
||||
|
|
@ -64,7 +58,7 @@ export function useRunOnceErrors({
|
|||
}, [locationErrors]);
|
||||
const hasBlockingError =
|
||||
!!runOnceServiceError ||
|
||||
(locationErrors?.length && locationErrors?.length === publicLocations.length);
|
||||
(locationErrors?.length && locationErrors?.length === locations.length);
|
||||
|
||||
const errorMessages = useMemo(() => {
|
||||
if (hasBlockingError) {
|
||||
|
|
|
|||
|
|
@ -15,14 +15,11 @@ import { Locations } from '../../../../../../common/runtime_types';
|
|||
export function ManualTestRunMode({
|
||||
manualTestRun,
|
||||
onDone,
|
||||
showErrors,
|
||||
}: {
|
||||
showErrors: boolean;
|
||||
manualTestRun: ManualTestRun;
|
||||
onDone: (testRunId: string) => void;
|
||||
}) {
|
||||
const { expectPings } = useRunOnceErrors({
|
||||
showErrors,
|
||||
testRunId: manualTestRun.testRunId!,
|
||||
locations: (manualTestRun.monitor!.locations ?? []) as Locations,
|
||||
errors: manualTestRun.errors ?? [],
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ export function TestNowModeFlyoutContainer() {
|
|||
key={manualTestRun.testRunId}
|
||||
manualTestRun={manualTestRun}
|
||||
onDone={onDone}
|
||||
showErrors={flyoutOpenTestRun?.testRunId !== manualTestRun.testRunId}
|
||||
/>
|
||||
))}
|
||||
{flyout}
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ export class Plugin implements PluginType {
|
|||
|
||||
if (this.server) {
|
||||
this.server.coreStart = coreStart;
|
||||
this.server.pluginsStart = pluginsStart;
|
||||
this.server.security = pluginsStart.security;
|
||||
this.server.fleet = pluginsStart.fleet;
|
||||
this.server.encryptedSavedObjects = pluginsStart.encryptedSavedObjects;
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ export const syncNewMonitor = async ({
|
|||
routeContext: RouteContext;
|
||||
privateLocations: PrivateLocationAttributes[];
|
||||
}) => {
|
||||
const { savedObjectsClient, server, syntheticsMonitorClient, request, spaceId } = routeContext;
|
||||
const { savedObjectsClient, server, syntheticsMonitorClient, spaceId } = routeContext;
|
||||
const newMonitorId = id ?? uuidV4();
|
||||
|
||||
let monitorSavedObject: SavedObject<EncryptedSyntheticsMonitorAttributes> | null = null;
|
||||
|
|
@ -193,7 +193,6 @@ export const syncNewMonitor = async ({
|
|||
|
||||
const syncErrorsPromise = syntheticsMonitorClient.addMonitors(
|
||||
[{ monitor: monitorWithNamespace as MonitorFields, id: newMonitorId }],
|
||||
request,
|
||||
savedObjectsClient,
|
||||
privateLocations,
|
||||
spaceId
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ export const syncNewMonitorBulk = async ({
|
|||
privateLocations: PrivateLocationAttributes[];
|
||||
spaceId: string;
|
||||
}) => {
|
||||
const { server, savedObjectsClient, syntheticsMonitorClient, request } = routeContext;
|
||||
const { server, savedObjectsClient, syntheticsMonitorClient } = routeContext;
|
||||
let newMonitors: CreatedMonitors | null = null;
|
||||
|
||||
const monitorsToCreate = normalizedMonitors.map((monitor) => {
|
||||
|
|
@ -88,7 +88,6 @@ export const syncNewMonitorBulk = async ({
|
|||
}),
|
||||
syntheticsMonitorClient.addMonitors(
|
||||
monitorsToCreate,
|
||||
request,
|
||||
savedObjectsClient,
|
||||
privateLocations,
|
||||
spaceId
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ export const deleteMonitorBulk = async ({
|
|||
...normalizedMonitor.attributes,
|
||||
id: normalizedMonitor.attributes[ConfigKey.MONITOR_QUERY_ID],
|
||||
})) as SyntheticsMonitorWithId[],
|
||||
request,
|
||||
savedObjectsClient,
|
||||
spaceId
|
||||
);
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ export const deleteMonitor = async ({
|
|||
routeContext: RouteContext;
|
||||
monitorId: string;
|
||||
}) => {
|
||||
const { spaceId, savedObjectsClient, server, syntheticsMonitorClient, request } = routeContext;
|
||||
const { spaceId, savedObjectsClient, server, syntheticsMonitorClient } = routeContext;
|
||||
const { logger, telemetry, stackVersion } = server;
|
||||
|
||||
const { monitor, monitorWithSecret } = await getMonitorToDelete(
|
||||
|
|
@ -92,7 +92,6 @@ export const deleteMonitor = async ({
|
|||
/* Type cast encrypted saved objects to decrypted saved objects for delete flow only.
|
||||
* Deletion does not require all monitor fields */
|
||||
] as SyntheticsMonitorWithId[],
|
||||
request,
|
||||
savedObjectsClient,
|
||||
spaceId
|
||||
);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ export const syncParamsSyntheticsParamsRoute: SyntheticsRestApiRouteFactory = ()
|
|||
const allPrivateLocations = await getPrivateLocations(savedObjectsClient);
|
||||
|
||||
await syntheticsMonitorClient.syncGlobalParams({
|
||||
request,
|
||||
spaceId,
|
||||
allPrivateLocations,
|
||||
encryptedSavedObjects: server.encryptedSavedObjects,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
*/
|
||||
import { schema } from '@kbn/config-schema';
|
||||
import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
|
||||
import { PrivateLocationAttributes } from '../../runtime_types/private_locations';
|
||||
import { getPrivateLocationsForMonitor } from '../monitor_cruds/add_monitor';
|
||||
import { SyntheticsRestApiRouteFactory } from '../types';
|
||||
import { MonitorFields } from '../../../common/runtime_types';
|
||||
import { SYNTHETICS_API_URLS } from '../../../common/constants';
|
||||
|
|
@ -20,7 +22,13 @@ export const runOnceSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () =
|
|||
monitorId: schema.string({ minLength: 1, maxLength: 1024 }),
|
||||
}),
|
||||
},
|
||||
handler: async ({ request, response, server, syntheticsMonitorClient }): Promise<any> => {
|
||||
handler: async ({
|
||||
request,
|
||||
response,
|
||||
server,
|
||||
syntheticsMonitorClient,
|
||||
savedObjectsClient,
|
||||
}): Promise<any> => {
|
||||
const monitor = request.body as MonitorFields;
|
||||
const { monitorId } = request.params;
|
||||
|
||||
|
|
@ -33,19 +41,22 @@ export const runOnceSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () =
|
|||
return response.badRequest({ body: { message, attributes: { details, ...payload } } });
|
||||
}
|
||||
|
||||
const { syntheticsService } = syntheticsMonitorClient;
|
||||
const privateLocations: PrivateLocationAttributes[] = await getPrivateLocationsForMonitor(
|
||||
savedObjectsClient,
|
||||
validationResult.decodedMonitor
|
||||
);
|
||||
|
||||
const paramsBySpace = await syntheticsService.getSyntheticsParams({ spaceId });
|
||||
|
||||
const errors = await syntheticsService.runOnceConfigs({
|
||||
// making it enabled, even if it's disabled in the UI
|
||||
monitor: { ...validationResult.decodedMonitor, enabled: true },
|
||||
configId: monitorId,
|
||||
heartbeatId: monitorId,
|
||||
runOnce: true,
|
||||
testRunId: monitorId,
|
||||
params: paramsBySpace[spaceId],
|
||||
});
|
||||
const [, errors] = await syntheticsMonitorClient.testNowConfigs(
|
||||
{
|
||||
monitor: { ...validationResult.decodedMonitor, config_id: monitorId } as MonitorFields,
|
||||
id: monitorId,
|
||||
testRunId: monitorId,
|
||||
},
|
||||
savedObjectsClient,
|
||||
privateLocations,
|
||||
spaceId,
|
||||
true
|
||||
);
|
||||
|
||||
if (errors) {
|
||||
return { errors };
|
||||
|
|
|
|||
|
|
@ -6,14 +6,12 @@
|
|||
*/
|
||||
import { schema } from '@kbn/config-schema';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { getDecryptedMonitor } from '../../saved_objects/synthetics_monitor';
|
||||
import { PrivateLocationAttributes } from '../../runtime_types/private_locations';
|
||||
import { getPrivateLocationsForMonitor } from '../monitor_cruds/add_monitor';
|
||||
import { RouteContext, SyntheticsRestApiRouteFactory } from '../types';
|
||||
import { syntheticsMonitorType } from '../../../common/types/saved_objects';
|
||||
import { TestNowResponse } from '../../../common/types';
|
||||
import {
|
||||
ConfigKey,
|
||||
MonitorFields,
|
||||
SyntheticsMonitorWithSecretsAttributes,
|
||||
} from '../../../common/runtime_types';
|
||||
import { ConfigKey, MonitorFields } from '../../../common/runtime_types';
|
||||
import { SYNTHETICS_API_URLS } from '../../../common/constants';
|
||||
import { normalizeSecrets } from '../../synthetics_service/utils/secrets';
|
||||
|
||||
|
|
@ -33,37 +31,32 @@ export const testNowMonitorRoute: SyntheticsRestApiRouteFactory<TestNowResponse>
|
|||
|
||||
export const triggerTestNow = async (
|
||||
monitorId: string,
|
||||
{ server, spaceId, syntheticsMonitorClient }: RouteContext
|
||||
routeContext: RouteContext
|
||||
): Promise<TestNowResponse> => {
|
||||
const encryptedClient = server.encryptedSavedObjects.getClient();
|
||||
const { server, spaceId, syntheticsMonitorClient, savedObjectsClient } = routeContext;
|
||||
|
||||
const monitorWithSecrets =
|
||||
await encryptedClient.getDecryptedAsInternalUser<SyntheticsMonitorWithSecretsAttributes>(
|
||||
syntheticsMonitorType,
|
||||
monitorId,
|
||||
{
|
||||
namespace: spaceId,
|
||||
}
|
||||
);
|
||||
const monitorWithSecrets = await getDecryptedMonitor(server, monitorId, spaceId);
|
||||
const normalizedMonitor = normalizeSecrets(monitorWithSecrets);
|
||||
|
||||
const { [ConfigKey.SCHEDULE]: schedule, [ConfigKey.LOCATIONS]: locations } =
|
||||
monitorWithSecrets.attributes;
|
||||
|
||||
const { syntheticsService } = syntheticsMonitorClient;
|
||||
|
||||
const privateLocations: PrivateLocationAttributes[] = await getPrivateLocationsForMonitor(
|
||||
savedObjectsClient,
|
||||
normalizedMonitor.attributes
|
||||
);
|
||||
const testRunId = uuidv4();
|
||||
|
||||
const paramsBySpace = await syntheticsService.getSyntheticsParams({ spaceId });
|
||||
|
||||
const errors = await syntheticsService.runOnceConfigs({
|
||||
// making it enabled, even if it's disabled in the UI
|
||||
monitor: { ...normalizedMonitor.attributes, enabled: true },
|
||||
configId: monitorId,
|
||||
heartbeatId: (normalizedMonitor.attributes as MonitorFields)[ConfigKey.MONITOR_QUERY_ID],
|
||||
testRunId,
|
||||
params: paramsBySpace[spaceId],
|
||||
});
|
||||
const [, errors] = await syntheticsMonitorClient.testNowConfigs(
|
||||
{
|
||||
monitor: normalizedMonitor.attributes as MonitorFields,
|
||||
id: monitorId,
|
||||
testRunId,
|
||||
},
|
||||
savedObjectsClient,
|
||||
privateLocations,
|
||||
spaceId
|
||||
);
|
||||
|
||||
if (errors && errors?.length > 0) {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,10 @@
|
|||
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
|
||||
import { SavedObjectsType } from '@kbn/core/server';
|
||||
import { i18n } from '@kbn/i18n';
|
||||
import { SyntheticsMonitorWithSecretsAttributes } from '../../common/runtime_types';
|
||||
import { SyntheticsServerSetup } from '../types';
|
||||
import { syntheticsMonitorType } from '../../common/types/saved_objects';
|
||||
import { secretKeys, ConfigKey, LegacyConfigKey } from '../../common/constants/monitor_management';
|
||||
import { ConfigKey, LegacyConfigKey, secretKeys } from '../../common/constants/monitor_management';
|
||||
import { monitorMigrations } from './migrations/monitors';
|
||||
|
||||
const legacyConfigKeys = Object.values(LegacyConfigKey);
|
||||
|
|
@ -194,3 +196,19 @@ export const getSyntheticsMonitorSavedObjectType = (
|
|||
},
|
||||
};
|
||||
};
|
||||
|
||||
export const getDecryptedMonitor = async (
|
||||
server: SyntheticsServerSetup,
|
||||
monitorId: string,
|
||||
spaceId: string
|
||||
) => {
|
||||
const encryptedClient = server.encryptedSavedObjects.getClient();
|
||||
|
||||
return await encryptedClient.getDecryptedAsInternalUser<SyntheticsMonitorWithSecretsAttributes>(
|
||||
syntheticsMonitorType,
|
||||
monitorId,
|
||||
{
|
||||
namespace: spaceId,
|
||||
}
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ export const formatSyntheticsPolicy = (
|
|||
location_id: string;
|
||||
'monitor.project.name': string;
|
||||
'monitor.project.id': string;
|
||||
'monitor.id': string;
|
||||
test_run_id: string;
|
||||
run_once: boolean;
|
||||
}
|
||||
>,
|
||||
params: Record<string, string>,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,138 @@
|
|||
/*
|
||||
* 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 { ConcreteTaskInstance, TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
|
||||
import moment from 'moment';
|
||||
import {
|
||||
BROWSER_TEST_NOW_RUN,
|
||||
LIGHTWEIGHT_TEST_NOW_RUN,
|
||||
} from '../synthetics_monitor/synthetics_monitor_client';
|
||||
import { SyntheticsServerSetup } from '../../types';
|
||||
|
||||
const SYNTHETICS_SERVICE_CLEAN_UP_TASK_TYPE = 'Synthetics:Clean-Up-Package-Policies';
|
||||
const SYNTHETICS_SERVICE_CLEAN_UP_TASK_ID = 'SyntheticsService:clean-up-package-policies-task-id';
|
||||
const SYNTHETICS_SERVICE_CLEAN_UP_INTERVAL_DEFAULT = '60m';
|
||||
const DELETE_BROWSER_MINUTES = 15;
|
||||
const DELETE_LIGHTWEIGHT_MINUTES = 2;
|
||||
|
||||
export const registerCleanUpTask = (
|
||||
taskManager: TaskManagerSetupContract,
|
||||
serverSetup: SyntheticsServerSetup
|
||||
) => {
|
||||
const { logger } = serverSetup;
|
||||
const interval = SYNTHETICS_SERVICE_CLEAN_UP_INTERVAL_DEFAULT;
|
||||
|
||||
taskManager.registerTaskDefinitions({
|
||||
[SYNTHETICS_SERVICE_CLEAN_UP_TASK_TYPE]: {
|
||||
title: 'Synthetics Plugin Clean Up Task',
|
||||
description: 'This task which runs periodically to clean up run once monitors.',
|
||||
timeout: '1m',
|
||||
maxAttempts: 3,
|
||||
|
||||
createTaskRunner: ({ taskInstance }: { taskInstance: ConcreteTaskInstance }) => {
|
||||
return {
|
||||
// Perform the work of the task. The return value should fit the TaskResult interface.
|
||||
async run() {
|
||||
logger.info(
|
||||
`Executing synthetics clean up task: ${SYNTHETICS_SERVICE_CLEAN_UP_TASK_ID}`
|
||||
);
|
||||
const { state } = taskInstance;
|
||||
try {
|
||||
const esClient = serverSetup.coreStart?.elasticsearch?.client.asInternalUser;
|
||||
if (esClient) {
|
||||
const { fleet } = serverSetup.pluginsStart;
|
||||
const { savedObjects } = serverSetup.coreStart;
|
||||
const soClient = savedObjects.createInternalRepository();
|
||||
|
||||
const { items } = await fleet.packagePolicyService.list(soClient, {
|
||||
kuery: getFilterForTestNowRun(),
|
||||
});
|
||||
|
||||
const allItems = items.map((item) => {
|
||||
const minutesAgo = moment().diff(moment(item.created_at), 'minutes');
|
||||
const isBrowser = item.name === BROWSER_TEST_NOW_RUN;
|
||||
if (isBrowser) {
|
||||
return {
|
||||
isBrowser: true,
|
||||
id: item.id,
|
||||
shouldDelete: minutesAgo > DELETE_BROWSER_MINUTES,
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
isBrowser: false,
|
||||
id: item.id,
|
||||
shouldDelete: minutesAgo > DELETE_LIGHTWEIGHT_MINUTES,
|
||||
};
|
||||
}
|
||||
});
|
||||
const toDelete = allItems.filter((item) => item.shouldDelete);
|
||||
if (toDelete.length > 0) {
|
||||
await fleet.packagePolicyService.delete(
|
||||
soClient,
|
||||
esClient,
|
||||
toDelete.map((item) => item.id),
|
||||
{
|
||||
force: true,
|
||||
}
|
||||
);
|
||||
}
|
||||
const remaining = allItems.filter((item) => !item.shouldDelete);
|
||||
if (remaining.length === 0) {
|
||||
return { state, schedule: { interval: '24h' } };
|
||||
} else {
|
||||
return { state, schedule: { interval: '15m' } };
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
logger.error(e);
|
||||
}
|
||||
|
||||
return { state, schedule: { interval } };
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
export const scheduleCleanUpTask = async ({ logger, pluginsStart }: SyntheticsServerSetup) => {
|
||||
const interval = SYNTHETICS_SERVICE_CLEAN_UP_INTERVAL_DEFAULT;
|
||||
|
||||
try {
|
||||
const taskInstance = await pluginsStart.taskManager.ensureScheduled({
|
||||
id: SYNTHETICS_SERVICE_CLEAN_UP_TASK_ID,
|
||||
taskType: SYNTHETICS_SERVICE_CLEAN_UP_TASK_TYPE,
|
||||
schedule: {
|
||||
interval,
|
||||
},
|
||||
params: {},
|
||||
state: {},
|
||||
scope: ['uptime'],
|
||||
});
|
||||
|
||||
logger?.info(
|
||||
`Task ${SYNTHETICS_SERVICE_CLEAN_UP_TASK_ID} scheduled with interval ${taskInstance.schedule?.interval}.`
|
||||
);
|
||||
|
||||
await pluginsStart.taskManager.runSoon(SYNTHETICS_SERVICE_CLEAN_UP_TASK_ID);
|
||||
} catch (e) {
|
||||
logger?.error(e);
|
||||
logger?.error(
|
||||
`Error running synthetics clean up task: ${SYNTHETICS_SERVICE_CLEAN_UP_TASK_ID}, ${e?.message}`
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const getFilterForTestNowRun = () => {
|
||||
const pkg = 'ingest-package-policies';
|
||||
|
||||
let filter = `${pkg}.package.name:synthetics and ${pkg}.is_managed:true`;
|
||||
const lightweight = `${pkg}.name: ${LIGHTWEIGHT_TEST_NOW_RUN}`;
|
||||
const browser = `${pkg}.name: ${BROWSER_TEST_NOW_RUN}`;
|
||||
filter = `${filter} and (${lightweight} or ${browser})`;
|
||||
return filter;
|
||||
};
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
|
||||
import { SavedObjectsClientContract } from '@kbn/core/server';
|
||||
import { loggerMock } from '@kbn/logging-mocks';
|
||||
import {
|
||||
DataStream,
|
||||
|
|
@ -93,7 +93,6 @@ describe('SyntheticsPrivateLocation', () => {
|
|||
try {
|
||||
await syntheticsPrivateLocation.createPackagePolicies(
|
||||
[{ config: testConfig, globalParams: {} }],
|
||||
{} as unknown as KibanaRequest,
|
||||
[mockPrivateLocation],
|
||||
'test-space'
|
||||
);
|
||||
|
|
@ -116,7 +115,6 @@ describe('SyntheticsPrivateLocation', () => {
|
|||
try {
|
||||
await syntheticsPrivateLocation.editMonitors(
|
||||
[{ config: testConfig, globalParams: {} }],
|
||||
{} as unknown as KibanaRequest,
|
||||
[mockPrivateLocation],
|
||||
'test-space'
|
||||
);
|
||||
|
|
@ -152,11 +150,7 @@ describe('SyntheticsPrivateLocation', () => {
|
|||
},
|
||||
});
|
||||
try {
|
||||
await syntheticsPrivateLocation.deleteMonitors(
|
||||
[testConfig],
|
||||
{} as unknown as KibanaRequest,
|
||||
'test-space'
|
||||
);
|
||||
await syntheticsPrivateLocation.deleteMonitors([testConfig], 'test-space');
|
||||
} catch (e) {
|
||||
expect(e).toEqual(new Error(error));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,15 @@
|
|||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
import { KibanaRequest } from '@kbn/core/server';
|
||||
import { NewPackagePolicy } from '@kbn/fleet-plugin/common';
|
||||
import { NewPackagePolicyWithId } from '@kbn/fleet-plugin/server/services/package_policy';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { SavedObjectError } from '@kbn/core-saved-objects-common';
|
||||
import {
|
||||
BROWSER_TEST_NOW_RUN,
|
||||
LIGHTWEIGHT_TEST_NOW_RUN,
|
||||
} from '../synthetics_monitor/synthetics_monitor_client';
|
||||
import { scheduleCleanUpTask } from './clean_up_task';
|
||||
import { getAgentPoliciesAsInternalUser } from '../../routes/settings/private_locations/get_agent_policies';
|
||||
import { SyntheticsServerSetup } from '../../types';
|
||||
import { formatSyntheticsPolicy } from '../formatters/private_formatters/format_synthetics_policy';
|
||||
|
|
@ -67,7 +71,9 @@ export class SyntheticsPrivateLocation {
|
|||
privateLocation: PrivateLocationAttributes,
|
||||
newPolicyTemplate: NewPackagePolicy,
|
||||
spaceId: string,
|
||||
globalParams: Record<string, string>
|
||||
globalParams: Record<string, string>,
|
||||
testRunId?: string,
|
||||
runOnce?: boolean
|
||||
): (NewPackagePolicy & { policy_id: string }) | null {
|
||||
const { label: locName } = privateLocation;
|
||||
|
||||
|
|
@ -76,10 +82,15 @@ export class SyntheticsPrivateLocation {
|
|||
try {
|
||||
newPolicy.is_managed = true;
|
||||
newPolicy.policy_id = privateLocation.agentPolicyId;
|
||||
if (config[ConfigKey.MONITOR_SOURCE_TYPE] === SourceType.PROJECT) {
|
||||
newPolicy.name = `${config.id}-${locName}`;
|
||||
if (testRunId) {
|
||||
newPolicy.name =
|
||||
config.type === 'browser' ? BROWSER_TEST_NOW_RUN : LIGHTWEIGHT_TEST_NOW_RUN;
|
||||
} else {
|
||||
newPolicy.name = `${config[ConfigKey.NAME]}-${locName}-${spaceId}`;
|
||||
if (config[ConfigKey.MONITOR_SOURCE_TYPE] === SourceType.PROJECT) {
|
||||
newPolicy.name = `${config.id}-${locName}`;
|
||||
} else {
|
||||
newPolicy.name = `${config[ConfigKey.NAME]}-${locName}-${spaceId}`;
|
||||
}
|
||||
}
|
||||
newPolicy.namespace = config[ConfigKey.NAMESPACE];
|
||||
|
||||
|
|
@ -91,8 +102,20 @@ export class SyntheticsPrivateLocation {
|
|||
config_id: config.fields?.config_id,
|
||||
location_name: stringifyString(privateLocation.label),
|
||||
location_id: privateLocation.id,
|
||||
'monitor.project.id': stringifyString(config.fields?.['monitor.project.name']),
|
||||
'monitor.project.name': stringifyString(config.fields?.['monitor.project.name']),
|
||||
'monitor.project.id': stringifyString(
|
||||
config.fields?.['monitor.project.id'] ?? config[ConfigKey.PROJECT_ID]
|
||||
),
|
||||
'monitor.project.name': stringifyString(
|
||||
config.fields?.['monitor.project.name'] ?? config[ConfigKey.PROJECT_ID]
|
||||
),
|
||||
...(testRunId
|
||||
? {
|
||||
test_run_id: testRunId,
|
||||
'monitor.id': config[ConfigKey.MONITOR_QUERY_ID],
|
||||
id: testRunId,
|
||||
}
|
||||
: {}),
|
||||
...(runOnce ? { run_once: runOnce } : {}),
|
||||
},
|
||||
globalParams
|
||||
);
|
||||
|
|
@ -106,27 +129,25 @@ export class SyntheticsPrivateLocation {
|
|||
|
||||
async createPackagePolicies(
|
||||
configs: PrivateConfig[],
|
||||
request: KibanaRequest,
|
||||
privateLocations: PrivateLocationAttributes[],
|
||||
spaceId: string
|
||||
spaceId: string,
|
||||
testRunId?: string,
|
||||
runOnce?: boolean
|
||||
) {
|
||||
if (configs.length === 0) {
|
||||
return { created: [], failed: [] };
|
||||
}
|
||||
|
||||
const newPolicies: NewPackagePolicyWithId[] = [];
|
||||
|
||||
const newPolicyTemplate = await this.buildNewPolicy();
|
||||
|
||||
for (const { config, globalParams } of configs) {
|
||||
try {
|
||||
const { locations } = config;
|
||||
|
||||
const fleetManagedLocations = locations.filter((loc) => !loc.isServiceManaged);
|
||||
|
||||
for (const privateLocation of fleetManagedLocations) {
|
||||
const location = privateLocations?.find((loc) => loc.id === privateLocation.id)!;
|
||||
|
||||
if (!location) {
|
||||
throw new Error(
|
||||
`Unable to find Synthetics private location for agentId ${privateLocation.id}`
|
||||
|
|
@ -138,7 +159,9 @@ export class SyntheticsPrivateLocation {
|
|||
location,
|
||||
newPolicyTemplate,
|
||||
spaceId,
|
||||
globalParams
|
||||
globalParams,
|
||||
testRunId,
|
||||
runOnce
|
||||
);
|
||||
|
||||
if (!newPolicy) {
|
||||
|
|
@ -149,7 +172,14 @@ export class SyntheticsPrivateLocation {
|
|||
);
|
||||
}
|
||||
if (newPolicy) {
|
||||
newPolicies.push({ ...newPolicy, id: this.getPolicyId(config, location.id, spaceId) });
|
||||
if (testRunId) {
|
||||
newPolicies.push(newPolicy as NewPackagePolicyWithId);
|
||||
} else {
|
||||
newPolicies.push({
|
||||
...newPolicy,
|
||||
id: this.getPolicyId(config, location.id, spaceId),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
|
|
@ -163,7 +193,12 @@ export class SyntheticsPrivateLocation {
|
|||
}
|
||||
|
||||
try {
|
||||
return await this.createPolicyBulk(newPolicies);
|
||||
const result = await this.createPolicyBulk(newPolicies);
|
||||
if (result?.created && result?.created?.length > 0 && testRunId) {
|
||||
// ignore await here, we don't want to wait for this to finish
|
||||
scheduleCleanUpTask(this.server);
|
||||
}
|
||||
return result;
|
||||
} catch (e) {
|
||||
this.server.logger.error(e);
|
||||
throw e;
|
||||
|
|
@ -215,7 +250,6 @@ export class SyntheticsPrivateLocation {
|
|||
|
||||
async editMonitors(
|
||||
configs: Array<{ config: HeartbeatConfig; globalParams: Record<string, string> }>,
|
||||
request: KibanaRequest,
|
||||
allPrivateLocations: PrivateLocationAttributes[],
|
||||
spaceId: string
|
||||
) {
|
||||
|
|
@ -354,18 +388,22 @@ export class SyntheticsPrivateLocation {
|
|||
const soClient = this.server.coreStart.savedObjects.createInternalRepository();
|
||||
const esClient = this.server.uptimeEsClient.baseESClient;
|
||||
if (soClient && esClient && policyIdsToDelete.length > 0) {
|
||||
return await this.server.fleet.packagePolicyService.delete(
|
||||
soClient,
|
||||
esClient,
|
||||
policyIdsToDelete,
|
||||
{
|
||||
force: true,
|
||||
}
|
||||
);
|
||||
try {
|
||||
return await this.server.fleet.packagePolicyService.delete(
|
||||
soClient,
|
||||
esClient,
|
||||
policyIdsToDelete,
|
||||
{
|
||||
force: true,
|
||||
}
|
||||
);
|
||||
} catch (e) {
|
||||
this.server.logger.error(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async deleteMonitors(configs: HeartbeatConfig[], request: KibanaRequest, spaceId: string) {
|
||||
async deleteMonitors(configs: HeartbeatConfig[], spaceId: string) {
|
||||
const soClient = this.server.coreStart.savedObjects.createInternalRepository();
|
||||
const esClient = this.server.uptimeEsClient.baseESClient;
|
||||
|
||||
|
|
@ -376,12 +414,7 @@ export class SyntheticsPrivateLocation {
|
|||
const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
|
||||
|
||||
for (const privateLocation of monitorPrivateLocations) {
|
||||
try {
|
||||
policyIdsToDelete.push(this.getPolicyId(config, privateLocation.id, spaceId));
|
||||
} catch (e) {
|
||||
this.server.logger.error(e);
|
||||
throw new Error(deletePolicyError(config[ConfigKey.NAME], privateLocation.label));
|
||||
}
|
||||
policyIdsToDelete.push(this.getPolicyId(config, privateLocation.id, spaceId));
|
||||
}
|
||||
}
|
||||
if (policyIdsToDelete.length > 0) {
|
||||
|
|
@ -393,7 +426,9 @@ export class SyntheticsPrivateLocation {
|
|||
force: true,
|
||||
}
|
||||
);
|
||||
const failedPolicies = result?.filter((policy) => !policy.success);
|
||||
const failedPolicies = result?.filter((policy) => {
|
||||
return !policy.success && policy?.statusCode !== 404;
|
||||
});
|
||||
if (failedPolicies?.length === policyIdsToDelete.length) {
|
||||
throw new Error(deletePolicyError(configs[0][ConfigKey.NAME]));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,7 +133,6 @@ describe('SyntheticsMonitorClient', () => {
|
|||
|
||||
await client.addMonitors(
|
||||
[{ monitor, id }],
|
||||
mockRequest,
|
||||
savedObjectsClientMock,
|
||||
privateLocations,
|
||||
'test-space'
|
||||
|
|
@ -223,7 +222,6 @@ describe('SyntheticsMonitorClient', () => {
|
|||
|
||||
await client.deleteMonitors(
|
||||
[monitor as unknown as SyntheticsMonitorWithId],
|
||||
mockRequest,
|
||||
savedObjectsClientMock,
|
||||
'test-space'
|
||||
);
|
||||
|
|
|
|||
|
|
@ -4,12 +4,7 @@
|
|||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
import {
|
||||
KibanaRequest,
|
||||
SavedObject,
|
||||
SavedObjectsClientContract,
|
||||
SavedObjectsFindResult,
|
||||
} from '@kbn/core/server';
|
||||
import { SavedObject, SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
|
||||
import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
|
||||
import { RouteContext } from '../../routes/types';
|
||||
import { SyntheticsServerSetup } from '../../types';
|
||||
|
|
@ -21,10 +16,12 @@ import {
|
|||
} from '../private_location/synthetics_private_location';
|
||||
import { SyntheticsService } from '../synthetics_service';
|
||||
import {
|
||||
ConfigKey,
|
||||
EncryptedSyntheticsMonitorAttributes,
|
||||
HeartbeatConfig,
|
||||
MonitorFields,
|
||||
MonitorServiceLocation,
|
||||
ScheduleUnit,
|
||||
SyntheticsMonitorWithId,
|
||||
SyntheticsMonitorWithSecretsAttributes,
|
||||
} from '../../../common/runtime_types';
|
||||
|
|
@ -34,19 +31,23 @@ import {
|
|||
mixParamsWithGlobalParams,
|
||||
} from '../formatters/public_formatters/format_configs';
|
||||
import type { PrivateLocationAttributes } from '../../runtime_types/private_locations';
|
||||
export const LIGHTWEIGHT_TEST_NOW_RUN = 'LIGHTWEIGHT_SYNTHETICS_TEST_NOW_RUN';
|
||||
export const BROWSER_TEST_NOW_RUN = 'BROWSER_SYNTHETICS_TEST_NOW_RUN';
|
||||
const LONG_TIME_MONTH = '43800';
|
||||
|
||||
export class SyntheticsMonitorClient {
|
||||
public server: SyntheticsServerSetup;
|
||||
public syntheticsService: SyntheticsService;
|
||||
public privateLocationAPI: SyntheticsPrivateLocation;
|
||||
|
||||
constructor(syntheticsService: SyntheticsService, server: SyntheticsServerSetup) {
|
||||
this.server = server;
|
||||
this.syntheticsService = syntheticsService;
|
||||
this.privateLocationAPI = new SyntheticsPrivateLocation(server);
|
||||
}
|
||||
|
||||
async addMonitors(
|
||||
monitors: Array<{ monitor: MonitorFields; id: string }>,
|
||||
request: KibanaRequest,
|
||||
savedObjectsClient: SavedObjectsClientContract,
|
||||
allPrivateLocations: PrivateLocationAttributes[],
|
||||
spaceId: string
|
||||
|
|
@ -75,7 +76,6 @@ export class SyntheticsMonitorClient {
|
|||
|
||||
const newPolicies = this.privateLocationAPI.createPackagePolicies(
|
||||
privateConfigs,
|
||||
request,
|
||||
allPrivateLocations,
|
||||
spaceId
|
||||
);
|
||||
|
|
@ -96,7 +96,6 @@ export class SyntheticsMonitorClient {
|
|||
allPrivateLocations: PrivateLocationAttributes[],
|
||||
spaceId: string
|
||||
) {
|
||||
const { request } = routeContext;
|
||||
const privateConfigs: Array<{ config: HeartbeatConfig; globalParams: Record<string, string> }> =
|
||||
[];
|
||||
|
||||
|
|
@ -143,7 +142,6 @@ export class SyntheticsMonitorClient {
|
|||
|
||||
const privateEditPromise = this.privateLocationAPI.editMonitors(
|
||||
privateConfigs,
|
||||
request,
|
||||
allPrivateLocations,
|
||||
spaceId
|
||||
);
|
||||
|
|
@ -161,11 +159,10 @@ export class SyntheticsMonitorClient {
|
|||
}
|
||||
async deleteMonitors(
|
||||
monitors: SyntheticsMonitorWithId[],
|
||||
request: KibanaRequest,
|
||||
savedObjectsClient: SavedObjectsClientContract,
|
||||
spaceId: string
|
||||
) {
|
||||
const privateDeletePromise = this.privateLocationAPI.deleteMonitors(monitors, request, spaceId);
|
||||
const privateDeletePromise = this.privateLocationAPI.deleteMonitors(monitors, spaceId);
|
||||
|
||||
const publicDeletePromise = this.syntheticsService.deleteConfigs(
|
||||
monitors.map((monitor) => ({ monitor, configId: monitor.config_id, params: {} }))
|
||||
|
|
@ -175,6 +172,62 @@ export class SyntheticsMonitorClient {
|
|||
return pubicResponse;
|
||||
}
|
||||
|
||||
async testNowConfigs(
|
||||
monitor: { monitor: MonitorFields; id: string; testRunId: string },
|
||||
savedObjectsClient: SavedObjectsClientContract,
|
||||
allPrivateLocations: PrivateLocationAttributes[],
|
||||
spaceId: string,
|
||||
runOnce?: true
|
||||
) {
|
||||
let privateConfig: PrivateConfig | undefined;
|
||||
let publicConfig: ConfigData | undefined;
|
||||
|
||||
const paramsBySpace = await this.syntheticsService.getSyntheticsParams({ spaceId });
|
||||
|
||||
const { formattedConfig, params, config } = await this.formatConfigWithParams(
|
||||
monitor,
|
||||
spaceId,
|
||||
paramsBySpace
|
||||
);
|
||||
|
||||
const { privateLocations, publicLocations } = this.parseLocations(formattedConfig);
|
||||
if (privateLocations.length > 0) {
|
||||
privateConfig = {
|
||||
config: {
|
||||
...formattedConfig,
|
||||
[ConfigKey.SCHEDULE]: {
|
||||
number: LONG_TIME_MONTH,
|
||||
unit: ScheduleUnit.MINUTES,
|
||||
},
|
||||
[ConfigKey.ENABLED]: true,
|
||||
},
|
||||
globalParams: params,
|
||||
};
|
||||
}
|
||||
|
||||
if (publicLocations.length > 0) {
|
||||
publicConfig = config;
|
||||
// making it enabled, even if it's disabled in the UI
|
||||
publicConfig.monitor.enabled = true;
|
||||
publicConfig.testRunId = monitor.testRunId;
|
||||
if (runOnce) {
|
||||
publicConfig.runOnce = true;
|
||||
}
|
||||
}
|
||||
|
||||
const newPolicies = this.privateLocationAPI.createPackagePolicies(
|
||||
privateConfig ? [privateConfig] : [],
|
||||
allPrivateLocations,
|
||||
spaceId,
|
||||
monitor.testRunId,
|
||||
runOnce
|
||||
);
|
||||
|
||||
const syncErrors = this.syntheticsService.runOnceConfigs(publicConfig);
|
||||
|
||||
return await Promise.all([newPolicies, syncErrors]);
|
||||
}
|
||||
|
||||
hasPrivateLocations(previousMonitor: SavedObject<EncryptedSyntheticsMonitorAttributes>) {
|
||||
const { locations } = previousMonitor.attributes;
|
||||
|
||||
|
|
@ -213,13 +266,11 @@ export class SyntheticsMonitorClient {
|
|||
}
|
||||
|
||||
async syncGlobalParams({
|
||||
request,
|
||||
spaceId,
|
||||
allPrivateLocations,
|
||||
encryptedSavedObjects,
|
||||
}: {
|
||||
spaceId: string;
|
||||
request: KibanaRequest;
|
||||
allPrivateLocations: PrivateLocationAttributes[];
|
||||
encryptedSavedObjects: EncryptedSavedObjectsPluginStart;
|
||||
}) {
|
||||
|
|
@ -243,12 +294,7 @@ export class SyntheticsMonitorClient {
|
|||
}
|
||||
}
|
||||
if (privateConfigs.length > 0) {
|
||||
await this.privateLocationAPI.editMonitors(
|
||||
privateConfigs,
|
||||
request,
|
||||
allPrivateLocations,
|
||||
spaceId
|
||||
);
|
||||
await this.privateLocationAPI.editMonitors(privateConfigs, allPrivateLocations, spaceId);
|
||||
}
|
||||
|
||||
if (publicConfigs.length > 0) {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin
|
|||
import pMap from 'p-map';
|
||||
import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
|
||||
import { ALL_SPACES_ID } from '@kbn/spaces-plugin/common/constants';
|
||||
import { registerCleanUpTask } from './private_location/clean_up_task';
|
||||
import { SyntheticsServerSetup } from '../types';
|
||||
import { syntheticsMonitorType, syntheticsParamType } from '../../common/types/saved_objects';
|
||||
import { sendErrorTelemetryEvents } from '../routes/telemetry/monitor_upgrade_sender';
|
||||
|
|
@ -92,6 +93,7 @@ export class SyntheticsService {
|
|||
|
||||
public async setup(taskManager: TaskManagerSetupContract) {
|
||||
this.registerSyncTask(taskManager);
|
||||
registerCleanUpTask(taskManager, this.server);
|
||||
|
||||
await this.registerServiceLocations();
|
||||
|
||||
|
|
@ -418,12 +420,15 @@ export class SyntheticsService {
|
|||
await this.getMonitorConfigs(subject);
|
||||
}
|
||||
|
||||
async runOnceConfigs(configs: ConfigData) {
|
||||
const license = await this.getLicense();
|
||||
async runOnceConfigs(configs?: ConfigData) {
|
||||
if (!configs) {
|
||||
return;
|
||||
}
|
||||
const monitors = this.formatConfigs(configs);
|
||||
if (monitors.length === 0) {
|
||||
return;
|
||||
}
|
||||
const license = await this.getLicense();
|
||||
|
||||
const output = await this.getOutput();
|
||||
if (!output) {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ export interface SyntheticsServerSetup {
|
|||
basePath: IBasePath;
|
||||
isDev?: boolean;
|
||||
coreStart: CoreStart;
|
||||
pluginsStart: SyntheticsPluginsStartDependencies;
|
||||
}
|
||||
|
||||
export interface SyntheticsPluginsSetupDependencies {
|
||||
|
|
@ -77,6 +78,7 @@ export interface SyntheticsPluginsSetupDependencies {
|
|||
|
||||
export interface SyntheticsPluginsStartDependencies {
|
||||
security: SecurityPluginStart;
|
||||
elasticsearch: SecurityPluginStart;
|
||||
fleet: FleetStartContract;
|
||||
encryptedSavedObjects: EncryptedSavedObjectsPluginStart;
|
||||
taskManager: TaskManagerStartContract;
|
||||
|
|
|
|||
|
|
@ -37043,7 +37043,6 @@
|
|||
"xpack.synthetics.analyzeDataButtonLabel.message": "La fonctionnalité Explorer les données vous permet de sélectionner et de filtrer les données de résultat dans toute dimension et de rechercher la cause ou l'impact des problèmes de performances.",
|
||||
"xpack.synthetics.app.navigateToAlertingButton.content": "Gérer les règles",
|
||||
"xpack.synthetics.app.navigateToAlertingUi": "Quitter Synthetics et accéder à la page de gestion Alerting",
|
||||
"xpack.synthetics.app.testNow.available.private": "Vous ne pouvez pas démarrer les tests manuellement dans un emplacement privé.",
|
||||
"xpack.synthetics.badge.readOnly.text": "Lecture seule",
|
||||
"xpack.synthetics.badge.readOnly.tooltip": "Enregistrement impossible",
|
||||
"xpack.synthetics.blocked": "Bloqué",
|
||||
|
|
|
|||
|
|
@ -37042,7 +37042,6 @@
|
|||
"xpack.synthetics.analyzeDataButtonLabel.message": "データの探索では、任意のディメンションの結果データを選択してフィルタリングし、パフォーマンスの問題の原因または影響を調査することができます。",
|
||||
"xpack.synthetics.app.navigateToAlertingButton.content": "ルールの管理",
|
||||
"xpack.synthetics.app.navigateToAlertingUi": "Syntheticsを離れてアラート管理ページに移動します",
|
||||
"xpack.synthetics.app.testNow.available.private": "非公開の場所では手動でテストを開始できません。",
|
||||
"xpack.synthetics.badge.readOnly.text": "読み取り専用",
|
||||
"xpack.synthetics.badge.readOnly.tooltip": "を保存できませんでした",
|
||||
"xpack.synthetics.blocked": "ブロック",
|
||||
|
|
|
|||
|
|
@ -37036,7 +37036,6 @@
|
|||
"xpack.synthetics.analyzeDataButtonLabel.message": "“浏览数据”允许您选择和筛选任意维度中的结果数据以及查找性能问题的原因或影响。",
|
||||
"xpack.synthetics.app.navigateToAlertingButton.content": "管理规则",
|
||||
"xpack.synthetics.app.navigateToAlertingUi": "离开 Synthetics 并前往“Alerting 管理”页面",
|
||||
"xpack.synthetics.app.testNow.available.private": "不能在专用位置上手动启动测试。",
|
||||
"xpack.synthetics.badge.readOnly.text": "只读",
|
||||
"xpack.synthetics.badge.readOnly.tooltip": "无法保存",
|
||||
"xpack.synthetics.blocked": "已阻止",
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ export default function ({ getService }: FtrProviderContext) {
|
|||
.expect(400);
|
||||
});
|
||||
|
||||
it('handles private location errors and does not delete the monitor if integration policy is unable to be deleted', async () => {
|
||||
it.skip('handles private location errors and does not delete the monitor if integration policy is unable to be deleted', async () => {
|
||||
const name = `Monitor with a private location ${uuidv4()}`;
|
||||
const newMonitor = {
|
||||
name,
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
|
|||
'Fleet-Usage-Logger',
|
||||
'Fleet-Usage-Sender',
|
||||
'ML:saved-objects-sync',
|
||||
'Synthetics:Clean-Up-Package-Policies',
|
||||
'UPTIME:SyntheticsService:Sync-Saved-Monitor-Objects',
|
||||
'actions:.cases-webhook',
|
||||
'actions:.d3security',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue