commit a87dde9b2f1716daafdeee00e998f0f20eb67447
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue May 21 14:40:52 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue May 21 14:40:52 2019 +0000
tree 323d492b3e95b8f0e477fa5ca2863ec9a94bbfbf
parent e2a51c8a0c83af115f7e0516a9065f0cb2fa4175
parent 7c77b7345147a00eb3ead1709f8a0f5cc1684367

Merge "Reroute docker logs to docker label" into release/2019.2.0

linux/meta/fluentd.yml

diff --git a/linux/meta/fluentd.yml b/linux/meta/fluentd.yml
index a4b111f..4e0bdc3 100644
--- a/linux/meta/fluentd.yml
+++ b/linux/meta/fluentd.yml
@@ -104,6 +104,14 @@
             type: relabel
             label: telegraf
   {%- endif %}
+  {%- if pillar.get('docker', {}).get('host', {}).get('enabled', False) %}
+          push_to_docker:
+            require:
+              - rewrite_tag
+            tag: 'docker.**'
+            type: relabel
+            label: docker
+  {%- endif %}
   {%- if pillar.get('prometheus', {}).get('exporters', {}).libvirt is defined %}
           push_to_libvirt:
             require: