Disabling apcupsd_ww

diff --git a/files/munin/apcupsd_ww b/files/munin/apcupsd_ww
index 96083af7369aaee4e86d8f5685b9052d0bcf576b..9a6d024dce9d54e38d94d8a937de056172d61af1 100644 (file)
--- 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 ad6d6d4480b9c7ccdd965b02aab41c103a6f05af..74f69472bdb91e9ead54d7f02d4c79fc0c043205 100644 (file)
--- 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,
   }
 }