Merge pull request #23 from elemoine/stacklight-timezone
Remove Heka decoder tz handling
diff --git a/_modules/netlink.py b/_modules/netlink.py
new file mode 100644
index 0000000..9e6df55
--- /dev/null
+++ b/_modules/netlink.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+_alphanum_re = re.compile(r'^[a-z0-9]+$')
+_lo_re = re.compile(r'^lo$')
+
+
+def _filter(interface):
+ return _alphanum_re.match(interface) and not _lo_re.match(interface)
+
+
+def ls():
+ """
+ Provide a list of network interfaces.
+ """
+ return filter(_filter, __salt__['grains.get']('ip_interfaces', {}).keys())
diff --git a/linux/files/collectd_df.conf b/linux/files/collectd_df.conf
index c0460eb..586e1a0 100644
--- a/linux/files/collectd_df.conf
+++ b/linux/files/collectd_df.conf
@@ -7,4 +7,8 @@
FSType {{ fs_type }}
{%- endfor %}
IgnoreSelected {{ plugin.get('ignore_selected', False)|lower }}
+ ReportByDevice false
+ ReportInodes true
+ ValuesAbsolute true
+ ValuesPercentage true
</Plugin>
diff --git a/linux/files/collectd_netlink.conf b/linux/files/collectd_netlink.conf
new file mode 100644
index 0000000..9d7d0d3
--- /dev/null
+++ b/linux/files/collectd_netlink.conf
@@ -0,0 +1,10 @@
+<LoadPlugin netlink>
+ Globals false
+</LoadPlugin>
+
+<Plugin netlink>
+ {%- for interface_name in plugin.get('interfaces', []) %}
+ VerboseInterface "{{ interface_name }}"
+ {%- endfor %}
+ IgnoreSelected {{ plugin.get('ignore_selected', False)|lower }}
+</Plugin>
diff --git a/linux/map.jinja b/linux/map.jinja
index cdc6123..71d6696 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -15,7 +15,7 @@
'doc_validity_pkgs': ['python-yaml'],
},
'Debian': {
- 'pkgs': ['python-apt','vim-nox', 'apt-transport-https'],
+ 'pkgs': ['python-apt','vim-nox', 'apt-transport-https', 'libmnl0'],
'utc': true,
'user': {},
'group': {},
diff --git a/linux/meta/collectd.yml b/linux/meta/collectd.yml
index 8ab85e2..b310f41 100644
--- a/linux/meta/collectd.yml
+++ b/linux/meta/collectd.yml
@@ -1,6 +1,12 @@
local_plugin:
- linux_network_interface:
- plugin: interface
+ linux_network_netlink:
+ plugin: netlink
+ template: linux/files/collectd_netlink.conf
+ ignore_selected: false
+ interfaces:
+ {%- for interface_name in salt['netlink.ls']() %}
+ - {{ interface_name }}
+ {%- endfor %}
linux_system_cpu:
plugin: cpu
linux_system_entropy: