Update Munin graphing scripts for new field names

diff --git a/web/all-usage.cgi b/web/all-usage.cgi
index 20d5eb4..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";
 
 $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";
 my @files = glob $path or die "No data found";
 
 push @args, "--start", "-".$days."d";

diff --git a/web/usage.cgi b/web/usage.cgi
index 5675e09..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";