Accepting request 889342 from server:monitoring

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/889342
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins-sar-perf?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2021-04-29 20:46:57 +00:00 committed by Git OBS Bridge
commit 46fd9253c8
3 changed files with 20 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 22 12:25:03 UTC 2021 - Lars Vogdt <lars@linux-schulserver.de>
- include abstractions/bash in apparmor profile - otherwise
the 'which iostat' command fails
- reload the apparmor profile in postun to make the changes effective
-------------------------------------------------------------------
Tue Jul 28 14:03:05 CEST 2020 - ro@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins-sar-perf
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -66,6 +66,17 @@ install -D -m755 check_sar_perf.py %{buildroot}/%{nagios_plugindir}/check_sar_pe
install -m755 %{SOURCE1} %{buildroot}/%{nagios_plugindir}/check_iostat
install -Dm0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_iostat
%postun
if [ "$YAST_IS_RUNNING" != "instsys" ]; then
if [ -x /sbin/apparmor_parser ]; then
if /usr/bin/systemctl is-active --quiet apparmor.service; then
/sbin/apparmor_parser -r -T -W %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_iostat &> /dev/null || :
fi
else
echo "Could not reload the Apparmor profile: /sbin/apparmor_parser is missing or not executable."
fi
fi
%clean
rm -rf %{buildroot}

View File

@ -1,6 +1,7 @@
#include <tunables/global>
/usr/lib/nagios/plugins/check_iostat {
#include <abstractions/base>
#include <abstractions/bash>
#include <abstractions/consoles>
#include <abstractions/perl>
/usr/bin/iostat rix,