commit e0f6ffa56d276b08e51900a747368d279816f456
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jan 14 15:40:51 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jan 14 15:40:51 2019 +0000
tree b43fd1600637ee1cd47506560d90f807a919c016
parent 2868f9affc7071fd459d3a4ca7f3da553c1001fd
parent 9f4a00080012a280a2a18ada85f0a60a29d8b6ac

Merge "Reroute docker logs to docker label"

linux/meta/fluentd.yml

diff --git a/linux/meta/fluentd.yml b/linux/meta/fluentd.yml
index 0f73580..90fa6d4 100644
--- a/linux/meta/fluentd.yml
+++ b/linux/meta/fluentd.yml
@@ -95,6 +95,16 @@
             type: relabel
             label: telegraf
   {%- endif %}
+  {%- if pillar.get('docker', {}).get('host', {}).get('enabled', False) %}
+          push_to_docker:
+            require_in:
+              - push_to_default
+            require:
+              - rewrite_tag
+            tag: 'docker.**'
+            type: relabel
+            label: docker
+  {%- endif %}
           push_to_default:
             tag: '*.systemd'
             type: copy