github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

synthetics - adjust default monitor values (#131025)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Dominique Clarke 2022-04-29 11:46:40 -04:00 • committed by GitHub
parent 4b5c85dc78
commit 78ed6deed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 220 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/synthetics/common/constants/index.ts
View file

@ -13,4 +13,3 @@ export * from './settings_defaults';
export { QUERY } from './query';
export * from './ui';
export * from './rest_api';
export const DEFAULT_NAMESPACE_STRING = 'default';

167
x-pack/plugins/synthetics/common/constants/monitor_defaults.ts Normal file
View file

@ -0,0 +1,167 @@
/*
* 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 {
BrowserAdvancedFields,
BrowserSimpleFields,
CommonFields,
DataStream,
HTTPAdvancedFields,
HTTPMethod,
HTTPSimpleFields,
ICMPSimpleFields,
Mode,
MonitorDefaults,
ResponseBodyIndexPolicy,
ScheduleUnit,
ScreenshotOption,
TCPAdvancedFields,
TCPSimpleFields,
TLSFields,
TLSVersion,
VerificationMode,
} from '../runtime_types/monitor_management';
import { ConfigKey } from './monitor_management';
export const DEFAULT_NAMESPACE_STRING = 'default';
export const DEFAULT_COMMON_FIELDS: CommonFields = {
[ConfigKey.MONITOR_TYPE]: DataStream.HTTP,
[ConfigKey.ENABLED]: true,
[ConfigKey.SCHEDULE]: {
number: '3',
unit: ScheduleUnit.MINUTES,
},
[ConfigKey.APM_SERVICE_NAME]: '',
[ConfigKey.TAGS]: [],
[ConfigKey.TIMEOUT]: '16',
[ConfigKey.NAME]: '',
[ConfigKey.LOCATIONS]: [],
[ConfigKey.NAMESPACE]: DEFAULT_NAMESPACE_STRING,
};
export const DEFAULT_BROWSER_ADVANCED_FIELDS: BrowserAdvancedFields = {
[ConfigKey.SCREENSHOTS]: ScreenshotOption.ON,
[ConfigKey.SYNTHETICS_ARGS]: [],
[ConfigKey.JOURNEY_FILTERS_MATCH]: '',
[ConfigKey.JOURNEY_FILTERS_TAGS]: [],
[ConfigKey.IGNORE_HTTPS_ERRORS]: false,
[ConfigKey.IS_THROTTLING_ENABLED]: true,
[ConfigKey.DOWNLOAD_SPEED]: '5',
[ConfigKey.UPLOAD_SPEED]: '3',
[ConfigKey.LATENCY]: '20',
[ConfigKey.THROTTLING_CONFIG]: '5d/3u/20l',
};
export const DEFAULT_BROWSER_SIMPLE_FIELDS: BrowserSimpleFields = {
...DEFAULT_COMMON_FIELDS,
[ConfigKey.SCHEDULE]: {
unit: ScheduleUnit.MINUTES,
number: '10',
},
[ConfigKey.METADATA]: {
script_source: {
is_generated_script: false,
file_name: '',
},
is_zip_url_tls_enabled: false,
},
[ConfigKey.MONITOR_TYPE]: DataStream.BROWSER,
[ConfigKey.SOURCE_INLINE]: '',
[ConfigKey.SOURCE_ZIP_URL]: '',
[ConfigKey.SOURCE_ZIP_USERNAME]: '',
[ConfigKey.SOURCE_ZIP_PASSWORD]: '',
[ConfigKey.SOURCE_ZIP_FOLDER]: '',
[ConfigKey.SOURCE_ZIP_PROXY_URL]: '',
[ConfigKey.PARAMS]: '',
[ConfigKey.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: undefined,
[ConfigKey.ZIP_URL_TLS_CERTIFICATE]: undefined,
[ConfigKey.ZIP_URL_TLS_KEY]: undefined,
[ConfigKey.ZIP_URL_TLS_KEY_PASSPHRASE]: undefined,
[ConfigKey.ZIP_URL_TLS_VERIFICATION_MODE]: undefined,
[ConfigKey.ZIP_URL_TLS_VERSION]: undefined,
[ConfigKey.URLS]: undefined,
[ConfigKey.PORT]: undefined,
};
export const DEFAULT_HTTP_SIMPLE_FIELDS: HTTPSimpleFields = {
...DEFAULT_COMMON_FIELDS,
[ConfigKey.METADATA]: {
is_tls_enabled: false,
},
[ConfigKey.URLS]: '',
[ConfigKey.MAX_REDIRECTS]: '0',
[ConfigKey.MONITOR_TYPE]: DataStream.HTTP,
};
export const DEFAULT_HTTP_ADVANCED_FIELDS: HTTPAdvancedFields = {
[ConfigKey.PASSWORD]: '',
[ConfigKey.PROXY_URL]: '',
[ConfigKey.RESPONSE_BODY_CHECK_NEGATIVE]: [],
[ConfigKey.RESPONSE_BODY_CHECK_POSITIVE]: [],
[ConfigKey.RESPONSE_BODY_INDEX]: ResponseBodyIndexPolicy.ON_ERROR,
[ConfigKey.RESPONSE_HEADERS_CHECK]: {},
[ConfigKey.RESPONSE_HEADERS_INDEX]: true,
[ConfigKey.RESPONSE_STATUS_CHECK]: [],
[ConfigKey.REQUEST_BODY_CHECK]: {
value: '',
type: Mode.PLAINTEXT,
},
[ConfigKey.REQUEST_HEADERS_CHECK]: {},
[ConfigKey.REQUEST_METHOD_CHECK]: HTTPMethod.GET,
[ConfigKey.USERNAME]: '',
};
export const DEFAULT_ICMP_SIMPLE_FIELDS: ICMPSimpleFields = {
...DEFAULT_COMMON_FIELDS,
[ConfigKey.HOSTS]: '',
[ConfigKey.MONITOR_TYPE]: DataStream.ICMP,
[ConfigKey.WAIT]: '1',
};
export const DEFAULT_TCP_SIMPLE_FIELDS: TCPSimpleFields = {
...DEFAULT_COMMON_FIELDS,
[ConfigKey.METADATA]: {
is_tls_enabled: false,
},
[ConfigKey.HOSTS]: '',
[ConfigKey.MONITOR_TYPE]: DataStream.TCP,
};
export const DEFAULT_TCP_ADVANCED_FIELDS: TCPAdvancedFields = {
[ConfigKey.PROXY_URL]: '',
[ConfigKey.PROXY_USE_LOCAL_RESOLVER]: false,
[ConfigKey.RESPONSE_RECEIVE_CHECK]: '',
[ConfigKey.REQUEST_SEND_CHECK]: '',
};
export const DEFAULT_TLS_FIELDS: TLSFields = {
[ConfigKey.TLS_CERTIFICATE_AUTHORITIES]: '',
[ConfigKey.TLS_CERTIFICATE]: '',
[ConfigKey.TLS_KEY]: '',
[ConfigKey.TLS_KEY_PASSPHRASE]: '',
[ConfigKey.TLS_VERIFICATION_MODE]: VerificationMode.FULL,
[ConfigKey.TLS_VERSION]: [TLSVersion.ONE_ONE, TLSVersion.ONE_TWO, TLSVersion.ONE_THREE],
};
export const DEFAULT_FIELDS: MonitorDefaults = {
[DataStream.HTTP]: {
...DEFAULT_HTTP_SIMPLE_FIELDS,
...DEFAULT_HTTP_ADVANCED_FIELDS,
...DEFAULT_TLS_FIELDS,
},
[DataStream.TCP]: {
...DEFAULT_TCP_SIMPLE_FIELDS,
...DEFAULT_TCP_ADVANCED_FIELDS,
...DEFAULT_TLS_FIELDS,
},
[DataStream.ICMP]: DEFAULT_ICMP_SIMPLE_FIELDS,
[DataStream.BROWSER]: {
...DEFAULT_BROWSER_SIMPLE_FIELDS,
...DEFAULT_BROWSER_ADVANCED_FIELDS,
...DEFAULT_TLS_FIELDS,
},
};

10
x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
View file

@ -10,6 +10,7 @@ import { secretKeys } from '../../constants/monitor_management';
import { ConfigKey } from './config_key';
import { MonitorServiceLocationsCodec, ServiceLocationErrors } from './locations';
import {
DataStream,
DataStreamCodec,
ModeCodec,
ResponseBodyIndexPolicyCodec,
@ -308,6 +309,15 @@ export type EncryptedSyntheticsMonitorWithId = t.TypeOf<
typeof EncryptedSyntheticsMonitorWithIdCodec
>;
export const MonitorDefaultsCodec = t.interface({
[DataStream.HTTP]: HTTPFieldsCodec,
[DataStream.TCP]: TCPFieldsCodec,
[DataStream.ICMP]: ICMPSimpleFieldsCodec,
[DataStream.BROWSER]: BrowserFieldsCodec,
});
export type MonitorDefaults = t.TypeOf<typeof MonitorDefaultsCodec>;
export const MonitorManagementListResultCodec = t.type({
monitors: t.array(
t.interface({

25
x-pack/plugins/synthetics/public/components/fleet_package/common/default_values.ts
View file

@ -1,25 +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 { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants';
import { CommonFields, ConfigKey, ScheduleUnit, DataStream } from '../types';
export const defaultValues: CommonFields = {
[ConfigKey.MONITOR_TYPE]: DataStream.HTTP,
[ConfigKey.LOCATIONS]: [],
[ConfigKey.ENABLED]: true,
[ConfigKey.SCHEDULE]: {
number: '3',
unit: ScheduleUnit.MINUTES,
},
[ConfigKey.APM_SERVICE_NAME]: '',
[ConfigKey.TAGS]: [],
[ConfigKey.TIMEOUT]: '16',
[ConfigKey.NAME]: '',
[ConfigKey.LOCATIONS]: [],
[ConfigKey.NAMESPACE]: DEFAULT_NAMESPACE_STRING,
};

16
x-pack/plugins/synthetics/public/components/fleet_package/common/normalizers.ts
View file

@ -7,9 +7,11 @@
import { NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
import { CommonFields, ConfigKey, DataStream } from '../types';
import { defaultValues as commonDefaultValues } from './default_values';
import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants';
import { defaultConfig } from '../contexts';
import {
DEFAULT_COMMON_FIELDS,
DEFAULT_NAMESPACE_STRING,
DEFAULT_FIELDS,
} from '../../../../common/constants/monitor_defaults';
// TO DO: create a standard input format that all fields resolve to
export type Normalizer = (fields: NewPackagePolicyInput['vars']) => unknown;
@ -46,15 +48,15 @@ export function getCronNormalizer<Fields>(key: string, defaultValues: Fields): N
}
export const getCommonNormalizer = (key: ConfigKey) => {
return getNormalizer(key, commonDefaultValues);
return getNormalizer(key, DEFAULT_COMMON_FIELDS);
};
export const getCommonjsonToJavascriptNormalizer = (key: ConfigKey) => {
return getJsonToJavascriptNormalizer(key, commonDefaultValues);
return getJsonToJavascriptNormalizer(key, DEFAULT_COMMON_FIELDS);
};
export const getCommonCronToSecondsNormalizer = (key: ConfigKey) => {
return getCronNormalizer(key, commonDefaultValues);
return getCronNormalizer(key, DEFAULT_COMMON_FIELDS);
};
export const commonNormalizers: CommonNormalizerMap = {
@ -76,7 +78,7 @@ export const commonNormalizers: CommonNormalizerMap = {
number,
};
} else {
return defaultConfig[type][ConfigKey.SCHEDULE];
return DEFAULT_FIELDS[type][ConfigKey.SCHEDULE];
}
},
[ConfigKey.APM_SERVICE_NAME]: getCommonNormalizer(ConfigKey.APM_SERVICE_NAME),

35
x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context.tsx
View file

@ -6,8 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { BrowserSimpleFields, ConfigKey, DataStream, ScheduleUnit } from '../types';
import { defaultValues as commonDefaultValues } from '../common/default_values';
import { BrowserSimpleFields } from '../types';
import { DEFAULT_BROWSER_SIMPLE_FIELDS } from '../../../../common/constants/monitor_defaults';
interface BrowserSimpleFieldsContext {
setFields: React.Dispatch<React.SetStateAction<BrowserSimpleFields>>;
@ -20,36 +20,7 @@ interface BrowserSimpleFieldsContextProvider {
defaultValues?: BrowserSimpleFields;
}
export const initialValues: BrowserSimpleFields = {
...commonDefaultValues,
[ConfigKey.SCHEDULE]: {
unit: ScheduleUnit.MINUTES,
number: '10',
},
[ConfigKey.METADATA]: {
script_source: {
is_generated_script: false,
file_name: '',
},
is_zip_url_tls_enabled: false,
},
[ConfigKey.MONITOR_TYPE]: DataStream.BROWSER,
[ConfigKey.SOURCE_ZIP_URL]: '',
[ConfigKey.SOURCE_ZIP_USERNAME]: '',
[ConfigKey.SOURCE_ZIP_PASSWORD]: '',
[ConfigKey.SOURCE_ZIP_FOLDER]: '',
[ConfigKey.SOURCE_ZIP_PROXY_URL]: '',
[ConfigKey.SOURCE_INLINE]: '',
[ConfigKey.PARAMS]: '',
[ConfigKey.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: undefined,
[ConfigKey.ZIP_URL_TLS_CERTIFICATE]: undefined,
[ConfigKey.ZIP_URL_TLS_KEY]: undefined,
[ConfigKey.ZIP_URL_TLS_KEY_PASSPHRASE]: undefined,
[ConfigKey.ZIP_URL_TLS_VERIFICATION_MODE]: undefined,
[ConfigKey.ZIP_URL_TLS_VERSION]: undefined,
[ConfigKey.URLS]: undefined,
[ConfigKey.PORT]: undefined,
};
export const initialValues: BrowserSimpleFields = DEFAULT_BROWSER_SIMPLE_FIELDS;
const defaultContext: BrowserSimpleFieldsContext = {
setFields: (_fields: React.SetStateAction<BrowserSimpleFields>) => {

16
x-pack/plugins/synthetics/public/components/fleet_package/contexts/browser_context_advanced.tsx
View file

@ -6,7 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { BrowserAdvancedFields, ConfigKey, ScreenshotOption } from '../types';
import { BrowserAdvancedFields } from '../types';
import { DEFAULT_BROWSER_ADVANCED_FIELDS } from '../../../../common/constants/monitor_defaults';
interface BrowserAdvancedFieldsContext {
setFields: React.Dispatch<React.SetStateAction<BrowserAdvancedFields>>;
@ -19,18 +20,7 @@ interface BrowserAdvancedFieldsContextProvider {
defaultValues?: BrowserAdvancedFields;
}
export const initialValues: BrowserAdvancedFields = {
[ConfigKey.SCREENSHOTS]: ScreenshotOption.ON,
[ConfigKey.SYNTHETICS_ARGS]: [],
[ConfigKey.JOURNEY_FILTERS_MATCH]: '',
[ConfigKey.JOURNEY_FILTERS_TAGS]: [],
[ConfigKey.IGNORE_HTTPS_ERRORS]: false,
[ConfigKey.IS_THROTTLING_ENABLED]: true,
[ConfigKey.DOWNLOAD_SPEED]: '5',
[ConfigKey.UPLOAD_SPEED]: '3',
[ConfigKey.LATENCY]: '20',
[ConfigKey.THROTTLING_CONFIG]: '5d/3u/20l',
};
export const initialValues: BrowserAdvancedFields = DEFAULT_BROWSER_ADVANCED_FIELDS;
const defaultContext: BrowserAdvancedFieldsContext = {
setFields: (_fields: React.SetStateAction<BrowserAdvancedFields>) => {

14
x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_context.tsx
View file

@ -6,8 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { HTTPSimpleFields, ConfigKey, DataStream } from '../types';
import { defaultValues as commonDefaultValues } from '../common/default_values';
import { HTTPSimpleFields } from '../types';
import { DEFAULT_HTTP_SIMPLE_FIELDS } from '../../../../common/constants/monitor_defaults';
interface HTTPSimpleFieldsContext {
setFields: React.Dispatch<React.SetStateAction<HTTPSimpleFields>>;
@ -20,15 +20,7 @@ interface HTTPSimpleFieldsContextProvider {
defaultValues?: HTTPSimpleFields;
}
export const initialValues: HTTPSimpleFields = {
...commonDefaultValues,
[ConfigKey.METADATA]: {
is_tls_enabled: false,
},
[ConfigKey.URLS]: '',
[ConfigKey.MAX_REDIRECTS]: '0',
[ConfigKey.MONITOR_TYPE]: DataStream.HTTP,
};
export const initialValues: HTTPSimpleFields = DEFAULT_HTTP_SIMPLE_FIELDS;
const defaultContext: HTTPSimpleFieldsContext = {
setFields: (_fields: React.SetStateAction<HTTPSimpleFields>) => {

21
x-pack/plugins/synthetics/public/components/fleet_package/contexts/http_context_advanced.tsx
View file

@ -6,7 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { HTTPAdvancedFields, ConfigKey, Mode, ResponseBodyIndexPolicy, HTTPMethod } from '../types';
import { HTTPAdvancedFields } from '../types';
import { DEFAULT_HTTP_ADVANCED_FIELDS } from '../../../../common/constants/monitor_defaults';
interface HTTPAdvancedFieldsContext {
setFields: React.Dispatch<React.SetStateAction<HTTPAdvancedFields>>;
@ -19,23 +20,7 @@ interface HTTPAdvancedFieldsContextProvider {
defaultValues?: HTTPAdvancedFields;
}
export const initialValues: HTTPAdvancedFields = {
[ConfigKey.PASSWORD]: '',
[ConfigKey.PROXY_URL]: '',
[ConfigKey.RESPONSE_BODY_CHECK_NEGATIVE]: [],
[ConfigKey.RESPONSE_BODY_CHECK_POSITIVE]: [],
[ConfigKey.RESPONSE_BODY_INDEX]: ResponseBodyIndexPolicy.ON_ERROR,
[ConfigKey.RESPONSE_HEADERS_CHECK]: {},
[ConfigKey.RESPONSE_HEADERS_INDEX]: true,
[ConfigKey.RESPONSE_STATUS_CHECK]: [],
[ConfigKey.REQUEST_BODY_CHECK]: {
value: '',
type: Mode.PLAINTEXT,
},
[ConfigKey.REQUEST_HEADERS_CHECK]: {},
[ConfigKey.REQUEST_METHOD_CHECK]: HTTPMethod.GET,
[ConfigKey.USERNAME]: '',
};
export const initialValues: HTTPAdvancedFields = DEFAULT_HTTP_ADVANCED_FIELDS;
export const defaultContext: HTTPAdvancedFieldsContext = {
setFields: (_fields: React.SetStateAction<HTTPAdvancedFields>) => {

11
x-pack/plugins/synthetics/public/components/fleet_package/contexts/icmp_context.tsx
View file

@ -6,8 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { ICMPSimpleFields, ConfigKey, DataStream } from '../types';
import { defaultValues as commonDefaultValues } from '../common/default_values';
import { ICMPSimpleFields } from '../types';
import { DEFAULT_ICMP_SIMPLE_FIELDS } from '../../../../common/constants/monitor_defaults';
interface ICMPSimpleFieldsContext {
setFields: React.Dispatch<React.SetStateAction<ICMPSimpleFields>>;
@ -20,12 +20,7 @@ interface ICMPSimpleFieldsContextProvider {
defaultValues?: ICMPSimpleFields;
}
export const initialValues: ICMPSimpleFields = {
...commonDefaultValues,
[ConfigKey.HOSTS]: '',
[ConfigKey.MONITOR_TYPE]: DataStream.ICMP,
[ConfigKey.WAIT]: '1',
};
export const initialValues: ICMPSimpleFields = DEFAULT_ICMP_SIMPLE_FIELDS;
const defaultContext: ICMPSimpleFieldsContext = {
setFields: (_fields: React.SetStateAction<ICMPSimpleFields>) => {

29
x-pack/plugins/synthetics/public/components/fleet_package/contexts/index.ts
View file

@ -4,16 +4,6 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { DataStream, PolicyConfig } from '../types';
import { initialValues as defaultHTTPSimpleFields } from './http_context';
import { initialValues as defaultHTTPAdvancedFields } from './http_context_advanced';
import { initialValues as defaultTCPSimpleFields } from './tcp_context';
import { initialValues as defaultICMPSimpleFields } from './icmp_context';
import { initialValues as defaultTCPAdvancedFields } from './tcp_context_advanced';
import { initialValues as defaultBrowserSimpleFields } from './browser_context';
import { initialValues as defaultBrowserAdvancedFields } from './browser_context_advanced';
import { initialValues as defaultTLSFields } from './tls_fields_context';
export type { IPolicyConfigContextProvider } from './policy_config_context';
export {
PolicyConfigContext,
@ -74,22 +64,3 @@ export { HTTPContextProvider } from './http_provider';
export { TCPContextProvider } from './tcp_provider';
export { BrowserContextProvider } from './browser_provider';
export { SyntheticsProviders } from './synthetics_context_providers';
export const defaultConfig: PolicyConfig = {
[DataStream.HTTP]: {
...defaultHTTPSimpleFields,
...defaultHTTPAdvancedFields,
...defaultTLSFields,
},
[DataStream.TCP]: {
...defaultTCPSimpleFields,
...defaultTCPAdvancedFields,
...defaultTLSFields,
},
[DataStream.ICMP]: defaultICMPSimpleFields,
[DataStream.BROWSER]: {
...defaultBrowserSimpleFields,
...defaultBrowserAdvancedFields,
...defaultTLSFields,
},
};

2
x-pack/plugins/synthetics/public/components/fleet_package/contexts/policy_config_context.tsx
View file

@ -6,7 +6,7 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants';
import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants/monitor_defaults';
import {
ScheduleUnit,
MonitorServiceLocations,

13
x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_context.tsx
View file

@ -6,8 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { TCPSimpleFields, ConfigKey, DataStream } from '../types';
import { defaultValues as commonDefaultValues } from '../common/default_values';
import { TCPSimpleFields } from '../types';
import { DEFAULT_TCP_SIMPLE_FIELDS } from '../../../../common/constants/monitor_defaults';
interface TCPSimpleFieldsContext {
setFields: React.Dispatch<React.SetStateAction<TCPSimpleFields>>;
@ -20,14 +20,7 @@ interface TCPSimpleFieldsContextProvider {
defaultValues?: TCPSimpleFields;
}
export const initialValues: TCPSimpleFields = {
...commonDefaultValues,
[ConfigKey.METADATA]: {
is_tls_enabled: false,
},
[ConfigKey.HOSTS]: '',
[ConfigKey.MONITOR_TYPE]: DataStream.TCP,
};
export const initialValues: TCPSimpleFields = DEFAULT_TCP_SIMPLE_FIELDS;
const defaultContext: TCPSimpleFieldsContext = {
setFields: (_fields: React.SetStateAction<TCPSimpleFields>) => {

10
x-pack/plugins/synthetics/public/components/fleet_package/contexts/tcp_context_advanced.tsx
View file

@ -6,7 +6,8 @@
*/
import React, { createContext, useContext, useMemo, useState } from 'react';
import { TCPAdvancedFields, ConfigKey } from '../types';
import { TCPAdvancedFields } from '../types';
import { DEFAULT_TCP_ADVANCED_FIELDS } from '../../../../common/constants/monitor_defaults';
interface TCPAdvancedFieldsContext {
setFields: React.Dispatch<React.SetStateAction<TCPAdvancedFields>>;
@ -19,12 +20,7 @@ interface TCPAdvancedFieldsContextProvider {
defaultValues?: TCPAdvancedFields;
}
export const initialValues: TCPAdvancedFields = {
[ConfigKey.PROXY_URL]: '',
[ConfigKey.PROXY_USE_LOCAL_RESOLVER]: false,
[ConfigKey.RESPONSE_RECEIVE_CHECK]: '',
[ConfigKey.REQUEST_SEND_CHECK]: '',
};
export const initialValues: TCPAdvancedFields = DEFAULT_TCP_ADVANCED_FIELDS;
const defaultContext: TCPAdvancedFieldsContext = {
setFields: (_fields: React.SetStateAction<TCPAdvancedFields>) => {

4
x-pack/plugins/synthetics/public/components/fleet_package/contexts/tls_fields_context.tsx
View file

@ -7,7 +7,7 @@
import React, { createContext, useContext, useMemo, useState } from 'react';
import { TLSFields } from '../types';
import { defaultValues as tlsDefaultValues } from '../tls/default_values';
import { DEFAULT_TLS_FIELDS } from '../../../../common/constants/monitor_defaults';
interface TLSFieldsContext {
setFields: React.Dispatch<React.SetStateAction<TLSFields>>;
@ -20,7 +20,7 @@ interface TLSFieldsContextProvider {
defaultValues?: TLSFields;
}
export const initialValues: TLSFields = tlsDefaultValues;
export const initialValues: TLSFields = DEFAULT_TLS_FIELDS;
const defaultContext: TLSFieldsContext = {
setFields: (_fields: React.SetStateAction<TLSFields>) => {

28
x-pack/plugins/synthetics/public/components/fleet_package/hooks/use_policy.ts
View file

@ -25,34 +25,10 @@ import {
useTLSFieldsContext,
useBrowserSimpleFieldsContext,
useBrowserAdvancedFieldsContext,
defaultHTTPAdvancedFields,
defaultHTTPSimpleFields,
defaultICMPSimpleFields,
defaultTCPSimpleFields,
defaultTCPAdvancedFields,
defaultBrowserSimpleFields,
defaultBrowserAdvancedFields,
defaultTLSFields,
} from '../contexts';
import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults';
export const defaultConfig: PolicyConfig = {
[DataStream.HTTP]: {
...defaultHTTPSimpleFields,
...defaultHTTPAdvancedFields,
...defaultTLSFields,
},
[DataStream.TCP]: {
...defaultTCPSimpleFields,
...defaultTCPAdvancedFields,
...defaultTLSFields,
},
[DataStream.ICMP]: defaultICMPSimpleFields,
[DataStream.BROWSER]: {
...defaultBrowserSimpleFields,
...defaultBrowserAdvancedFields,
...defaultTLSFields,
},
};
export const defaultConfig: PolicyConfig = DEFAULT_FIELDS;
export const usePolicy = (fleetPolicyName: string = '') => {
const {

32
x-pack/plugins/synthetics/public/components/fleet_package/synthetics_policy_create_extension.tsx
View file

@ -10,40 +10,14 @@ import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/pu
import { useTrackPageview } from '@kbn/observability-plugin/public';
import { DataStream } from './types';
import { PolicyConfig } from './types';
import {
usePolicyConfigContext,
defaultHTTPSimpleFields,
defaultHTTPAdvancedFields,
defaultTCPSimpleFields,
defaultTCPAdvancedFields,
defaultICMPSimpleFields,
defaultBrowserSimpleFields,
defaultBrowserAdvancedFields,
defaultTLSFields,
} from './contexts';
import { usePolicyConfigContext } from './contexts';
import { DEFAULT_FIELDS } from '../../../common/constants/monitor_defaults';
import { CustomFields } from './custom_fields';
import { useUpdatePolicy } from './hooks/use_update_policy';
import { usePolicy } from './hooks/use_policy';
import { validate } from './validation';
export const defaultConfig: PolicyConfig = {
[DataStream.HTTP]: {
...defaultHTTPSimpleFields,
...defaultHTTPAdvancedFields,
...defaultTLSFields,
},
[DataStream.TCP]: {
...defaultTCPSimpleFields,
...defaultTCPAdvancedFields,
...defaultTLSFields,
},
[DataStream.ICMP]: defaultICMPSimpleFields,
[DataStream.BROWSER]: {
...defaultBrowserSimpleFields,
...defaultBrowserAdvancedFields,
...defaultTLSFields,
},
};
export const defaultConfig: PolicyConfig = DEFAULT_FIELDS;
/**
* Exports Synthetics-specific package policy instructions

17
x-pack/plugins/synthetics/public/components/fleet_package/tls/default_values.ts
View file

@ -1,17 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { TLSFields, ConfigKey, VerificationMode, TLSVersion } from '../types';
export const defaultValues: TLSFields = {
[ConfigKey.TLS_CERTIFICATE_AUTHORITIES]: '',
[ConfigKey.TLS_CERTIFICATE]: '',
[ConfigKey.TLS_KEY]: '',
[ConfigKey.TLS_KEY_PASSPHRASE]: '',
[ConfigKey.TLS_VERIFICATION_MODE]: VerificationMode.FULL,
[ConfigKey.TLS_VERSION]: [TLSVersion.ONE_ONE, TLSVersion.ONE_TWO, TLSVersion.ONE_THREE],
};

2
x-pack/plugins/synthetics/public/components/monitor_management/edit_monitor_config.tsx
View file

@ -18,7 +18,7 @@ import {
import { SyntheticsProviders } from '../fleet_package/contexts';
import { PolicyConfig } from '../fleet_package/types';
import { MonitorConfig } from './monitor_config/monitor_config';
import { DEFAULT_NAMESPACE_STRING } from '../../../common/constants';
import { DEFAULT_NAMESPACE_STRING } from '../../../common/constants/monitor_defaults';
interface Props {
monitor: MonitorFields;

5
x-pack/plugins/synthetics/public/components/monitor_management/monitor_config/monitor_config.tsx
View file

@ -17,7 +17,7 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { v4 as uuidv4 } from 'uuid';
import { defaultConfig, usePolicyConfigContext } from '../../fleet_package/contexts';
import { usePolicyConfigContext } from '../../fleet_package/contexts';
import { usePolicy } from '../../fleet_package/hooks/use_policy';
import { validate } from '../validation';
@ -26,6 +26,7 @@ import { useFormatMonitor } from '../hooks/use_format_monitor';
import { MonitorFields } from './monitor_fields';
import { TestNowMode, TestRun } from '../test_now_mode/test_now_mode';
import { MonitorFields as MonitorFieldsType } from '../../../../common/runtime_types';
import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults';
export const MonitorConfig = ({ isEdit = false }: { isEdit: boolean }) => {
const { monitorType } = usePolicyConfigContext();
@ -41,7 +42,7 @@ export const MonitorConfig = ({ isEdit = false }: { isEdit: boolean }) => {
monitorType,
validate,
config: policyConfig[monitorType],
defaultConfig: defaultConfig[monitorType],
defaultConfig: DEFAULT_FIELDS[monitorType],
});
const [hasBeenSubmitted, setHasBeenSubmitted] = useState(false);

2
x-pack/plugins/synthetics/server/lib/synthetics_service/formatters/convert_to_data_stream.ts
View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants';
import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants/monitor_defaults';
import { DataStream, MonitorFields } from '../../../../common/runtime_types';
interface DataStreamConfig {