♻ refactor: Alarm notification adds aggregated variables (#358)

masastack · Sep 5, 2024 · ebf4021 · ebf4021
1 parent 11c45cb
commit ebf4021
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/...pplication/Masa.Alert.Application/AlarmHistories/EventHandler/TriggerAlarmEventHandler.cs b/...pplication/Masa.Alert.Application/AlarmHistories/EventHandler/TriggerAlarmEventHandler.cs
@@ -29,13 +29,13 @@ public async Task HandleEventAsync(TriggerAlarmEvent eto)
         {
             alarm = new AlarmHistory(eto.AlarmRuleId, eto.AlertSeverity, isNotification, eto.TriggerRuleItems);
             alarm.AddAlarmRuleRecord(eto.ExcuteTime, eto.AggregateResult, true, eto.ConsecutiveCount, eto.TriggerRuleItems);
-            alarm.SetIsNotification(isNotification, isSilence);
+            alarm.SetIsNotification(isNotification, isSilence, eto.AggregateResult);
             await _repository.AddAsync(alarm);
         }
         else
         {
             alarm.Update(eto.AlertSeverity, isNotification, eto.TriggerRuleItems);
-            alarm.SetIsNotification(isNotification, isSilence);
+            alarm.SetIsNotification(isNotification, isSilence, eto.AggregateResult);
             alarm.AddAlarmRuleRecord(eto.ExcuteTime, eto.AggregateResult, true, eto.ConsecutiveCount, eto.TriggerRuleItems);
             await _repository.UpdateAsync(alarm);
 

diff --git a/...ation/Masa.Alert.Application/AlarmRules/EventHandler/SendAlarmNotificationEventHandler.cs b/...ation/Masa.Alert.Application/AlarmRules/EventHandler/SendAlarmNotificationEventHandler.cs
@@ -37,7 +37,10 @@ public async Task HandleEventAsync(SendAlarmNotificationEvent eto)
             var notificationConfig = item.AlarmRuleItem.NotificationConfig;
 
             var variables = new Dictionary<string, object>();
-            var alarmRule = await _alarmRuleRepository.FindAsync(x => x.Id == eto.AlarmRuleId);
+
+            AddAggregateVariables(variables, eto.AggregateResult);
+
+            var alarmRule = await _alarmRuleRepository.FindAsync(x => x.Id == alarm.AlarmRuleId);
             if (alarmRule != null)
             {
                 variables.TryAdd(AlertConsts.ALARM_RULE_NAME_NOTIFICATION_TEMPLATE_VAR_NAME, alarmRule.DisplayName);
@@ -55,6 +58,14 @@ public async Task HandleEventAsync(SendAlarmNotificationEvent eto)
         await _repository.UpdateAsync(alarm);
     }
 
+    private void AddAggregateVariables(Dictionary<string, object> variables, ConcurrentDictionary<string, long> aggregateResult)
+    {
+        foreach (var aggregateItem in aggregateResult)
+        {
+            variables.TryAdd(aggregateItem.Key, aggregateItem.Value);
+        }
+    }
+
     private async Task AddLogVariablesAsync(AlarmRule alarmRule, Dictionary<string, object> variables)
     {
         var checkTime = DateTimeOffset.Now;
@@ -63,6 +74,9 @@ private async Task AddLogVariablesAsync(AlarmRule alarmRule, Dictionary<string,
         if (startTime == null)
             return;
 
+        variables.TryAdd(AlertConsts.CHECK_START_TIME_NOTIFICATION_TEMPLATE_VAR_NAME, startTime.Value.UtcDateTime);
+        variables.TryAdd(AlertConsts.CHECK_END_TIME_NOTIFICATION_TEMPLATE_VAR_NAME, checkTime.UtcDateTime);
+
         var request = new LogLatestRequest
         {
             Query = alarmRule.WhereExpression,

diff --git a/src/Domain/Masa.Alert.Domain.Shared/Consts/AlertConsts.cs b/src/Domain/Masa.Alert.Domain.Shared/Consts/AlertConsts.cs
@@ -8,4 +8,6 @@ public static class AlertConsts
     public const string DB_TABLE_PREFIX = null;
     public const string DB_SCHEMA = "alert";
     public const string ALARM_RULE_NAME_NOTIFICATION_TEMPLATE_VAR_NAME = "Name";
+    public const string CHECK_START_TIME_NOTIFICATION_TEMPLATE_VAR_NAME = "CheckStartTime";
+    public const string CHECK_END_TIME_NOTIFICATION_TEMPLATE_VAR_NAME = "CheckEndTime";
 }
diff --git a/src/Domain/Masa.Alert.Domain/AlarmHistories/Aggregates/AlarmHistory.cs b/src/Domain/Masa.Alert.Domain/AlarmHistories/Aggregates/AlarmHistory.cs
@@ -85,13 +85,13 @@ public void Notification()
         LastNotificationTime = DateTimeOffset.Now;
     }
 
-    public void SetIsNotification(bool isNotification, bool isSilence)
+    public void SetIsNotification(bool isNotification, bool isSilence, ConcurrentDictionary<string, long> aggregateResult)
     {
         IsNotification = isNotification;
 
         if (IsNotification && !isSilence)
         {
-            AddDomainEvent(new SendAlarmNotificationEvent(Id, AlarmRuleId));
+            AddDomainEvent(new SendAlarmNotificationEvent(Id, aggregateResult));
         }
     }
 

diff --git a/src/Domain/Masa.Alert.Domain/AlarmRules/Events/SendAlarmNotificationEvent.cs b/src/Domain/Masa.Alert.Domain/AlarmRules/Events/SendAlarmNotificationEvent.cs
@@ -3,6 +3,6 @@
 
 namespace Masa.Alert.Domain.AlarmRules.Events;
 
-public record SendAlarmNotificationEvent(Guid AlarmHistoryId, Guid AlarmRuleId) : DomainEvent
+public record SendAlarmNotificationEvent(Guid AlarmHistoryId, ConcurrentDictionary<string, long> AggregateResult) : DomainEvent
 {
 }