Changeset 3866 for monitoring

Timestamp:

10/23/13 17:56:29 (11 years ago)

Author:

oschonef

Message:

• cosmetic fixes

Location:

monitoring/plugins/ids

Files:

• check_shib_idp (modified) (2 diffs, 1 prop)
• check_shib_sp (modified) (8 diffs, 1 prop)

monitoring/plugins/ids/check_shib_idp

@@ -1 +1 @@
 #!/usr/bin/perl
 #
-# check_shib_idp, version 2012-06-13
+# $Id$
 #
 
@@ -111 +111 @@
 $url =~ s|^/+||g;
 $url =~ s|/+$||g;
-my $sp_status_url = sprintf('%s://%s/%s', ($use_ssl ? 'https' : 'http'),
-                                          $host,
-                                          $url);
-print STDERR "IDP URL: $sp_status_url\n" if ($verbose > 0);
+my $idp_status_url = sprintf('%s://%s/%s', ($use_ssl ? 'https' : 'http'),
+                                            $host,
+                                            $url);
+print STDERR "IDP URL: $idp_status_url\n" if ($verbose > 0);
 
 my $browser = LWP::UserAgent->new;
-my $response = $browser->get($sp_status_url);
+my $response = $browser->get($idp_status_url);
 if ($response->is_success) {
     my $code    = OK;

monitoring/plugins/ids/check_shib_sp

@@ -1 +1 @@
 #!/usr/bin/perl
 #
-# check_shib_sp, version 2012-04-03
+# $Id$
 #
 
@@ -151 +151 @@
 my $cert_warn_days = 31;
 my $timeout        = 10;
-
+my $verbose        = 0;
 
 my $result = GetOptions("H=s" => \$host,
@@ -158 +158 @@
                         "S"   => \$use_ssl,
                         "D=i" => \$max_clock_diff,
-                        "C=i" => \$cert_warn_days);
+                        "C=i" => \$cert_warn_days,
+                        'v'   => \$verbose);
+
 if (!($result)) {
     status(UNKNOWN, 'USAGE: -H <host> [-u <url>] [-t <timeout>] [-S] [-D <clock skew> -C <age>');
@@ -167 +169 @@
     status(UNKNOWN, 'missing manadorty parameter -H <host>');
 }
-
-#print "Host: $host\nURL: $url\nUSE_SSL: $use_ssl\nCLOCK: $max_clock_diff\nCERT WARN: $cert_warn_days\n";
 
 local $SIG{ALRM} = sub {
@@ -181 +181 @@
                                           $host,
                                           $url);
+
+print STDERR "SP URL: $sp_status_url\n" if ($verbose > 0);
+
 my $browser = LWP::UserAgent->new;
 my $response = $browser->get($sp_status_url);
@@ -190 +193 @@
     };
     if ($@) {
-        status(CRITICAL, "error parsing XML response: " . $@);
+        my $msg = $@;
+        $msg =~ s/^\n*(.*)\s+at.*?\n*$/$1/gs;
+        status(CRITICAL, "error parsing XML response: " . $msg);
     }
 
@@ -235 +240 @@
         if ($cert->checkend(0)) {
             status(CRITICAL,
-                   sprintf('%s certificate is expired since %s',
+                   sprintf('%s certificate has expired since %s',
                            $key->{'use'}, $cert->notAfter()));
         }
@@ -241 +246 @@
             my $expire_days = int(get_diff($cert->notAfter()) / 86400);
             $code           = WARNING;
-            $message        = sprintf('%s certificate expires in %d day(s)',
+            $message        = sprintf('%s certificate will expire in %d day(s)',
                                       $key->{'use'}, $expire_days);
         }