merged with puzzle upstream

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1254 d66ca3ae-40d7-4aa7-90d4-87d79ca94279

4 files changed, 76 insertions, 127 deletions

diff --git a/manifests/client.pp b/manifests/client.pp
index 8181845..69e9f2e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -11,47 +11,14 @@ class munin::client {
 		default => $munin_host
 	}
 
-	case $operatingsystem {
-		darwin: { include munin::client::darwin }
-		debian: {
-			include munin::client::debian
-			include munin::plugins::debian
-		}
-		ubuntu: {
-			info ( "Trying to configure Ubuntu's munin with Debian class" )
-			include munin::client::debian
-			include munin::plugins::debian
-		}
-		gentoo: {
-			include munin::client::gentoo
-			include munin::plugins::gentoo
-		}
-		centos: {
-			include munin::client::centos
-			include munin::plugins::centos
-		}
-		default: { fail ("Don't know how to handle munin on $operatingsystem") }
-	}
-
-	case $kernel {
-		linux: {
-			case $vserver {
-				guest: { include munin::plugins::vserver }
-				default: {
-					include munin::plugins::linux
-				}
-			}
-		}
-		default: {
-			err( "Don't know which munin plugins to install for $kernel" )
-		}
-	}
-	case $virtual {
-        physical: { include munin::plugins::physical }
-	    xen0: { include munin::plugins::dom0 }
-        xenu: { include munin::plugins::domU }
+    case $operatingsystem {
+        darwin: { include munin::client::darwin }
+        debian: { include munin::client::debian }
+        ubuntu: { include munin::client::ubuntu }
+        centos: { include munin::client::centos }
+        gentoo: { include munin::client::gentoo }
+        default: { include munin::client::base }
     }
-
 }
 
 define munin::register()
@@ -66,7 +33,7 @@ define munin::register()
 	@@file { "${NODESDIR}/${name}_${munin_port_real}":
 		ensure => present,
 		content => template("munin/defaultclient.erb"),
-        tag => 'munin',
+		tag => 'munin',
 	}
 }
 
@@ -75,12 +42,34 @@ define munin::register_snmp()
 	@@file { "munin_snmp_${name}": path => "${NODESDIR}/${name}",
 		ensure => present,
 		content => template("munin/snmpclient.erb"),
-        tag => 'munin',
+		tag => 'munin',
 	}
 }
 
