Changeset 1986

Timestamp:

06/13/12 15:32:58 (12 years ago)

Author:

oschonef

Message:

• make value for memory warning and memory critical user settable
• enhance output
• cosmetic fixes

File:

• monitoring/plugins/ids/check_shib_idp (modified) (6 diffs)

monitoring/plugins/ids/check_shib_idp

@@ -1 +1 @@
 #!/usr/bin/perl
 #
-# check_shib_idp, version 2012-04-23
+# check_shib_idp, version 2012-06-13
 #
 
@@ -65 +65 @@
 
 
-my $result = GetOptions("H=s" => \$host,
-                        "u=s" => \$url,
-                        "t=i" => \$timeout,
-                        "S"   => \$use_ssl,
-                        "D=i" => \$max_clock_diff,
-                        "C=i" => \$cert_warn_days,
-                        "v"   => \$verbose);
+my $result = GetOptions('H=s' => \$host,
+                        'u=s' => \$url,
+                        't=i' => \$timeout,
+                        'S'   => \$use_ssl,
+                        'D=i' => \$max_clock_diff,
+                        'C=i' => \$cert_warn_days,
+                        'v'   => \$verbose,
+                        'W=i'    => \$memory_warn,
+                        'X=i'    => \$memory_crit);
 if (!($result)) {
-    status(UNKNOWN, 'USAGE: -H <host> [-u <url>] [-t <timeout>] [-S] [-D <clock skew> -C <age>');
+    status(UNKNOWN, 'USAGE: -H <host> [-u <url>] [-t <timeout>] [-S] ' .
+           '[-D <clock skew>] [-C <age>] [-W <value] [-X <value>]');
 }
 
@@ -80 +83 @@
     status(UNKNOWN, 'missing manadorty parameter -H <host>');
 }
+
+if (($memory_warn < 0) || ($memory_warn > 100)) {
+    status(UNKNOWN, 'parameter -W <value> (memory warning) ' .
+           'must be between 0 and 100');
+}
+
+if (($memory_crit < 0) || ($memory_crit > 100)) {
+    status(UNKNOWN, 'parameter -X <value> (memory critical) ' .
+           'must be between 0 and 100');
+}
+
+if ($memory_warn > $memory_crit) {
+    status(UNKNOWN, 'value for memory warning must be less than ' .
+           'value for memory critical');
+}
+
 
 #
@@ -129 +148 @@
     my $mem_used = $result->{'used_memory'};
     my $mem_max  = $result->{'maximum_memory'};
+    my $mem_percentage = -1.0;
     if (defined($mem_used) || defined($mem_max)) {
         $mem_used =~ s/MB$//;
         $mem_max  =~ s/MB$//;
-        my $x = int(($mem_used * 10000) / $mem_max) / 100;
-
-        print "memory $mem_used/$mem_max ($x)\n" if ($verbose > 0);
-        if ($x > $memory_crit) {
+        $mem_percentage = int(($mem_used * 10000) / $mem_max / 100);
+
+        printf("memory usage %s/%s (%d%%)\n",
+               $mem_used, $mem_max, $mem_percentage)
+            if ($verbose > 0);
+
+        if ($mem_percentage > $memory_crit) {
             $code    = CRITICAL;
-            $message = sprintf('IDP is low on memory (%s MB/%s MB)',
-                               $mem_used, $mem_max);
+            $message = sprintf('IDP is low on memory (%s MB/%s MB = %d%%)',
+                               $mem_used, $mem_max, $mem_percentage);
         }
-        elsif ($x > $memory_warn) {
+        elsif ($mem_percentage > $memory_warn) {
             $code    = WARNING;
-            $message = sprintf('IDP is running low on memory (%s MB/%s MB)',
-                               $mem_used, $mem_max);
+            $message = sprintf('IDP is running low on memory ' .
+                               '(%s MB/%s MB = %d%%)',
+                               $mem_used, $mem_max, $mem_percentage);
         }
     }
@@ -185 +209 @@
     }
     else {
-        status(OK, sprintf('Shibboleth IDP version %s (Java version %s)',
-                           $versions->{IDP}, $versions->{JAVA}));
+        status(OK, sprintf('Shibboleth IDP version %s ' .
+                           '(Java version %s, %d%% memory used)',
+                           $versions->{IDP}, $versions->{JAVA},
+                           $mem_percentage));
     }
 }
@@ -193 +219 @@
     status(CRITICAL, sprintf('error fetching status: %s', $status));
 }
-FOO:
 exit OK;