Merge pull request #988 from tk422/master

Fix Downtiming for Alertmanager
HenriWahl · Nov 23, 2023 · 399d485 · 399d485
2 parents a0ee596 + eafe457
commit 399d485
Showing 1 changed file with 16 additions and 20 deletions.
diff --git a/Nagstamon/Servers/Alertmanager/alertmanagerserver.py b/Nagstamon/Servers/Alertmanager/alertmanagerserver.py
@@ -276,31 +276,27 @@ def open_monitor(self, host, service=''):
     def _set_downtime(self, host, service, author, comment, fixed, start_time,
                       end_time, hours, minutes):
 
+        alert = self.hosts[host].services[service]
+
         # Convert local dates to UTC
         start_time_dt = convert_timestring_to_utc(start_time)
         end_time_dt = convert_timestring_to_utc(end_time)
 
         # API Spec: https://github.com/prometheus/alertmanager/blob/master/api/v2/openapi.yaml
-        silence_data = {
-            "matchers": [
-                {
-                    "name": "instance",
-                    "value": host,
-                    "isRegex": False,
-                    "isEqual": False
-                },
-                {
-                    "name": "alertname",
-                    "value": service,
-                    "isRegex": False,
-                    "isEqual": False
-                }
-            ],
-            "startsAt": start_time_dt,
-            "endsAt": end_time_dt,
-            "createdBy": author,
-            "comment": comment
-        }
+        silence_data = {}
+        silence_data["matchers"] = []
+        for name, value in alert.labels.items():
+            silence_data["matchers"].append({
+                "name": name,
+                "value": value,
+                "isRegex": False,
+                "isEqual": True
+            })
+        silence_data["startsAt"] = start_time_dt
+        silence_data["endsAt"] = end_time_dt
+        silence_data["comment"] = comment or "Nagstamon downtime"
+        silence_data["createdBy"] = author or "Nagstamon"
+
 
         post = requests.post(self.monitor_url + self.API_PATH_SILENCES, json=silence_data)