Changeset 250

Timestamp:

Jun 25, 2018, 12:49:54 PM (6 years ago)

Author:

g7moreau

Message:

• Parameter script name and remove old comment

File:

• trunk/nagios-velvice/velvice.cgi (modified) (8 diffs)

trunk/nagios-velvice/velvice.cgi

@@ -10 +10 @@
 # Possible command http://old.nagios.org/developerinfo/externalcommands/commandlist.php
 #
-# apt-get install libnagios-object-perl libhtml-parser-perl perl-modules liburi-encode-perl libcolor-calc-perl libyaml-syck-perl
+# apt-get install perl-modules libnagios-object-perl libhtml-parser-perl liburi-encode-perl libcolor-calc-perl libyaml-syck-perl
 
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.5.1');
+use version; our $VERSION = version->declare('0.5.4');
 
 use CGI;
@@ -44 +44 @@
 
 my $check = uri_decode($query->param('check'));
+my $script_name = $query->script_name();
 
 sub hostmapping {
@@ -126 +127 @@
  <ul>
    <li>Nagios Velvice Alert Panel : <a href="$config->{'portal-url'}">Core Server</a></li>
-   <li><small>(<a href='velvice.cgi'>UPDATE</a> - $date)</small></li>
+   <li><small>(<a href="$script_name">UPDATE</a> - $date)</small></li>
  </ul>
 </h1>
@@ -145 +146 @@
    $htmlpage .= "<p>Alert to recheck - Level:\n";
    $htmlpage .= join ",\n",
-      ' <a href="velvice.cgi?check=all">ALL</a><small>(' . scalar(@serviceproblems) . ')</small>',
-      map(" <a href='velvice.cgi?check=" . lc(uri_encode($_)) . "'>$_</a>($service_level{$_})", sort keys %service_level);
+      " <a href='$script_name?check=all'>ALL</a><small>(" . scalar(@serviceproblems) . ')</small>',
+      map(" <a href='$script_name?check=" . lc(uri_encode($_)) . "'>$_</a>($service_level{$_})", sort keys %service_level);
    $htmlpage .= ".\n";
    $htmlpage .= " <br />\n";
    $htmlpage .= " Service:\n";
-   $htmlpage .= join ",\n", map(" <a href='velvice.cgi?check=" . lc(uri_encode($_)) . "'>$_</a><small>($service_name{$_})</small>", sort keys %service_name);
+   $htmlpage .= join ",\n", map(" <a href='$script_name?check=" . lc(uri_encode($_)) . "'>$_</a><small>($service_name{$_})</small>", sort keys %service_name);
    $htmlpage .= ".\n";
    $htmlpage .= "</p>\n";
@@ -157 +158 @@
    open $nagios_cmd, '>>', $config->{'nagios-cmd'} or die "Can't open file filename: $!";
 
-#   my @oomkiller     = ();
-   my %sshdown       = ();
-#   my @aptuptodate   = ();
-   my %cmdafter      = ();
+   my %sshdown    = ();
+   my %cmdafter   = ();
    my $after;
 
@@ -212 +211 @@
          }
 
-#      push @aptuptodate, $hostname if $service eq 'APT UPTODATE';
-#      push @oomkiller,   $hostname if $service eq 'OOM Killer' and $status ne 'PENDING';
       for my $srv_name (keys %{$config->{'service'}}) {
          my $srv_regex  = $config->{'service'}{$srv_name}{'regex'};
@@ -253 +250 @@
       }
 
-#   if (@oomkiller or @aptuptodate or $after) {
    if ($after) {
       require Nagios::Object::Config;
@@ -277 +273 @@
             }
          }
-
-#      @oomkiller = grep !exists $sshdown{$_}, @oomkiller;
-#      if (@oomkiller) {
-#         $htmlpage .= "<h2>OOM Killer</h2>\n";
-#         $htmlpage .= "<pre>\n";
-#         if (@oomkiller == 1) {
-#            $htmlpage .= " ssh";
-#            }
-#         else {
-#            $htmlpage .= " tssh -c 'sudo rm /var/lib/nagios3/nagios_oom_killer.log'";
-#            }
-#         for my $host (@oomkiller) {
-#            my $object = $parser->find_object("$host", "Nagios::Host");
-#            $htmlpage .= ' ' . hostmapping($object->address =~ s/\..*$//r);
-#            }
-#         $htmlpage .= " 'sudo rm /var/lib/nagios3/nagios_oom_killer.log'" if (@oomkiller == 1);
-#         $htmlpage .= "</pre>\n";
-#         }
-#
-#      @aptuptodate = grep !exists $sshdown{$_}, @aptuptodate;
-#      if (@aptuptodate) {
-#         $htmlpage .= "<h2>APT UPTODATE</h2>\n";
-#         $htmlpage .= "<pre>\n";
-#         if (@aptuptodate == 1) {
-#            $htmlpage .= " ssh";
-#            }
-#         else {
-#            $htmlpage .= " tssh";
-#            }
-#         for my $host (@aptuptodate) {
-#            my $object = $parser->find_object("$host", "Nagios::Host");
-#            $htmlpage .= ' ' . hostmapping($object->address =~ s/\..*$//r);
-#            }
-#         $htmlpage .= "</pre>\n";
-#         }
       }
    }