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

[Synthetics] Remove TLS alert option for ICMP monitor (#161173)

Browse source
This commit is contained in:
Shahzad 2023-07-05 11:55:38 +02:00 • committed by GitHub
parent 3d146f3eff
commit 6a84ea186b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
View file

@ -507,9 +507,13 @@ export const FIELD = (readOnly?: boolean): FieldMap => ({
controlled: true,
props: ({ setValue, field }): EuiSwitchProps => ({
id: 'syntheticsMonitorConfigIsAlertEnabled',
label: i18n.translate('xpack.synthetics.monitorConfig.enabledAlerting.label', {
defaultMessage: 'Enable status alerts',
}),
label: field?.value
? i18n.translate('xpack.synthetics.monitorConfig.enabledAlerting.label', {
defaultMessage: 'Disable status alerts on this monitor',
})
: i18n.translate('xpack.synthetics.monitorConfig.disabledAlerting.label', {
defaultMessage: 'Enable status alerts on this monitor',
}),
checked: field?.value || false,
onChange: (event) => {
setValue(AlertConfigKey.STATUS_ENABLED, !!event.target.checked);
@ -522,18 +526,15 @@ export const FIELD = (readOnly?: boolean): FieldMap => ({
[AlertConfigKey.TLS_ENABLED]: {
fieldKey: AlertConfigKey.TLS_ENABLED,
component: Switch,
label: i18n.translate('xpack.synthetics.monitorConfig.enabledAlerting.tls.label', {
defaultMessage: 'Enable TLS alerts',
}),
controlled: true,
props: ({ isEdit, setValue, field }): EuiSwitchProps => ({
props: ({ setValue, field }): EuiSwitchProps => ({
id: 'syntheticsMonitorConfigIsTlsAlertEnabled',
label: isEdit
label: field?.value
? i18n.translate('xpack.synthetics.monitorConfig.edit.alertTlsEnabled.label', {
defaultMessage: 'Disabling will stop tls alerting on this monitor.',
defaultMessage: 'Disable TLS alerts on this monitor.',
})
: i18n.translate('xpack.synthetics.monitorConfig.create.alertTlsEnabled.label', {
defaultMessage: 'Enable tls alerts on this monitor.',
defaultMessage: 'Enable TLS alerts on this monitor.',
}),
checked: field?.value || false,
onChange: (event) => {

1
x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx
View file

@ -287,7 +287,6 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
FIELD(readOnly)[ConfigKey.TIMEOUT],
FIELD(readOnly)[ConfigKey.ENABLED],
FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
FIELD(readOnly)[AlertConfigKey.TLS_ENABLED],
],
advanced: [DEFAULT_DATA_OPTIONS(readOnly), ICMP_ADVANCED(readOnly).requestConfig],
},

3
x-pack/plugins/synthetics/server/alert_rules/tls_rule/tls_rule_executor.test.ts
View file

@ -75,7 +75,8 @@ describe('tlsRuleExecutor', () => {
expect(certs).toEqual([]);
expect(spy).toHaveBeenCalledWith({
filter: 'synthetics-monitor.attributes.alert.tls.enabled: true',
filter:
'synthetics-monitor.attributes.alert.tls.enabled: true and (synthetics-monitor.attributes.type: http or synthetics-monitor.attributes.type: tcp)',
soClient,
});
});

5
x-pack/plugins/synthetics/server/alert_rules/tls_rule/tls_rule_executor.ts
View file

@ -21,7 +21,7 @@ import {
getAllMonitors,
processMonitors,
} from '../../saved_objects/synthetics_monitor/get_all_monitors';
import { CertResult, EncryptedSyntheticsMonitor } from '../../../common/runtime_types';
import { CertResult, ConfigKey, EncryptedSyntheticsMonitor } from '../../../common/runtime_types';
import { SyntheticsMonitorClient } from '../../synthetics_service/synthetics_monitor/synthetics_monitor_client';
import { monitorAttributes } from '../../../common/types/saved_objects';
import { AlertConfigKey } from '../../../common/constants/monitor_management';
@ -55,9 +55,10 @@ export class TLSRuleExecutor {
}
async getMonitors() {
const HTTP_OR_TCP = `${monitorAttributes}.${ConfigKey.MONITOR_TYPE}: http or ${monitorAttributes}.${ConfigKey.MONITOR_TYPE}: tcp`;
this.monitors = await getAllMonitors({
soClient: this.soClient,
filter: `${monitorAttributes}.${AlertConfigKey.TLS_ENABLED}: true`,
filter: `${monitorAttributes}.${AlertConfigKey.TLS_ENABLED}: true and (${HTTP_OR_TCP})`,
});
const {