From 5b22bfc8eaa6bdf0917bd303ddc83174878a199e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 7 Nov 2014 12:44:20 -0200
Subject: Disabling apcupsd_ww

---
 files/munin/apcupsd_ww | 18 +++++++++---------
 manifests/munin.pp     |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/files/munin/apcupsd_ww b/files/munin/apcupsd_ww
index 96083af..9a6d024 100644
--- a/files/munin/apcupsd_ww
+++ b/files/munin/apcupsd_ww
@@ -122,15 +122,15 @@ my $language = $ENV{LANG} || 'en';
 		warning =>  [ '+-10%', '108:128' ],
 		critical => [ 'LOTRANS:HITRANS', '+-15%', '104:132' ],
 	},
-	NOMPOWER => {	# NOMPOWER
-		name => 'outputwatts',
-		label => {
-			en => 'Nominal power output in Watts',
-		},
-		nominal => [ 'NOMPOWER', '0,1500' ],
-		warning => 1200,
-		critical => 1300,
-	},
+    #NOMPOWER => {	# NOMPOWER
+    #	name => 'outputwatts',
+    #	label => {
+    #		en => 'Nominal power output in Watts',
+    #	},
+    #	nominal => [ 'NOMPOWER', '0,1500' ],
+    #	warning => 1200,
+    #	critical => 1300,
+    #},
 	ITEMP => {	# ITEMP    : 44.1 C Internal
 		name => 'temperature',
 		label => {
diff --git a/manifests/munin.pp b/manifests/munin.pp
index ad6d6d4..74f6947 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,7 +1,6 @@
 class apcupsd::munin(
   $ensure = present
 ) {
-  # TODO: disable this in the future as apcupsd_ww is more flexible
   munin::plugin::deploy { 'apc_nis':
     source => "apcupsd/munin/apc_nis",
     ensure => $ensure,
@@ -10,6 +9,6 @@ class apcupsd::munin(
   # From http://munin-monitoring.org/browser/munin-contrib/plugins/ups/apcupsd_ww
   munin::plugin::deploy { 'apcupsd_ww':
     source => "apcupsd/munin/apcupsd_ww",
-    ensure => $ensure,
+    ensure => absent,
   }
 }
-- 
cgit v1.2.3