IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Use mute_time_intervals as field name in dto ,for simplified routing (#82045)

Browse Source 
Use mute_time_intervals as field name in dto ,for simplified routing
This commit is contained in:
Sonia Aguilar 2024-02-07 09:54:31 +01:00 committed by GitHub
parent a385ae4fa5
commit f59e76d54b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/alerting/unified/utils/rule-form.test.ts
View File

@ -130,7 +130,7 @@ describe('getContactPointsFromDTO', () => {
], ],
notification_settings: { notification_settings: {
receiver: 'receiver', receiver: 'receiver',
mute_timings: ['mute_timing'], mute_time_intervals: ['mute_timing'],
group_by: ['group_by'], group_by: ['group_by'],
group_wait: 'group_wait', group_wait: 'group_wait',
group_interval: 'group_interval', group_interval: 'group_interval',
@ -199,7 +199,7 @@ describe('getNotificationSettingsForDTO', () => {
const result = getNotificationSettingsForDTO(manualRouting, contactPoints); const result = getNotificationSettingsForDTO(manualRouting, contactPoints);
expect(result).toEqual({ expect(result).toEqual({
receiver: 'receiver', receiver: 'receiver',
mute_timings: ['mute_timing'], mute_time_intervals: ['mute_timing'],
group_by: ['group_by'], group_by: ['group_by'],
group_wait: 'group_wait', group_wait: 'group_wait',
group_interval: 'group_interval', group_interval: 'group_interval',

22
public/app/features/alerting/unified/utils/rule-form.ts
View File

@ -147,7 +147,7 @@ export function getNotificationSettingsForDTO(
if (contactPoints?.grafana?.selectedContactPoint && manualRouting) { if (contactPoints?.grafana?.selectedContactPoint && manualRouting) {
return { return {
receiver: contactPoints?.grafana?.selectedContactPoint, receiver: contactPoints?.grafana?.selectedContactPoint,
mute_timings: contactPoints?.grafana?.muteTimeIntervals, mute_time_intervals: contactPoints?.grafana?.muteTimeIntervals,
group_by: contactPoints?.grafana?.overrideGrouping ? contactPoints?.grafana?.groupBy : undefined, group_by: contactPoints?.grafana?.overrideGrouping ? contactPoints?.grafana?.groupBy : undefined,
group_wait: group_wait:
contactPoints?.grafana?.overrideTimings && contactPoints?.grafana?.groupWaitValue contactPoints?.grafana?.overrideTimings && contactPoints?.grafana?.groupWaitValue
@ -197,7 +197,7 @@ export function getContactPointsFromDTO(ga: GrafanaRuleDefinition): AlertManager
const contactPoint: ContactPoint | undefined = ga.notification_settings const contactPoint: ContactPoint | undefined = ga.notification_settings
? { ? {
selectedContactPoint: ga.notification_settings.receiver, selectedContactPoint: ga.notification_settings.receiver,
muteTimeIntervals: ga.notification_settings.mute_timings ?? [], muteTimeIntervals: ga.notification_settings.mute_time_intervals ?? [],
overrideGrouping: overrideGrouping:
Array.isArray(ga.notification_settings.group_by) && ga.notification_settings.group_by.length > 0, Array.isArray(ga.notification_settings.group_by) && ga.notification_settings.group_by.length > 0,
overrideTimings: [ overrideTimings: [
@ -247,24 +247,6 @@ export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleF
contactPoints: routingSettings, contactPoints: routingSettings,
manualRouting: Boolean(routingSettings), manualRouting: Boolean(routingSettings),
// next line is for testing
// manualRouting: true,
// contactPoints: {
// grafana: {
// selectedContactPoint: "contact_point_5",
// muteTimeIntervals: [
// "mute timing 1"
// ],
// overrideGrouping: true,
// overrideTimings: true,
// "groupBy": [
// "..."
// ],
// groupWaitValue: "35s",
// groupIntervalValue: "6m",
// repeatIntervalValue: "5h"
// }
// }
}; };
} else { } else {
throw new Error('Unexpected type of rule for grafana rules source'); throw new Error('Unexpected type of rule for grafana rules source');

2
public/app/types/unified-alerting-dto.ts
View File

@ -203,7 +203,7 @@ export interface GrafanaNotificationSettings {
group_wait?: string; group_wait?: string;
group_interval?: string; group_interval?: string;
repeat_interval?: string; repeat_interval?: string;
mute_timings?: string[]; mute_time_intervals?: string[];
} }
export interface PostableGrafanaRuleDefinition { export interface PostableGrafanaRuleDefinition {
uid?: string; uid?: string;