1 files changed, 30 insertions, 21 deletions

diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php
index e91cb16..ee04316 100644
--- a/type/GenericIO.class.php
+++ b/type/GenericIO.class.php
@@ -5,45 +5,54 @@ require_once 'Default.class.php';
 class Type_GenericIO extends Type_Default {
         
         function rrd_gen_graph() {
-                $filename = $this->get_filename();
-
                 $rrdgraph = $this->rrd_options();
 
+                $sources = $this->rrd_get_sources();
+
                 if ($this->scale)
                         $raw = '_raw';
-                foreach($this->data_sources as $ds) {
-                        $rrdgraph[] = sprintf('DEF:min_%s%s=%s:%s:MIN', $ds, $raw, $filename, $ds);
-                        $rrdgraph[] = sprintf('DEF:avg_%s%s=%s:%s:AVERAGE', $ds, $raw, $filename, $ds);
-                        $rrdgraph[] = sprintf('DEF:max_%s%s=%s:%s:MAX', $ds, $raw, $filename, $ds);
+                $i=0;
+                foreach ($this->tinstances as $tinstance) {
+                        foreach ($this->data_sources as $ds) {
+                                $rrdgraph[] = sprintf('DEF:min_%s%s=%s:%s:MIN', $sources[$i], $raw, $this->files[$tinstance], $ds);
+                                $rrdgraph[] = sprintf('DEF:avg_%s%s=%s:%s:AVERAGE', $sources[$i], $raw, $this->files[$tinstance], $ds);
+                                $rrdgraph[] = sprintf('DEF:max_%s%s=%s:%s:MAX', $sources[$i], $raw, $this->files[$tinstance], $ds);
+                                $i++;
+                        }
                 }
                 if ($this->scale) {
-                        foreach($this->data_sources as $ds) {
-                                $rrdgraph[] = sprintf('CDEF:min_%s=min_%s_raw,%s,*', $ds, $ds, $this->scale);
-                                $rrdgraph[] = sprintf('CDEF:avg_%s=avg_%s_raw,%s,*', $ds, $ds, $this->scale);
-                                $rrdgraph[] = sprintf('CDEF:max_%s=max_%s_raw,%s,*', $ds, $ds, $this->scale);
+                        $i=0;
+                        foreach ($this->tinstances as $tinstance) {
+                                foreach ($this->data_sources as $ds) {
+                                        $rrdgraph[] = sprintf('CDEF:min_%s=min_%1$s_raw,%s,*', $sources[$i], $this->scale);
+                                        $rrdgraph[] = sprintf('CDEF:avg_%s=avg_%1$s_raw,%s,*', $sources[$i], $this->scale);
+                                        $rrdgraph[] = sprintf('CDEF:max_%s=max_%1$s_raw,%s,*', $sources[$i], $this->scale);
+                                        $i++;
+                                }
                         }
                 }
 
                 $rrdgraph[] = sprintf('CDEF:overlap=avg_%s,avg_%s,LT,avg_%1$s,avg_%2$s,IF',
-                                                $this->data_sources[0], $this->data_sources[1]);
+                                                $sources[0], $sources[1]);
 
-                foreach($this->data_sources as $ds) {
-                        $rrdgraph[] = sprintf('AREA:avg_%s#%s', $ds, $this->get_faded_color($this->colors[$ds]));
+                foreach($sources as $source) {
+                        $rrdgraph[] = sprintf('AREA:avg_%s#%s', $source, $this->get_faded_color($this->colors[$source]));
                 }
 
                 $rrdgraph[] = sprintf('AREA:overlap#%s',
                         $this->get_faded_color(
-                                $this->get_faded_color($this->colors[$this->data_sources[0]]),
-                                $this->get_faded_color($this->colors[$this->data_sources[1]])
+                                $this->get_faded_color($this->colors[$sources[0]]),
+                                $this->get_faded_color($this->colors[$sources[1]])
                         )
                 );
 
-                foreach($this->data_sources as $ds) {
-                        $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', $ds, $this->colors[$ds], $this->ds_names[$ds]);
-                        $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', $ds, $this->rrd_format);
-                        $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', $ds, $this->rrd_format);
-                        $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', $ds, $this->rrd_format);
-                        $rrdgraph[] = sprintf('GPRINT:avg_%s:LAST:\'%s Last\l\'', $ds, $this->rrd_format);
+                foreach($sources as $source) {
+                        $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
+                        $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', $source, $this->colors[$source], $dsname);
+                        $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', $source, $this->rrd_format);
+                        $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', $source, $this->rrd_format);
+                        $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', $source, $this->rrd_format);
+                        $rrdgraph[] = sprintf('GPRINT:avg_%s:LAST:\'%s Last\l\'', $source, $this->rrd_format);
                 }
                 
                 return $rrdgraph;