commit 89897d67fb28eb488207cd8f9477718ce29756fd
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Oct 05 16:24:07 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Oct 05 16:24:07 2018 +0000
tree ed0cede64d254320e2900ef2a566632806682b7b
parent 2595d28e04c82bd7217d21f8835bbf3d9170c569
parent 31291bedb1a0531563ed475337829700e0fb210c

Merge "Bump containernetworking-plugins binary to 0.7.2-96"

prometheus/server/alert/alerta_relabel.yml

diff --git a/prometheus/server/alert/alerta_relabel.yml b/prometheus/server/alert/alerta_relabel.yml
index df6aca0..1e06b6c 100644
--- a/prometheus/server/alert/alerta_relabel.yml
+++ b/prometheus/server/alert/alerta_relabel.yml
@@ -1,12 +1,7 @@
 parameters:
-  _param:
-    alerta_environment_label: ${_param:cluster_name}
   prometheus:
     server:
       config:
-        alert:
-          labels_add:
-            environment: ${_param:alerta_environment_label}
         alert_relabel_configs:
           - replacement: "aggregated"
             source_labels: "instance"

prometheus/server/container.yml

diff --git a/prometheus/server/container.yml b/prometheus/server/container.yml
index 99873ad..8bda131 100644
--- a/prometheus/server/container.yml
+++ b/prometheus/server/container.yml
@@ -1,3 +1,10 @@
 classes:
 - service.prometheus.server.container
 - system.prometheus.server
+parameters:
+  _param:
+    prometheus_environment_label: ${_param:cluster_domain}
+  prometheus:
+    server:
+      config:
+        environment_label: ${_param:prometheus_environment_label}