Changeset 247

Timestamp:

Jun 25, 2018, 11:32:49 AM (6 years ago)

Author:

g7moreau

Message:

• Push generic remote command, remove old one

File:

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

trunk/nagios-velvice/velvice.cgi

@@ -118 +118 @@
    display: inline;
    }
-.bold td {
+td.bold {
    font-weight: bold;
    }
@@ -157 +157 @@
    open $nagios_cmd, '>>', $config->{'nagios-cmd'} or die "Can't open file filename: $!";
 
-   my @oomkiller     = ();
+#   my @oomkiller     = ();
    my %sshdown       = ();
-   my @aptuptodate   = ();
+#   my @aptuptodate   = ();
    my %cmdafter      = ();
    my $after;
@@ -212 +212 @@
          }
 
-      push @aptuptodate, $hostname if $service eq 'APT UPTODATE';
-      push @oomkiller,   $hostname if $service eq 'OOM Killer' and $status ne 'PENDING';
+#      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 +253 @@
       }
 
-   if (@oomkiller or @aptuptodate or $after) {
+#   if (@oomkiller or @aptuptodate or $after) {
+   if ($after) {
       require Nagios::Object::Config;
       my $parser = Nagios::Object::Config->new();
@@ -261 +262 @@
          my @action = grep !exists $sshdown{$_}, @{$cmdafter{$srv_name}};
          if (@action) {
-            my $srv_title = $config->{'service'}{$srv_name}{'title'} || $srv_name;
-            $htmlpage .= "<h2>Action: $srv_title</h2>\n";
+            my $srv_title = $config->{'service'}{$srv_name}{'title'} || "Action: $srv_name";
+            $htmlpage .= "<h2>$srv_title</h2>\n";
             $htmlpage .= "<pre>\n";
             my $remote_action = $config->{'service'}{$srv_name}{'command'};
@@ -277 +278 @@
          }
 
-      @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";
-         }
+#      @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";
+#         }
       }
    }