commit 7325b9ba8516972baa3731e2b84108eddd72f46a
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Jan 11 14:24:44 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Jan 11 14:24:44 2019 +0000
tree 3d951145b13aebb1924089606a889773dcb15b70
parent 3a4c407600d06032c839959f1660ba0609648071
parent 1a0011d9e0a73e0d3b245fabd4ba5fa594455d03

Merge "Relabel telegraf logs"

linux/meta/fluentd.yml

diff --git a/linux/meta/fluentd.yml b/linux/meta/fluentd.yml
index f6d6720..0f73580 100644
--- a/linux/meta/fluentd.yml
+++ b/linux/meta/fluentd.yml
@@ -87,6 +87,14 @@
               - name: ident
                 regexp: '^(.*)$'
                 result: $1.systemd
+  {%- if pillar.get('telegraf', {}).get('agent', {}).get('enabled', False) %}
+          push_to_telegraf:
+            require_in:
+              - push_to_default
+            tag: 'telegraf.systemd'
+            type: relabel
+            label: telegraf
+  {%- endif %}
           push_to_default:
             tag: '*.systemd'
             type: copy