From 75b012c355277eba4717ea6b72e8dcbcff1b991650e8b15ab45cda25fbb1d028 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sat, 26 Mar 2022 11:36:45 +0000 Subject: [PATCH] Accepting request 963894 from home:niner9:branches:server:monitoring - added monitoring-plugins-2.3.1-check_disk_on_btrfs.patch backport fix for check_disk reporting critical on btrfs (nagios-plugins issue %569) OBS-URL: https://build.opensuse.org/request/show/963894 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=98 --- ...ng-plugins-2.3.1-check_disk_on_btrfs.patch | 25 +++++++++++++++++++ monitoring-plugins.changes | 7 ++++++ monitoring-plugins.spec | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 monitoring-plugins-2.3.1-check_disk_on_btrfs.patch diff --git a/monitoring-plugins-2.3.1-check_disk_on_btrfs.patch b/monitoring-plugins-2.3.1-check_disk_on_btrfs.patch new file mode 100644 index 0000000..b9e5905 --- /dev/null +++ b/monitoring-plugins-2.3.1-check_disk_on_btrfs.patch @@ -0,0 +1,25 @@ +commit a00fd77179dd6a6c2c96ff09350a9c213c18fd62 +Author: George Hansper +Date: Tue Sep 22 19:06:57 2020 +1000 + + check_disk - fix false DISK CRITICAL alert for btrfs filesystems due to BSD Gnulib workaround + +diff --git a/plugins/check_disk.c b/plugins/check_disk.c +index 2f20e47a..c813ad65 100755 +--- a/plugins/check_disk.c ++++ b/plugins/check_disk.c +@@ -1310,10 +1310,14 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) { + + void + get_path_stats (struct parameter_list *p, struct fs_usage *fsp) { ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD ) + /* 2007-12-08 - Workaround for Gnulib reporting insanely high available + * space on BSD (the actual value should be negative but fsp->fsu_bavail + * is unsigned) */ + p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail; ++#else ++ p->available = fsp->fsu_bavail; ++#endif + p->available_to_root = fsp->fsu_bfree; + p->used = fsp->fsu_blocks - fsp->fsu_bfree; + if (freespace_ignore_reserved) { diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 8776680..4f633e6 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 22 09:58:05 UTC 2022 - Stefan Seifert + +- added monitoring-plugins-2.3.1-check_disk_on_btrfs.patch + backport fix for check_disk reporting critical on btrfs (nagios-plugins + issue %569) + ------------------------------------------------------------------- Fri Dec 3 08:37:09 UTC 2021 - Lars Vogdt diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 30f6b8f..c30bbe6 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -86,6 +86,7 @@ Patch125: monitoring-plugins-2.3.1-check_ssh.patch Patch126: monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch # PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/issues/1375 Patch127: monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch +Patch128: monitoring-plugins-2.3.1-check_disk_on_btrfs.patch BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping @@ -1139,6 +1140,7 @@ done %patch125 -p1 %patch126 -p1 %patch127 -p1 +%patch128 -p1 find -type f -exec chmod 644 {} + %build