[pkg-nagios-changes] [Git][nagios-team/nagios-plugins-contrib][master] 5 commits: Adding dsa-wrap-nagios-check (Closes: #1053155)
Jan Wagner (@waja)
gitlab at salsa.debian.org
Sun Apr 20 22:21:38 BST 2025
Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / nagios-plugins-contrib
Commits:
fbd1c3e8 by Jan Wagner at 2025-04-20T22:57:27+02:00
Adding dsa-wrap-nagios-check (Closes: #1053155)
Thanks Matthias Foerste
- - - - -
094a9976 by Jan Wagner at 2025-04-20T23:03:50+02:00
Auto-update debian/copyright
- - - - -
eb517b99 by Jan Wagner at 2025-04-20T23:04:29+02:00
Auto-update debian/control
- - - - -
b164d2b3 by Jan Wagner at 2025-04-20T23:09:13+02:00
Prepare release
- - - - -
284ada38 by Jan Wagner at 2025-04-20T23:12:11+02:00
New changelog
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/copyright
- dsa/Makefile
- dsa/copyright
- + dsa/sbin/dsa-wrap-nagios-check
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,16 @@
-nagios-plugins-contrib (47.20250421) UNRELEASED; urgency=medium
+nagios-plugins-contrib (48.20250421) UNRELEASED; urgency=medium
*
- -- Jan Wagner <waja at cyconet.org> Sun, 20 Apr 2025 22:19:00 +0200
+ -- Jan Wagner <waja at cyconet.org> Sun, 20 Apr 2025 23:11:59 +0200
+
+nagios-plugins-contrib (48.20250420) unstable; urgency=medium
+
+ * [fbd1c3e] Adding dsa-wrap-nagios-check (Closes: #1053155)
+ * [094a997] Auto-update debian/copyright
+ * [eb517b9] Auto-update debian/control
+
+ -- Jan Wagner <waja at cyconet.org> Sun, 20 Apr 2025 21:08:25 +0000
nagios-plugins-contrib (47.20250420) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8.0.0),
dh-sequence-python3,
python3:any, python3-debian:native,
quilt (>= 0.46-7),
- autotools-dev, flex, libmemcached-dev [!hurd-i386], pkgconf
+ autotools-dev, flex, libmemcached-dev [!hurd-i386], pkg-config
Standards-Version: 4.7.2
Vcs-Git: https://salsa.debian.org/nagios-team/nagios-plugins-contrib.git
Vcs-Browser: https://salsa.debian.org/nagios-team/nagios-plugins-contrib
@@ -75,14 +75,14 @@ Description: Plugins for nagios compatible monitoring systems
Check /etc/resolv.conf, and make sure the name servers listed are
working. It will ignore entries with '# NAGIOSIGNORE' at the end.
* check_graphite: Plugin to monitor graphite metrics
- * check_haproxy (rev135): plugin to check the HAProxy statistics url
+ * check_haproxy (1.1): plugin to check the HAProxy statistics url
* check_haproxy_stats (1.1.3): check haproxy via admin socket
Different from check_haproxy this plugin is able to check
haproxy via the unix admin socket.
* check_hp_bladechassis (1.0.1): plugin to check the hardware health of
HP blade enclosures via SNMP.
The plugin is only tested with the c7000 enclosure.
- * check_hpasm (4.8.0.2): plugin to check the hardware health of
+ * check_hpasm (4.9): plugin to check the hardware health of
HP Proliant Servers
It either uses snmp or - if installed - the hpasm package locally.
The plugin checks the health of
@@ -146,7 +146,7 @@ Description: Plugins for nagios compatible monitoring systems
- Solaris software RAID via metastat
- Areca SATA RAID Support via cli64/cli32
- Detecting SCSI devices or hosts with lsscsi
- * check_rbl (1.7.1): plugin to check if a server is blacklisted
+ * check_rbl (1.7.7): plugin to check if a server is blacklisted
* check_redis (0.73): Redis Server check plugin
This plugin checks Redis NoSQL database status variables,
measures its response time and if specified allows one to set thresholds
@@ -172,7 +172,7 @@ Description: Plugins for nagios compatible monitoring systems
HOST-RESOURCES-MIB::hrSystemDate.0 used here returns 8 or 11 byte octets.
SNMP translation needs to be switched off and to be converted the
received SNMP data into readable strings.
- * check_ssl_cert (2.70.0): plugin to check the CA and validity of an
+ * check_ssl_cert (2.92.0): plugin to check the CA and validity of an
X.509 certificate
* check_uptime (0.521): check_uptime returns uptime of a system
in text (readable) format as well as in minutes for performance graphing.
@@ -218,7 +218,7 @@ Description: Plugins for nagios compatible monitoring systems
* extras (1): various scripts and extras
Not a plugin, but a collection of various useful
event/obsession handlers and similar scripts.
- * madrisan-nagios-plugins-linux (bbbdc5279cd2569d4c6b5e0ed19d12c082e322ad): Nagios-compatible Plugins for Linux
+ * madrisan-nagios-plugins-linux (34): Nagios-compatible Plugins for Linux
Various binary plugins for monitoring (physical and virtual) Linux hosts with
Nagios and Nagios-compatible monitoring systems like Icinga and Naemon:
* check_clock: returns the number of seconds elapsed between
=====================================
debian/copyright
=====================================
@@ -376,7 +376,8 @@ http://labs.consol.de/lang/en/nagios/check_hpasm/
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, see <https://www.gnu.org/licenses/>.
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
@@ -623,7 +624,8 @@ http://labs.consol.de/lang/en/nagios/check_mysql_health/
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, see <https://www.gnu.org/licenses/>.
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
@@ -757,7 +759,9 @@ https://github.com/matteocorti/check_rbl
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA.
------------------------------------------------------------------------------
@@ -781,7 +785,9 @@ https://github.com/willixix/WL-NagiosPlugins
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA.
------------------------------------------------------------------------------
@@ -888,7 +894,8 @@ https://github.com/willixix/WL-NagiosPlugins
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, see <https://www.gnu.org/licenses/>.
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -1069,6 +1076,7 @@ https://salsa.debian.org/dsa-team/mirror/dsa-nagios
checks/dsa-check-running-kernel:# Copyright 2011 Alexander Reichle-Schmehl
sbin/dsa-update-apt-status:# Copyright 2009 Peter Palfrader
sbin/dsa-update-unowned-file-status:# Copyright 2012 Peter Palfrader
+ sbin/dsa-wrap-nagios-check:# Copyright 2017 Peter Palfrader
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -1153,7 +1161,7 @@ http://www.percona.com/doc/percona-monitoring-plugins/
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation, version 2. You should have received a copy of the GNU General
- Public License along with this program; if not, see
- <https://www.gnu.org/licenses/>.
+ Public License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
=====================================
dsa/Makefile
=====================================
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
PLUGIN:=$(shell cd checks; ls -1 | sed 's,^dsa-,,;s,-,_,g')
-CRONJOBS:=$(shell cd sbin; ls -1 | sed 's,^dsa-,,')
+CRONJOBS:=$(shell cd sbin; ls -1 dsa-update-* | sed 's,^dsa-,,')
INIFILES:=etc/obsolete-packages-ignore
DOCFILES:=$(wildcard *.cmd)
@@ -20,4 +20,4 @@ include ../common.mk
install::
install -d $(DESTDIR)$(INIDIR)/obsolete-packages-ignore.d
-
+ install -m 755 -o root -g root sbin/dsa-wrap-nagios-check $(DESTDIR)/usr/lib/nagios/wrap-nagios-check
=====================================
dsa/copyright
=====================================
@@ -11,6 +11,7 @@ checks/dsa-check-running-kernel:# Copyright 2010 Uli Martens
checks/dsa-check-running-kernel:# Copyright 2011 Alexander Reichle-Schmehl
sbin/dsa-update-apt-status:# Copyright 2009 Peter Palfrader
sbin/dsa-update-unowned-file-status:# Copyright 2012 Peter Palfrader
+sbin/dsa-wrap-nagios-check:# Copyright 2017 Peter Palfrader
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
=====================================
dsa/sbin/dsa-wrap-nagios-check
=====================================
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Copyright 2017 Peter Palfrader
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# wrap a nagios check and write a status-file to be used with dsa-check-statusfile
+
+set -u
+
+STATUSDIR=/var/cache/dsa/nagios
+
+usage(){
+ ret=$1
+
+ cat <<EOF
+$0: usage:
+ $0 <options> <nagios-check> [nagios-check-options]
+
+ Calls nagios-check and stores its result in a state
+ file in status-dir. The state file is named after
+ the nagios check (but can be overridden with -s).
+
+ -S <dir> state dir ($STATUSDIR)
+ -s <filename> state file name
+ -h print this help
+EOF
+
+ exit $ret
+}
+
+
+while getopts S:s:h opt ; do
+ case "$opt" in
+ S) STATUSDIR="$OPTARG" ;;
+ s) STATUSFILE="$OPTARG";;
+ h) usage 0 ;;
+ ?) usage 1 ;;
+ esac
+done
+shift $(($OPTIND - 1))
+if [ "$#" = 0 ]; then
+ usage 1 >&2
+fi
+
+if [ -z "${STATUSFILE:-}" ]; then
+ STATUSFILE="$(basename "$1")"
+fi
+
+if ! [ -d "$STATUSDIR" ]; then
+ echo >&2 "status directory $STATUSDIR does not exist."
+ exit 3
+fi
+
+tmp=`mktemp`
+trap "rm -f '$tmp'" exit
+"$@" > "$tmp" 2>&1
+result="$?"
+case "$result" in
+ 0)
+ st="OK"
+ ;;
+ 1)
+ st="WARNING"
+ ;;
+ 2)
+ st="CRITICAL"
+ ;;
+ *)
+ st="UNKNOWN"
+ ;;
+esac
+(echo "$st"; cat "$tmp") > "$STATUSDIR/$STATUSFILE"
View it on GitLab: https://salsa.debian.org/nagios-team/nagios-plugins-contrib/-/compare/0ea0a76defa118a81693eacb3709652bba6256c6...284ada382f49209383bb41b62cdf7d2aaf0a2f30
--
View it on GitLab: https://salsa.debian.org/nagios-team/nagios-plugins-contrib/-/compare/0ea0a76defa118a81693eacb3709652bba6256c6...284ada382f49209383bb41b62cdf7d2aaf0a2f30
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20250420/9432eb03/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list