Hello community,
here is the log from the commit of package monitoring-plugins-mysql_health for
openSUSE:Factory checked in at 2016-08-17 12:04:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-mysql_health (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-mysql_health.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-mysql_health"
Changes:
--------
---
/work/SRC/openSUSE:Factory/monitoring-plugins-mysql_health/monitoring-plugins-mysql_health.changes
2015-10-22 12:58:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.monitoring-plugins-mysql_health.new/monitoring-plugins-mysql_health.changes
2016-08-17 12:04:52.000000000 +0200
@@ -1,0 +2,8 @@
+Sun Aug 14 11:24:13 UTC 2016 - [email protected]
+
+- update to 2.2.2
+ - handle permission/syntax problems for mode sql
+- fix source url
+- ran spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
check_mysql_health-2.2.1.tar.gz
New:
----
check_mysql_health-2.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-mysql_health.spec ++++++
--- /var/tmp/diff_new_pack.IDEqqn/_old 2016-08-17 12:04:53.000000000 +0200
+++ /var/tmp/diff_new_pack.IDEqqn/_new 2016-08-17 12:04:53.000000000 +0200
@@ -1,8 +1,7 @@
#
# spec file for package monitoring-plugins-mysql_health
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +16,22 @@
#
+%define realname check_mysql_health
Name: monitoring-plugins-mysql_health
-Version: 2.2.1
+Version: 2.2.2
Release: 0
Summary: Check various parameters of a MySQL database
License: GPL-2.0+
Group: System/Monitoring
Url: http://labs.consol.de/lang/en/nagios/check_mysql_health/
-# Source0:
http://labs.consol.de/download/shinken-nagios-plugins/check_mysql_health-%{version}.tar.gz
-Source0: check_mysql_health-%{version}.tar.gz
+Source0:
https://labs.consol.de/assets/downloads/nagios/%{realname}-%{version}.tar.gz
Patch1:
patches/monitoring-plugins-mysql_health-destroy_connection.patch
BuildRequires: nagios-rpm-macros
-Provides: nagios-plugins-mysql_health = %{version}-%{release}
-Obsoletes: nagios-plugins-mysql_health < %{version}-%{release}
Requires: mysql-client
Recommends: perl(DBD::mysql)
Recommends: perl(DBI)
+Provides: nagios-plugins-mysql_health = %{version}-%{release}
+Obsoletes: nagios-plugins-mysql_health < %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -44,7 +43,7 @@
MySQL database.
%prep
-%setup -q -n check_mysql_health-%{version}
+%setup -q -n %{realname}-%{version}
%patch1 -p1
%build
@@ -59,12 +58,9 @@
%install
mkdir -p %{buildroot}/%{nagios_plugindir}
mkdir -p %{buildroot}/%{pnp4nagios_templatedir}
-make install DESTDIR=%{buildroot}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
mv contrib/check_mysql_health.php
%{buildroot}/%{pnp4nagios_templatedir}/check_mysql_health.php
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root)
%attr(0644,root,root) %doc README TODO NEWS ChangeLog AUTHORS COPYING contrib
++++++ check_mysql_health-2.2.1.tar.gz -> check_mysql_health-2.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_mysql_health-2.2.1/ChangeLog
new/check_mysql_health-2.2.2/ChangeLog
--- old/check_mysql_health-2.2.1/ChangeLog 2015-08-18 18:21:29.000000000
+0200
+++ new/check_mysql_health-2.2.2/ChangeLog 2016-05-13 11:12:17.000000000
+0200
@@ -1,6 +1,8 @@
-* 2.2.1 - 2015-08-18
+* 2.2.2 2016-05-13
+ handle permission/syntax problems for mode sql
+* 2.2.1 2015-08-18
fix the autoconf m4, so the debian-builds don't fail (thanks Jan Wagner)
-* 2.2 - 2015-04-23
+* 2.2 2015-04-23
add rfc3986-encoded passwords
* 2.1.9.2 2014-12-22
bugfix in InnoDB initialization & versions > 5.6.1 (Thanks Jorg Veit)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_mysql_health-2.2.1/Makefile.in
new/check_mysql_health-2.2.2/Makefile.in
--- old/check_mysql_health-2.2.1/Makefile.in 2015-08-18 18:22:47.000000000
+0200
+++ new/check_mysql_health-2.2.2/Makefile.in 2016-05-13 11:16:34.000000000
+0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -571,9 +571,10 @@
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_mysql_health-2.2.1/aclocal.m4
new/check_mysql_health-2.2.2/aclocal.m4
--- old/check_mysql_health-2.2.1/aclocal.m4 2015-08-18 18:22:41.000000000
+0200
+++ new/check_mysql_health-2.2.2/aclocal.m4 2016-05-13 11:16:26.000000000
+0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_mysql_health-2.2.1/configure
new/check_mysql_health-2.2.2/configure
--- old/check_mysql_health-2.2.1/configure 2015-08-18 18:22:44.000000000
+0200
+++ new/check_mysql_health-2.2.2/configure 2016-05-13 11:21:37.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for check_mysql_health 2.2.1.
+# Generated by GNU Autoconf 2.69 for check_mysql_health 2.2.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='check_mysql_health'
PACKAGE_TARNAME='check_mysql_health'
-PACKAGE_VERSION='2.2.1'
-PACKAGE_STRING='check_mysql_health 2.2.1'
+PACKAGE_VERSION='2.2.2'
+PACKAGE_STRING='check_mysql_health 2.2.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1232,7 +1232,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_mysql_health 2.2.1 to adapt to many kinds of
systems.
+\`configure' configures check_mysql_health 2.2.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of check_mysql_health 2.2.1:";;
+ short | recursive ) echo "Configuration of check_mysql_health 2.2.2:";;
esac
cat <<\_ACEOF
@@ -1390,7 +1390,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-check_mysql_health configure 2.2.1
+check_mysql_health configure 2.2.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1407,7 +1407,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_mysql_health $as_me 2.2.1, which was
+It was created by check_mysql_health $as_me 2.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2270,7 +2270,7 @@
# Define the identity of the package.
PACKAGE='check_mysql_health'
- VERSION='2.2.1'
+ VERSION='2.2.2'
cat >>confdefs.h <<_ACEOF
@@ -3551,7 +3551,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by check_mysql_health $as_me 2.2.1, which was
+This file was extended by check_mysql_health $as_me 2.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3604,7 +3604,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_mysql_health config.status 2.2.1
+check_mysql_health config.status 2.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_mysql_health-2.2.1/configure.ac
new/check_mysql_health-2.2.2/configure.ac
--- old/check_mysql_health-2.2.1/configure.ac 2015-08-18 18:21:36.000000000
+0200
+++ new/check_mysql_health-2.2.2/configure.ac 2016-05-13 11:12:24.000000000
+0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT(check_mysql_health,2.2.1)
+AC_INIT(check_mysql_health,2.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_mysql_health-2.2.1/plugins-scripts/Makefile.in
new/check_mysql_health-2.2.2/plugins-scripts/Makefile.in
--- old/check_mysql_health-2.2.1/plugins-scripts/Makefile.in 2015-08-18
18:22:47.000000000 +0200
+++ new/check_mysql_health-2.2.2/plugins-scripts/Makefile.in 2016-05-13
11:16:34.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/check_mysql_health-2.2.1/plugins-scripts/Nagios/DBD/MySQL/Server.pm
new/check_mysql_health-2.2.2/plugins-scripts/Nagios/DBD/MySQL/Server.pm
--- old/check_mysql_health-2.2.1/plugins-scripts/Nagios/DBD/MySQL/Server.pm
2015-07-29 11:46:00.000000000 +0200
+++ new/check_mysql_health-2.2.2/plugins-scripts/Nagios/DBD/MySQL/Server.pm
2016-05-13 11:08:19.000000000 +0200
@@ -101,11 +101,19 @@
# sql output must be a number (or array of numbers)
@{$self->{genericsql}} =
$self->{handle}->fetchrow_array($params{selectname});
- if (! (defined $self->{genericsql} &&
- (scalar(grep { /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/ }
@{$self->{genericsql}})) ==
+ if ($self->{handle}->{errstr}) {
+ $self->add_nagios_unknown(sprintf "got no valid response for %s: %s",
+ $params{selectname}, $self->{handle}->{errstr});
+ } elsif (! (defined $self->{genericsql} &&
+ (scalar(grep {
+ /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/
+ } @{$self->{genericsql}})) ==
scalar(@{$self->{genericsql}}))) {
$self->add_nagios_unknown(sprintf "got no valid response for %s",
$params{selectname});
+ } elsif (! defined $self->{genericsql}) {
+ $self->add_nagios_unknown(sprintf "got no valid response for %s",
+ $params{selectname});
} else {
# name2 in array
# units in array
@@ -1000,7 +1008,7 @@
$self->{dsn},
$self->{username},
$self->decode_password($self->{password}),
- { RaiseError => 0, AutoCommit => 0, PrintError => 0 })) {
+ { RaiseError => 0, AutoCommit => 0, PrintError => 1 })) {
# $self->{handle}->do(q{
# ALTER SESSION SET NLS_NUMERIC_CHARACTERS=".," });
$retval = $self;
@@ -1058,6 +1066,10 @@
my @arguments = @_;
my $sth = undef;
my @row = ();
+ my $stderrvar;
+ *SAVEERR = *STDERR;
+ open ERR ,'>',\$stderrvar;
+ *STDERR = *ERR;
eval {
$self->trace(sprintf "SQL:\n%s\nARGS:\n%s\n",
$sql, Data::Dumper::Dumper(\@arguments));
@@ -1071,8 +1083,17 @@
$self->trace(sprintf "RESULT:\n%s\n",
Data::Dumper::Dumper(\@row));
};
+ *STDERR = *SAVEERR;
if ($@) {
$self->debug(sprintf "bumm %s", $@);
+ $self->{errstr} = $@;
+ return (undef);
+ } elsif ($stderrvar) {
+ $self->{errstr} = $stderrvar;
+ return (undef);
+ } elsif ($sth->errstr()) {
+ $self->{errstr} = $sth->errstr();
+ return (undef);
}
if (-f "/tmp/check_mysql_health_simulation/".$self->{mode}) {
my $simulation = do { local (@ARGV, $/) =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/check_mysql_health-2.2.1/t/Makefile.in
new/check_mysql_health-2.2.2/t/Makefile.in
--- old/check_mysql_health-2.2.1/t/Makefile.in 2015-08-18 18:22:47.000000000
+0200
+++ new/check_mysql_health-2.2.2/t/Makefile.in 2016-05-13 11:16:34.000000000
+0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
