Hello community, here is the log from the commit of package monitoring-plugins-nwc_health for openSUSE:Factory checked in at 2020-07-18 21:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-nwc_health" Sat Jul 18 21:03:21 2020 rev:6 rq:821651 version:7.12.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health/monitoring-plugins-nwc_health.changes 2020-06-09 00:06:40.729719502 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.3592/monitoring-plugins-nwc_health.changes 2020-07-18 21:03:42.947657451 +0200 @@ -1,0 +2,11 @@ +Mon Jul 13 18:53:38 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Update to version 7.12.1.2 +* 2020-07-13 7.12.1.2 + * improve output for connect-vips +- Update to version 7.12.1.1 + * bugfix in UCD-MIB swap +- Update to version 7.12.1 + * try to fallback to ucd if neither sysUptime nor sysDescr exist + +------------------------------------------------------------------- Old: ---- check_nwc_health-7.12.tar.gz New: ---- check_nwc_health-7.12.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins-nwc_health.spec ++++++ --- /var/tmp/diff_new_pack.XxC78S/_old 2020-07-18 21:03:44.367658977 +0200 +++ /var/tmp/diff_new_pack.XxC78S/_new 2020-07-18 21:03:44.371658982 +0200 @@ -19,7 +19,7 @@ %define realname check_nwc_health Name: monitoring-plugins-nwc_health -Version: 7.12 +Version: 7.12.1.2 Release: 0 Summary: This plugin checks the health of network components and interfaces # https://github.com/lausser/check_nwc_health ++++++ check_nwc_health-7.12.tar.gz -> check_nwc_health-7.12.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/ChangeLog new/check_nwc_health-7.12.1.2/ChangeLog --- old/check_nwc_health-7.12/ChangeLog 2020-06-04 11:34:33.703040600 +0200 +++ new/check_nwc_health-7.12.1.2/ChangeLog 2020-07-13 13:19:17.067282200 +0200 @@ -1,3 +1,9 @@ +* 2020-07-13 7.12.1.2 + improve output for connect-vips +* 2020-07-13 7.12.1.1 + bugfix in UCD-MIB swap +* 2020-07-10 7.12.1 + try to fallback to ucd if neither sysUptime nor sysDescr exist * 2020-06-04 7.12 add mode watch-vips and connect-vips for F5 * 2020-06-02 7.11.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm new/check_nwc_health-7.12.1.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm --- old/check_nwc_health-7.12/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm 2020-06-04 11:34:35.264273600 +0200 +++ new/check_nwc_health-7.12.1.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm 2020-07-13 13:19:18.461200000 +0200 @@ -824,7 +824,8 @@ my $confirmed = {}; foreach my $mib (keys %{$Monitoring::GLPlugin::SNMP::MibsAndOids::mibs_and_oids}) { foreach my $sym (keys %{$Monitoring::GLPlugin::SNMP::MibsAndOids::mibs_and_oids->{$mib}}) { - if (my $obj = $self->get_snmp_object($mib, $sym)) { + my $obj = $self->get_snmp_object($mib, $sym); + if (defined $obj) { my $oid = $Monitoring::GLPlugin::SNMP::MibsAndOids::mibs_and_oids->{$mib}->{$sym}; if (exists $unknowns->{$oid}) { $confirmed->{$oid} = sprintf '%s::%s = %s', $mib, $sym, $obj; @@ -2740,6 +2741,8 @@ $mo->{$symoid} = 'unknown_'.$result->{$oid}; # oder $Monitoring::GLPlugin::SNMP::MibsAndOids::mibs_and_oids->{$mib}->{$symoid.'Definition'}? } + } else { + $mo->{$symoid} = $result->{$oid}; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/GLPlugin/lib/Monitoring/GLPlugin.pm new/check_nwc_health-7.12.1.2/GLPlugin/lib/Monitoring/GLPlugin.pm --- old/check_nwc_health-7.12/GLPlugin/lib/Monitoring/GLPlugin.pm 2020-06-04 11:34:35.288859800 +0200 +++ new/check_nwc_health-7.12.1.2/GLPlugin/lib/Monitoring/GLPlugin.pm 2020-07-13 13:19:18.489199600 +0200 @@ -20,7 +20,7 @@ $Data::Dumper::Sparseseen = 1; }; our $AUTOLOAD; -*VERSION = \'3.2.23.1'; +*VERSION = \'3.2.25'; 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.12/configure new/check_nwc_health-7.12.1.2/configure --- old/check_nwc_health-7.12/configure 2020-06-04 11:34:24.412773900 +0200 +++ new/check_nwc_health-7.12.1.2/configure 2020-07-13 13:19:08.470763600 +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 7.12. +# Generated by GNU Autoconf 2.69 for check_nwc_health 7.12.1.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='7.12' -PACKAGE_STRING='check_nwc_health 7.12' +PACKAGE_VERSION='7.12.1.2' +PACKAGE_STRING='check_nwc_health 7.12.1.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 7.12 to adapt to many kinds of systems. +\`configure' configures check_nwc_health 7.12.1.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 7.12:";; + short | recursive ) echo "Configuration of check_nwc_health 7.12.1.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 7.12 +check_nwc_health configure 7.12.1.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 7.12, which was +It was created by check_nwc_health $as_me 7.12.1.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='7.12' + VERSION='7.12.1.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 7.12, which was +This file was extended by check_nwc_health $as_me 7.12.1.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 7.12 +check_nwc_health config.status 7.12.1.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-7.12/configure.ac new/check_nwc_health-7.12.1.2/configure.ac --- old/check_nwc_health-7.12/configure.ac 2020-06-04 11:34:33.753040300 +0200 +++ new/check_nwc_health-7.12.1.2/configure.ac 2020-07-13 13:19:17.108278100 +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,7.12) +AC_INIT(check_nwc_health,7.12.1.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-7.12/plugins-scripts/Classes/Device.pm new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/Device.pm --- old/check_nwc_health-7.12/plugins-scripts/Classes/Device.pm 2020-06-04 11:34:36.596442100 +0200 +++ new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/Device.pm 2020-07-13 13:19:19.649135700 +0200 @@ -22,6 +22,22 @@ $self->{productname} = 'upnp'; $self->check_upnp_and_model(); } else { + $self->{broken_snmp_agent} = [ + sub { + if ($self->implements_mib("UCD-SNMP-MIB")) { + $self->debug("this is a very, very dumb brick with just the UCD-SNMP-MIB"); + $self->{productname} = "generic_ucd"; + $self->{uptime} = $self->timeticks(100 * 3600); + my $sysobj = $self->get_snmp_object('MIB-2-MIB', 'sysObjectID', 0); + if (! $sysobj) { + $self->add_rawdata('1.3.6.1.2.1.1.2.0', "dearmanufactureryouareasdumbasyourpieceofcrap"); + $self->{sysobjectid} = "dearmanufactureryouareasdumbasyourpieceofcrap"; + } + return 1; + } + return 0; + }, + ]; $self->check_snmp_and_model(); } if ($self->opts->servertype) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/plugins-scripts/Classes/F5/F5BIGIP/Component/VipSubsystem.pm new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/F5/F5BIGIP/Component/VipSubsystem.pm --- old/check_nwc_health-7.12/plugins-scripts/Classes/F5/F5BIGIP/Component/VipSubsystem.pm 2020-06-04 11:34:36.870613700 +0200 +++ new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/F5/F5BIGIP/Component/VipSubsystem.pm 2020-07-13 13:19:19.908123500 +0200 @@ -27,6 +27,7 @@ $now, $now + 2); } sleep 1; + my $num_unreachable_vips = 0; foreach (@{$self->{vips}}) { $ping->port_number($_->{ltmVirtualServPort}); if ($ping->ack($_->{ltmVirtualServAddr})) { @@ -34,13 +35,31 @@ $_->{ltmVirtualServName}, $_->{ltmVirtualServPort}); $self->add_ok(); } else { + $num_unreachable_vips++; my $host = $self->reverse_resolve($_->{ltmVirtualServAddr}); - $self->add_info(sprintf "%s:%d unreachable", - $host ? $host : $_->{ltmVirtualServName}, $_->{ltmVirtualServPort}); + if ($host) { + $self->add_info(sprintf "%s:%d (%s) unreachable", + $_->{ltmVirtualServName}, $_->{ltmVirtualServPort}, $host); + } else { + $self->add_info(sprintf "%s:%d unreachable", + $_->{ltmVirtualServName}, $_->{ltmVirtualServPort}); + } $self->add_critical(); } } $self->reduce_messages(sprintf "all %d vips are up", scalar(@{$self->{vips}})); + $self->add_perfdata( + label => 'reachable_vips', + value => scalar(@{$self->{vips}}) - $num_unreachable_vips, + min => 0, + max => scalar(@{$self->{vips}}), + ); + $self->add_perfdata( + label => 'unreachable_vips', + value => $num_unreachable_vips, + min => 0, + max => scalar(@{$self->{vips}}), + ); } elsif ($self->mode =~ /vip::watch/) { # take a snapshot of the vip list. -> good baseline # warning if there appear vips, mitigate to ok @@ -124,13 +143,13 @@ sub reverse_resolve { my ($self, $ip) = @_; + my $name = undef; eval { $ENV{RES_OPTIONS} = "timeout:2"; my $iaddr = Socket::inet_aton($ip); - my $name = gethostbyaddr($iaddr, Socket::AF_INET); - return $name; + $name = gethostbyaddr($iaddr, Socket::AF_INET); }; - return undef; + return $name; } package Classes::F5::F5BIGIP::Component::VipSubsystem::VIP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/plugins-scripts/Classes/UCDMIB/Components/SwapSubsystem.pm new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/UCDMIB/Components/SwapSubsystem.pm --- old/check_nwc_health-7.12/plugins-scripts/Classes/UCDMIB/Components/SwapSubsystem.pm 2020-06-04 11:34:38.318032900 +0200 +++ new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/UCDMIB/Components/SwapSubsystem.pm 2020-07-13 13:19:21.208053500 +0200 @@ -9,9 +9,11 @@ memSwapError memSwapErrorMsg))); # calc swap usage - eval { + if (defined $self->{memTotalSwap} && $self->{memTotalSwap}) { $self->{swap_usage} = 100 - ($self->{memAvailSwap} * 100 / $self->{memTotalSwap}); - }; + } else { + $self->{'swap_usage'} = undef if $@; + } # exception if memTotalSwap = 0, which means that no swap partition/device # was configured at all } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/plugins-scripts/Classes/UCDMIB.pm new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/UCDMIB.pm --- old/check_nwc_health-7.12/plugins-scripts/Classes/UCDMIB.pm 2020-06-04 11:34:38.328033200 +0200 +++ new/check_nwc_health-7.12.1.2/plugins-scripts/Classes/UCDMIB.pm 2020-07-13 13:19:21.217050000 +0200 @@ -13,6 +13,10 @@ } elsif ($self->mode =~ /device::hardware::memory/) { $self->analyze_and_check_mem_subsystem("Classes::UCDMIB::Component::MemSubsystem"); $self->analyze_and_check_swap_subsystem("Classes::UCDMIB::Component::SwapSubsystem"); + } elsif ($self->mode =~ /device::process::status/) { + $self->analyze_and_check_process_subsystem("Classes::UCDMIB::Component::ProcessSubsystem"); + } elsif ($self->mode =~ /device::uptime/ && $self->implements_mib("HOST-RESOURCES-MIB")) { + $self->analyze_and_check_uptime_subsystem("Classes::HOSTRESOURCESMIB::Component::UptimeSubsystem"); } else { $self->no_such_mode(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_nwc_health-7.12/plugins-scripts/check_nwc_health.pl new/check_nwc_health-7.12.1.2/plugins-scripts/check_nwc_health.pl --- old/check_nwc_health-7.12/plugins-scripts/check_nwc_health.pl 2020-06-04 11:34:35.376606700 +0200 +++ new/check_nwc_health-7.12.1.2/plugins-scripts/check_nwc_health.pl 2020-07-13 13:19:18.553196400 +0200 @@ -440,7 +440,7 @@ $plugin->add_mode( internal => 'device::vip::connect', spec => 'connect-vips', - alias => undef, + alias => ['connected-vips'], help => 'Check connectivity with load balancer vips', ); $plugin->add_mode(