Update Munin graphing scripts for new field names

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

diff --git a/web/all-usage.cgi b/web/all-usage.cgi
index c1817bd..efc8a2c 100755 (executable)
--- a/web/all-usage.cgi
+++ b/web/all-usage.cgi
@@ -46,7 +46,7 @@ my $type = $q->param("type") || "cpu";
 $type =~ m|^(\w+)$| or die "Invalid graph type";
 $type = $graph_types{$1} or die "Invalid graph type";
 
-my $path = catfile(GRAPH_DIR, "*-$type-????????_????_????_????_????????????-?.rrd");
+my $path = catfile(GRAPH_DIR, "*-$type-uuid_????????_????_????_????_????????????-?.rrd");
 my @files = glob $path or die "No data found";
 
 push @args, "--start", "-".$days."d";
@@ -60,7 +60,7 @@ my @COLOUR = ("#22ff22", "#0022ff", "#ff0000", "#00aaaa", "#ff00ff",
               "#0080FF", "#FF8000", "#800000", "#FB31FB");
 my $color_index = 0;
 
-foreach my $uuid (keys %uuids) {
+foreach my $uuid (sort keys %uuids) {
   my @uuid_files = grep { m|$uuid-.\.rrd$| } @files;
   foreach my $i (0..$#uuid_files) {
     $uuid_files[$i] =~ m|^([^:]+)$|;