Changeset 320

Timestamp:

Jul 20, 2018, 1:43:36 PM (6 years ago)

Author:

g7moreau

Message:

• CHange alertcolor API

File:

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

trunk/nagios-velvice/velvice.cgi

@@ -65 +65 @@
 
 sub alertcolor {
-   my ($color, $downtime) = @_;
+   my ($status, $downtime) = @_;
+
+   my %STATUS_DB = (
+      CRITICAL => {id => 3, color => '#F88888'}
+      WARNING  => {id => 2, color => '#FFFF00'}
+      PENDING  => {id => 1, color => '#E0E0E0'}
+      );
+
+   my $color = '#0000FF';
+   $color = $STATUS_DB{$status}->{'color'} if exists $STATUS_DB{$status};
 
    $downtime = $downtime - $config->{'color-downtime'}{'day-min'}; # same color first days
@@ -107 +116 @@
     
       my $downtime = downtime($log->service($host, $srv)->last_state_change);
-      my $color    = $status eq 'CRITICAL' ? '#F88888' : '#FFFF00';
-      $color = alertcolor($color, $downtime);
-
-      my %status_db = (
-         CRITICAL => 3,
-         WARNING  => 2,
-         PENDING  => 1,
-         );
+      my $color    = alertcolor($status, $downtime);
 
       my $status_id = 0;
-      $status_id = $status_db{$status} if exists $status_db{$status};
+      $status_id = $STATUS_DB{$status}->{'id'} if exists $STATUS_DB{$status};
 
       #$hostcount{$host}++;
@@ -201 +203 @@
       my $output   = HTML::Entities::encode($srv->plugin_output) =~ s/^[A-Z_\s]+?[:-]//r;
 
-      my $color = $status eq 'CRITICAL' ? '#F88888' : '#FFFF00';
-      $color = alertcolor($color, $downtime);
+      my $color = alertcolor($status, $downtime);
       my $stylecolor = "style='background:$color;'";
       $htmlpage .= " <tr>\n";
@@ -280 +281 @@
          my $hostname = $host_stat->host_name;
          my $downtime = downtime($host_stat->last_state_change);
-         my $color = alertcolor('#F88888', $downtime);
+         my $color = alertcolor('CRITICAL', $downtime);
          $htmlpage .= " <tr style='background:$color'>\n";
          $htmlpage .= "  <td><a class='hoop' href=\"$config->{'nagios-server'}{'status-cgi'}?host=" . uri_encode($hostname) . "\">$hostname</a></td>\n";