diff --git a/roles/collectd/defaults/main.yml b/roles/collectd/defaults/main.yml index 071845c..2b5f168 100644 --- a/roles/collectd/defaults/main.yml +++ b/roles/collectd/defaults/main.yml @@ -3,7 +3,10 @@ collectd_load_network_plugin: false collectd_network_servers: [] collectd_network_listen: [] -collectd_disable_plugins: [] +collectd_plugins: {} + +collectd_plugins_defaults: + md: false collectd_df: {} diff --git a/roles/collectd/templates/collectd.conf.j2 b/roles/collectd/templates/collectd.conf.j2 index 27ea1c7..ea02ff0 100644 --- a/roles/collectd/templates/collectd.conf.j2 +++ b/roles/collectd/templates/collectd.conf.j2 @@ -90,9 +90,9 @@ LoadPlugin syslog ############################################################################## {% macro load_plugin(name) %} -{% if name in collectd_disable_plugins %} +{% if (collectd_plugins_defaults | combine(collectd_plugins)).get(name, true) | bool is false %} #LoadPlugin {{ name }} -{% else %} +{%- else %} LoadPlugin {{ name }} {%- endif -%} {% endmacro %}