From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 23 Feb 2010 20:02:15 +0000 (+0100)
Subject: Fix disk (media/hardware) graphs with xen.
X-Git-Tag: v2.9-beta1~448
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a76779bff60174dbde43e8c42d8590a6f1b300c8;p=people%2Fpmueller%2Fipfire-2.x.git

Fix disk (media/hardware) graphs with xen.
---

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index a148b084a3..07349c8f31 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -37,7 +37,7 @@ LoadPlugin syslog
 </Plugin>
 
 <Plugin "disk">
-	Disk "/[0-9]$/"
+	Disk "/[hs]d[a-z][0-9]$/"
 	IgnoreSelected true
 </Plugin>
 
diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index 16000de3db..dabdfd1aee 100644
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -67,7 +67,7 @@ if ( $querry[0] =~ "hwtemp"){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	&Graphs::updatethermaltempgraph($querry[1]);
-}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
+}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??" ){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);
 	&Graphs::updatehddgraph($querry[0],$querry[1]);
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 4fe472a029..6a89ca8677 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -47,7 +47,7 @@ $querry[1] = 'hour' unless defined $querry[1];
 
 my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
 
-if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
+if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??"){
 	print "Content-type: image/png\n\n";
 	binmode(STDOUT);