rpm/monitoring-plugins
SHA256
1
0
Fork 0
forked from pool/monitoring-plugins
Code Pull Requests Activity

Accepting request 965012 from server:monitoring

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/965012
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2022-03-26 21:31:10 +00:00 committed by Git OBS Bridge
commit b29e02b0cd
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
monitoring-plugins-2.3.1-check_disk_on_btrfs.patch Normal file
View File

@ -0,0 +1,25 @@
commit a00fd77179dd6a6c2c96ff09350a9c213c18fd62
Author: George Hansper <george@hansper.id.au>
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) {

7
monitoring-plugins.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 22 09:58:05 UTC 2022 - Stefan Seifert <nine@detonation.org>
- 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 <lars@linux-schulserver.de>

2
monitoring-plugins.spec
View File

@ -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