diff -pruN 2.2-6/debian/changelog 2.2-6ubuntu2/debian/changelog --- 2.2-6/debian/changelog 2019-04-16 17:14:10.000000000 +0000 +++ 2.2-6ubuntu2/debian/changelog 2020-05-02 06:43:05.000000000 +0000 @@ -1,3 +1,32 @@ +monitoring-plugins (2.2-6ubuntu2) groovy; urgency=medium + + [Haw Loeung] + * fix check_http - was having constant socket timeouts (LP: #1875517) + - d/p/14_check_http_socket_timeouts + + -- Rafael David Tinoco Sat, 02 May 2020 06:43:05 +0000 + +monitoring-plugins (2.2-6ubuntu1) focal; urgency=medium + + * d/p/exclude-tmpfs-squashfs-tracefs.patch: Ignore artificial filesystems + that trigger false-positive DISK CRITICAL checks due to reporting as at + 100% capacity. + (LP: #1827159) + + -- Bryce Harrington Thu, 31 Oct 2019 00:21:55 +0000 + +monitoring-plugins (2.2-6build2) eoan; urgency=medium + + * No-change upload with strops.h and sys/strops.h removed in glibc. + + -- Matthias Klose Thu, 05 Sep 2019 11:02:17 +0000 + +monitoring-plugins (2.2-6build1) eoan; urgency=medium + + * No change rebuild for libmysqlclient21. + + -- Christian Ehrhardt Thu, 15 Aug 2019 09:34:09 +0200 + monitoring-plugins (2.2-6) unstable; urgency=medium * [697d611] travis-ci: Remove trusty from definition diff -pruN 2.2-6/debian/control 2.2-6ubuntu2/debian/control --- 2.2-6/debian/control 2019-04-16 17:14:10.000000000 +0000 +++ 2.2-6ubuntu2/debian/control 2020-05-02 06:43:05.000000000 +0000 @@ -1,7 +1,8 @@ Source: monitoring-plugins Section: net Priority: optional -Maintainer: Debian Nagios Maintainer Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt Build-Depends: autotools-dev, debhelper (>= 5), diff -pruN 2.2-6/debian/patches/16_check_http_socket_timeouts 2.2-6ubuntu2/debian/patches/16_check_http_socket_timeouts --- 2.2-6/debian/patches/16_check_http_socket_timeouts 1970-01-01 00:00:00.000000000 +0000 +++ 2.2-6ubuntu2/debian/patches/16_check_http_socket_timeouts 2020-05-02 06:43:05.000000000 +0000 @@ -0,0 +1,29 @@ +Description: fix check_http - was having constant socket timeouts + + [Backport] + Only the realloc() logic for the my_recv() buffer was backported. + It made signifiant performance improvements and was worth to be + backported. + +Author: Bryan Heden +Origin: backport, https://github.com/nagios-plugins/nagios-plugins/commit/2b38350d54 +Bug-Ubuntu: https://launchpad.net/bugs/1875517 +Reviewed-By: Rafael David Tinoco +Last-Update: 2020-05-02 + +--- monitoring-plugins-2.2.orig/plugins/check_http.c ++++ monitoring-plugins-2.2/plugins/check_http.c +@@ -1046,8 +1046,11 @@ check_http (void) + *pos = ' '; + } + buffer[i] = '\0'; +- xasprintf (&full_page_new, "%s%s", full_page, buffer); +- free (full_page); ++ ++ if ((full_page_new = realloc(full_page, pagesize + i + 1)) == NULL) ++ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate memory for full_page\n")); ++ ++ memmove(&full_page_new[pagesize], buffer, i + 1); + full_page = full_page_new; + pagesize += i; + diff -pruN 2.2-6/debian/patches/exclude-tmpfs-squashfs-tracefs.patch 2.2-6ubuntu2/debian/patches/exclude-tmpfs-squashfs-tracefs.patch --- 2.2-6/debian/patches/exclude-tmpfs-squashfs-tracefs.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2-6ubuntu2/debian/patches/exclude-tmpfs-squashfs-tracefs.patch 2020-05-02 06:43:05.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Exclude tmpfs, squashfs, and tracefs. + These synthetic filesystems always report 100% disk usage by design, so + can generate false-positive "disk full" alerts. While it is possible to + exclude these via command line arguments, it is more convenient to + ignore them directly by the tool. +Author: Bryce Harrington +Bug-Ubuntu: https://bugs.launchpad.net/nagios-charm/+bug/1827159 +Forwarded: yes, https://github.com/monitoring-plugins/monitoring-plugins/pull/1609 +Last-Update: 2019-11-07 +--- + plugins/check_disk.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugins/check_disk.c b/plugins/check_disk.c +index e73a008..ec5d663 100644 +--- a/plugins/check_disk.c ++++ b/plugins/check_disk.c +@@ -471,6 +471,9 @@ process_arguments (int argc, char **argv) + return ERROR; + + np_add_name(&fs_exclude_list, "iso9660"); ++ np_add_name(&fs_exclude_list, "squashfs"); ++ np_add_name(&fs_exclude_list, "tmpfs"); ++ np_add_name(&fs_exclude_list, "tracefs"); + + for (c = 1; c < argc; c++) + if (strcmp ("-to", argv[c]) == 0) +-- +2.17.1 + diff -pruN 2.2-6/debian/patches/series 2.2-6ubuntu2/debian/patches/series --- 2.2-6/debian/patches/series 2019-04-16 17:14:10.000000000 +0000 +++ 2.2-6ubuntu2/debian/patches/series 2020-05-02 06:43:05.000000000 +0000 @@ -6,3 +6,7 @@ 13_check_apt_list_packages 14_mariadb 15_check_smtp_initialize +16_check_http_socket_timeouts + +# Ubuntu +exclude-tmpfs-squashfs-tracefs.patch