Changed all occurences of `http://verplant.org/collectd/' to `http://collectd.org/'

[collectd.git] / contrib / collection.cgi

diff --git a/contrib/collection.cgi b/contrib/collection.cgi
index 392c62b..51e187d 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",
@@ -1196,6 +1198,7 @@ sub output_graph
                $Inst = $files->{$Type}[0];
        }
 
+       #push (@cmd, '-', '-a', 'PNG', '-s', $TimeSpan, '-w', 800, '-h', 150);
        push (@cmd, '-', '-a', 'PNG', '-s', $TimeSpan);
        push (@cmd, @{$GraphArgs->{$Type}}) if (defined ($GraphArgs->{$Type}));
 
@@ -1290,6 +1293,8 @@ HEADER
                print <<HTML;
                </ul>
 
+               <h3>Hourly</h3>
+               <div><img src="$MySelf$RelDir/$Type/hour" /></div>
                <h3>Daily</h3>
                <div><img src="$MySelf$RelDir/$Type/day" /></div>
                <h3>Weekly</h3>
@@ -1314,6 +1319,8 @@ HTML
                }
 
                print <<HTML;
+               <h3>Hourly</h3>
+               <div><img src="$MySelf$RelDir/$ext/hour" /></div>
                <h3>Daily</h3>
                <div><img src="$MySelf$RelDir/$ext/day" /></div>
                <h3>Weekly</h3>