commit 75d00734b1259d77c465c026da09c600a21c91fb
author Éric Lemoine <elemoine@mirantis.com> Wed Dec 14 17:05:02 2016 +0000
committer Éric Lemoine <elemoine@mirantis.com> Fri Dec 16 14:30:33 2016 +0000
tree 4f5ce7b6ba6fd98627f19b3c56611579b71dea63
parent 9be2aa5c0c71529687154d0848aaa40501e3dab5

Fix inconsistent Stacklight environment label

The previous version generated inconsistent labels between the
monitoring nodes and the other nodes. This change makes
stacklight_environment a mandatory parameter to avoid this problem.

https://github.com/Mirantis/mk-lab-salt-model/pull/209

heka/server.yml

diff --git a/heka/server.yml b/heka/server.yml
index 5141e40..f82cfc5 100644
--- a/heka/server.yml
+++ b/heka/server.yml
@@ -1,6 +1,4 @@
 parameters:
-  _param:
-    stacklight_environment: ${_param:cluster_domain}
   heka:
     server:
       extra_fields:

nagios/server/init.yml

diff --git a/nagios/server/init.yml b/nagios/server/init.yml
index da4dcc4..49f4943 100644
--- a/nagios/server/init.yml
+++ b/nagios/server/init.yml
@@ -3,7 +3,6 @@
     nagios_notification_email: root@localhost
     nagios_host_dimension_key: nagios_host
     nagios_default_host_alarm_clusters: 00-clusters
-    stacklight_environment: ${_param:cluster_domain}
   nagios :
     server:
       enabled: true