From 368f5c890e7c987023372f511647c4922564c8e8 Mon Sep 17 00:00:00 2001
From: Gerhard Gonter <ggonter@gmail.com>
Date: Mon, 17 Dec 2018 15:16:39 +0100
Subject: [PATCH] updated filesystem monitoring
---
modules/util/Util/Monitoring.pm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/modules/util/Util/Monitoring.pm b/modules/util/Util/Monitoring.pm
index def5b0d..2477ace 100644
--- a/modules/util/Util/Monitoring.pm
+++ b/modules/util/Util/Monitoring.pm
@@ -278,7 +278,7 @@ sub mon_fs
# $ev->{'ts'}= $ts;
}
- $ev;
+ (wantarray) ? ($ev, $fs_hash) : $ev;
}
sub get_fs_level
@@ -330,26 +330,28 @@ sub check_level
my ($label, $l_warn, $v_warn, $l_crit, $v_crit)= @$reference;
+ my $fmt_level= sprintf ("%2.1f", $level); # NOTE: avoid too fine grained percentage values in message
+
my ($nagios_status, $nagios_msg);
if ($level >= $v_crit)
{
$nagios_status= 3;
- $nagios_msg= "resource=[$resource] $label=$level >= $l_crit=$v_crit";
+ $nagios_msg= "resource=[$resource] $label=$fmt_level >= $l_crit=$v_crit";
}
elsif ($level >= $v_warn)
{
$nagios_status= 2;
- $nagios_msg= "resource=[$resource] $label=$level >= $l_warn=$v_warn";
+ $nagios_msg= "resource=[$resource] $label=$fmt_level >= $l_warn=$v_warn";
}
elsif ($level >= 0.0)
{
$nagios_status= 0;
- $nagios_msg= "resource=[$resource] $label=$level";
+ $nagios_msg= "resource=[$resource] $label=$fmt_level";
}
else
{
$nagios_status= 1;
- $nagios_msg= "resource=[$resource] $label=$level";
+ $nagios_msg= "resource=[$resource] $label=$fmt_level";
}
(wantarray) ? ($nagios_status, $nagios_msg) : [$nagios_status, $nagios_msg];
--
GitLab