From b95644cf74b80f2577a00ba6a1f54896085b6a54 Mon Sep 17 00:00:00 2001
From: Ben Kero <ben.kero@gmail.com>
Date: Tue, 19 Jan 2010 15:50:37 -0800
Subject: [PATCH] Initial munin commit

---
 cfengine/inputs/cf.classes          |    4 ++-
 cfengine/inputs/cf.main             |    1 +
 cfengine/inputs/cf.munin            |   53 +++++++++++++++++++++++++++++++++++
 files/etc/cron.d/munin/update-munin |   15 ++++++++++
 4 files changed, 72 insertions(+), 1 deletions(-)
 create mode 100644 cfengine/inputs/cf.munin
 create mode 100644 files/etc/cron.d/munin/update-munin

diff --git a/cfengine/inputs/cf.classes b/cfengine/inputs/cf.classes
index ab2fcce..37c0bc9 100644
--- a/cfengine/inputs/cf.classes
+++ b/cfengine/inputs/cf.classes
@@ -171,6 +171,8 @@ groups:
         service_db_backup   = ( backup )
         service_postgresql  = ( dogwood orvsd_dev rocky )
         service_postgresql_new = ( pg1_osuosl_org pg2_osuosl_org )
+        service_munin_host  = ( )
+        service_munin_node  = ( )
         service_netboot     = ( oak )
         service_nfs         = ( service_netboot hazelnut www1_drupal_org
                                 www1_mozillazine_org pg1 )
@@ -733,7 +735,7 @@ groups:
         package_gcpan       = ( ash flossmanuals maple )
         package_libxslt     = ( service_rtv_util service_rtv_web )
         package_irssi       = ( ash busybox www_inkscape_org )
-        package_munin_node  = ( www_phpbb_com )
+        package_munin_node  = ( service_munin_node www_phpbb_com )
         package_debootstrap = ( service_ganeti_node host_xen )
         package_perl_threaded = ( dev_helpdesk_osuosl_org
                                   web1_helpdesk_osuosl_org )
diff --git a/cfengine/inputs/cf.main b/cfengine/inputs/cf.main
index b88bc84..99792bd 100644
--- a/cfengine/inputs/cf.main
+++ b/cfengine/inputs/cf.main
@@ -158,6 +158,7 @@ import:
         cf.mirrorbrain
         cf.mysql
         cf.mon
+        cf.munin
         cf.nagios
         cf.netboot
         cf.nfs
diff --git a/cfengine/inputs/cf.munin b/cfengine/inputs/cf.munin
new file mode 100644
index 0000000..315c120
--- /dev/null
+++ b/cfengine/inputs/cf.munin
@@ -0,0 +1,53 @@
+control:
+
+    any::
+        AddInstallable = ( bounce_munin update_initd )
+
+    service_munin_node::
+        proc_munin-node = ( "\/usr\/sbin\/munin-node" )
+
+copy:
+
+#    service_munin_host::
+#        $(masterfiles)/etc/munin/munin.conf
+#            dest=/etc/munin/munin.conf
+#            mode=644
+#            server=$(gold)
+
+    service_munin_host::
+        $(masterfiles)/etc/cron.d/update-munin
+            dest=/etc/cron.d/update-munin
+            mode=644
+            server=$(gold)
+
+packages:
+
+    service_munin_host.centos::
+        munin cmp=ge version=1.2.6 action=install
+
+
+    # In Gentoo, the server and munin-node are both in the net-analyzer/munin package!
+
+    package_munin_node.gentoo::
+        net-analyzer/munin cmp=ge version=1.3.4-r2 action=install elsedefine=bounce_munin
+    
+    package_munin_node.centos::
+        munin-node cmp=ge version=1.2.6 action=install elsedefine=bounce_munin
+
+    package_munin_node.fedora::
+        munin-node action=install elsedefine=bounce_munin
+
+processes:
+
+    service_munin_node.!install_only.bounce_munin::
+        "$(proc_munin-node)"
+            signal=term restart "$(initd) munin-node restart"
+
+    service_munin_host.!install_only.gentoo::
+        "$(proc_munin-node)"
+            restart "$(initd) munin-node start"
+
+files:
+
+    service_munin_node::
+        $(rcdir)/on/munin-node action=touch mode=644 define=update_initd
diff --git a/files/etc/cron.d/munin/update-munin b/files/etc/cron.d/munin/update-munin
new file mode 100644
index 0000000..1e0d05e
--- /dev/null
+++ b/files/etc/cron.d/munin/update-munin
@@ -0,0 +1,15 @@
+# Force the shell to bash
+SHELL=/bin/bash
+ 
+# This runs the munin task every 5 minutes.
+*/5	* * * * munin		[ -x /usr/bin/munin-cron ] && /usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#*/1 * * * * munin		[ -x /usr/libexec/munin/munin-update ] && /usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#*/2 * * * * munin		[ -x /usr/libexec/munin/munin-limits ] && /usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#*/5 * * * * munin		[ -x /usr/libexec/munin/munin-graph  ] && nice /usr/libexec/munin/munin-graph --cron
+## Update HTML pages every 15 minutes
+#*/15 * * * * munin		[ -x /usr/libexec/munin/munin-html   ] && nice /usr/libexec/munin/munin-html
-- 
1.6.4.4