From: Simon Pasquier <spasquier@mirantis.com>
Date: Fri, 21 Jul 2017 09:11:50 +0000 (+0200)
Subject: Disable monitoring for InfluxDB running in container
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=b0b30342033fcf26ec712397d88279add381b171

Disable monitoring for InfluxDB running in container

Change-Id: I6d27ea741af82f77b3f97abc41b1dff1360f7568
---

diff --git a/influxdb/meta/telegraf.yml b/influxdb/meta/telegraf.yml
index 2ed4308..9c8b9dd 100644
--- a/influxdb/meta/telegraf.yml
+++ b/influxdb/meta/telegraf.yml
@@ -1,11 +1,9 @@
-{%- if pillar.influxdb.server is defined %}
 {%- from "influxdb/map.jinja" import server with context %}
 
-{%- if server.get('enabled', False) and server.get('http', {}).get('enabled', False) %}
+{%- if not server.container_mode and server.get('enabled', False) and server.get('http', {}).get('enabled', False) %}
 agent:
   input:
     influxdb:
       servers:
-        - url: http://{{ server.http.bind.address|replace('0.0.0.0', '127.0.0.1') }}:{{ server.http.bind.port }}/debug/vars
-{%- endif %}
+      - url: http://{{ server.http.bind.address|replace('0.0.0.0', '127.0.0.1') }}:{{ server.http.bind.port }}/debug/vars
 {%- endif %}