commit c61d874083adb5875c369503964290b1b1f7a4fc
author Dmitry Kalashnik <dkalashnik@mirantis.com> Wed Jun 27 15:58:14 2018 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Wed Jun 27 15:58:14 2018 +0400
tree 846a8fec43dfa8e3bd6cc802c59f289cdb746df5
parent 858fc1fb578e2e6d95f27bda2fe75ebfa768881a

Fix telegraf meta enabling condition

Change-Id: I063bd5e948ba31990ffb8dd971e738731b41d996
Closes-Bug: PROD-20950

prometheus/meta/telegraf.yml

diff --git a/prometheus/meta/telegraf.yml b/prometheus/meta/telegraf.yml
index 3cce8a9..2561bda 100644
--- a/prometheus/meta/telegraf.yml
+++ b/prometheus/meta/telegraf.yml
@@ -1,8 +1,7 @@
-{%- if pillar.prometheus is defined %}
 {%- from "prometheus/map.jinja" import server, relay with context %}
+{%- if pillar.prometheus is defined and relay.get('enabled', False) and server.get("enabled", False) and not server.get("is_container", True) %}
 agent:
   input:
-  {%- if relay.get('enabled', False) and server.get("enabled", False) and not server.get("is_container", True) %}
     procstat:
       process:
     {%- if relay.get('enabled', False) %}
@@ -13,5 +12,4 @@
         prometheus:
           pattern: '/usr/bin/prometheus[^-]'
     {%- endif %}
-  {% endif %}
 {%- endif %}