Changeset 261 for trunk/nagios-velvice

Timestamp:

Jun 25, 2018, 10:25:30 PM (7 years ago)

Author:

g7moreau

Message:

• Change color-downtime min and max entries to day-min and day-max

Location:

trunk/nagios-velvice

Files:

• velvice.cgi (modified) (4 diffs)
• velvice.sample.yml (modified) (1 diff)

trunk/nagios-velvice/velvice.cgi

@@ -15 +15 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.6.5');
+use version; our $VERSION = version->declare('0.6.6');
 
 use CGI;
@@ -38 +38 @@
 $config->{'host-mapping'}                 ||= {};
 $config->{'color-downtime'}               ||= {};
-$config->{'color-downtime'}{'min'}        ||= 3;
-$config->{'color-downtime'}{'max'}        ||= 50;
-$config->{'color-downtime'}{'factor'}     ||= 0.7;
+$config->{'color-downtime'}{'day-min'}    ||=  3;
+$config->{'color-downtime'}{'day-max'}    ||= 50;
+$config->{'color-downtime'}{'factor'}     ||=  0.7;
 $config->{'remote-action'}                ||= {};
 
@@ -64 +64 @@
    my ($color, $downtime) = @_;
 
-   $downtime = $downtime - $config->{'color-downtime'}{'min'}; # same color first days
-   $downtime = $config->{'color-downtime'}{'max'} if $downtime > $config->{'color-downtime'}{'max'}; # max 50 days for color
+   $downtime = $downtime - $config->{'color-downtime'}{'day-min'}; # same color first days
+   $downtime = $config->{'color-downtime'}{'day-max'} if $downtime > $config->{'color-downtime'}{'day-max'}; # max 50 days for color
    $downtime =  0 if $downtime <  0;
 
-   my $factor = ($downtime * $config->{'color-downtime'}{'factor'}) / $config->{'color-downtime'}{'max'};
+   my $factor = ($downtime * $config->{'color-downtime'}{'factor'}) / $config->{'color-downtime'}{'day-max'};
    return Color::Calc::color_light_html($color, $factor);
    }
@@ -204 +204 @@
          $interval =  240 if $interval <  240;
          $interval = 3000 if $interval > 3000;
-         my $future = $now + 20 + int(rand($interval - 20)); # 5 * 60 = 300
+         my $future = $now + 20 + int(rand($interval - 20)); # 5 * 60 = 300
 
          $htmlpage .= " -- <b>CHECK</b> [$now/" . ($future - $now) . "]";

trunk/nagios-velvice/velvice.sample.yml

@@ -11 +11 @@
 
 color-downtime:
-   min:     3
-   max:    50
-   factor:  0.7
+   day-min:  3
+   day-max: 50
+   factor:   0.7
 
 remote-action: