Fix disk (media/hardware) graphs with xen.

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index a148b084a321ccad7c8cd966092b7ed27c8a9b56..07349c8f31816fd518bf506d0475401bfe47ebbc 100644 (file)
--- 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 16000de3db707083e85a4fe95543dc0f016e24d4..dabdfd1aeeeed3af82f9f4c384890de0b622e1d0 100644 (file)
--- 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 4fe472a029f5c0002c57ec7eb5313b90dfe082b7..6a89ca86774710c29dc19f3398aa800f4b344568 100644 (file)
--- 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);