diff options
author | Micah <micah@riseup.net> | 2015-02-28 16:09:07 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-02-28 16:09:07 +0000 |
commit | c117993ffe62f5d69232aa91487efc206a97e221 (patch) | |
tree | 9099a50b25e1baf75f79f334e1d3bc02e0c4afa7 | |
parent | 11440d5a71549041c639017d3be32866a2a79513 (diff) | |
parent | 6d7494bfe90819273bb6343911f410071b5561a8 (diff) |
Merge branch 'custom_if_filter_param' into 'master'
Add class parameter to allow customisation of if plugin filter
See merge request !3
-rw-r--r-- | manifests/init.pp | 1 | ||||
-rw-r--r-- | manifests/plugins/interfaces.pp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index bbabf2e..367ba8f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -40,6 +40,7 @@ class munin ( $munin_group = 'absent', $cgi_graphing = false, $cgi_owner = 'os_default', + $if_filter = 'eth\d+_\d+|sit0|virbr\d+_nic|vif\d+_\d+|veth\d+|vnet\d+|__tmp\d+', ) { include munin::client diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp index 35b41fd..2bbc1c6 100644 --- a/manifests/plugins/interfaces.pp +++ b/manifests/plugins/interfaces.pp @@ -2,7 +2,7 @@ class munin::plugins::interfaces { # filter out many of the useless interfaces that show up - $real_ifs = reject(split($::interfaces, ' |,'), 'eth\d+_\d+|sit0|virbr\d+_nic|vif\d+_\d+|veth\d+|vnet\d+|__tmp\d+') + $real_ifs = reject(split($::interfaces, ' |,'), $munin::if_filter) $ifs = prefix($real_ifs, 'if_') $if_err_plugin = $::operatingsystem ? { |