Hello community,
here is the log from the commit of package monitoring-plugins-nwc_health for
openSUSE:Factory checked in at 2020-01-22 22:45:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.26092
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-nwc_health"
Wed Jan 22 22:45:53 2020 rev:2 rq:766202 version:7.10.1.8
Changes:
--------
---
/work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health/monitoring-plugins-nwc_health.changes
2020-01-19 20:58:23.552080348 +0100
+++
/work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.26092/monitoring-plugins-nwc_health.changes
2020-01-22 22:46:08.376571662 +0100
@@ -1,0 +2,14 @@
+Tue Jan 21 18:18:09 UTC 2020 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 7.10.1.8
+ * fix a bug in Cisco memory, for Cisco emulation mode of
+ Bel VPN Gate
+
+-------------------------------------------------------------------
+Mon Jan 20 21:48:42 UTC 2020 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 7.10.1.7
+ * fix redundant argument in sprintf
+ * fix operstatus in linuxlocal
+
+-------------------------------------------------------------------
Old:
----
check_nwc_health-7.10.1.6.tar.gz
New:
----
check_nwc_health-7.10.1.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-nwc_health.spec ++++++
--- /var/tmp/diff_new_pack.eD1rnG/_old 2020-01-22 22:46:09.676572317 +0100
+++ /var/tmp/diff_new_pack.eD1rnG/_new 2020-01-22 22:46:09.684572320 +0100
@@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins-nwc_health
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017, Martin Hauke <mar...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -19,12 +19,12 @@
%define realname check_nwc_health
Name: monitoring-plugins-nwc_health
-Version: 7.10.1.6
+Version: 7.10.1.8
Release: 0
Summary: This plugin checks the health of network components and
interfaces
+# https://github.com/lausser/check_nwc_health
License: GPL-2.0-or-later
Group: System/Monitoring
-# https://github.com/lausser/check_nwc_health
URL: https://labs.consol.de/nagios/check_nwc_health/
Source:
https://labs.consol.de/assets/downloads/nagios/%{realname}-%{version}.tar.gz
#
https://raw.githubusercontent.com/lausser/check_nwc_health/master/check_nwc_health.php
++++++ check_nwc_health-7.10.1.6.tar.gz -> check_nwc_health-7.10.1.8.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_nwc_health-7.10.1.6/ChangeLog
new/check_nwc_health-7.10.1.8/ChangeLog
--- old/check_nwc_health-7.10.1.6/ChangeLog 2020-01-16 15:11:50.936567100
+0100
+++ new/check_nwc_health-7.10.1.8/ChangeLog 2020-01-21 15:41:08.955207800
+0100
@@ -1,3 +1,8 @@
+* 2020-01-21 7.10.1.8
+ fix a bug in Cisco memory, for Cisco emulation mode of Bel VPN Gate
+* 2020-01-18 7.10.1.7
+ issue #229 fix redundant argument in sprintf
+ issue #228 fix operstatus in linuxlocal
* 2020-01-16 7.10.1.6
fix a bug in verbose mode if --nosensors is used
* 2019-12-06 7.10.1.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-7.10.1.6/GLPlugin/lib/Monitoring/GLPlugin/Item.pm
new/check_nwc_health-7.10.1.8/GLPlugin/lib/Monitoring/GLPlugin/Item.pm
--- old/check_nwc_health-7.10.1.6/GLPlugin/lib/Monitoring/GLPlugin/Item.pm
2020-01-16 15:11:51.052151000 +0100
+++ new/check_nwc_health-7.10.1.8/GLPlugin/lib/Monitoring/GLPlugin/Item.pm
2020-01-21 15:41:09.054522700 +0100
@@ -27,6 +27,44 @@
}
}
+sub init_subsystems {
+ my ($self, $subsysref) = @_;
+ foreach (@{$subsysref}) {
+ my ($subsys, $class) = @{$_};
+ $self->{$subsys} = $class->new()
+ if (! $self->opts->subsystem || grep {
+ $_ eq $subsys;
+ } map {
+ s/^\s+|\s+$//g;
+ $_;
+ } split /,/, $self->opts->subsystem);
+ }
+}
+
+sub check_subsystems {
+ my ($self) = @_;
+ my @subsystems = grep { $_ =~ /.*_subsystem$/ } keys %{$self};
+ foreach (@subsystems) {
+ $self->{$_}->check();
+ }
+ $self->reduce_messages_short(join(", ",
+ map {
+ sprintf "%s working fine", $_;
+ } map {
+ s/^\s+|\s+$//g;
+ $_;
+ } split /,/, $self->opts->subsystem
+ ));
+}
+
+sub dump_subsystems {
+ my ($self) = @_;
+ my @subsystems = grep { $_ =~ /.*_subsystem$/ } keys %{$self};
+ foreach (@subsystems) {
+ $self->{$_}->dump();
+ }
+}
+
1;
__END__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-7.10.1.6/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
new/check_nwc_health-7.10.1.8/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
--- old/check_nwc_health-7.10.1.6/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
2020-01-16 15:11:52.580569400 +0100
+++ new/check_nwc_health-7.10.1.8/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
2020-01-21 15:41:10.555509800 +0100
@@ -1028,7 +1028,7 @@
scalar localtime (time - $self->{uptime}));
$Monitoring::GLPlugin::SNMP::uptime = $self->{uptime};
$self->debug('whoami: '.$self->{productname});
- last;
+ return;
}
}
if (! $mein_lieber_freund_und_kupferstecher) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-7.10.1.6/GLPlugin/lib/Monitoring/GLPlugin.pm
new/check_nwc_health-7.10.1.8/GLPlugin/lib/Monitoring/GLPlugin.pm
--- old/check_nwc_health-7.10.1.6/GLPlugin/lib/Monitoring/GLPlugin.pm
2020-01-16 15:11:52.612233600 +0100
+++ new/check_nwc_health-7.10.1.8/GLPlugin/lib/Monitoring/GLPlugin.pm
2020-01-21 15:41:10.588681700 +0100
@@ -20,7 +20,7 @@
$Data::Dumper::Sparseseen = 1;
};
our $AUTOLOAD;
-*VERSION = \'3.2.13.5';
+*VERSION = \'3.2.15';
use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_nwc_health-7.10.1.6/configure
new/check_nwc_health-7.10.1.8/configure
--- old/check_nwc_health-7.10.1.6/configure 2020-01-16 15:11:41.171981800
+0100
+++ new/check_nwc_health-7.10.1.8/configure 2020-01-21 15:40:58.717640400
+0100
@@ -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 7.10.1.6.
+# Generated by GNU Autoconf 2.69 for check_nwc_health 7.10.1.8.
#
#
# 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='7.10.1.6'
-PACKAGE_STRING='check_nwc_health 7.10.1.6'
+PACKAGE_VERSION='7.10.1.8'
+PACKAGE_STRING='check_nwc_health 7.10.1.8'
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 7.10.1.6 to adapt to many kinds of
systems.
+\`configure' configures check_nwc_health 7.10.1.8 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 7.10.1.6:";;
+ short | recursive ) echo "Configuration of check_nwc_health 7.10.1.8:";;
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 7.10.1.6
+check_nwc_health configure 7.10.1.8
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 7.10.1.6, which was
+It was created by check_nwc_health $as_me 7.10.1.8, 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='7.10.1.6'
+ VERSION='7.10.1.8'
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 7.10.1.6, which was
+This file was extended by check_nwc_health $as_me 7.10.1.8, 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 7.10.1.6
+check_nwc_health config.status 7.10.1.8
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-7.10.1.6/configure.ac
new/check_nwc_health-7.10.1.8/configure.ac
--- old/check_nwc_health-7.10.1.6/configure.ac 2020-01-16 15:11:50.994315500
+0100
+++ new/check_nwc_health-7.10.1.8/configure.ac 2020-01-21 15:41:09.003784900
+0100
@@ -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,7.10.1.6)
+AC_INIT(check_nwc_health,7.10.1.8)
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-7.10.1.6/plugins-scripts/Classes/Cisco/CISCOMEMORYPOOLMIB/Component/MemSubsystem.pm
new/check_nwc_health-7.10.1.8/plugins-scripts/Classes/Cisco/CISCOMEMORYPOOLMIB/Component/MemSubsystem.pm
---
old/check_nwc_health-7.10.1.6/plugins-scripts/Classes/Cisco/CISCOMEMORYPOOLMIB/Component/MemSubsystem.pm
2020-01-16 15:11:53.593540100 +0100
+++
new/check_nwc_health-7.10.1.8/plugins-scripts/Classes/Cisco/CISCOMEMORYPOOLMIB/Component/MemSubsystem.pm
2020-01-21 15:41:11.517360600 +0100
@@ -18,8 +18,10 @@
my ($self) = @_;
$self->{usage} = 100 * $self->{ciscoMemoryPoolUsed} /
($self->{ciscoMemoryPoolFree} + $self->{ciscoMemoryPoolUsed});
- $self->{type} = $self->{ciscoMemoryPoolType} ||= 0;
- $self->{name} = $self->{ciscoMemoryPoolName};
+ # Bel VPN Gate has only ciscoMemoryPoolUsed and ciscoMemoryPoolFree
+ # others were found to have no ciscoMemoryPoolType
+ $self->{type} = $self->{ciscoMemoryPoolType} ||= "generic memory";
+ $self->{name} = $self->{ciscoMemoryPoolName} ||= "ram";
}
sub check {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-7.10.1.6/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
new/check_nwc_health-7.10.1.8/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
---
old/check_nwc_health-7.10.1.6/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
2020-01-16 15:11:53.655088200 +0100
+++
new/check_nwc_health-7.10.1.8/plugins-scripts/Classes/Cisco/IOS/Component/ConnectionSubsystem.pm
2020-01-21 15:41:11.578947900 +0100
@@ -18,10 +18,10 @@
if ($self->{cfwConnectionStatDescription} !~ /number of connections
currently in use/i) {
$self->add_blacklist(sprintf 'c:%s',
$self->{cfwConnectionStatDescription});
$self->add_info(sprintf '%d connections currently in use',
- $self->{cfwConnectionStatValue}||$self->{cfwConnectionStatCount},
$self->{usage});
+ ($self->{cfwConnectionStatValue}||$self->{cfwConnectionStatCount}));
} else {
$self->add_info(sprintf '%d connections currently in use',
- $self->{cfwConnectionStatValue}, $self->{usage});
+ $self->{cfwConnectionStatValue});
$self->set_thresholds(warning => 500000, critical => 750000);
$self->add_message($self->check_thresholds($self->{cfwConnectionStatValue}));
$self->add_perfdata(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_nwc_health-7.10.1.6/plugins-scripts/Classes/Server/LinuxLocal.pm
new/check_nwc_health-7.10.1.8/plugins-scripts/Classes/Server/LinuxLocal.pm
--- old/check_nwc_health-7.10.1.6/plugins-scripts/Classes/Server/LinuxLocal.pm
2020-01-16 15:11:55.605701900 +0100
+++ new/check_nwc_health-7.10.1.8/plugins-scripts/Classes/Server/LinuxLocal.pm
2020-01-21 15:41:13.582360600 +0100
@@ -60,7 +60,7 @@
chomp $tmpif->{$_} if defined $tmpif->{$_};
$tmpif->{$_} =~ s/\s*$//g if defined $tmpif->{$_};
} keys %{$tmpif};
- if ($tmpif->{ifOperStatus} eq 'unknown') {
+ if (! defined $tmpif->{ifOperStatus} || $tmpif->{ifOperStatus} eq
'unknown') {
$tmpif->{ifOperStatus} = $tmpif->{ifCarrier} ? 'up' : 'down';
}
$tmpif->{ifAdminStatus} = $tmpif->{ifOperStatus};
