X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=clearadm%2Fplotloadavg.cgi;h=c8acbfa7bf7cfc3e15261348afc275e81574c01f;hb=0c802537ec02d6cfea4c41b3138535c09a319489;hp=d33afd9337ced3a3a3c41c1aec856dee77d74acb;hpb=020a4a5ea2be725b155cae3a2cadc9aba3911b9b;p=clearscm.git diff --git a/clearadm/plotloadavg.cgi b/clearadm/plotloadavg.cgi index d33afd9..c8acbfa 100755 --- a/clearadm/plotloadavg.cgi +++ b/clearadm/plotloadavg.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl =pod @@ -85,12 +85,6 @@ if ($opts{tiny}) { $opts{scaling} = 'Hour'; } # if -sub labelY ($) { - my ($value) = @_; - - return $opts{tiny} ? '' : $value; -} # labelY - my $clearadm = Clearadm->new; my $graph = GD::Graph::area->new ($opts{width}, $opts{height}); @@ -109,7 +103,7 @@ my @loads = $clearadm->GetLoadavg ( $opts{scaling} ); -graphError "No loadavg data found for system $opts{system}" +graphError "No loadavg data" unless @loads; my (@x, @y); @@ -122,7 +116,7 @@ foreach (@loads) { } else { push @x, $load{timestamp}; } # if - + push @y, $load{loadavg}; } # foreach @@ -137,6 +131,7 @@ my $x_label_skip = @x > 1000 ? 200 my $x_label = $opts{tiny} ? '' : 'Time'; my $y_label = $opts{tiny} ? '' : 'Load'; my $title = $opts{tiny} ? '' : "Load Average for $opts{system}"; +my $labelY = $opts{tiny} ? '' : '%.2f'; $graph->set ( x_label => $x_label, @@ -144,7 +139,7 @@ $graph->set ( x_label_skip => $x_label_skip, x_label_position => .5, y_label => $y_label, - y_number_format => &labelY, + y_number_format => $labelY, title => $title, dclrs => [$opts{color}], bgclr => 'white', @@ -195,9 +190,9 @@ L =begin html
-Clearadm
-ClearadmWeb
-Display
+Clearadm
+ClearadmWeb
+Display
=end html @@ -212,4 +207,4 @@ Please report problems to Andrew DeFaria . Copyright (c) 2010, ClearSCM, Inc. All rights reserved. -=cut \ No newline at end of file +=cut