commit 8f232cde8de34a60c452e3438cc4ad8d90a5b63f
author Dmitry Kalashnik <dkalashnik@mirantis.com> Fri Jun 08 13:02:10 2018 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Fri Jun 08 13:02:10 2018 +0400
tree 02683902992dbce1cc1e2ec09757713e24dbc168
parent 5dfd7ebfec05fb0c410af3a7fa844bbb0a07eb4a

Add relabel for alerts with only job or host

Change-Id: If96fcc3d0bdbfa724e468cb03a3ef3d56de414d8
Closes-Bug: PROD-20602

prometheus/server/alert/alerta_relabel.yml

diff --git a/prometheus/server/alert/alerta_relabel.yml b/prometheus/server/alert/alerta_relabel.yml
index a81c59a..ca0f4b4 100644
--- a/prometheus/server/alert/alerta_relabel.yml
+++ b/prometheus/server/alert/alerta_relabel.yml
@@ -11,9 +11,15 @@
           - replacement: "aggregated"
             source_labels: "instance"
             target_label: "instance"
+          - source_labels: "host"
+            target_label: "instance"
+            regex: "(.+)"
+          - source_labels: "job"
+            target_label: "instance"
+            regex: "(.+)"
           - source_labels: ["host", "job"]
             target_label: "instance"
-            regex: "([a-zA-Z0-9]+;[a-zA-Z0-9_]+)"
+            regex: "(.+;.+)"
           - source_labels: ["hostname", "job"]
             target_label: "instance"
-            regex: "([a-zA-Z0-9]+;[a-zA-Z0-9_]+)"
+            regex: "(.+;.+)"
\ No newline at end of file