From 0cb710c31c9baac6fd71d95f4dffb3473fb9cb7b9981266465f2561792006786 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Thu, 5 Dec 2019 15:35:07 +0000
Subject: [PATCH] - check_iostat: exit with OK if running on tmpfs -
 check_iostat: fix apparmor profile to allow stat call

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins-sar-perf?expand=0&rev=19
---
 check_iostat                        | 6 ++++++
 monitoring-plugins-sar-perf.changes | 6 ++++++
 usr.lib.nagios.plugins.check_iostat | 1 +
 3 files changed, 13 insertions(+)

diff --git a/check_iostat b/check_iostat
index 29de2f2..2aadb49 100644
--- a/check_iostat
+++ b/check_iostat
@@ -75,6 +75,12 @@ if (-d "$disk") {
     # directory specified ...
     my $mp = `stat --format '\%m' $disk`;
     chomp($mp);
+    my $fstype = `stat --file-system --format '\%T' $mp`;
+    chomp($fstype);
+    if ($fstype eq "tmpfs") {
+        print "OK - $disk (mountpoint $mp is tmpfs)\n";
+        exit 0;
+    }
     open(MOUNTS,"/proc/mounts");
     while(<MOUNTS>) {
         chomp($_);
diff --git a/monitoring-plugins-sar-perf.changes b/monitoring-plugins-sar-perf.changes
index 1c1e701..e38a303 100644
--- a/monitoring-plugins-sar-perf.changes
+++ b/monitoring-plugins-sar-perf.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  5 16:34:19 CET 2019 - ro@suse.de
+
+- check_iostat: exit with OK if running on tmpfs
+- check_iostat: fix apparmor profile to allow stat call 
+
 -------------------------------------------------------------------
 Thu Dec  5 14:40:38 CET 2019 - ro@suse.de
 
diff --git a/usr.lib.nagios.plugins.check_iostat b/usr.lib.nagios.plugins.check_iostat
index ba35d84..3e02b7d 100644
--- a/usr.lib.nagios.plugins.check_iostat
+++ b/usr.lib.nagios.plugins.check_iostat
@@ -5,6 +5,7 @@
    #include <abstractions/perl>
    /usr/bin/iostat rix,
    /{usr/,}bin/bash rix,
+   /{usr/,}bin/stat rix,
    /usr/bin/which rix,
    /sys/devices/system/cpu/ r,
    /proc/meminfo r,