From e355289f24637a21d02bf4266943b915699a77b6 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Fri, 4 Nov 2016 11:07:11 +0100 Subject: [PATCH 1/1] Add collectd support only when the server is enabled --- influxdb/meta/collectd.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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: {} -- 2.32.7