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, 20 insertions, 0 deletions

diff --git a/manifests/plugins/nagios.pp b/manifests/plugins/nagios.pp
new file mode 100644
index 0000000..c07e99d
--- /dev/null
+++ b/manifests/plugins/nagios.pp
@@ -0,0 +1,20 @@
+class munin::plugins::nagios inherits munin::plugins::base {
+
+    munin::plugin::deploy {
+        nagios_hosts: config => 'user root';
+        nagios_svc: config => 'user root';
+        nagios_perf_hosts: ensure => nagios_perf_, config => 'user root';
+        nagios_perf_svc: ensure => nagios_perf_, config => 'user root';
+    }
+
+    exec { 'munin_nagios2stats_link':
+        command => 'ln -s /usr/sbin/nagios2stats /usr/local/sbin/nagiostats',
+        onlyif => ["test ! -e /usr/local/sbin/nagiostats", "test -e /usr/sbin/nagios2stats"],
+    }
+
+    exec { 'munin_nagios3stats_link':
+        command => 'ln -s /usr/sbin/nagios3stats /usr/local/sbin/nagiostats',
+        onlyif => ["test ! -e /usr/local/sbin/nagiostats", "test -e /usr/sbin/nagios3stats"],
+    }
+
+}