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

Accepting request 694443 from server:monitoring

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/694443
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2019-04-17 08:08:08 +00:00 committed by Git OBS Bridge
commit 0c8c5f133e
6 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
check_ping_fix_ip4.patch Normal file
View File

@ -0,0 +1,15 @@
diff -ur monitoring-plugins-2.2/plugins/check_ping.c monitoring-plugins-2.2_fix/plugins/check_ping.c
--- monitoring-plugins-2.2/plugins/check_ping.c 2016-11-29 09:45:08.000000000 +0100
+++ monitoring-plugins-2.2_fix/plugins/check_ping.c 2019-04-09 14:09:57.574380368 +0200
@@ -128,6 +128,11 @@
#else
xasprintf (&cmd, rawcmd, addresses[i], max_packets);
#endif
+ if (address_family == AF_INET) {
+ free(rawcmd);
+ rawcmd = cmd;
+ xasprintf (&cmd, "%s -4", rawcmd);
+ }
if (verbose >= 2)
printf ("CMD: %s\n", cmd);

17
monitoring-plugins.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sun Apr 14 15:57:26 UTC 2019 - Christian Boltz <suse-beta@cboltz.de>
- update AppArmor profiles for usrMerge (related to boo#1132350)
- grep in check_cups
- ps in check_procs and check_procs.sle15
-------------------------------------------------------------------
Fri Apr 12 14:20:08 CEST 2019 - ro@suse.de
- update usr.lib.nagios.plugins.check_procs to bash in /usr
-------------------------------------------------------------------
Tue Apr 9 12:19:20 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
- support IPv4 ping for dual stacked host again: check_ping_fix_ip4.patch
-------------------------------------------------------------------
Fri Nov 30 14:25:19 CET 2018 - ro@suse.de

3
monitoring-plugins.spec
View File

@ -62,6 +62,8 @@ Source59: nrpe-check_mysql
Source60: nrpe-check_ups
# PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces)
Patch1: %{name}-2.1.1-check_logfile.patch
# PATCH-FIX-UPSTREAM Allow to ping IPv4 with check_ping again for dual stack hosts: https://github.com/monitoring-plugins/monitoring-plugins/issues/1550
Patch2: check_ping_fix_ip4.patch
# PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user)
Patch6: %{name}-1.4.6-no_chown.patch
# PATCH-FIX-UPSTREAM Use correct pointer
@ -1102,6 +1104,7 @@ EOF
done
%patch1 -p1
%patch2 -p1
%patch6 -p1
%patch11 -p1
%patch15 -p1

4
usr.lib.nagios.plugins.check_cups
View File

@ -10,8 +10,8 @@
network inet dgram,
network inet stream,
/bin/bash rix,
/bin/grep rix,
/{usr/,}bin/bash rix,
/{usr/,}bin/grep rix,
/{usr/,}bin/which rix,
/{usr/,}bin/lpstat rix,
/{usr/,}bin/basename rix,

2
usr.lib.nagios.plugins.check_procs
View File

@ -6,7 +6,7 @@
capability sys_ptrace,
/bin/ps rix,
/{usr/,}bin/ps rix,
/proc/ r,
/proc/** r,
/usr/lib/nagios/plugins/check_procs mr,

2
usr.lib.nagios.plugins.check_procs.sle15
View File

@ -7,7 +7,7 @@
ptrace,
ptrace (read) peer=unconfined,
/bin/ps rix,
/{usr/,}bin/ps rix,
/proc/ r,
/proc/** r,
/usr/lib/nagios/plugins/check_procs mr,