X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fcollection3%2Flib%2FCollectd%2FGraph%2FType.pm;h=81add728382898ea513f68d757774f161d7c07ed;hb=82f94c7cd55852aab1f1bd5116eaabf1dfb65c98;hp=1fb60afeecdd31a36b2eb4f1faefcaaad08ba149;hpb=7a36927e0c5411c701d9e1bfd3f02a9c2f254d0f;p=collectd.git

diff --git a/contrib/collection3/lib/Collectd/Graph/Type.pm b/contrib/collection3/lib/Collectd/Graph/Type.pm
index 1fb60afe..81add728 100644
--- a/contrib/collection3/lib/Collectd/Graph/Type.pm
+++ b/contrib/collection3/lib/Collectd/Graph/Type.pm
@@ -250,7 +250,11 @@ sub getTitle
   my $type_instance = $ident->{'type_instance'};
   my $instance;
 
-  if (defined $type_instance)
+  if ((defined $type_instance) && (defined $plugin_instance))
+  {
+    $instance = "$plugin_instance/$type_instance";
+  }
+  elsif (defined $type_instance)
   {
     $instance = $type_instance;
   }
@@ -349,10 +353,24 @@ sub getRRDArgs
     $f =~ s#:#\\:#g;
     $ds_name =~ s#:#\\:#g;
 
-    push (@ret,
-      "DEF:min${i}=${f}:${ds_name}:MIN",
-      "DEF:avg${i}=${f}:${ds_name}:AVERAGE",
-      "DEF:max${i}=${f}:${ds_name}:MAX");
+    if (exists ($obj->{'scale'}))
+    {
+      my $scale = 0.0 + $obj->{'scale'};
+      push (@ret,
+	"DEF:min${i}_raw=${f}:${ds_name}:MIN",
+	"DEF:avg${i}_raw=${f}:${ds_name}:AVERAGE",
+	"DEF:max${i}_raw=${f}:${ds_name}:MAX",
+	"CDEF:max${i}=max${i}_raw,$scale,*",
+	"CDEF:avg${i}=avg${i}_raw,$scale,*",
+	"CDEF:min${i}=min${i}_raw,$scale,*");
+    }
+    else
+    {
+      push (@ret,
+	"DEF:min${i}=${f}:${ds_name}:MIN",
+	"DEF:avg${i}=${f}:${ds_name}:AVERAGE",
+	"DEF:max${i}=${f}:${ds_name}:MAX");
+    }
   }
 
   if (@$ds == 1)