X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=clearadm%2Findex.cgi;fp=clearadm%2Findex.cgi;h=df9a74ad81a6f1a392fa7ca154e96d4f3eac2d0b;hb=3c28a301742e8f8cdd35825fd6ebe4f842a510c7;hp=4fc9cecb2eb27bdfbc9c8b36e2ea0ce94b06c383;hpb=cc7bfce480ad76a92d6c9e8c8bcb59295e099388;p=clearscm.git diff --git a/clearadm/index.cgi b/clearadm/index.cgi index 4fc9cec..df9a74a 100755 --- a/clearadm/index.cgi +++ b/clearadm/index.cgi @@ -42,8 +42,9 @@ use warnings; 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 Convert::Base64; use lib "$FindBin::Bin/lib", "$FindBin::Bin/../lib"; @@ -57,7 +58,7 @@ use Utils; my $clearadm = Clearadm->new; # Main -GetOptions ( +GetOptions( 'usage' => sub { Usage }, 'verbose' => sub { set_verbose }, 'debug' => sub { set_debug }, @@ -94,7 +95,7 @@ my @systems = $clearadm->FindSystem; $perRow = @systems if @systems < $perRow; -foreach (@systems) { +for (@systems) { my %system = %{$_}; if ($i++ % $perRow == 0) { @@ -106,8 +107,7 @@ foreach (@systems) { my $data; - $data = '' - if $system{active} eq 'false'; + $data = '' if $system{active} eq 'false'; $data .= a { href => "systemdetails.cgi?system=$system{name}" @@ -115,7 +115,7 @@ foreach (@systems) { 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!', @@ -123,22 +123,25 @@ foreach (@systems) { }; } # if + my $image = $system{loadavgsmall} + ? "data:image/png;base64,$system{loadavgsmall}" + : "plotloadavg.cgi?system=$system{name}&tiny=1"; + $data .= '
' . 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, }; - $data .= '
' - if $system{active} eq 'false'; + $data .= '
' if $system{active} eq 'false'; $load{uptime} ||= 'Unknown'; display td {class => 'dataCentered'}, "$data ", font {class => 'dim' }, "
Up: $load{uptime}"; -} # foreach +} # for while ($i % $perRow != 0) { $i++;