From c61d874083adb5875c369503964290b1b1f7a4fc Mon Sep 17 00:00:00 2001 From: Dmitry Kalashnik Date: Wed, 27 Jun 2018 15:58:14 +0400 Subject: [PATCH] Fix telegraf meta enabling condition Change-Id: I063bd5e948ba31990ffb8dd971e738731b41d996 Closes-Bug: PROD-20950 --- prometheus/meta/telegraf.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 @@ agent: prometheus: pattern: '/usr/bin/prometheus[^-]' {%- endif %} - {% endif %} {%- endif %}