Merge pull request #1581 from mozilla/add_tag_deadmans

Add self describing tag for deadman alerts
mozilla · Mar 24, 2020 · 0ba71b1 · 0ba71b1
2 parents add9c44 + 412e5da
commit 0ba71b1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/alerts/deadman.py b/alerts/deadman.py
@@ -37,7 +37,7 @@ def main(self):
     # if no events found
     def onNoEvent(self, hostname):
         category = 'deadman'
-        tags = ['bro']
+        tags = ['bro', 'bro_deadman']
         severity = 'ERROR'
 
         summary = ('No {0} bro healthcheck events found the past 20 minutes'.format(hostname))

diff --git a/alerts/deadman_generic.py b/alerts/deadman_generic.py
@@ -42,7 +42,7 @@ def process_alert(self, alert_config):
     # if no events found
     def onNoEvent(self, description):
         category = 'deadman'
-        tags = ['deadman']
+        tags = ['deadman', 'generic_deadman']
         severity = 'ERROR'
 
         summary = "Deadman check failed for '{0}' the past {1} {2}".format(

diff --git a/tests/alerts/test_deadman.py b/tests/alerts/test_deadman.py
@@ -24,7 +24,7 @@ class TestAlertDeadman(AlertTestSuite):
         "category": "deadman",
         "severity": "ERROR",
         "summary": 'No host1 bro healthcheck events found the past 20 minutes',
-        "tags": ['bro'],
+        "tags": ['bro', 'bro_deadman'],
     }
 
     test_cases = []

diff --git a/tests/alerts/test_deadman_generic.py b/tests/alerts/test_deadman_generic.py
@@ -31,7 +31,7 @@ class TestDeadmanGeneric(AlertTestSuite):
     }
     unmatched_first_alert = {
         "category": "deadman",
-        "tags": ['deadman'],
+        "tags": ['deadman', 'generic_deadman'],
         "severity": "ERROR",
         "summary": 'Deadman check failed for \'Sample Alert 1\' the past 5 minutes',
     }
@@ -50,7 +50,7 @@ class TestDeadmanGeneric(AlertTestSuite):
     }
     unmatched_second_alert = {
         "category": "deadman",
-        "tags": ['deadman'],
+        "tags": ['deadman', 'generic_deadman'],
         "severity": "ERROR",
         "summary": 'Deadman check failed for \'Sample Alert 2\' the past 20 hours',
     }