fix alarm silence strategy setting failed (#1131)

apache · Jul 25, 2023 · 56e6270 · 56e6270
1 parent 76dfef8
commit 56e6270
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 28 deletions.
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmConvergeReduce.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmConvergeReduce.java
@@ -80,6 +80,8 @@ public boolean filterConverge(Alert currentAlert) {
                             return false;
                         }
                     });
+                } else {
+                    match = true;
                 }
                 if (match && alertConverge.getPriorities() != null && !alertConverge.getPriorities().isEmpty()) {
                     match = alertConverge.getPriorities().stream().anyMatch(item -> item != null && item == currentAlert.getPriority());

diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmSilenceReduce.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmSilenceReduce.java
@@ -61,7 +61,9 @@ public boolean filterSilence(Alert alert) {
 							return false;
 						}
 					});
-				}
+				} else {
+                    match = true;
+                }
 				if (match && alertSilence.getPriorities() != null && !alertSilence.getPriorities().isEmpty()) {
 					match = alertSilence.getPriorities().stream().anyMatch(item -> item != null && item == alert.getPriority());
 				}

diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java
@@ -14,6 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.Set;
 
 /**
@@ -31,7 +32,11 @@ public class AlertSilenceServiceImpl implements AlertSilenceService {
 
 	@Override
 	public void validate(AlertSilence alertSilence, boolean isModify) throws IllegalArgumentException {
-		// todo 
+		// todo
+		// 兜底策略, 如果周期性情况下设置的告警静默选择日期为空, 视为全部勾选
+		if (alertSilence.getType() == 1 && alertSilence.getDays() == null) {
+			alertSilence.setDays(Arrays.asList((byte)7, (byte)1, (byte)2, (byte)3, (byte)4, (byte)5, (byte)6));
+		}
 	}
 
 	@Override

diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
@@ -531,12 +531,7 @@
       <nz-form-item *ngIf="isLimit">
         <nz-form-label nzSpan="7" nzFor="days">{{ 'alert.notice.rule.period-chose' | i18n }}</nz-form-label>
         <nz-form-control nzSpan="12">
-          <nz-checkbox-group
-            name="days"
-            id="days"
-            [(ngModel)]="dayCheckOptions"
-            (ngModelChange)="onNoticeRuleDaysChange(dayCheckOptions)"
-          ></nz-checkbox-group>
+          <nz-checkbox-group name="days" id="days" [(ngModel)]="dayCheckOptions"></nz-checkbox-group>
         </nz-form-control>
       </nz-form-item>
       <nz-form-item>

diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts
@@ -291,6 +291,9 @@ export class AlertNoticeComponent implements OnInit {
     } else {
       this.isLimit = true;
     }
+    this.dayCheckOptions.forEach(item => {
+      item.checked = this.rule.days != undefined && this.rule.days.indexOf(item.value) >= 0;
+    });
     this.isManageRuleModalVisible = true;
     this.isManageRuleModalAdd = false;
     this.receiversOption.push({
@@ -313,19 +316,12 @@ export class AlertNoticeComponent implements OnInit {
     }
   }
 
-  onNoticeRuleDaysChange(value: any[]) {
-    this.rule.days = value
-      .filter(item => item.checked == true)
-      .map(item => item.value)
-      .concat();
-  }
-
   onNoticeRuleLimitChange(limit: boolean) {
     if (!limit) {
       this.rule.days = this.dayCheckOptions.map(item => item.value).concat();
     } else {
       this.rule.days = this.dayCheckOptions
-        .filter(item => item.checked == true)
+        .filter(item => item.checked)
         .map(item => item.value)
         .concat();
     }
@@ -496,6 +492,14 @@ export class AlertNoticeComponent implements OnInit {
     if (this.rule.priorities != undefined) {
       this.rule.priorities = this.rule.priorities.filter(item => item != null && item != 9);
     }
+    if (this.isLimit) {
+      this.rule.days = this.dayCheckOptions
+        .filter(item => item.checked)
+        .map(item => item.value)
+        .concat();
+    } else {
+      this.rule.days = this.dayCheckOptions.map(item => item.value).concat();
+    }
     this.isManageRuleModalOkLoading = true;
     if (this.isManageRuleModalAdd) {
       const modalOk$ = this.noticeRuleSvc

diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
@@ -206,12 +206,7 @@
       <nz-form-item *ngIf="silence.type == 1">
         <nz-form-label nzSpan="7" nzFor="days">{{ 'alert.notice.rule.period-chose' | i18n }}</nz-form-label>
         <nz-form-control nzSpan="12">
-          <nz-checkbox-group
-            name="days"
-            id="days"
-            [(ngModel)]="dayCheckOptions"
-            (ngModelChange)="onSilenceDaysChange(dayCheckOptions)"
-          ></nz-checkbox-group>
+          <nz-checkbox-group name="days" id="days" [(ngModel)]="dayCheckOptions"></nz-checkbox-group>
         </nz-form-control>
       </nz-form-item>
       <nz-form-item *ngIf="silence.type == 1">

diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts
@@ -200,6 +200,7 @@ export class AlertSilenceComponent implements OnInit {
     let now = new Date();
     now.setHours(now.getHours() + 6);
     this.silenceDates = [new Date(), now];
+    this.dayCheckOptions.forEach(item => (item.checked = true));
     this.isManageModalAdd = true;
     this.isManageModalVisible = true;
     this.isManageModalOkLoading = false;
@@ -233,6 +234,10 @@ export class AlertSilenceComponent implements OnInit {
             this.silence = message.data;
             if (this.silence.type === 0) {
               this.silenceDates = [this.silence.periodStart, this.silence.periodEnd];
+            } else {
+              this.dayCheckOptions.forEach(item => {
+                item.checked = this.silence.days != undefined && this.silence.days.indexOf(item.value) >= 0;
+              });
             }
             this.isManageModalVisible = true;
             this.isManageModalAdd = false;
@@ -279,6 +284,11 @@ export class AlertSilenceComponent implements OnInit {
     if (this.silence.type === 0) {
       this.silence.periodStart = this.silenceDates[0];
       this.silence.periodEnd = this.silenceDates[1];
+    } else {
+      this.silence.days = this.dayCheckOptions
+        .filter(item => item.checked)
+        .map(item => item.value)
+        .concat();
     }
     this.isManageModalOkLoading = true;
     if (this.isManageModalAdd) {
@@ -329,12 +339,6 @@ export class AlertSilenceComponent implements OnInit {
         );
     }
   }
-  onSilenceDaysChange(value: any[]) {
-    this.silence.days = value
-      .filter(item => item.checked == true)
-      .map(item => item.value)
-      .concat();
-  }
 
   onPrioritiesChange() {
     if (this.silence.priorities != undefined) {