Add description to threshold alarms

johannaengland · Nov 2, 2023 · 891607e · 891607e
1 parent e297772
commit 891607e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/python/nav/etc/alertmsg/thresholdState/belowThreshold-email.txt b/python/nav/etc/alertmsg/thresholdState/belowThreshold-email.txt
@@ -6,3 +6,4 @@ Metric: {{ metric }}
 Time: {{ time }}
 Value: {{ measured_value }}
 Threshold: {% firstof clear alert %}
+{% if description %}Description: {{ description }}{% endif %}
diff --git a/python/nav/etc/alertmsg/thresholdState/belowThreshold-sms.txt b/python/nav/etc/alertmsg/thresholdState/belowThreshold-sms.txt
@@ -1 +1 @@
-{{ metric }} cleared at {{ measured_value }} {% firstof clear alert %} on {{ time }}.
+{{ metric }} cleared at {{ measured_value }} {% firstof clear alert %} on {{ time }}{% if description %} ({{ description }}){% endif %}.
diff --git a/python/nav/etc/alertmsg/thresholdState/exceededThreshold-email.txt b/python/nav/etc/alertmsg/thresholdState/exceededThreshold-email.txt
@@ -6,3 +6,4 @@ Metric: {{ metric }}
 Time: {{ time }}
 Value: {{ measured_value }}
 Threshold: {{ alert|safe }}
+{% if description %}Description: {{ description }}{% endif %}
diff --git a/python/nav/etc/alertmsg/thresholdState/exceededThreshold-sms.txt b/python/nav/etc/alertmsg/thresholdState/exceededThreshold-sms.txt
@@ -1 +1 @@
-{{ metric }} exceeded at {{ measured_value }} {{ alert|safe }} on {{ time }}.
+{{ metric }} exceeded at {{ measured_value }} {{ alert|safe }} on {{ time }}{% if description %} ({{ description }}){% endif %}.
diff --git a/python/nav/thresholdmon.py b/python/nav/thresholdmon.py
@@ -181,6 +181,8 @@ def make_event(start, rule, metric, value):
     )
     if rule.clear:
         varmap['clear'] = str(rule.clear)
+    if rule.description:
+        varmap['description'] = rule.description
     _add_subject_details(event, metric, varmap)
 
     event.save()
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{ metric }} cleared at {{ measured_value }} {% firstof clear alert %} on {{ time }}.
		{{ metric }} cleared at {{ measured_value }} {% firstof clear alert %} on {{ time }}{% if description %} ({{ description }}){% endif %}.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{ metric }} exceeded at {{ measured_value }} {{ alert\|safe }} on {{ time }}.
		{{ metric }} exceeded at {{ measured_value }} {{ alert\|safe }} on {{ time }}{% if description %} ({{ description }}){% endif %}.