X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcollection3%2Flib%2FCollectd%2FGraph%2FType.pm;h=01c2417c39db7bab0e5a74fbd6f91b4724e7c60a;hb=571806f201f21a10f6f700a4adf57480fafe5d54;hp=1fb60afeecdd31a36b2eb4f1faefcaaad08ba149;hpb=5e700757575fa6606cf201947cb0efb57ce12e6d;p=collectd.git

diff --git a/contrib/collection3/lib/Collectd/Graph/Type.pm b/contrib/collection3/lib/Collectd/Graph/Type.pm
index 1fb60afe..01c2417c 100644
--- a/contrib/collection3/lib/Collectd/Graph/Type.pm
+++ b/contrib/collection3/lib/Collectd/Graph/Type.pm
@@ -349,10 +349,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)