From e32d626535b32cac9899baa28e39ffa3908852cc Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Thu, 23 Mar 2023 12:34:44 +0200 Subject: [PATCH] Improvements for default notification configs --- .../DefaultNotificationSettingsService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java index f0f3a11d3a..eb995c4d86 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java @@ -137,11 +137,11 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS "notifications", null, null); AlarmNotificationRuleTriggerConfig alarmRuleTriggerConfig = new AlarmNotificationRuleTriggerConfig(); alarmRuleTriggerConfig.setAlarmTypes(null); - alarmRuleTriggerConfig.setAlarmSeverities(Set.of(AlarmSeverity.MAJOR, AlarmSeverity.CRITICAL)); + alarmRuleTriggerConfig.setAlarmSeverities(null); alarmRuleTriggerConfig.setNotifyOn(Set.of(AlarmAction.CREATED, AlarmAction.SEVERITY_CHANGED, AlarmAction.ACKNOWLEDGED, AlarmAction.CLEARED)); - createRule(tenantId, "Major or critical alarm", alarmNotificationTemplate.getId(), alarmRuleTriggerConfig, + createRule(tenantId, "Alarm", alarmNotificationTemplate.getId(), alarmRuleTriggerConfig, List.of(originatorEntityOwnerUsers.getId()), "Send notification to tenant admins or customer users " + - "when any major or critical alarm is created, updated or cleared"); + "when any alarm is created, updated or cleared"); NotificationTemplate deviceActionNotificationTemplate = createTemplate(tenantId, "Device action notification", NotificationType.ENTITY_ACTION, "${entityType} was ${actionType}", @@ -163,7 +163,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS DeviceInactivityNotificationRuleTriggerConfig deviceInactivityRuleTriggerConfig = new DeviceInactivityNotificationRuleTriggerConfig(); deviceInactivityRuleTriggerConfig.setDevices(null); deviceInactivityRuleTriggerConfig.setDeviceProfiles(null); - createRule(tenantId, "Device inactivity", deviceInactivityNotificationTemplate.getId(), deviceInactivityRuleTriggerConfig, + createRule(tenantId, "Device became inactive", deviceInactivityNotificationTemplate.getId(), deviceInactivityRuleTriggerConfig, List.of(originatorEntityOwnerUsers.getId()), "Send notification to tenant admins or customer users " + "when any device became inactive"); @@ -190,7 +190,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS alarmAssignmentRuleTriggerConfig.setAlarmSeverities(null); alarmAssignmentRuleTriggerConfig.setAlarmStatuses(null); alarmAssignmentRuleTriggerConfig.setNotifyOn(Set.of(AlarmAssignmentNotificationRuleTriggerConfig.Action.ASSIGNED)); - createRule(tenantId, "Alarm assigned", alarmAssignedNotificationTemplate.getId(), alarmAssignmentRuleTriggerConfig, + createRule(tenantId, "Alarm assignment", alarmAssignedNotificationTemplate.getId(), alarmAssignmentRuleTriggerConfig, List.of(affectedUser.getId()), "Send notification to user when any alarm was assigned to him"); NotificationTemplate ruleEngineComponentLifecycleFailureNotificationTemplate = createTemplate(tenantId, "Rule chain/node lifecycle failure notification", NotificationType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT, @@ -204,7 +204,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS ruleEngineComponentLifecycleEventRuleTriggerConfig.setTrackRuleNodeEvents(true); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleNodeEvents(Set.of(ComponentLifecycleEvent.STARTED, ComponentLifecycleEvent.UPDATED, ComponentLifecycleEvent.STOPPED)); ruleEngineComponentLifecycleEventRuleTriggerConfig.setOnlyRuleNodeLifecycleFailures(true); - createRule(tenantId, "Rule chain/node lifecycle failure", ruleEngineComponentLifecycleFailureNotificationTemplate.getId(), + createRule(tenantId, "Rule node initialization failure", ruleEngineComponentLifecycleFailureNotificationTemplate.getId(), ruleEngineComponentLifecycleEventRuleTriggerConfig, List.of(tenantAdmins.getId()), "Send notification to tenant admins when any Rule chain or Rule node failed to start, update or stop"); }