-class munin::client::darwin 
-{
+class munin::client::base {
+	package { "munin-node": ensure => installed }
+	service { "munin-node":
+		ensure => running, 
+        hasstatus => true,
+        hasrestart => true,
+        require => Package[munin-node],
+	}
+	file {
+		"/etc/munin/":
+			ensure => directory,
+			mode => 0755, owner => root, group => 0;
+		"/etc/munin/munin-node.conf":
+			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistrelease"),
+			mode => 0644, owner => root, group => 0,
+			# this has to be installed before the package, so the postinst can
+			# boot the munin-node without failure!
+			before => Package["munin-node"],
+	}
+	munin::register { $fqdn: }
+	include munin::plugins::base
+}
+
+class munin::client::darwin {
 	file { "/usr/share/snmp/snmpd.conf": 
 		mode => 744,
 		content => template("munin/darwin_snmpd.conf.erb"),
@@ -102,95 +91,30 @@ class munin::client::darwin
 	munin::register_snmp { $fqdn: }
 }
 
-class munin::client::debian 
-{
-	package { "munin-node": ensure => installed }
+class munin::client::debian inherits munin::client::base {
     # the plugin will need that
 	package { "iproute": ensure => installed }
 
-	file {
-		"/etc/munin/":
-			ensure => directory,
-			mode => 0755, owner => root, group => 0;
-		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.${operatingsystem}.${lsbdistcodename}"),
-			mode => 0644, owner => root, group => 0,
-			# this has to be installed before the package, so the postinst can
-			# boot the munin-node without failure!
-			before => Package["munin-node"],
-			notify => Service["munin-node"],
-	}
-
-	service { "munin-node":
-		ensure => running, 
+	Service["munin-node"]{
 		# sarge's munin-node init script has no status
 		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
 	}
-
-	munin::register { $fqdn: }
-
 	# workaround bug in munin_node_configure
-	munin::plugin { "postfix_mailvolume": ensure => absent }
+	plugin { "postfix_mailvolume": ensure => absent }
+	include munin::plugins::debian
 }
 
-class munin::client::gentoo 
-{
-    $acpi_available = "absent"
-    package { 'munin-node':
-                name => 'munin',
-                ensure => present,
-                category => $operatingsystem ? {
-                        gentoo => 'net-analyzer',
-                        default => '',
-                },
-    }
-
-	file {
-		"/etc/munin/":
-			ensure => directory,
-			mode => 0755, owner => root, group => 0;
-		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.Gentoo."),
-			mode => 0644, owner => root, group => 0,
-			# this has to be installed before the package, so the postinst can
-			# boot the munin-node without failure!
-			before => Package["munin-node"],
-	    #		notify => Service["munin"],
-	}
-
-	service { "munin-node":
-		ensure => running, 
-	}
-
-	munin::register { $fqdn: }
-}
+class munin::client::ubuntu inherits munin::client::debian {}
 
-class munin::client::centos 
-{
-    package { 'munin-node':
-                ensure => present,
+class munin::client::gentoo inherits munin::client::base {
+    Package['munin-node'] {
+        name => 'munin',
+        category => 'net-analyzer',
     }
 
-
-	file {
-		"/etc/munin/":
-			ensure => directory,
-			mode => 0755, owner => root, group =>0;
-		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.CentOS."),
-			mode => 0644, owner => root, group => 0,
-			# this has to be installed before the package, so the postinst can
-			# boot the munin-node without failure!
-			before => Package["munin-node"],
-			notify => Service["munin-node"],
-	}
-
-	service { "munin-node":
-		ensure => running, 
-	}
-
-	munin::register { $fqdn: }
-
+	include munin::plugins::gentoo
 }
 
-
+class munin::client::centos inherits munin::client::base {
+	include munin::plugins::centos
+}
diff --git a/manifests/host.pp b/manifests/host.pp
index d49c5a2..8f79020 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -4,7 +4,7 @@
 
 class munin::host
 {
-	package { [ "munin", "nmap"]: ensure => installed, }
+	package {"munin": ensure => installed, }
 
 	File <<| tag == 'munin' |>>
 
@@ -12,7 +12,7 @@ class munin::host
 		dir => $NODESDIR,
 		header => "/etc/munin/munin.conf.header",
 	}
-
+	
     file { ["/var/log/munin-update.log", "/var/log/munin-limits.log", 
                "/var/log/munin-graph.log", "/var/log/munin-html.log"]:
         ensure => present,
diff --git a/manifests/init.pp b/manifests/init.pp
index 9c4b1de..6b6cd08 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,8 @@
 # munin.pp - everything a sitewide munin installation needs
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
-
+# adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch
+#
 # the port is a parameter so vservers can share IP addresses and still be happy
 
 # Define where the individual nodes' configs are stored
@@ -16,4 +17,3 @@ import "plugin.pp"
 case $operatingsystem {
     debian,ubuntu: { include assert_lsbdistcodename }
 }
-
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index ac25abf..6a92c56 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -93,8 +93,9 @@ define munin::remoteplugin($ensure = "present", $source, $config = '') {
 	}
 }
 define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') {
+    $plugin_src = $ensure ? { "present" => $name, default => $ensure }
     $real_source = $source ? {
-        ''  =>  "munin/plugins/$name",
+        ''  =>  "munin/plugins/$plugin_src",
         default => $source
     }
     include munin::plugin::scriptpaths
@@ -142,6 +143,21 @@ class munin::plugins::base {
 		    }
 		}
 	}
+    case $kernel {
+        linux: {
+            case $vserver {
+                guest: { include munin::plugins::vserver }
+                default: {
+                    include munin::plugins::linux
+                }
+            }
+        }
+    }
+    case $virtual {
+        physical: { include munin::plugins::physical }
+        xen0: { include munin::plugins::dom0 }
+        xenu: { include munin::plugins::domU }
+    }
 }
 
 # handle if_ and if_err_ plugins
@@ -195,6 +211,7 @@ class munin::plugins::dom0 inherits munin::plugins::physical {
     munin::plugin::deploy { "xen-cpu": config => "user root"}
     munin::plugin::deploy { "xen_memory": config => "user root"}
     munin::plugin::deploy { "xen_vbd": config => "user root"}
+    munin::plugin::deploy { "xen_traffic_all": config => "user root"}
 }
 
 class munin::plugins::physical inherits munin::plugins::base {
@@ -229,3 +246,11 @@ class munin::plugins::postgres inherits munin::plugins::base {
     munin::plugin::deploy { "pg__connections": ensure => false }
     munin::plugin::deploy { "pg__locks": ensure => false }
 }
+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';
+    }
+}