Changeset 257 for trunk

Timestamp:

Jun 25, 2018, 9:35:20 PM (7 years ago)

Author:

g7moreau

Message:

• Better default value, better variable cgi name

File:

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

trunk/nagios-velvice/velvice.cgi

@@ -15 +15 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.6.1');
+use version; our $VERSION = version->declare('0.6.2');
 
 use CGI;
@@ -24 +24 @@
 use YAML::Syck;
 
-my $query = CGI->new();
-my $check = uri_decode($query->param('check'));
-my $script_name = $query->script_name();
-#my $uri = $query->request_uri();
+my $query           = CGI->new();
+my $cgi_check       = uri_decode($query->param('check'));
+my $cgi_script_name = $query->script_name();
+my $cgi_uri         = $query->request_uri();
 
 my $config = {};
@@ -34 +34 @@
 $config->{'nagios-server'}{'status-file'} ||= '/var/cache/nagios3/status.dat';
 $config->{'nagios-server'}{'nagios-cmd'}  ||= '/var/lib/nagios3/rw/nagios.cmd';
-$config->{'nagios-server'}{'portal-url'}  ||= 'http://localhost/nagios3/';
-$config->{'nagios-server'}{'status-cgi'}  ||= 'http://localhost/cgi-bin/nagios3/status.cgi';
-#$config->{'nagios-server'}{'status-cgi'}  ||= "$uri/status.cgi";
+$config->{'nagios-server'}{'portal-url'}  ||= $cgi_uri =~ s{/cgi-bin/}{/}r;
+$config->{'nagios-server'}{'status-cgi'}  ||= "$cgi_uri/status.cgi";
 $config->{'host-mapping'}                 ||= {};
 $config->{'color-downtime'}               ||= {};
@@ -130 +129 @@
  <ul>
    <li>Nagios Velvice Alert Panel : <a href="$config->{'nagios-server'}{'portal-url'}">Core Server</a></li>
-   <li><small>(<a href="$script_name">UPDATE</a> - $date)</small></li>
+   <li><small>(<a href="$cgi_script_name">UPDATE</a> - $date)</small></li>
  </ul>
 </h1>
@@ -149 +148 @@
    $htmlpage .= "<p>Alert to recheck - Level:\n";
    $htmlpage .= join ",\n",
-      " <a href='$script_name?check=all'>ALL</a><small>(" . scalar(@serviceproblems) . ')</small>',
-      map(" <a href='$script_name?check=" . lc(uri_encode($_)) . "'>$_</a>($service_status{$_})", sort keys %service_status);
+      " <a href='$cgi_script_name?check=all'>ALL</a><small>(" . scalar(@serviceproblems) . ')</small>',
+      map(" <a href='$cgi_script_name?check=" . lc(uri_encode($_)) . "'>$_</a>($service_status{$_})", sort keys %service_status);
    $htmlpage .= ".\n";
    $htmlpage .= " <br />\n";
    $htmlpage .= " Service:\n";
-   $htmlpage .= join ",\n", map(" <a href='$script_name?check=" . lc(uri_encode($_)) . "'>$_</a><small>($service_name{$_})</small>", sort keys %service_name);
+   $htmlpage .= join ",\n", map(" <a href='$cgi_script_name?check=" . lc(uri_encode($_)) . "'>$_</a><small>($service_name{$_})</small>", sort keys %service_name);
    $htmlpage .= ".\n";
    $htmlpage .= "</p>\n";
@@ -173 +172 @@
       my $status   = $srv->status;
       my $downtime = downtime($srv->last_state_change);
-      my $output   = HTML::Entities::encode($srv->plugin_output);
-      $output =~ s/^[A-Z_\s]+?[:-]//;
+      my $output   = HTML::Entities::encode($srv->plugin_output) =~ s/^[A-Z_\s]+?[:-]//r;
 
       my $color = $status eq 'CRITICAL' ? '#F88888' : '#FFFF00';
@@ -196 +194 @@
       $htmlpage .= "  <td style='max-width:60%;'><small>$output";
 
-      if (($check =~ m/all/i)
-            or ($check =~ m/^$service$/i)
-            or ($check =~ m/critical/i and $status eq 'CRITICAL')
-            or ($check =~ m/warning/i  and $status eq 'WARNING')
-            or ($check =~ m/pending/i  and $status eq 'PENDING')
+      if (($cgi_check =~ m/all/i)
+            or ($cgi_check =~ m/^$service$/i)
+            or ($cgi_check =~ m/critical/i and $status eq 'CRITICAL')
+            or ($cgi_check =~ m/warning/i  and $status eq 'WARNING')
+            or ($cgi_check =~ m/pending/i  and $status eq 'PENDING')
             ) {
          $now++;