diff options
| -rw-r--r-- | files/munin/apcupsd_ww | 18 | ||||
| -rw-r--r-- | 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, } } |