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

Accepting request 631188 from server:monitoring

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/631188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2018-08-24 15:12:52 +00:00 committed by Git OBS Bridge
commit 008b726768
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monitoring-plugins.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 10 00:48:01 CEST 2018 - ro@suse.de
- copy usr.lib.nagios.plugins.check_procs as
usr.lib.nagios.plugins.check_procs.sle15 and use that for sle15
and above. "ptrace" to enable ptrace globally is needed here.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 8 14:14:00 UTC 2017 - kstreitova@suse.com Wed Nov 8 14:14:00 UTC 2017 - kstreitova@suse.com

9
monitoring-plugins.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package monitoring-plugins # spec file for package monitoring-plugins
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@ Name: monitoring-plugins
Version: 2.2 Version: 2.2
Release: 0 Release: 0
Summary: The Monitoring Plug-Ins Summary: The Monitoring Plug-Ins
License: GPL-2.0+ and GPL-3.0 License: GPL-2.0-or-later AND GPL-3.0-only
Group: System/Monitoring Group: System/Monitoring
Url: http://monitoring-plugins.org/ Url: http://monitoring-plugins.org/
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
@ -48,6 +48,7 @@ Source31: usr.lib.nagios.plugins.check_load
Source32: usr.lib.nagios.plugins.check_procs Source32: usr.lib.nagios.plugins.check_procs
Source33: usr.lib.nagios.plugins.check_swap Source33: usr.lib.nagios.plugins.check_swap
Source34: usr.lib.nagios.plugins.check_users Source34: usr.lib.nagios.plugins.check_users
Source35: usr.lib.nagios.plugins.check_procs.sle15
# PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces)
Patch1: %{name}-2.1.1-check_logfile.patch Patch1: %{name}-2.1.1-check_logfile.patch
# PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user) # PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user)
@ -1175,7 +1176,11 @@ install -m 644 %{SOURCE24} %{buildroot}%{_sysconfdir}/apparmor.d/
install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/apparmor.d/
install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/apparmor.d/
install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/apparmor.d/
%if 0%{?suse_version} >= 1500
install -m 644 %{SOURCE35} %{buildroot}%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_procs
%else
install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/apparmor.d/
%endif
install -m 644 %{SOURCE33} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE33} %{buildroot}%{_sysconfdir}/apparmor.d/
install -m 644 %{SOURCE34} %{buildroot}%{_sysconfdir}/apparmor.d/ install -m 644 %{SOURCE34} %{buildroot}%{_sysconfdir}/apparmor.d/

13
usr.lib.nagios.plugins.check_procs.sle15 Normal file
View File

@ -0,0 +1,13 @@
#include <tunables/global>
/usr/lib/nagios/plugins/check_procs {
#include <abstractions/nameservice>
#include <abstractions/base>
#include <abstractions/consoles>
ptrace,
/bin/ps rix,
/proc/ r,
/proc/** r,
/usr/lib/nagios/plugins/check_procs mr,
}