Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'

Conflicts:
	README
	lib/facter/acpi_available.rb
	lib/facter/interfaces.rb
	lib/facter/munin_interfaces.rb
	manifests/client.pp
	manifests/host.pp
	manifests/init.pp
	manifests/plugin.pp
	plugins/facter/interfaces.rb
	templates/defaultclient.erb
	templates/munin-node.conf.Debian.lenny

1 files changed, 22 insertions, 0 deletions

diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
new file mode 100644
index 0000000..99b85ba
--- /dev/null
+++ b/manifests/plugins/interfaces.pp
@@ -0,0 +1,22 @@
+# handle if_ and if_err_ plugins
+class munin::plugins::interfaces inherits munin::plugins::base {
+
+    $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
+    munin::plugin {
+    $ifs: ensure => "if_";
+    }
+    case $operatingsystem {
+        openbsd: {
+            $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
+    	      munin::plugin{
+            $if_errs: ensure => "if_errcoll_";
+          }
+        }
+        default: {
+            $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
+    	      munin::plugin{
+    	        $if_errs: ensure => "if_err_";
+          }
+        }
+    }
+}