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

Accepting request 940945 from server:monitoring

Browse Source 
Preparing for inclusion in SLE12 and (latest) SLE15 as general update (to have the package on the same version in all SLE distributions.

OBS-URL: https://build.opensuse.org/request/show/940945
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2021-12-16 20:19:51 +00:00 committed by Git OBS Bridge
commit f4c70a4ccb
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch
View File

@ -1,17 +0,0 @@
Index: monitoring-plugins-2.3.1/lib/utils_cmd.c
===================================================================
--- monitoring-plugins-2.3.1.orig/lib/utils_cmd.c
+++ monitoring-plugins-2.3.1/lib/utils_cmd.c
@@ -355,10 +355,10 @@ cmd_run_array (char *const *argv, output
if ((fd = _cmd_open (argv, pfd_out, pfd_err)) == -1)
die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), argv[0]);
- if (out)
- out->lines = _cmd_fetch_output (pfd_out[0], out, flags);
if (err)
err->lines = _cmd_fetch_output (pfd_err[0], err, flags);
+ if (out)
+ out->lines = _cmd_fetch_output (pfd_out[0], out, flags);
return _cmd_close (fd);
}

25
monitoring-plugins.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Dec 3 08:37:09 UTC 2021 - Lars Vogdt <lars@linux-schulserver.de>
- removed the following, either upstreamed or integrated in other patches:
+ monitoring-plugins-wrong_return_in_check_swap.patch
+ monitoring-plugins-check_swap-fix_comment.patch
+ monitoring-plugins-check_swap-return_unknown.patch
+ monitoring-plugins-check_swap-fix-n.patch
-------------------------------------------------------------------
Thu Dec 2 14:54:25 UTC 2021 - Lars Vogdt <lars@linux-schulserver.de>
- remove monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch
the patch just reverts the problem, if you get more than 64K on
stdout
-------------------------------------------------------------------
Fri Nov 19 09:35:19 UTC 2021 - Lars Vogdt <lars@linux-schulserver.de>
@ -218,11 +234,18 @@ Mon Sep 14 13:39:18 CEST 2020 - ro@suse.de
-------------------------------------------------------------------
Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de
- include upstream fixes for check_swap
- add patch monitoring-plugins-check_swap-fix_comment.patch
simply fix the plugin name in the comment
- monitoring-plugins-check_swap-fix_zero_output.patch
improve the output if the swap has zero size
- monitoring-plugins-check_swap-return_unknown.patch
use unknown exit code for help/version in plugins
- add patch monitoring-plugins-check_swap-fix-n.patch
check_swap fix behaviour for "-n" if 0 free swap is left
from git commit 6995b510759cf531d70745b7d0c6e8a0d9010b06
(bug#1175828)
- updated context in
- updated context in
monitoring-plugins-wrong_return_in_check_swap.patch
-------------------------------------------------------------------

3
monitoring-plugins.spec
View File

@ -86,8 +86,6 @@ 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
# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/issues/1706
Patch128: monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch
BuildRequires: bind-utils
BuildRequires: dhcp-devel
BuildRequires: fping
@ -1141,7 +1139,6 @@ done
%patch125 -p1
%patch126 -p1
%patch127 -p1
%patch128 -p1
find -type f -exec chmod 644 {} +
%build