Applied all the changes that `git-svnimport' missed.

[collectd.git] / contrib / collection.cgi

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index 63b1563..54cde20 100755 (executable)
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -303,8 +303,10 @@ our $GraphDefs;
                        'DEF:free_max={file}:free:MAX',
                        'DEF:buffers_max={file}:buffers:MAX',
                        'DEF:cached_max={file}:cached:MAX',
-                       'CDEF:free_cached_buffers_used=free_avg,cached_avg,+,buffers_avg,+,used_avg,+',
-                       'CDEF:cached_buffers_used=cached_avg,buffers_avg,+,used_avg,+',
+                       'CDEF:cached_avg_nn=cached_avg,UN,0,cached_avg,IF',
+                       'CDEF:buffers_avg_nn=buffers_avg,UN,0,buffers_avg,IF',
+                       'CDEF:free_cached_buffers_used=free_avg,cached_avg_nn,+,buffers_avg_nn,+,used_avg,+',
+                       'CDEF:cached_buffers_used=cached_avg,buffers_avg_nn,+,used_avg,+',
                        'CDEF:buffers_used=buffers_avg,used_avg,+',
                        "AREA:free_cached_buffers_used#$HalfGreen",
                        "AREA:cached_buffers_used#$HalfBlue",
@@ -894,7 +896,7 @@ our $GraphMulti =
        ping    => \&output_graph_ping,
        sensors => 1,
        traffic => 1,
-    users => 1
+       users => 1
 };
 
 our @Info;
@@ -1457,7 +1459,7 @@ sub parse_pathinfo
        $AbsDir = $Config->{'Directory'};
        $RelDir = '';
 
-       while (@info and -d $AbsDir . '/' . $Info[0])
+       while (@info and -d $AbsDir . '/' . $info[0])
        {
                my $new = shift (@info);
                next if ($new =~ m/^\./);