[auto-discovery] tpl_tags can also be dicts apparently - parse them.

DataDog · Jul 17, 2017 · 5181cdd · 5181cdd
1 parent 3411289
commit 5181cdd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/utils/service_discovery/sd_docker_backend.py b/utils/service_discovery/sd_docker_backend.py
@@ -491,7 +491,11 @@ def _fill_tpl(self, state, c_id, instance_tpl, variables, tags=None):
         # add default tags to the instance
         if tags:
             tpl_tags = instance_tpl.get('tags', [])
-            tags += tpl_tags if isinstance(tpl_tags, list) else [tpl_tags]
+            if isinstance(tpl_tags, dict):
+                for key, val in tpl_tags.iteritems():
+                    tags.append("{}:{}".format(key, val))
+            else:
+                tags += tpl_tags if isinstance(tpl_tags, list) else [tpl_tags]
             instance_tpl['tags'] = list(set(tags))
 
         for var in variables: