Code Review
/
salt-formulas
/
influxdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
05791ea
)
Add collectd support only when the server is enabled
author
Simon Pasquier
<spasquier@mirantis.com>
Fri, 4 Nov 2016 10:07:11 +0000
(11:07 +0100)
committer
Simon Pasquier
<spasquier@mirantis.com>
Fri, 4 Nov 2016 11:01:33 +0000
(12:01 +0100)
influxdb/meta/collectd.yml
patch
|
blob
|
history
diff --git
a/influxdb/meta/collectd.yml
b/influxdb/meta/collectd.yml
index c09ea487aa0bd944e5ac87854bd0b772bad53840..770729f9694cead4d9fa3212ca182dd65cf21e4a 100644
(file)
--- 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 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:
local_plugin:
+{%- if server.admin.get('user', {}).get('enabled', False) and server.http.enabled %}
influxdb:
plugin: python
template: influxdb/files/collectd_influxdb.conf
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 }}
port: {{ server.http.bind.port }}
username: {{ server.admin.user.name }}
password: {{ server.admin.user.password }}
+{%- endif %}
collectd_processes:
process:
influxd: {}
collectd_processes:
process:
influxd: {}