commit a0517045ee032657536882a7fab6e9e86a0dfdd6
author Jakub Josef <jjosef@mirantis.com> Mon Aug 28 15:10:44 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Mon Aug 28 15:10:45 2017 +0000
tree 946bd21c48e5955c110c3a3466b35cee34f4ecbd
parent ca36547f39192fe62f81604801772df426187ca6
parent 441978b20c072b6c51061cd8053e4eea8cf0bf5d

Merge "Fix alerts when stack names contain '-'"

docker/meta/prometheus.yml

diff --git a/docker/meta/prometheus.yml b/docker/meta/prometheus.yml
index 14a6f1a..d5fed29 100644
--- a/docker/meta/prometheus.yml
+++ b/docker/meta/prometheus.yml
@@ -20,7 +20,7 @@
     {%- for service_name, service in stack.get('service', {})|dictsort %}
       {%- if service.get('deploy', {}).replicas is defined %}
         {%- set full_service_name = "{}_{}".format(stack_name, service_name) %}
-        {%- set camel_case_name = full_service_name.split('_')|map('capitalize')|join('') %}
+        {%- set camel_case_name = full_service_name.split('_')|map('capitalize')|join('')|replace('-', '') %}
         {%- set label_selector = 'com_docker_swarm_service_name="{}_{}"'.format(stack_name, service_name) %}
         {%- if service.deploy.replicas > 1 %}
     DockerService{{ camel_case_name }}InvalidReplicasNumber: