From a6af5119d0dd5063a36498ca38153cd7389c2c46 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 10 Apr 2021 14:13:41 +0200 Subject: Updating THANKS.in --- THANKS.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'THANKS.in') diff --git a/THANKS.in b/THANKS.in index 7d1d1ff0..0f1fe6f7 100644 --- a/THANKS.in +++ b/THANKS.in @@ -381,3 +381,8 @@ Michael Kraus Patrick Rauscher Prathamesh Bhanuse Valentin Vidic +Barak Shohat +Florian Lohoff +Stefan Bethke +Tim Gates +Tomas Mozes -- cgit v1.2.3-74-g34f1 From d4f71ac2e7370e20b64150db0b859c9ba4b6a098 Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Wed, 19 Oct 2022 14:31:59 +0200 Subject: release v2.3.2 --- AUTHORS | 1 + NEWS | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- THANKS.in | 14 +++++++++ doc/RELEASING.md | 6 ++-- 4 files changed, 108 insertions(+), 8 deletions(-) (limited to 'THANKS.in') diff --git a/AUTHORS b/AUTHORS index 802efb77..1b1a0366 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,3 +23,4 @@ Holger Weiss Michael Wirtgen Oliver Skibbe Andreas Baumann +Lorenz Kästle diff --git a/NEWS b/NEWS index b1b8b7de..b674391b 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,95 @@ This file documents the major additions and syntax changes between releases. -2.4 [...] - ENHANCEMENTS - - FIXES +2.3.2 20th Oct 2022 + GENERAL + Use netcat-openbsd for debian explicitely (by @RincewindsHat #1704) + Replace egrep with grep -E (by @RincewindsHat #1791) + Use silent automake by default (by @RincewindsHat #1747) + + SINGLE PLUGINS + check_by_ssh: added option to exit with an warning, if there is output on STDERR (by @nafets #1301) + check_by_ssh: Add "-U" flag (#1123). (by @archiecobbs #1774) + check_by_ssh: Let ssh decide if a host is valid, enables usage of ssh .config file (by @RincewindsHat #1691) + check_curl: Add an option to check_curl to verify the peer certificate & host using the system CA's (by @bazzisoft #1669) + check_curl: fixed -ffollow for HTTP/2.0 (Fixes #1685): added major_version parsing to PicoHTTPParser (by @andreasbaumann #1742) + check_curl: fixes check_curl: "CRITICAL - Cannot retrieve certificate subject." (by @andreasbaumann #1689) + check_curl: fix if http header contains leading spaces (by @sni #1666) + check_curl: Update check_curl.c to display a specific human-readable error message where possible (by @bazzisoft #1668) + check_curl: verify certificates option should not force SSL to be used (by @bazzisoft #1688) + check_disk: Description for -M was the wrong way around (by @RincewindsHat #1746) + check_disk: Fixing the stuff that is broken on btrfs (by @waja #1388) + check_disk: Fix perfdata for big values for check disk (by @RincewindsHat #1714) + check_disk_smb: Add configfile feature (by @Napsty #1402) + check_disk_smb: Add timeout (by @cdruee #1770) + check_dns: Add --expect-nxdomain (by @Jonny007-MKD #1623) + check_dns: split multiple IP addresses passed in one -a argument (by @DerDakon #1649) + check_file_age: Make size parameter a little bit more intelligible (by @RincewindsHat #1730) + check_fping: Implements 'host-alive' mode (Closes. #1027) (by @waja #1740) + check_game: Update Url to qstat (by @RincewindsHat #1725) + check_http: changed 'STATE_CRITICAL' to 'STATE_WARNING' for infinite loop (by @xFuture603 #1690) + check_http: Increase regexp limit (by @hydrapolic #1566) + check_http: Support http redirect (by @waja #1449) + check_icmp: buffer offerflow (by @RincewindsHat #1733) + check_icmp: delay set_source_ip() until address_family is detected (by @ghciv6 #1735) + check_icmp: Fix "Invalid Argument" from sendmsg() under FreeBSD 13.1 and "setsockopt failed" for TTL setting (by @eriksejr #1771) + check_icmp: Fix pkt perfdata in check_host mode (by @sjoegren #1721) + check_ldap: Allows check_ldap to read password from environment variable (by @mullumaus #1724) + check_load: add LOAD prefix to load plugin (by @haraldj #1694) + check_load: Display total and scaled load values if check_load scales the values (by number of CPUs by @RincewindsHat #1778) + check_log: Missing oldlog now aborts check_log (by @RincewindsHat #1732) + check_mailq: Add mailq -C option for config dir or config file (by @leeclemens #1490) + check_mailq: Check mailq domain specific warnings (by @RincewindsHat #1731) + check_mailq: Fix regexp for nullmailer "mailq" output (by @darksoul42 #1493) + check_mysql: fix segfaults with mysql-connector-c #1562 (by @ghciv6 #1644) + check_pgsql: add --queryname parameter to check_pgsql (by @datamuc #1741) + check_ping: Do not show RTA if no connection was possible (by @RincewindsHat #1697) + check_ping: understang ping6 output from iputils package (by @glensc #1412) + check_proc: Fix check proc ps detection (by @sni #1712) + check_procs: exchange needle and haystack in strstr() for proper st… (by @wolfgangkarall #1654) + check_smtp: add -L flag to support LMTP (LHLO instead of HELO/EHLO). (by @ghen2 #1715) + check_snmp: Added option for null zero length string exit codes (by @FracKenA #1496) + check_snmp: fix performance thresholds when using multiple oids (by @sni #1722) + check_snmp fix segfaults (by @adrb #1589) + check_snmp: put the "c" (to mark a counter) after the perfdata value (by @lausser #1465) + check_swap: fix parsing swap values (by @sni #1780) + check_swap: Fix perfdata for check swap (by @RincewindsHat #1707) + check_swap: Fix unit for total in perfdata (by @RincewindsHat #1779) + check_swap: Handle cached swap (by @mdavranche #1642) + check_swap: Small fix to threshold validation and style (indentation) fixes (by @RincewindsHat #1723) + check_ups: Fix possible overflow in check_ups (by @phibos #1727) + check_uptime: Add option to report uptime in days instead of seconds (by @amotl #1750) + check_uptime: Fix/improve output message "Uptime is ..." (by @amotl #1751) + + MULTIPLE PLUGINS + check_http, check_curl: added --max-redirs=N option (feature #1684) (by @andreasbaumann #1744) + check_http, check_curl: Enhancement --continue-after-certificate (backport from nagios-plugins) (by @andreasbaumann #1762) + check_http, check_curl: Remove check_http and check_curl test which are somehow always failing (by @RincewindsHat #1777) + check_log, check_oracle, check_sensors: Several fixes shellcheck complaining about (by @waja #1459) + sslutils: use chain from client certificates (by @tobiaswiese #1664) + + NON FUNCTIONAL CHANGES + Trivial source code whitespace formatting fixes to standard. (by @ziesemer #1424) + docs: fix simple typo, conspicuosly -> conspicuously (by @timgates42 #1652) + Migrate to GitHub actions (by @jacobbaungard #1686) + Point to Icinga Exchange instead of dead Monitoring Exchange (by @RincewindsHat #1737) + github actions: fix check_users test case (by @sni #1713) + Add CodeQL checks (by @phibos #1682) + Fix some QL problems (by @RincewindsHat #1729) + Update CodeQL and update runner before installing (by @RincewindsHat #1775) + check_disk: Check disk compiler warnings (by @RincewindsHat #1758) + check_disk: Trivial printf fix and a little bit of code style (by @RincewindsHat #1695) + check_http: Docs: make -C obvious (by @stblassitude #1554) + check_ifoperstatus: Re-attach a comment to where it actually belongs (by @peternewman #1699) + check_ircd: Restrict the nickname length of the test user for check_ircd (by @RincewindsHat #1710) + check_load: Check load compiler warnings (by @RincewindsHat #1759) + check_log: Modernize check log (by @RincewindsHat #1692) + check_mailq: remove duplicate W=i/C=i args in check_mailq.pl (by @ichdasich #1755) + check_ntp: Check ntp remove unused variables (by @RincewindsHat #1781) + check_pgsql: Using snprintf which honors the buffers size and guarantees null temination. (Closes: #1601) (by @waja #1663) + check_procs: Fix double percentage sign in usage (by @RincewindsHat #1743) + check_sensors.sh: Make shellcheck happier (by @RincewindsHat #1679) + check_snmp: Fixed option description authpassword -> authpasswd + whitespaces (by @RincewindsHat #1676) + check_swap: Check swap compiler warnings (by @RincewindsHat #1756) 2.3.1 10 April 2021 ENHANCEMENTS @@ -549,4 +635,3 @@ This file documents the major additions and syntax changes between releases. check_swap % thresholds changed to measure amount free, instead of amount used check_disk syntax changes for -p, -m/-M, defaults to MB instead of kB check_procs -C expects no path for the command name - diff --git a/THANKS.in b/THANKS.in index 0f1fe6f7..89201404 100644 --- a/THANKS.in +++ b/THANKS.in @@ -386,3 +386,17 @@ Florian Lohoff Stefan Bethke Tim Gates Tomas Mozes +Aksel Sjögren +Andreas Motl +Claudio Kuenzler +Daniel Uhlmann +Eric Wunderlin +Geert Hendrickx +Ken D +Klaus Ethgen +Lee Clemens +Linda Guo +Peter Newman +Tobias Fiebig +Tobias Wiese +Wolfgang Karall-Ahlborn diff --git a/doc/RELEASING.md b/doc/RELEASING.md index bcd2c5ac..58ec3e16 100644 --- a/doc/RELEASING.md +++ b/doc/RELEASING.md @@ -2,14 +2,14 @@ Releasing a New Monitoring Plugins Version ========================================== Throughout this document, it is assumed that the current Monitoring -Plugins version is 2.2.1, and that we're about to publish version 2.3. +Plugins version is 2.3.2, and that we're about to publish version 2.4. It is also assumed that the official repository on GitHub is tracked using the remote name `monitoring-plugins` (rather than `origin`). Before you start ---------------- -- Check Travis CI status. +- Check Github Actions status. - Update local Git repository to the current `master` tip. For a maintenance release (e.g., version 2.3.2), update to the current `maint-2.3` tip, instead. @@ -55,7 +55,7 @@ Build the tarball ----------------- cd /tmp/plugins - tools/setup + tools/setup # requires docbook to be installed ./configure make dist -- cgit v1.2.3-74-g34f1 From 1a964086aacce594ea73a641620ccfdc98782105 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 1 Feb 2023 13:40:55 +0000 Subject: Preaparing Release 2.3.3 --- NEWS | 38 ++++++++++++++++++++++++++++++++++++++ NP-VERSION-GEN | 2 +- THANKS.in | 5 +++++ configure.ac | 2 +- 4 files changed, 45 insertions(+), 2 deletions(-) (limited to 'THANKS.in') diff --git a/NEWS b/NEWS index b674391b..83d522e7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,43 @@ This file documents the major additions and syntax changes between releases. +2.3.3 2nd Feb 2023 + ENHANCEMENTS + using PRId64 and PRIu64 instead of %ld directly + check_http: Make faster with larger files + check_snmp: add 'multiplier' to modify current value + check_http: Implement chunked encoding decoding + check_http/check_curl: add chunked encoding test + check_log: Added --exclude to exclude patterns + check_log: Add tests + check_disk: Clarify usage possibilites + + FIXES + fixed two PRId64 to PRIu64 in perfdata_uint64 + check_pgsql: Removing is_pg_dbname alltogether,using postgres API. + check_http: Remove superflous CRLF in HTTP-Requests + check_curl: detect ipv6 + check_icmp: fix parsing help/version long options + check_http: fix test plan + check_disk: Find accessible mount path if multiple are available + check_apt: Fix unknown escape sequence error output + check_curl: fix checking large bodys + check_snmp: Improve tests for check_snmp & multiply option + check_snmp: always apply format when applying multiplier + check_http: Use real booleans instead of ints + check_http: Document process_arguments a little bit better + check_http: Remove dead code + check_http: Fix several bug in the implementation of unchunking + check_http: Reformat a part to increase readability + check_apt: Put upgrade options in the root sections + check_apt: Fix comment + check_apt: Use real booleans + check_mailq: Fixing nullmailer regex + check_snmp: Fix regex matches + check_log: Fixed a bug when using --all + check_log: Cleaned up duplicated code in the args + check_http: Fix memory reallocation error in chunk decoding logic + check_http: Add space for ending NULL byte in array for chunked encoding + 2.3.2 20th Oct 2022 GENERAL Use netcat-openbsd for debian explicitely (by @RincewindsHat #1704) diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN index c353b1d1..b4c8d24e 100755 --- a/NP-VERSION-GEN +++ b/NP-VERSION-GEN @@ -6,7 +6,7 @@ SRC_ROOT=`dirname $0` NPVF=NP-VERSION-FILE -DEF_VER=2.3git +DEF_VER=2.3.3 LF=' ' diff --git a/THANKS.in b/THANKS.in index 89201404..73b3b3a7 100644 --- a/THANKS.in +++ b/THANKS.in @@ -400,3 +400,8 @@ Peter Newman Tobias Fiebig Tobias Wiese Wolfgang Karall-Ahlborn +Danijel Tasov +Robert Bohne +Wolfgang Nieder +andrew bezella +Lorenz Gruenwald diff --git a/configure.ac b/configure.ac index 87a84a0c..5f186951 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(monitoring-plugins,2.3git) +AC_INIT(monitoring-plugins,2.3.3) AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_FILES([gl/Makefile]) AC_CONFIG_AUX_DIR(build-aux) -- cgit v1.2.3-74-g34f1 From 12ae1fb6627bfef419fb4571a7189909107f5e6e Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 1 Oct 2013 15:06:51 +0200 Subject: check_mailq.pl: separate submission queue check_mailq.pl ignores the separate submission queue used in (modern?) sendmail implementations. For the queue output below with one message in the submission queue and no messages in the transport queue, check_mailq.pl reports zero messages in the queue because the request count from the last queue always overwrites previous queues. If the sendmail MTA isn't running or has become wedged, messages will sit in the submission queue forever. The attached patch fixes this in a backwards compatible way (i.e., it shouldn't break any of the currently supported formats). -- Just turning attached patch of github issue #972 into a push request. (Closes #972) --- THANKS.in | 1 + plugins-scripts/check_mailq.pl | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) (limited to 'THANKS.in') diff --git a/THANKS.in b/THANKS.in index 73b3b3a7..b1327440 100644 --- a/THANKS.in +++ b/THANKS.in @@ -405,3 +405,4 @@ Robert Bohne Wolfgang Nieder andrew bezella Lorenz Gruenwald +John Morrissey diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index 27073d3c..f02c90fb 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -149,7 +149,26 @@ if ($mailq eq "sendmail") { ##/var/spool/mqueue/qF/df is empty ## Total Requests: 1 - +# separate submission/transport queues, empty +## MSP Queue status... +## /var/spool/mqueue-client is empty +## Total requests: 0 +## MTA Queue status... +## /var/spool/mqueue is empty +## Total requests: 0 +# separate submission/transport queues: 1 +## MSP Queue status... +## /var/spool/mqueue-client (1 request) +## -----Q-ID----- --Size-- -----Q-Time----- ------------Sender/Recipient----------- +## oAJEfhdW014123 5 Fri Nov 19 14:41 jwm +## (Deferred: Connection refused by [127.0.0.1]) +## root +## Total requests: 1 +## MTA Queue status... +## /var/spool/mqueue is empty +## Total requests: 0 + + my $this_msg_q = 0; while () { # match email addr on queue listing @@ -189,13 +208,18 @@ if ($mailq eq "sendmail") { # # single queue: first line # multi queue: one for each queue. overwrite on multi queue below - $msg_q = $1 ; + $this_msg_q = $1 ; + $msg_q += $1 ; } } elsif (/^\s+Total\sRequests:\s(\d+)$/i) { - print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ; - # - # multi queue: last line - $msg_q = $1 ; + if ($this_msg_q) { + $this_msg_q = 0 ; + } else { + print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ; + # + # multi queue: last line + $msg_q += $1 ; + } } } -- cgit v1.2.3-74-g34f1