Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package monitoring-plugins-haproxy for
openSUSE:Factory checked in at 2021-05-20 19:25:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-haproxy (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-haproxy.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-haproxy"
Thu May 20 19:25:45 2021 rev:2 rq:894653 version:1.1g6790d7f
Changes:
--------
---
/work/SRC/openSUSE:Factory/monitoring-plugins-haproxy/monitoring-plugins-haproxy.changes
2016-02-11 12:36:35.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.monitoring-plugins-haproxy.new.2988/monitoring-plugins-haproxy.changes
2021-05-20 19:26:17.217640646 +0200
@@ -1,0 +2,23 @@
+Thu May 20 15:01:44 UTC 2021 - l...@linux-schulserver.de - 1.2
+
+- Build require icinga2-bin and icinga2-common to get rid of owning
+ directories that belong to icinga2
+
+-------------------------------------------------------------------
+Sun Jun 14 14:42:50 UTC 2020 - l...@linux-schulserver.de - 1.1
+
+- Update to 1.1:
+ + Add new option -i or --ignore-backends to exclude certain backend(s)
+ from the check. The parameter expects a single string for the backend
+ name or a list of comma-separated backend names
+ + Fix and display the maximum number of allowed concurrent sessions
+ of the backend in performance data (was always showing 0 before)
+ + Added bytes_in and bytes_out to performance data per backend
+- switch to https://github.com/Napsty/check_haproxy as upstream
+ URL: contains latest 1.1 relase plus additional icinga2 config
+- package NRPE snipplet
+- package icinga2 CheckCommand definition template
+- use _service for sources
+- ran spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
check_haproxy.pl
New:
----
_service
check_haproxy-1.1g6790d7f.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-haproxy.spec ++++++
--- /var/tmp/diff_new_pack.sLLlqA/_old 2021-05-20 19:26:17.569639203 +0200
+++ /var/tmp/diff_new_pack.sLLlqA/_new 2021-05-20 19:26:17.573639186 +0200
@@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins-haproxy
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,29 +12,33 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
Name: monitoring-plugins-haproxy
-Version: 1.0
-Release: 100
-License: GPL-2.0+
+Version: 1.1g6790d7f
+Release: 0
Summary: Plugin to check HAProxy (csv) stats url
-Url:
http://cvs.orion.education.fr/viewvc/viewvc.cgi/monitoring-plugins-perl/trunk/plugins/
+License: GPL-2.0-or-later
Group: System/Monitoring
-Source0: check_haproxy.pl
+URL: https://github.com/Napsty/check_haproxy
+Source0: check_haproxy-%{version}.tar.gz
Source1: gpl-2.0.txt
BuildRequires: nagios-rpm-macros
-Provides: nagios-plugins-haproxy = %{version}-%{release}
-Obsoletes: nagios-plugins-haproxy < %{version}-%{release}
-Requires: perl(Nagios::Plugin)
-Requires: perl(Locale::gettext)
+# For directory ownership:
+BuildRequires: icinga2-bin
+BuildRequires: icinga2-common
+Requires: perl(Data::Dumper)
Requires: perl(File::Basename)
-Requires: perl(Time::HiRes)
-Requires: perl(LWP::UserAgent)
Requires: perl(HTTP::Request)
Requires: perl(HTTP::Status)
-Requires: perl(Data::Dumper)
+Requires: perl(LWP::UserAgent)
+Requires: perl(Locale::gettext)
+Requires: perl(Nagios::Plugin)
+Requires: perl(Time::HiRes)
+Provides: nagios-plugins-haproxy = %{version}-%{release}
+Obsoletes: nagios-plugins-haproxy < %{version}-%{release}
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,22 +46,33 @@
The plugin checks HAProxy statistic url (csv) and gets UP and DOWN services.
%prep
-%setup -q -T -c %{name}
+%setup -q -n check_haproxy-%{version}
install -m644 %{SOURCE1} LICENSE
%build
#
%install
-%{__mkdir} -p %{buildroot}%{nagios_plugindir}
-%{__install} -D -m755 %{SOURCE0} %{buildroot}%{nagios_plugindir}
-
-%clean
-rm -rf %{buildroot}
+install -D -m755 check_haproxy.pl
%{buildroot}%{nagios_plugindir}/check_haproxy.pl
+# icinga2 check_command template
+install -D -m0644 icinga2/CheckCommand.conf
%{buildroot}%{icinga2_datadir}/include/plugins-contrib.d/%{name}.conf
+# NRPE configuration check_connections
+mkdir -p %{buildroot}%{nrpe_sysconfdir}
+cat > %{buildroot}%{nrpe_sysconfdir}/check_haproxy.cfg << EOF
+# default check, please adjust the URL, User and Password
+command[check_haproxy]=/usr/lib/nagios/plugins/check_haproxy.pl -u
'https://proxy.example.com/;csv;norefresh' -U admin -P 's3cr3t'
+# define backends, that will immediately turn the check critical. Other
backends will only result in a warning
+#command[check_haproxy]=/usr/lib/nagios/plugins/check_haproxy.pl -u
'https://proxy.example.com/;csv;norefresh' -U admin -P 's3cr3t'
--critical-backends=www,galera
+# ignore backends
+#command[check_haproxy]=/usr/lib/nagios/plugins/check_haproxy.pl -u
'https://proxy.example.com/;csv;norefresh' -U admin -P 's3cr3t'
--ignore-backends=test
+EOF
%files
-%defattr(-,root,root)
-%doc LICENSE
+%license LICENSE
%dir %{nagios_libdir}
-%{nagios_plugindir}/
+%dir %{nagios_plugindir}
+%{nagios_plugindir}/check_haproxy.pl
+%{icinga2_datadir}/include/plugins-contrib.d/%{name}.conf
+%dir %{nrpe_sysconfdir}
+%config(noreplace) %{nrpe_sysconfdir}/check_haproxy.cfg
%changelog
++++++ _service ++++++
<services>
<service name="tar_scm" mode="localonly">
<param name="scm">git</param>
<param name="url">https://github.com/Napsty/check_haproxy.git</param>
<param name="versionformat">1.1g%h</param>
<param name="filename">check_haproxy</param>
</service>
<service name="recompress" mode="localonly">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="localonly"/>
</services>
