From: Quentin Smith <quentin@mit.edu>
Date: Thu, 11 Aug 2011 05:41:45 +0000 (-0400)
Subject: Update Munin graphing scripts for new field names
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/munin.git/commitdiff_plain/8d6e57668a3f9e68154644419a7b9fc5a20d97f5?hp=4c324bfb6be6d25e00cac859278f21729ca8e8b6

Update Munin graphing scripts for new field names
---

diff --git a/web/all-usage.cgi b/web/all-usage.cgi
index 20d5eb4..efc8a2c 100755
--- 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";
diff --git a/web/usage.cgi b/web/usage.cgi
index 5675e09..e815d78 100755
--- 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";
 
-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";