From 9a79e6ff75f62faf15978f1b43345e0d8bc51e8a Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 1 Feb 2010 15:08:39 -0500
Subject: remove outdated and undesirable apt_all plugin on debian systems
 which triggers random apt-get update commands

---
 manifests/plugins/debian.pp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'manifests/plugins')

diff --git a/manifests/plugins/debian.pp b/manifests/plugins/debian.pp
index f239989..6d2faef 100644
--- a/manifests/plugins/debian.pp
+++ b/manifests/plugins/debian.pp
@@ -1,4 +1,2 @@
 class munin::plugins::debian inherits munin::plugins::base {
-    munin::plugin { apt_all: ensure => present; }
 }
-
-- 
cgit v1.2.3


From b87436f0513d1fea94b3fda625fd9e1c4f20c4d0 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 1 Feb 2010 15:31:06 -0500
Subject: remove nagios plugin, now provided by nagios module

---
 manifests/plugins/nagios.pp | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 manifests/plugins/nagios.pp

(limited to 'manifests/plugins')

diff --git a/manifests/plugins/nagios.pp b/manifests/plugins/nagios.pp
deleted file mode 100644
index c07e99d..0000000
--- a/manifests/plugins/nagios.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-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"],
-    }
-
-}
-- 
cgit v1.2.3


From 4591a91f7a8b169d0aa3ccb46357c60f8dcb7079 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 13 May 2010 14:12:07 -0400
Subject: remove tabs and trailing whitespaces in manifests

---
 manifests/plugins/interfaces.pp | 6 +++---
 manifests/plugins/linux.pp      | 8 ++++----
 manifests/plugins/vserver.pp    | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests/plugins')

diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index 99b85ba..df0828c 100644
--- a/manifests/plugins/interfaces.pp
+++ b/manifests/plugins/interfaces.pp
@@ -8,14 +8,14 @@ class munin::plugins::interfaces inherits munin::plugins::base {
     case $operatingsystem {
         openbsd: {
             $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
-    	      munin::plugin{
+              munin::plugin{
             $if_errs: ensure => "if_errcoll_";
           }
         }
         default: {
             $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
-    	      munin::plugin{
-    	        $if_errs: ensure => "if_err_";
+              munin::plugin{
+                $if_errs: ensure => "if_err_";
           }
         }
     }
diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp
index c7beb59..86696cc 100644
--- a/manifests/plugins/linux.pp
+++ b/manifests/plugins/linux.pp
@@ -1,9 +1,9 @@
 class munin::plugins::linux inherits munin::plugins::base {
     munin::plugin {
-    	[ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]:
-    		ensure => present;
-    	acpi:
-    		ensure => $acpi_available;
+        [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]:
+            ensure => present;
+        acpi:
+            ensure => $acpi_available;
     }
 
     include munin::plugins::interfaces
diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp
index bce28a1..f24af07 100644
--- a/manifests/plugins/vserver.pp
+++ b/manifests/plugins/vserver.pp
@@ -1,7 +1,7 @@
 class munin::plugins::vserver inherits munin::plugins::base {
     munin::plugin {
-    	[ netstat, processes ]:
-    		ensure => present;
+        [ netstat, processes ]:
+            ensure => present;
     }
 }
 
-- 
cgit v1.2.3