[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] 4 commits: Adding d/p/20_check_icmp_fix_rtmin from upstream

Jan Wagner (@waja) gitlab at salsa.debian.org
Sat Apr 19 09:52:38 BST 2025 


Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins


Commits:
38aec8e0 by Jan Wagner at 2025-04-19T10:19:43+02:00
Adding d/p/20_check_icmp_fix_rtmin from upstream

https://github.com/monitoring-plugins/monitoring-plugins/commit/e5f35d40556468fcdebccae847cfc19380952ca0.patch

- - - - -
e817fecb by Jan Wagner at 2025-04-19T10:27:49+02:00
Adding d/p/21_check_http_state_regex from upstream

https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2056.patch

- - - - -
45f91e20 by Jan Wagner at 2025-04-19T10:35:24+02:00
Adding d/p/22_check_by_ssh_missing_options from upstream

https://github.com/monitoring-plugins/monitoring-plugins/commit/02adcbfa896eb726c59ca647eb4cf6909c690f37.patch

- - - - -
b6a58eb9 by Jan Wagner at 2025-04-19T10:47:53+02:00
Adding d/p/23_sslutils_fix_error_message from upstream

https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2112.patch

- - - - -


5 changed files:

- + debian/patches/20_check_icmp_fix_rtmin
- + debian/patches/21_check_http_state_regex
- + debian/patches/22_check_by_ssh_missing_options
- + debian/patches/23_sslutils_fix_error_message
- debian/patches/series


Changes:

=====================================
debian/patches/20_check_icmp_fix_rtmin
=====================================
@@ -0,0 +1,29 @@
+From e5f35d40556468fcdebccae847cfc19380952ca0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lorenz=20K=C3=A4stle?=
+ <12514511+RincewindsHat at users.noreply.github.com>
+Date: Wed, 27 Nov 2024 15:29:19 +0100
+Subject: [PATCH] check_icmp: set rtmin initially
+
+---
+ plugins-root/check_icmp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/plugins-root/check_icmp.c
++++ b/plugins-root/check_icmp.c
+@@ -64,6 +64,7 @@
+ #include <netinet/ip_icmp.h>
+ #include <netinet/icmp6.h>
+ #include <arpa/inet.h>
++#include <math.h>
+ 
+ 
+ /** sometimes undefined system macros (quite a few, actually) **/
+@@ -1051,7 +1052,7 @@
+ 		icmp_recv++;
+ 		if (tdiff > (unsigned int)host->rtmax)
+ 			host->rtmax = tdiff;
+-		if (tdiff < (unsigned int)host->rtmin)
++		if ((host->rtmin == INFINITY) || (tdiff < (unsigned int)host->rtmin))
+ 			host->rtmin = tdiff;
+ 
+ 		if(debug) {


=====================================
debian/patches/21_check_http_state_regex
=====================================
@@ -0,0 +1,22 @@
+From e445a386f8ad1166b05fcdfdb5b9cde4622a8632 Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Fri, 27 Dec 2024 15:32:24 +0100
+Subject: [PATCH] check_http: fix documentation for --state-regex
+
+---
+ plugins/check_http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 97c0e39ad..baff682a7 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -1805,7 +1805,7 @@ print_help (void)
+   printf (" %s\n", "--invert-regex");
+   printf ("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
+   printf ("    %s\n", _("can be changed with --state--regex)"));
+-  printf (" %s\n", "--regex-state=STATE");
++  printf (" %s\n", "--state-regex=STATE");
+   printf ("    %s\n", _("Return STATE if regex is found, OK if not\n"));
+ 
+   printf (" %s\n", "-a, --authorization=AUTH_PAIR");


=====================================
debian/patches/22_check_by_ssh_missing_options
=====================================
@@ -0,0 +1,20 @@
+From 02adcbfa896eb726c59ca647eb4cf6909c690f37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lorenz=20K=C3=A4stle?=
+ <12514511+RincewindsHat at users.noreply.github.com>
+Date: Mon, 24 Feb 2025 20:32:19 +0100
+Subject: [PATCH] check_by_ssh: Remove warning/critical from help
+
+---
+ plugins/check_by_ssh.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/plugins/check_by_ssh.c
++++ b/plugins/check_by_ssh.c
+@@ -454,7 +454,6 @@
+   printf ("    %s\n", _("Tell ssh to use this configfile [optional]"));
+   printf (" %s\n","-q, --quiet");
+   printf ("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
+-	printf (UT_WARN_CRIT);
+ 	printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+ 	printf (" %s\n","-U, --unknown-timeout");
+ 	printf ("    %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL"));


=====================================
debian/patches/23_sslutils_fix_error_message
=====================================
@@ -0,0 +1,23 @@
+From ef3045b97eea23a4dec3197277e5ff4e5afc5c71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andre=20Kl=C3=A4rner?= <kandre at ak-online.be>
+Date: Mon, 17 Mar 2025 16:13:46 +0100
+Subject: [PATCH] change error message for missing certificate
+
+The old error message is quite similar to the openssl `failed to retrieve issuer certificate` and can mislead users to troubleshooting certificate stores.
+
+The new message should be distinct enough to make it clear to users that this is not a problem raised by the underlying SSL implementation, but a problem inside monitoring-plugins.
+---
+ plugins/sslutils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/plugins/sslutils.c
++++ b/plugins/sslutils.c
+@@ -208,7 +208,7 @@
+ 	time_t tm_t;
+ 
+ 	if (!certificate) {
+-		printf("%s\n",_("CRITICAL - Cannot retrieve server certificate."));
++		printf("%s\n",_("CRITICAL - No server certificate present to inspect."));
+ 		return STATE_CRITICAL;
+ 	}
+ 


=====================================
debian/patches/series
=====================================
@@ -11,4 +11,8 @@
 17_check_fping_dontfrag_random
 18_check_curl_fix_TLS_notes
 19_check_curl_cookie_handling
+20_check_icmp_fix_rtmin
+21_check_http_state_regex
+22_check_by_ssh_missing_options
+23_sslutils_fix_error_message
 # feature patches



View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/af69fcf3106ee4f08d401811e7b3a4a42598e7e6...b6a58eb919d21a5d7a74a96bcd0a889cc27416e7

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/af69fcf3106ee4f08d401811e7b3a4a42598e7e6...b6a58eb919d21a5d7a74a96bcd0a889cc27416e7
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/20250419/01b206c2/attachment-0001.htm>

More information about the pkg-nagios-changes mailing list