Collectd role : deletion of collectd_plugin_exec variable
This variable had to be activated only if collectd_plugin_exec_ifq_drops or collectd_plugin_exec_dns_stats was also activated, for some configuration to be taken into account. I changed the role so that the configuration is automatically taken into account if one of these two variables is activated.
This commit is contained in:
parent
7cc374ea9e
commit
11d3331958
|
@ -10,7 +10,6 @@ collectd_interval: "300"
|
||||||
|
|
||||||
# exec plugin
|
# exec plugin
|
||||||
|
|
||||||
collectd_plugin_exec: false # Set to true only if one of the exec plugins below is also set to true
|
|
||||||
collectd_plugin_exec_interval: "{{ collectd_interval }}"
|
collectd_plugin_exec_interval: "{{ collectd_interval }}"
|
||||||
collectd_plugin_exec_ifq_drops: false
|
collectd_plugin_exec_ifq_drops: false
|
||||||
collectd_plugin_exec_dns_stats: false # Based on unbound
|
collectd_plugin_exec_dns_stats: false # Based on unbound
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
file:
|
file:
|
||||||
path: /usr/local/share/collectd/scripts
|
path: /usr/local/share/collectd/scripts
|
||||||
state: directory
|
state: directory
|
||||||
when: collectd_plugin_exec
|
when: collectd_plugin_exec_ifq_drops or collectd_plugin_exec_dns_stats
|
||||||
tags:
|
tags:
|
||||||
- collectd
|
- collectd
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ LoadPlugin syslog
|
||||||
LogLevel warning
|
LogLevel warning
|
||||||
</Plugin>
|
</Plugin>
|
||||||
|
|
||||||
{% if collectd_plugin_exec is sameas true %}
|
{% if (collectd_plugin_exec_ifq_drops is sameas true) or (collectd_plugin_exec_dns_stats is sameas true) %}
|
||||||
<LoadPlugin exec>
|
<LoadPlugin exec>
|
||||||
Interval {{ collectd_plugin_exec_interval }}
|
Interval {{ collectd_plugin_exec_interval }}
|
||||||
</LoadPlugin>
|
</LoadPlugin>
|
||||||
|
|
Loading…
Reference in a new issue