projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed to not try new images while the monitor is off
[clearscm.git]
/
clearadm
/
index.cgi
diff --git
a/clearadm/index.cgi
b/clearadm/index.cgi
index
a5259ea
..
df9a74a
100755
(executable)
--- a/
clearadm/index.cgi
+++ b/
clearadm/index.cgi
@@
-1,4
+1,4
@@
-#!/usr/bin/perl
+#!/usr/
local/
bin/perl
=pod
=pod
@@
-42,22
+42,23
@@
use warnings;
use FindBin;
use Getopt::Long;
use FindBin;
use Getopt::Long;
-use CGI qw
(:standard *table start_Tr end_Tr);
+use CGI qw(:standard *table start_Tr end_Tr);
use CGI::Carp 'fatalsToBrowser';
use CGI::Carp 'fatalsToBrowser';
+use Convert::Base64;
use lib "$FindBin::Bin/lib", "$FindBin::Bin/../lib";
use ClearadmWeb;
use Clearadm;
use lib "$FindBin::Bin/lib", "$FindBin::Bin/../lib";
use ClearadmWeb;
use Clearadm;
-
#
use Clearcase;
-
#
use Clearcase::Views;
+use Clearcase;
+use Clearcase::Views;
use Display;
use Utils;
my $clearadm = Clearadm->new;
# Main
use Display;
use Utils;
my $clearadm = Clearadm->new;
# Main
-GetOptions
(
+GetOptions(
'usage' => sub { Usage },
'verbose' => sub { set_verbose },
'debug' => sub { set_debug },
'usage' => sub { Usage },
'verbose' => sub { set_verbose },
'debug' => sub { set_debug },
@@
-94,7
+95,7
@@
my @systems = $clearadm->FindSystem;
$perRow = @systems if @systems < $perRow;
$perRow = @systems if @systems < $perRow;
-for
each
(@systems) {
+for (@systems) {
my %system = %{$_};
if ($i++ % $perRow == 0) {
my %system = %{$_};
if ($i++ % $perRow == 0) {
@@
-106,8
+107,7
@@
foreach (@systems) {
my $data;
my $data;
- $data = '<strike>'
- if $system{active} eq 'false';
+ $data = '<strike>' if $system{active} eq 'false';
$data .= a {
href => "systemdetails.cgi?system=$system{name}"
$data .= a {
href => "systemdetails.cgi?system=$system{name}"
@@
-115,7
+115,7
@@
foreach (@systems) {
if ($system{notification}) {
$data .= ' ' . a {
if ($system{notification}) {
$data .= ' ' . a {
- href => "alertlog.cgi?system=$system{name}"}, img {
+ href
=> "alertlog.cgi?system=$system{name}"}, img {
src => 'alert.png',
border => 0,
alt => 'Alert!',
src => 'alert.png',
border => 0,
alt => 'Alert!',
@@
-123,20
+123,25
@@
foreach (@systems) {
};
} # if
};
} # if
+ my $image = $system{loadavgsmall}
+ ? "data:image/png;base64,$system{loadavgsmall}"
+ : "plotloadavg.cgi?system=$system{name}&tiny=1";
+
$data .= '<br>' .
a {href =>
"plot.cgi?type=loadavg&system=$system{name}&scaling=Hour&points=24"
}, img {
$data .= '<br>' .
a {href =>
"plot.cgi?type=loadavg&system=$system{name}&scaling=Hour&points=24"
}, img {
- src =>
"plotloadavg.cgi?system=$system{name}&tiny=1"
,
+ src =>
$image
,
border => 0,
};
border => 0,
};
- $data .= '</strike>'
- if $system{active} eq 'false';
+ $data .= '</strike>' if $system{active} eq 'false';
+ $load{uptime} ||= 'Unknown';
+
display td {class => 'dataCentered'}, "$data ",
font {class => 'dim' }, "<br>Up: $load{uptime}";
display td {class => 'dataCentered'}, "$data ",
font {class => 'dim' }, "<br>Up: $load{uptime}";
-} # for
each
+} # for
while ($i % $perRow != 0) {
$i++;
while ($i % $perRow != 0) {
$i++;
@@
-203,4
+208,4
@@
Please report problems to Andrew DeFaria <Andrew@ClearSCM.com>.
Copyright (c) 2010, ClearSCM, Inc. All rights reserved.
Copyright (c) 2010, ClearSCM, Inc. All rights reserved.
-=cut
\ No newline at end of file
+=cut