[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] 7 commits: Adding d/p/24_check_http_deprecation from upstream
Jan Wagner (@waja)
gitlab at salsa.debian.org
Mon Apr 21 15:50:56 BST 2025
Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins
Commits:
7e8c776b by Jan Wagner at 2025-04-21T11:11:55+02:00
Adding d/p/24_check_http_deprecation from upstream
https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2118.patch
- - - - -
baad659e by Jan Wagner at 2025-04-21T15:32:59+02:00
Add d/monitoring-plugins-basic.alternatives
Handle check_http alternatives
- - - - -
6bb85804 by Jan Wagner at 2025-04-21T15:33:05+02:00
Adjust debian/rules for check_http rename
- - - - -
ddaa81fb by Jan Wagner at 2025-04-21T15:33:05+02:00
check_curl: move to monitoring-plugins-basic package
- - - - -
b724e41b by Jan Wagner at 2025-04-21T16:22:30+02:00
d/NEWS: Add information about check_http deprecation
- - - - -
dde9499b by Jan Wagner at 2025-04-21T16:30:31+02:00
Prepare release
- - - - -
1e0ad806 by Jan Wagner at 2025-04-21T16:50:37+02:00
New changelog
- - - - -
7 changed files:
- debian/NEWS
- debian/changelog
- debian/control
- + debian/monitoring-plugins-basic.alternatives
- + debian/patches/24_check_http_deprecation
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/NEWS
=====================================
@@ -1,3 +1,15 @@
+monitoring-plugins (2.4.0-3) unstable; urgency=medium
+
+ The check_http plugin was deprecated. Please migrate the check command
+ definitions over to the drop-in replacement check_curl. It should be
+ sufficient to replace check_http with check_curl in your command definitions.
+ The check_curl plugin was moved to the monitoring-plugins-basic package for
+ a smoother migration path. For making things easy, update-alternatives can
+ be used to change the check_http alternative. This can be done with the
+ command: update-alternatives --config check_http
+
+ -- Jan Wagner <waja at cyconet.org> Mon, 21 Apr 2025 11:00:59 +0200
+
monitoring-plugins (2.1.2-3) unstable; urgency=medium
We switched again over to another radius library. This time radcli
=====================================
debian/changelog
=====================================
@@ -1,8 +1,18 @@
-monitoring-plugins (2.4.0-3) UNRELEASED; urgency=medium
+monitoring-plugins (2.4.0-3~exp2) UNRELEASED; urgency=medium
*
- -- Jan Wagner <waja at cyconet.org> Sun, 20 Apr 2025 22:17:46 +0200
+ -- Jan Wagner <waja at cyconet.org> Mon, 21 Apr 2025 16:50:18 +0200
+
+monitoring-plugins (2.4.0-3~exp1) experimental; urgency=medium
+
+ * [7e8c776] Adding d/p/24_check_http_deprecation from upstream
+ * [baad659] Add d/monitoring-plugins-basic.alternatives
+ * [6bb8580] Adjust debian/rules for check_http rename
+ * [ddaa81f] check_curl: move to monitoring-plugins-basic package
+ * [b724e41] d/NEWS: Add information about check_http deprecation
+
+ -- Jan Wagner <waja at cyconet.org> Mon, 21 Apr 2025 16:29:02 +0200
monitoring-plugins (2.4.0-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -58,22 +58,24 @@ Depends: inetutils-ping [kfreebsd-any hurd-any],
${shlibs:Depends}
Recommends: libcap2-bin [linux-any]
Suggests: icinga2
+Breaks: monitoring-plugins-standard (<< 2.4.0-3~)
+Replaces: monitoring-plugins-standard (<< 2.4.0-3~)
Provides: nagios-plugins-basic
Description: Plugins for nagios compatible monitoring systems (basic)
Plugins for nagios compatible monitoring systems like Naemon and Icinga. It
contains the following plugins:
.
check_apt, check_by_ssh, check_clamd, check_cluster,
- check_dhcp, check_disk, check_dummy, check_file_age,
- check_ftp, check_host, check_http, check_icmp,
- check_ide_smart, check_imap, check_ircd, check_jabber,
- check_load, check_log, check_mrtg, check_mrtgtraf,
- check_nagios, check_nntp, check_nntps, check_nt,
- check_ntp, check_ntp_peer, check_ntp_time, check_nwstat,
- check_overcr, check_ping, check_pop, check_procs,
- check_real, check_rta_multi, check_sensors, check_simap,
- check_smtp, check_spop, check_ssh, check_ssmtp,
- check_swap, check_tcp, check_time, check_udp,
+ check_curl, check_dhcp, check_disk, check_dummy,
+ check_file_age, check_ftp, check_host, check_http,
+ check_icmp, check_ide_smart, check_imap, check_ircd,
+ check_jabber, check_load, check_log, check_mrtg,
+ check_mrtgtraf, check_nagios, check_nntp, check_nntps,
+ check_nt, check_ntp, check_ntp_peer, check_ntp_time,
+ check_nwstat, check_overcr, check_ping, check_pop,
+ check_procs, check_real, check_rta_multi, check_sensors,
+ check_simap, check_smtp, check_spop, check_ssh,
+ check_ssmtp, check_swap, check_tcp, check_time, check_udp,
check_ups, check_users
.
This package provides a basic set of plugins with minimal external
@@ -101,7 +103,7 @@ Description: Plugins for nagios compatible monitoring systems (standard)
Plugins for nagios compatible monitoring systems like Naemon and Icinga. It
contains the following plugins:
.
- check_breeze, check_curl, check_dbi, check_dig, check_disk_smb, check_dns,
+ check_breeze, check_dbi, check_dig, check_disk_smb, check_dns,
check_flexlm, check_fping, check_game, check_hpjd, check_ifoperstatus,
check_ifstatus, check_ldap, check_ldaps, check_mailq, check_mysql,
check_mysql_query, check_oracle, check_pgsql, check_radius, check_rpc,
=====================================
debian/monitoring-plugins-basic.alternatives
=====================================
@@ -0,0 +1,12 @@
+Name: check_http
+Link: /usr/lib/nagios/plugins/check_http
+Status: auto
+Best: /usr/lib/nagios/plugins/check_http.deprecated
+Value: /usr/lib/nagios/plugins/check_http.deprecated
+Alternative: /usr/lib/nagios/plugins/check_http.deprecated
+Priority: 50
+
+Name: check_http
+Link: /usr/lib/nagios/plugins/check_http
+Alternative: /usr/lib/nagios/plugins/check_curl
+Priority: -100
=====================================
debian/patches/24_check_http_deprecation
=====================================
@@ -0,0 +1,30 @@
+From 14169fe5a11b94a9f9ab44336fdb5170ee98be66 Mon Sep 17 00:00:00 2001
+From: Jan Wagner <waja at cyconet.org>
+Date: Sat, 19 Apr 2025 14:37:46 +0200
+Subject: [PATCH] check_http: Adding deprecation text
+
+---
+ plugins/check_http.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index baff682a7..8e0c15ec9 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -1724,6 +1724,16 @@ print_help (void)
+ printf ("%s\n", _("strings and regular expressions, check connection times, and report on"));
+ printf ("%s\n", _("certificate expiration times."));
+
++ printf ("\n");
++ printf ("%s\n", _("ATTENTION!"));
++ printf ("\n");
++ printf ("%s\n", _("THIS PLUGIN IS DEPRECATED. The functionality was reimplemented by the"));
++ printf ("%s\n", _("check_curl plugin, which can be used as a drop-in replacement. You should"));
++ printf ("%s\n", _("migrate your checks over to check_curl, because check_http is going to be"));
++ printf ("%s\n", _("removed sooner than later. Just replace check_http with check_curl in your"));
++ printf ("%s\n", _("check command definitions."));
++ printf ("%s\n", _("Report issues to: https://github.com/monitoring-plugins/monitoring-plugins/issues"));
++
+ printf ("\n\n");
+
+ print_usage ();
=====================================
debian/patches/series
=====================================
@@ -16,4 +16,5 @@
21_check_http_state_regex
22_check_by_ssh_missing_options
23_sslutils_fix_error_message
+24_check_http_deprecation
# feature patches
=====================================
debian/rules
=====================================
@@ -28,15 +28,15 @@ std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
check_rpc check_snmp check_wave check_fping check_game \
check_radius check_mysql check_mysql_query check_pgsql \
check_disk_smb check_ldap check_ldaps \
- check_mailq check_curl \
+ check_mailq \
check_dns check_dig check_flexlm check_oracle \
check_dbi
common_files:=negate urlize utils.pm utils.sh
-basic_plugin_cfgs:=apt dhcp disk dummy ftp http load mail news ntp ping procs \
+basic_plugin_cfgs:=apt dhcp disk dummy ftp http curl-http load mail news ntp ping procs \
real ssh tcp_udp telnet users
-std_plugin_cfgs:=breeze curl-http disk-smb dns flexlm fping games hppjd ifstatus ldap \
+std_plugin_cfgs:=breeze disk-smb dns flexlm fping games hppjd ifstatus ldap \
mailq mrtg mysql netware nt pgsql radius rpc-nfs snmp
PATH = /bin:/sbin:/usr/bin:/usr/sbin
@@ -156,6 +156,8 @@ install: build
for p in ${std_plugins}; do \
mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \
done
+ # rename check_http to check_http_deprecated for making use of update-alternatives
+ mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_http ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_http.deprecated
# slit out common files
for p in ${common_files}; do \
mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_COMMON_DIR}/${NP_LIBEXEC}; \
@@ -213,6 +215,7 @@ binary-arch: build install
dh_link -a
dh_installexamples -a
dh_installman -a
+ dh_installalternatives -a
dh_strip -a
dh_compress -a
dh_fixperms -a -X utils.pm
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/f8202f34c0bf4856f3ad691d4113f48d10b46018...1e0ad80693e739367a78ecd75d4d2dee08366c0a
--
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/f8202f34c0bf4856f3ad691d4113f48d10b46018...1e0ad80693e739367a78ecd75d4d2dee08366c0a
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/20250421/6e95e8c7/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list