Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package monitoring-plugins-nwc_health for
openSUSE:Factory checked in at 2021-05-10 15:38:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.2988
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-nwc_health"
Mon May 10 15:38:56 2021 rev:11 rq:891848 version:8.3.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health/monitoring-plugins-nwc_health.changes
2021-03-05 13:51:31.543966826 +0100
+++
/work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.2988/monitoring-plugins-nwc_health.changes
2021-05-10 15:41:32.673047644 +0200
@@ -1,0 +2,11 @@
+Thu May 6 18:32:15 UTC 2021 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 8.3.2.2
+ * Blacklist storage device "junosprocfs" on JunOS (Juniper)
+ devices PR #278
+ * bugfix in f5 cpu-load, correct negative values
+ * query LM-SENSORS-MIB only if it exists on Linux (it may hang
+ even if not existing)
+ * bugfix in CISCO-ENTITY-SENSOR-MIB. Scale values correctly.
+
+-------------------------------------------------------------------
Old:
----
check_nwc_health-8.3.1.1.tar.gz
New:
----
check_nwc_health-8.3.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-nwc_health.spec ++++++
--- /var/tmp/diff_new_pack.9SMYIv/_old 2021-05-10 15:41:33.085046033 +0200
+++ /var/tmp/diff_new_pack.9SMYIv/_new 2021-05-10 15:41:33.089046017 +0200
@@ -19,7 +19,7 @@
%define realname check_nwc_health
Name: monitoring-plugins-nwc_health
-Version: 8.3.1.1
+Version: 8.3.2.2
Release: 0
Summary: This plugin checks the health of network components and
interfaces
# https://github.com/lausser/check_nwc_health
++++++ check_nwc_health-8.3.1.1.tar.gz -> check_nwc_health-8.3.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_nwc_health-8.3.1.1/ChangeLog
new/check_nwc_health-8.3.2.2/ChangeLog
--- old/check_nwc_health-8.3.1.1/ChangeLog 2021-03-02 21:19:13.227187600
+0100
+++ new/check_nwc_health-8.3.2.2/ChangeLog 2021-04-29 15:48:20.214364700
+0200
@@ -1,3 +1,11 @@
+* 2021-04-29 8.3.2.2
+ Blacklist storage device "junosprocfs" on JunOS (Juniper) devices PR #278
+* 2021-04-15 8.3.2.1
+ bugfix in f5 cpu-load, correct negative values
+* 2021-03-23 8.3.2
+ query LM-SENSORS-MIB only if it exists on Linux (it may hang even if not
existing)
+* 2021-03-19 8.3.1.2
+ bugfix in CISCO-ENTITY-SENSOR-MIB. Scale values correctly.
* 2021-03-02 8.3.1.1
bugfix in interface-stack-status (triggered when --name did not match)
* 2021-02-12 8.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/Commandline.pm
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/Commandline.pm
---
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/Commandline.pm
2021-03-02 21:19:13.317183900 +0100
+++
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/Commandline.pm
2021-04-29 15:48:20.302931800 +0200
@@ -531,12 +531,14 @@
$value = $params{value};
my $metric = $params{metric};
if ($metric ne 'default') {
- $warningrange = exists $self->{thresholds}->{$metric}->{warning} ?
- $self->{thresholds}->{$metric}->{warning} :
- $self->{thresholds}->{default}->{warning};
- $criticalrange = exists $self->{thresholds}->{$metric}->{critical} ?
- $self->{thresholds}->{$metric}->{critical} :
- $self->{thresholds}->{default}->{critical};
+ $warningrange = defined $params{warning} ? $params{warning} :
+ (exists $self->{thresholds}->{$metric}->{warning} ?
+ $self->{thresholds}->{$metric}->{warning} :
+ $self->{thresholds}->{default}->{warning});
+ $criticalrange = defined $params{critical} ? $params{critical} :
+ (exists $self->{thresholds}->{$metric}->{critical} ?
+ $self->{thresholds}->{$metric}->{critical} :
+ $self->{thresholds}->{default}->{critical});
} else {
$warningrange = (defined $params{warning}) ?
$params{warning} : $self->{thresholds}->{default}->{warning};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/CISCOENTITYSENSORMIB.pm
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/CISCOENTITYSENSORMIB.pm
---
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/CISCOENTITYSENSORMIB.pm
2021-03-02 21:19:13.621172100 +0100
+++
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/CISCOENTITYSENSORMIB.pm
2021-04-29 15:48:20.606327500 +0200
@@ -21,6 +21,7 @@
'entSensorScaleDefinition' => 'CISCO-ENTITY-SENSOR-MIB::SensorDataScale',
'entSensorPrecision' => '1.3.6.1.4.1.9.9.91.1.1.1.1.3',
'entSensorValue' => '1.3.6.1.4.1.9.9.91.1.1.1.1.4',
+ 'entSensorValueDefinition' =>
'CISCO-ENTITY-SENSOR-MIB::entSensorValue(entSensorScale,entSensorType)',
'entSensorStatus' => '1.3.6.1.4.1.9.9.91.1.1.1.1.5',
'entSensorStatusDefinition' => 'CISCO-ENTITY-SENSOR-MIB::SensorStatus',
'entSensorValueTimeStamp' => '1.3.6.1.4.1.9.9.91.1.1.1.1.6',
@@ -95,6 +96,35 @@
'16' => 'zetta',
'17' => 'yotta',
},
+ 'entSensorValue' => sub {
+ my($value, $scale, $type) = @_;
+ if ($type eq "truthvalue") {
+ return $value ? "true" : "false";
+ } elsif ($type eq "specialEnum") {
+ return $value;
+ } else {
+ my $exp = {
+ yocto => -24,
+ zepto => -21,
+ atto => -18,
+ femto => -15,
+ pico => -12,
+ nano => -9,
+ micro => -6,
+ milli => -3,
+ units => 0,
+ kilo => 3,
+ mega => 6,
+ giga => 9,
+ tera => 12,
+ exa => 15,
+ peta => 18,
+ zetta => 21,
+ yotta => 24,
+ };
+ return exists $exp->{$scale} ? $value * 10 ** $exp->{$scale} : $value;
+ }
+ },
};
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/ENTITYSENSORMIB.pm
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/ENTITYSENSORMIB.pm
---
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/ENTITYSENSORMIB.pm
2021-03-02 21:19:13.907176500 +0100
+++
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/ENTITYSENSORMIB.pm
2021-04-29 15:48:20.867694100 +0200
@@ -19,6 +19,7 @@
entPhySensorScaleDefinition => 'ENTITY-SENSOR-MIB::EntitySensorDataScale',
entPhySensorPrecision => '1.3.6.1.2.1.99.1.1.1.3',
entPhySensorValue => '1.3.6.1.2.1.99.1.1.1.4',
+ #entPhySensorValueDefinition =>
'ENTITY-SENSOR-MIB::entPhySensorValue(entPhySensorScale,entPhySensorType)',
entPhySensorOperStatus => '1.3.6.1.2.1.99.1.1.1.5',
entPhySensorOperStatusDefinition => 'ENTITY-SENSOR-MIB::EntitySensorStatus',
entPhySensorUnitsDisplay => '1.3.6.1.2.1.99.1.1.1.6',
@@ -68,4 +69,35 @@
'2' => 'unavailable',
'3' => 'nonoperational',
},
+ entPhySensorValue => sub {
+ my($value, $scale, $type) = @_;
+ if ($type eq "truthvalue") {
+ return $value ? "true" : "false";
+ } else {
+ my $exp = {
+# Irgend so ein Hanswurscht bei Cisco hat fuer alle Werte einer ASA
+# entPhySensorScale auf yocto gesetzt.
+# rpm sensor PS0 Fan Sensor reports 5.9e-21rpm
+# Viel ist das nicht. Depp.
+# yocto => -24,
+ zepto => -21,
+ atto => -18,
+ femto => -15,
+ pico => -12,
+ nano => -9,
+ micro => -6,
+ milli => -3,
+ units => 0,
+ kilo => 3,
+ mega => 6,
+ giga => 9,
+ tera => 12,
+ exa => 15,
+ peta => 18,
+ zetta => 21,
+ yotta => 24,
+ };
+ return exists $exp->{$scale} ? $value * 10 ** $exp->{$scale} : $value;
+ }
+ },
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
--- old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
2021-03-02 21:19:14.740346500 +0100
+++ new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
2021-04-29 15:48:21.644984300 +0200
@@ -1269,7 +1269,7 @@
my ($self, $maxrepetitions) = @_;
$self->reset_snmp_max_msg_size();
$Monitoring::GLPlugin::SNMP::maxrepetitions =
- $Monitoring::GLPlugin::SNMP::session->max_msg_size() * 0.017;
+ int($Monitoring::GLPlugin::SNMP::session->max_msg_size() * 0.017);
}
sub bulk_is_baeh {
@@ -1312,8 +1312,10 @@
}
}
if (ref($self) eq "Monitoring::GLPlugin::SNMP") {
- printf "Mode %s is not implemented for this type of device\n",
- $self->opts->mode;
+ $self->nagios_exit(3,
+ sprintf "Mode %s is not implemented for this type of device",
+ $self->opts->mode
+ );
exit 3;
}
}
@@ -1469,6 +1471,10 @@
grep { # following oid is inside this tree
substr($_, 0, length($check_oid)) eq $check_oid
} keys %{$traces}) {
+ if (exists $traces->{$check_oid} &&
+ $traces->{$check_oid} eq "endOfMibView") {
+ return 0;
+ }
$self->debug(sprintf "implements %s (found traces)", $mib);
return 1;
}
@@ -2609,19 +2615,23 @@
exists
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition} &&
ref($Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition})
eq 'CODE') {
if ($parameters) {
- if (! exists $mo->{$parameters}) {
- # this happens if there are two isolated get_snmp_object
calls, one for
- # cLHaPeerIpAddressType and one for cLHaPeerIpAddress
where the latter needs
- # the symbolized value of the first. we are inside this
index-loop because
- # both have this usual extra .0 although this is not a
table row.
- # if this were a table row, $mo would know
cLHaPeerIpAddressType.
- # there's a chance that $self got cLHaPeerIpAddressType
in a previous call
- # to make_symbolic
- if (@{$indices} and scalar(@{$indices}) == 1 and !
$indices->[0]->[0]) {
- $mo->{$parameters} = $self->{$parameters};
+ my @args = ($result->{$fulloid});
+ foreach my $parameter (split(",", $parameters)) {
+ if (! exists $mo->{$parameter}) {
+ # this happens if there are two isolated
get_snmp_object calls, one for
+ # cLHaPeerIpAddressType and one for cLHaPeerIpAddress
where the latter needs
+ # the symbolized value of the first. we are inside
this index-loop because
+ # both have this usual extra .0 although this is not a
table row.
+ # if this were a table row, $mo would know
cLHaPeerIpAddressType.
+ # there's a chance that $self got
cLHaPeerIpAddressType in a previous call
+ # to make_symbolic
+ if (@{$indices} and scalar(@{$indices}) == 1 and !
$indices->[0]->[0]) {
+ $mo->{$parameter} = $self->{$parameter};
+ }
}
+ push(@args, $mo->{$parameter});
}
- $mo->{$symoid} =
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition}->($result->{$fulloid},
$mo->{$parameters});
+ $mo->{$symoid} =
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition}->(@args);
} else {
$mo->{$symoid} =
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition}->($result->{$fulloid});
}
@@ -2689,12 +2699,16 @@
exists
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition} &&
ref($Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition})
eq 'CODE') {
if ($parameters) {
- if (! exists $mo->{$parameters}) {
- if (@{$indices} and scalar(@{$indices}) == 1 and !
$indices->[0]->[0]) {
- $mo->{$parameters} = $self->{$parameters};
+ my @args = ($result->{$fulloid});
+ foreach my $parameter (split(",", $parameters)) {
+ if (! exists $mo->{$parameter}) {
+ if (@{$indices} and scalar(@{$indices}) == 1 and !
$indices->[0]->[0]) {
+ $mo->{$parameter} = $self->{$parameter};
+ }
}
+ push(@args, $mo->{$parameter});
}
- $mo->{$symoid} =
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition}->($result->{$fulloid},
$mo->{$parameters});
+ $mo->{$symoid} =
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition}->(@args);
} else {
$mo->{$symoid} =
$Monitoring::GLPlugin::SNMP::MibsAndOids::definitions->{$mib}->{$definition}->($result->{$fulloid});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin.pm
new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin.pm
--- old/check_nwc_health-8.3.1.1/GLPlugin/lib/Monitoring/GLPlugin.pm
2021-03-02 21:19:14.770353000 +0100
+++ new/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin.pm
2021-04-29 15:48:21.674985800 +0200
@@ -20,7 +20,7 @@
$Data::Dumper::Sparseseen = 1;
};
our $AUTOLOAD;
-*VERSION = \'3.3.3.1';
+*VERSION = \'3.4';
use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
@@ -77,8 +77,10 @@
sub no_such_mode {
my ($self) = @_;
- printf "Mode %s is not implemented for this type of device\n",
- $self->opts->mode;
+ $self->nagios_exit(3,
+ sprintf "Mode %s is not implemented for this type of device",
+ $self->opts->mode
+ );
exit 3;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_nwc_health-8.3.1.1/configure
new/check_nwc_health-8.3.2.2/configure
--- old/check_nwc_health-8.3.1.1/configure 2021-03-02 21:19:03.583820000
+0100
+++ new/check_nwc_health-8.3.2.2/configure 2021-04-29 15:48:10.549179500
+0200
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for check_nwc_health 8.3.1.1.
+# Generated by GNU Autoconf 2.69 for check_nwc_health 8.3.2.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='check_nwc_health'
PACKAGE_TARNAME='check_nwc_health'
-PACKAGE_VERSION='8.3.1.1'
-PACKAGE_STRING='check_nwc_health 8.3.1.1'
+PACKAGE_VERSION='8.3.2.2'
+PACKAGE_STRING='check_nwc_health 8.3.2.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1236,7 +1236,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures check_nwc_health 8.3.1.1 to adapt to many kinds of
systems.
+\`configure' configures check_nwc_health 8.3.2.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1308,7 +1308,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of check_nwc_health 8.3.1.1:";;
+ short | recursive ) echo "Configuration of check_nwc_health 8.3.2.2:";;
esac
cat <<\_ACEOF
@@ -1393,7 +1393,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-check_nwc_health configure 8.3.1.1
+check_nwc_health configure 8.3.2.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1410,7 +1410,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by check_nwc_health $as_me 8.3.1.1, which was
+It was created by check_nwc_health $as_me 8.3.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2273,7 +2273,7 @@
# Define the identity of the package.
PACKAGE='check_nwc_health'
- VERSION='8.3.1.1'
+ VERSION='8.3.2.2'
cat >>confdefs.h <<_ACEOF
@@ -3324,7 +3324,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by check_nwc_health $as_me 8.3.1.1, which was
+This file was extended by check_nwc_health $as_me 8.3.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3377,7 +3377,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-check_nwc_health config.status 8.3.1.1
+check_nwc_health config.status 8.3.2.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_nwc_health-8.3.1.1/configure.ac
new/check_nwc_health-8.3.2.2/configure.ac
--- old/check_nwc_health-8.3.1.1/configure.ac 2021-03-02 21:19:13.275197500
+0100
+++ new/check_nwc_health-8.3.2.2/configure.ac 2021-04-29 15:48:20.262902000
+0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_REVISION ($Revision: 1.150 $)
AC_PREREQ(2.58)
-AC_INIT(check_nwc_health,8.3.1.1)
+AC_INIT(check_nwc_health,8.3.2.2)
AM_INIT_AUTOMAKE([1.9 tar-pax])
AM_MAINTAINER_MODE([disable])
AC_CANONICAL_HOST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
---
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
2021-03-02 21:19:15.655267700 +0100
+++
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Cisco/CISCOENTITYSENSORMIB/Component/SensorSubsystem.pm
2021-04-29 15:48:22.505710200 +0200
@@ -11,7 +11,7 @@
# get_entries_get_bulk wird's schon richten.
$self->bulk_is_baeh(128);
$self->get_snmp_tables('CISCO-ENTITY-SENSOR-MIB', [
- ['sensors', 'entSensorValueTable',
'Classes::Cisco::CISCOENTITYSENSORMIB::Component::SensorSubsystem::Sensor', sub
{ my ($o) = @_; $self->filter_name($o->{entPhysicalIndex})}, ["entSensorType",
"entSensorStatus", "entSensorValue", "entSensorMeasuredEntity"]],
+ ['sensors', 'entSensorValueTable',
'Classes::Cisco::CISCOENTITYSENSORMIB::Component::SensorSubsystem::Sensor', sub
{ my ($o) = @_; $self->filter_name($o->{entPhysicalIndex})}, ["entSensorType",
"entSensorScale", "entSensorStatus", "entSensorValue",
"entSensorMeasuredEntity"]],
['thresholds', 'entSensorThresholdTable',
'Classes::Cisco::CISCOENTITYSENSORMIB::Component::SensorSubsystem::SensorThreshold',
undef, ["entSensorThresholdSeverity", "entSensorThresholdValue",
"entSensorThresholdEvaluation"]],
]);
$self->get_snmp_tables('ENTITY-MIB', [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
---
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
2021-03-02 21:19:16.263641200 +0100
+++
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/CpuSubsystem.pm
2021-04-29 15:48:23.113706200 +0200
@@ -23,6 +23,7 @@
($self->{delta_sysStatTmIdleCycles} +
$self->{delta_sysStatTmSleepCycles});
$self->{cpu_usage} = $self->{delta_sysStatTmTotalCycles} ?
(($delta_used_cycles / $self->{delta_sysStatTmTotalCycles}) * 100) : 0;
+ $self->protect_value('f5_cpu_usage', 'cpu_usage', 'percent');
}
sub init {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/Juniper/SRX.pm
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Juniper/SRX.pm
--- old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/Juniper/SRX.pm
2021-03-02 21:19:17.167630600 +0100
+++ new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Juniper/SRX.pm
2021-04-29 15:48:23.939081300 +0200
@@ -10,7 +10,7 @@
$self->{components}->{hostresource_subsystem} =
Classes::HOSTRESOURCESMIB::Component::EnvironmentalSubsystem->new();
foreach
(@{$self->{components}->{hostresource_subsystem}->{disk_subsystem}->{storages}})
{
- if (exists $_->{device} && $_->{device} =~ /^\/dev\/md/) {
+ if (exists $_->{device} && $_->{device} =~ /^(\/dev\/md|junosprocfs)/) {
$_->blacklist();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/Server/Linux/Component/EnvironmentalSubsystem.pm
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Server/Linux/Component/EnvironmentalSubsystem.pm
---
old/check_nwc_health-8.3.1.1/plugins-scripts/Classes/Server/Linux/Component/EnvironmentalSubsystem.pm
2021-03-02 21:19:17.559803100 +0100
+++
new/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Server/Linux/Component/EnvironmentalSubsystem.pm
2021-04-29 15:48:24.312662600 +0200
@@ -12,16 +12,23 @@
sub init {
my ($self) = @_;
- $self->{fan_subsystem} =
- Classes::LMSENSORSMIB::Component::FanSubsystem->new();
- $self->{temperature_subsystem} =
- Classes::LMSENSORSMIB::Component::TemperatureSubsystem->new();
+ if ($self->implements_mib("LM-SENSORS-MIB")) {
+ $self->{fan_subsystem} =
+ Classes::LMSENSORSMIB::Component::FanSubsystem->new();
+ $self->{temperature_subsystem} =
+ Classes::LMSENSORSMIB::Component::TemperatureSubsystem->new();
+ }
+ $self->{env_subsystem} =
+ Classes::HOSTRESOURCESMIB::Component::EnvironmentalSubsystem->new();
}
sub check {
my ($self) = @_;
- $self->{fan_subsystem}->check();
- $self->{temperature_subsystem}->check();
+ if ($self->implements_mib("LM-SENSORS-MIB")) {
+ $self->{fan_subsystem}->check();
+ $self->{temperature_subsystem}->check();
+ }
+ $self->{env_subsystem}->check();
if (! $self->check_messages()) {
$self->add_ok("environmental hardware working fine");
}
@@ -29,8 +36,11 @@
sub dump {
my ($self) = @_;
- $self->{fan_subsystem}->dump();
- $self->{temperature_subsystem}->dump();
+ if ($self->implements_mib("LM-SENSORS-MIB")) {
+ $self->{fan_subsystem}->dump();
+ $self->{temperature_subsystem}->dump();
+ }
+ $self->{env_subsystem}->dump();
}
1;
