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

diff --git a/manifests/register_snmp.pp b/manifests/register_snmp.pp
new file mode 100644
index 0000000..e74ba44
--- /dev/null
+++ b/manifests/register_snmp.pp
@@ -0,0 +1,21 @@
+# snmp_testplugin: the plugin we use to test if it's set
+define munin::register_snmp(
+    $snmpd_testplugin = 'load'
+)
+{
+	$munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } 
+	$munin_host_real = $munin_host ? {
+		'' => '*',
+		'fqdn' => '*',
+		default => $munin_host
+    }
+    exec{"register_snmp_munin_for_${name}":
+        command => "munin-node-configure-snmp ${name} | sh",
+        unless => "test -e /etc/munin/plugins/snmp_${name}_${snmpd_testplugin}",
+    }
+    @@file { "munin_snmp_${name}": path => "/var/lib/puppet/modules/munin/nodes/${name}",
+        ensure => present,
+        content => template("munin/snmpclient.erb"),
+        tag => 'munin',
+    }
+}