Global collectd update
diff --git a/linux/files/collectd_df.conf b/linux/files/collectd_df.conf
index b7ac768..c0460eb 100644
--- a/linux/files/collectd_df.conf
+++ b/linux/files/collectd_df.conf
@@ -1,9 +1,10 @@
-LoadPlugin df
+<LoadPlugin df>
+ Globals false
+</LoadPlugin>
+
<Plugin df>
{%- for fs_type in plugin.get('fs_types', []) %}
FSType {{ fs_type }}
{%- endfor %}
- {%- if plugin.get('ignore_selected', False) %}
- IgnoreSelected true
- {%- endif %}
+ IgnoreSelected {{ plugin.get('ignore_selected', False)|lower }}
</Plugin>
diff --git a/linux/files/collectd_disk.conf b/linux/files/collectd_disk.conf
index 50c5288..4dac534 100644
--- a/linux/files/collectd_disk.conf
+++ b/linux/files/collectd_disk.conf
@@ -1,6 +1,7 @@
-LoadPlugin disk
+<LoadPlugin disk>
+ Globals false
+</LoadPlugin>
+
<Plugin disk>
- {%- if plugin.get('ignore_selected', False) %}
- IgnoreSelected true
- {%- endif %}
+ IgnoreSelected {{ plugin.get('ignore_selected', True)|lower }}
</Plugin>
diff --git a/linux/meta/collectd.yml b/linux/meta/collectd.yml
index 8c0382a..e40f45a 100644
--- a/linux/meta/collectd.yml
+++ b/linux/meta/collectd.yml
@@ -1,33 +1,33 @@
plugin:
linux_network_interface:
plugin: interface
- interval: 60
+ execution: local
linux_system_cpu:
plugin: cpu
- interval: 60
+ execution: local
linux_system_entropy:
plugin: entropy
- interval: 60
+ execution: local
linux_system_load:
plugin: load
- interval: 60
+ execution: local
linux_system_contextswitch:
plugin: contextswitch
- interval: 60
+ execution: local
linux_system_memory:
plugin: memory
- interval: 60
+ execution: local
linux_system_uptime:
plugin: uptime
- interval: 60
+ execution: local
linux_system_users:
plugin: users
- interval: 60
+ execution: local
linux_storage_df:
plugin: df
- interval: 60
+ execution: local
template: linux/files/collectd_df.conf
- ignore_selected: true
+ ignore_selected: True
fs_types:
- rootfs
- sysfs
@@ -39,9 +39,9 @@
- cgroup
linux_storage_disk:
plugin: disk
- interval: 60
+ execution: local
template: linux/files/collectd_disk.conf
- ignore_selected: true
+ ignore_selected: True
linux_storage_swap:
plugin: swap
- interval: 60
+ execution: local