From 4ade531347d2cfef7945f2521fb9e1ae3730098c Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 09:48:23 +0000
Subject: rearranged plugin ordering, fixed some yum stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1247 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/plugin.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 2b66ce2..6eaa518 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -213,7 +213,6 @@ class munin::plugins::djbdns inherits munin::plugins::base {
 }
 
 class munin::plugins::apache inherits munin::plugins::base {
-    include apache::status
     munin::plugin{ "apache_accesses": }
     munin::plugin{ "apache_processes": }
     munin::plugin{ "apache_volume": }
-- 
cgit v1.2.3


From a3ac1c067e22f25b6fa5643873a4a935358561f1 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 11:05:25 +0000
Subject: fixed munin stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1248 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 ++-
 manifests/plugin.pp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index c81e6f4..8181845 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -66,6 +66,7 @@ define munin::register()
 	@@file { "${NODESDIR}/${name}_${munin_port_real}":
 		ensure => present,
 		content => template("munin/defaultclient.erb"),
+        tag => 'munin',
 	}
 }
 
@@ -129,7 +130,7 @@ class munin::client::debian
 	munin::register { $fqdn: }
 
 	# workaround bug in munin_node_configure
-	plugin { "postfix_mailvolume": ensure => absent }
+	munin::plugin { "postfix_mailvolume": ensure => absent }
 }
 
 class munin::client::gentoo 
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 6eaa518..161bf88 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -149,7 +149,7 @@ class munin::plugins::interfaces inherits munin::plugins::base {
 
 	$ifs = gsub(split($interfaces, " "), "(.+)", "if_\\1")
 	$if_errs = gsub(split($interfaces, " "), "(.+)", "if_err_\\1")
-	plugin {
+	munin::plugin {
 		$ifs: ensure => "if_";
 		$if_errs: ensure => "if_err_";
 	}
@@ -157,7 +157,7 @@ class munin::plugins::interfaces inherits munin::plugins::base {
 
 class munin::plugins::linux inherits munin::plugins::base {
 
-	plugin {
+	munin::plugin {
 		[ df_abs, forks, memory, processes, cpu, df_inode, irqstats,
 		  netstat, open_files, swap, df, entropy, interrupts, load, open_inodes,
 		  vmstat
-- 
cgit v1.2.3


From b1381333f577b0b4c6ff17a2cfff1abfa58c00e3 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 12:26:34 +0000
Subject: unified fileserver location, in the future the fileserver should only
 be accessed by $server

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1251 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/host.pp   | 2 +-
 manifests/plugin.pp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/host.pp b/manifests/host.pp
index 4625ba9..d49c5a2 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -27,7 +27,7 @@ class munin::snmp_collector
 
 	file { 
 		"/var/lib/puppet/modules/munin/create_snmp_links":
-			source => "puppet://$servername/munin/create_snmp_links.sh",
+			source => "puppet://$server/munin/create_snmp_links.sh",
 			mode => 755, owner => root, group => 0;
 	}
 
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 161bf88..ac25abf 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -101,7 +101,7 @@ define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') {
 	debug ( "munin_plugin_${name}: name=$name, source=$source, script_path=$munin::plugin::scriptpaths::script_path" )
     file { "munin_plugin_${name}":
             path => "$munin::plugin::scriptpaths::script_path/${name}",
-            source => "puppet://$servername/$real_source",
+            source => "puppet://$server/$real_source",
             ensure => file,
             mode => 0755, owner => root, group => 0;
     }
@@ -116,7 +116,7 @@ class munin::plugins::base {
 		centos: {		
 		    file {
 			[ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-				source => "puppet://$servername/munin/empty",
+				source => "puppet://$server/munin/empty",
 				ensure => directory, checksum => mtime,
 				recurse => true, purge => true, force => true, 
 				mode => 0755, owner => root, group => 0;
@@ -129,7 +129,7 @@ class munin::plugins::base {
 		default: {
 		    file {
 			[ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-				source => "puppet://$servername/munin/empty",
+				source => "puppet://$server/munin/empty",
 				ensure => directory, checksum => mtime,
 				recurse => true, purge => true, force => true, 
 				mode => 0755, owner => root, group => 0,
-- 
cgit v1.2.3


From 9dca19736cd11ed42cfdb8aed30c8628b22231cb Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 13:26:14 +0000
Subject: merged with puzzle upstream

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1254 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 files/plugins/nagios_hosts              |  28 ++++++
 files/plugins/nagios_perf_              |  35 +++++++
 files/plugins/nagios_svc                |  33 +++++++
 files/plugins/xen_traffic_all           |  63 ++++++++++++
 manifests/client.pp                     | 168 +++++++++-----------------------
 manifests/host.pp                       |   4 +-
 manifests/init.pp                       |   4 +-
 manifests/plugin.pp                     |  27 ++++-
 templates/munin-node.conf.Debian.gutsy  |   1 -
 templates/munin-node.conf.Ubuntu.feisty |   1 +
 templates/munin-node.conf.Ubuntu.gutsy  |   1 +
 templates/munin-node.conf.Ubuntu.hardy  |   1 +
 12 files changed, 238 insertions(+), 128 deletions(-)
 create mode 100755 files/plugins/nagios_hosts
 create mode 100755 files/plugins/nagios_perf_
 create mode 100755 files/plugins/nagios_svc
 create mode 100644 files/plugins/xen_traffic_all
 delete mode 120000 templates/munin-node.conf.Debian.gutsy
 create mode 120000 templates/munin-node.conf.Ubuntu.feisty
 create mode 120000 templates/munin-node.conf.Ubuntu.gutsy
 create mode 120000 templates/munin-node.conf.Ubuntu.hardy

diff --git a/files/plugins/nagios_hosts b/files/plugins/nagios_hosts
new file mode 100755
index 0000000..04fe8ed
--- /dev/null
+++ b/files/plugins/nagios_hosts
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Nagios host stats'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel hosts'
+	echo 'graph_category nagios'
+	echo 'graph_info The number of hosts checked by nagios'
+	echo 'up.label up'
+	echo 'up.draw AREA'
+	echo 'up.info number of hosts UP'
+	echo 'down.label down'
+	echo 'down.draw STACK'
+	echo 'down.info number of hosts DOWN'
+	echo 'unr.label unr'
+	echo 'unr.draw STACK'
+	echo 'unr.info number of hosts UNREACHABLE'
+
+	exit 0
+fi
+
+echo -n 'up.value '
+nagios2stats --mrtg --data NUMHSTUP
+echo -n 'down.value '
+nagios2stats --mrtg --data NUMHSTDOWN
+echo -n 'unr.value '
+nagios2stats --mrtg --data NUMHSTUNR
+
diff --git a/files/plugins/nagios_perf_ b/files/plugins/nagios_perf_
new file mode 100755
index 0000000..f819def
--- /dev/null
+++ b/files/plugins/nagios_perf_
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+NAME=$(basename $0)
+
+TYPE=${NAME##nagios_perf_}
+
+[ "x$TYPE" = 'xhosts' ] && TYPE_ABBR=HST
+[ "x$TYPE" = 'xsvc' ] && TYPE_ABBR=SVC
+[ -z "$TYPE_ABBR" ] && echo "unknown type $TYPE" >&2 && exit 1
+
+if [ "$1" = "config" ]; then
+	echo "graph_title Nagios $TYPE performance stats"
+	echo "graph_args --base 1000"
+	echo "graph_vlabel seconds"
+	echo "graph_category nagios"
+	echo "graph_info Check performance statistics"
+
+	echo "act_lat_$TYPE_ABBR.label act lat"
+	echo "act_lat_$TYPE_ABBR.type GAUGE"
+	echo "act_lat_$TYPE_ABBR.draw AREA"
+	echo "act_lat_$TYPE_ABBR.cdef act_lat_$TYPE_ABBR,1000,/"
+	echo "act_lat_$TYPE_ABBR.info average latency of active checks over the last 5 minutes"
+
+	echo "act_ext_$TYPE_ABBR.label act ext"
+	echo "act_ext_$TYPE_ABBR.type GAUGE"
+	echo "act_ext_$TYPE_ABBR.draw LINE1"
+	echo "act_ext_$TYPE_ABBR.cdef act_ext_$TYPE_ABBR,1000,/"
+	echo "act_ext_$TYPE_ABBR.info average execution time of active checks over the last 5 minutes"
+
+	exit 0
+fi
+
+echo "act_lat_$TYPE_ABBR.value " $(nagios2stats --mrtg --data AVGACT${TYPE_ABBR}LAT)
+echo "act_ext_$TYPE_ABBR.value " $(nagios2stats --mrtg --data AVGACT${TYPE_ABBR}EXT)
+
diff --git a/files/plugins/nagios_svc b/files/plugins/nagios_svc
new file mode 100755
index 0000000..3938999
--- /dev/null
+++ b/files/plugins/nagios_svc
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Nagios service stats'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel services'
+	echo 'graph_category nagios'
+	echo 'graph_info The number of services checked by nagios'
+	echo 'ok.label ok'
+	echo 'ok.draw AREA'
+	echo 'ok.info number of services OK'
+	echo 'warn.label warn'
+	echo 'warn.draw STACK'
+	echo 'warn.info number of services WARNING'
+	echo 'crit.label crit'
+	echo 'crit.draw STACK'
+	echo 'crit.info number of services CRITICAL'
+	echo 'unkn.label unkn'
+	echo 'unkn.draw STACK'
+	echo 'unkn.info number of services UNKNOWN'
+
+	exit 0
+fi
+
+echo -n 'ok.value '
+nagios2stats --mrtg --data NUMSVCOK
+echo -n 'warn.value '
+nagios2stats --mrtg --data NUMSVCWARN
+echo -n 'crit.value '
+nagios2stats --mrtg --data NUMSVCCRIT
+echo -n 'unkn.value '
+nagios2stats --mrtg --data NUMSVCUNKN
+
diff --git a/files/plugins/xen_traffic_all b/files/plugins/xen_traffic_all
new file mode 100644
index 0000000..1216a7d
--- /dev/null
+++ b/files/plugins/xen_traffic_all
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Author: mario manno <projects@manno.name>
+# Description: measure traffic for all xen hosts
+#
+#%# family=auto
+#%# capabilities=autoconf
+
+if [ "$1" = "autoconf" ]; then
+    if which xm > /dev/null ; then
+        echo yes
+    else
+        echo "no (xm not found)"
+        exit 1
+    fi
+    if [ -r /proc/net/dev ]; then
+        echo yes
+    else
+        echo "no (/proc/net/dev not found)"
+        exit 1
+    fi
+    exit 0
+fi
+
+if [ "$1" = "config" ]; then
+    echo 'graph_title Xen Traffic'
+    echo 'graph_vlabel bits received (-) / sent (+) per ${graph_period}'
+    echo 'graph_args --base 1024 -l 0'
+    echo 'graph_category xen'
+    DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
+    for dom in $DOMAINS; do
+        name=$( echo $dom | sed -e's/-/_/g' )
+        #echo $name"UP.label $name"
+        #echo $name"DOWN.label $name"
+        
+        echo $name'Down.label received'
+        echo $name'Down.type COUNTER'
+        echo $name'Down.graph no'
+        echo "${name}Down.cdef ${name}Down,8,*"
+        echo "${name}Up.label ${name}"
+        echo $name'Up.type COUNTER'
+        echo "${name}Up.negative ${name}Down"
+        echo "${name}Up.cdef ${name}Up,8,*"
+    done
+    exit 0
+fi
+
+DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
+for dom in $DOMAINS; do
+    dev=$( xm network-list $dom |\
+        egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
+    name=$( echo $dom | sed -e's/-/_/g' ) 
+    #awk -v name="$name" -v interface="$dev" -F'[: \t]+' \
+    #'{ sub(/^ */,""); if ($1 == interface) \
+    #print name"DOWN.value "$2"\n"name"UP.value "$10; }' /proc/net/dev
+    awk -v name="$name" -v interface="$dev" \
+        'BEGIN { gsub(/\./, "\\.", interface) } \
+        $1 ~ "^" interface ":" {
+            split($0, a, /: */); $0 = a[2]; \
+            print name"Down.value " $1 "\n"name"Up.value " $9 \
+        }' \
+        /proc/net/dev
+done
+
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';
+    }
+}
diff --git a/templates/munin-node.conf.Debian.gutsy b/templates/munin-node.conf.Debian.gutsy
deleted file mode 120000
index e0646b9..0000000
--- a/templates/munin-node.conf.Debian.gutsy
+++ /dev/null
@@ -1 +0,0 @@
-munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Ubuntu.feisty b/templates/munin-node.conf.Ubuntu.feisty
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Ubuntu.feisty
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Ubuntu.gutsy b/templates/munin-node.conf.Ubuntu.gutsy
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Ubuntu.gutsy
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Ubuntu.hardy b/templates/munin-node.conf.Ubuntu.hardy
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Ubuntu.hardy
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
-- 
cgit v1.2.3


From 3b9dff3584c98fe8e2754fe91204748853e84d84 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 14:35:15 +0000
Subject: refixed template path

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1257 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp                     | 2 +-
 templates/munin-node.conf.Debian.feisty | 1 +
 templates/munin-node.conf.Debian.gutsy  | 1 +
 templates/munin-node.conf.Debian.hardy  | 1 +
 templates/munin-node.conf.Ubuntu.feisty | 1 -
 templates/munin-node.conf.Ubuntu.gutsy  | 1 -
 templates/munin-node.conf.Ubuntu.hardy  | 1 -
 7 files changed, 4 insertions(+), 4 deletions(-)
 create mode 120000 templates/munin-node.conf.Debian.feisty
 create mode 120000 templates/munin-node.conf.Debian.gutsy
 create mode 120000 templates/munin-node.conf.Debian.hardy
 delete mode 120000 templates/munin-node.conf.Ubuntu.feisty
 delete mode 120000 templates/munin-node.conf.Ubuntu.gutsy
 delete mode 120000 templates/munin-node.conf.Ubuntu.hardy

diff --git a/manifests/client.pp b/manifests/client.pp
index 69e9f2e..39d9a15 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -59,7 +59,7 @@ class munin::client::base {
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
 		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistrelease"),
+			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!
diff --git a/templates/munin-node.conf.Debian.feisty b/templates/munin-node.conf.Debian.feisty
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Debian.feisty
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.gutsy b/templates/munin-node.conf.Debian.gutsy
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Debian.gutsy
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.hardy b/templates/munin-node.conf.Debian.hardy
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Debian.hardy
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Ubuntu.feisty b/templates/munin-node.conf.Ubuntu.feisty
deleted file mode 120000
index e0646b9..0000000
--- a/templates/munin-node.conf.Ubuntu.feisty
+++ /dev/null
@@ -1 +0,0 @@
-munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Ubuntu.gutsy b/templates/munin-node.conf.Ubuntu.gutsy
deleted file mode 120000
index e0646b9..0000000
--- a/templates/munin-node.conf.Ubuntu.gutsy
+++ /dev/null
@@ -1 +0,0 @@
-munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Ubuntu.hardy b/templates/munin-node.conf.Ubuntu.hardy
deleted file mode 120000
index e0646b9..0000000
--- a/templates/munin-node.conf.Ubuntu.hardy
+++ /dev/null
@@ -1 +0,0 @@
-munin-node.conf.Debian.etch
\ No newline at end of file
-- 
cgit v1.2.3


From 540d97e640a7b1415cdaffae922a5253f0e3790d Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 15:03:26 +0000
Subject: fixed munin-conf on gentoo

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1258 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/client.pp b/manifests/client.pp
index 39d9a15..08fc3ba 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -111,6 +111,9 @@ class munin::client::gentoo inherits munin::client::base {
         name => 'munin',
         category => 'net-analyzer',
     }
+    File["/etc/munin/munin-node.conf"]{
+			content => template("munin/munin-node.conf.$operatingsystem"),
+    }
 
 	include munin::plugins::gentoo
 }
-- 
cgit v1.2.3


From 6bc29ac288bcc25dec161a96679f1ac872f11837 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 10:43:41 +0000
Subject: another try to fix this problem

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1261 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 08fc3ba..2208b8d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -59,7 +59,7 @@ class munin::client::base {
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
 		"/etc/munin/munin-node.conf":
-			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
+			content => template("munin/munin-node.conf.$operatingsystem"),
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
 			# boot the munin-node without failure!
@@ -99,6 +99,9 @@ class munin::client::debian inherits munin::client::base {
 		# sarge's munin-node init script has no status
 		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
 	}
+    File["/etc/munin/munin-node.conf"]{
+			content => template("munin/munin-node.conf.$operatingsystem"),
+    }
 	# workaround bug in munin_node_configure
 	plugin { "postfix_mailvolume": ensure => absent }
 	include munin::plugins::debian
@@ -111,9 +114,7 @@ class munin::client::gentoo inherits munin::client::base {
         name => 'munin',
         category => 'net-analyzer',
     }
-    File["/etc/munin/munin-node.conf"]{
-			content => template("munin/munin-node.conf.$operatingsystem"),
-    }
+    
 
 	include munin::plugins::gentoo
 }
-- 
cgit v1.2.3


From 561b770f24a688842bfad68143826aefd8ab1fd0 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 11:03:45 +0000
Subject: forgot lsbdistcodename in debian

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1262 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 2208b8d..b2bad8b 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,6 +1,7 @@
 # client.pp - configure a munin node
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
+# Adapted and improved by admin(at)immerda.ch
 
 class munin::client {
 
@@ -100,7 +101,7 @@ class munin::client::debian inherits munin::client::base {
 		hasstatus => $lsbdistcodename ? { sarge => false, default => true }
 	}
     File["/etc/munin/munin-node.conf"]{
-			content => template("munin/munin-node.conf.$operatingsystem"),
+			content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
     }
 	# workaround bug in munin_node_configure
 	plugin { "postfix_mailvolume": ensure => absent }
-- 
cgit v1.2.3


From b312f62d11fa036c2e75d6afaafb14b03d38660b Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 11:23:45 +0000
Subject: fixed category

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1263 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 files/plugins/selinux_avcstats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/plugins/selinux_avcstats b/files/plugins/selinux_avcstats
index 9687be0..b7d2dbb 100755
--- a/files/plugins/selinux_avcstats
+++ b/files/plugins/selinux_avcstats
@@ -31,7 +31,7 @@ if [ "$1" = "config" ]; then
         echo "graph_title SELinux's Access Vector Cache"
         echo 'graph_args -l 0 --base 1000'
         echo 'graph_vlabel AVC operations'
-        echo 'graph_category system'
+        echo 'graph_category selinux'
 
         echo 'lookups.label lookups'
         echo 'lookups.type DERIVE'
-- 
cgit v1.2.3


From e80b4c9f2aff54318f2f3338ef23b73a3a40a58c Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 11:37:59 +0000
Subject: antoher try to fix the problem

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1264 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index b2bad8b..8305bf0 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -55,11 +55,11 @@ class munin::client::base {
         hasrestart => true,
         require => Package[munin-node],
 	}
-	file {
-		"/etc/munin/":
+	file {"/etc/munin/":
 			ensure => directory,
 			mode => 0755, owner => root, group => 0;
-		"/etc/munin/munin-node.conf":
+    }
+    file {"/etc/munin/munin-node.conf":
 			content => template("munin/munin-node.conf.$operatingsystem"),
 			mode => 0644, owner => root, group => 0,
 			# this has to be installed before the package, so the postinst can
-- 
cgit v1.2.3


From a043afef5e8fb14385f59b4fee558f7f9618b050 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 25 Apr 2008 14:47:46 +0000
Subject: added missing template

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1265 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 templates/munin-node.conf.Debian | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 templates/munin-node.conf.Debian

diff --git a/templates/munin-node.conf.Debian b/templates/munin-node.conf.Debian
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Debian
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
-- 
cgit v1.2.3