From: pasquier-s <spasquier@mirantis.com>
Date: Mon, 7 Nov 2016 09:01:14 +0000 (+0100)
Subject: Merge pull request #6 from simonpasquier/add-collectd-support
X-Git-Tag: 2016.12~1^2~7
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=80579f6f80ebab5756c44097cac384f4f4465ac9;hp=5b63596af3be9ff468e815e6eda66c846c2f9e23

Merge pull request #6 from simonpasquier/add-collectd-support

Add collectd support only when the server is enabled
---

diff --git a/influxdb/meta/collectd.yml b/influxdb/meta/collectd.yml
index c09ea48..770729f 100644
--- a/influxdb/meta/collectd.yml
+++ b/influxdb/meta/collectd.yml
@@ -1,8 +1,9 @@
 {%- if pillar.influxdb.server is defined %}
 {%- from "influxdb/map.jinja" import server with context %}
 
-{%- if server.admin.get('user', {}).get('enabled', False) and server.http.enabled %}
+{%- if server.get('enabled', False) %}
 local_plugin:
+{%- if server.admin.get('user', {}).get('enabled', False) and server.http.enabled %}
   influxdb:
     plugin: python
     template: influxdb/files/collectd_influxdb.conf
@@ -10,6 +11,7 @@ local_plugin:
     port: {{ server.http.bind.port }}
     username: {{ server.admin.user.name }}
     password: {{ server.admin.user.password  }}
+{%- endif %}
   collectd_processes:
     process:
       influxd: {}