Update Munin graphing scripts for new field names

[invirt/scripts/munin.git] / web / usage.cgi

diff --git a/web/usage.cgi b/web/usage.cgi
index b7e742d..e815d78 100755 (executable)
--- a/web/usage.cgi
+++ b/web/usage.cgi
@@ -50,7 +50,7 @@ my $type = $q->param("type") || "cpu";
 $type =~ m|^(\w+)$| or die "Invalid graph type";
 $type = $graph_types{$1} or die "Invalid graph type";
 
 $type =~ m|^(\w+)$| or die "Invalid graph type";
 $type = $graph_types{$1} or die "Invalid graph type";
 

-my $path = catfile(GRAPH_DIR, "*-$type-$uuid-?.rrd");
+my $path = catfile(GRAPH_DIR, "*-$type-uuid_$uuid-?.rrd");

 my @files = glob $path or die "No data found";
 
 push @args, "--start", "-".$days."d";
 my @files = glob $path or die "No data found";
 
 push @args, "--start", "-".$days."d";

@@ -82,9 +82,10 @@ sub die(@) {
                              pointsize => 14,
                              );
   $im->Read('label:'.join('', @_));
                              pointsize => 14,
                              );
   $im->Read('label:'.join('', @_));

-  $format = 'png' unless exists($format{$format});
+  $format = 'png' unless exists($formats{$format});

   $mime_type = $formats{$format};
   $mime_type = $formats{$format};

+  $| = 1;

   print $q->header(-type=>$mime_type);
   $im->Write($format.':-');
   print $q->header(-type=>$mime_type);
   $im->Write($format.':-');

-  die @_;
+  CORE::die @_;

 }
 }