merged r6060, r6061 and r6068 into 3.1

lib/admin/Controller/dashboard.pm

@@ -43,8 +43,14 @@ sub system : Local {
     $c->stash->{template} = 'tt/dashboard.tt';
 
     my @plotdata = ();
-    push @plotdata, {name=>"mem", title=>"Free Memory", 
-        url=>"/rrd/get?path=memory/memory-free.rrd", si=>1};
+    push @plotdata, {name=>"mem", title=>"Free Physical Memory", 
+        url=>[qw(
+		/rrd/get?path=memory/memory-free.rrd
+		/rrd/get?path=memory/memory-cached.rrd
+		/rrd/get?path=memory/memory-buffered.rrd
+	)], si=>1};
+    push @plotdata, {name=>"swap", title=>"Free Swap Memory", 
+        url=>"/rrd/get?path=swap/swap-free.rrd", si=>1};
     push @plotdata, {name=>"load", title=>"Load", 
         url=>"/rrd/get?path=load/load.rrd", si=>0};
     push @plotdata, {name=>"rdisk", title=>"Root Disk", 

root/tt/dashboard.tt

@@ -1,6 +1,7 @@
     <!--[if IE]><script language="javascript" type="text/javascript" src="/js/jsrrd/flot/excanvas.min.js"></script><![endif]-->
     <script type="text/javascript" src="/js/jsrrd/jsrrd/binaryXHR.js"></script>
     <script type="text/javascript" src="/js/jsrrd/jsrrd/rrdFile.js"></script>
+    <script type="text/javascript" src="/js/jsrrd/jsrrd/rrdMultiFile.js"></script>
     <script type="text/javascript" src="/js/jsrrd/jsrrd/rrdFlotSupport.js"></script>
     <script type="text/javascript" src="/js/jsrrd/jsrrd/rrdFlot.js"></script>
     <script type="text/javascript" src="/js/jsrrd/flot/jquery.flot.js"></script>
@@ -28,34 +29,53 @@
 
     <script type="text/javascript">
 
-      function update_fname(rrd_data, args) {
+      function update_fname(rrd_data_arr, args) {
         var graph_opts={};
         var ds_graph_opts={};
-        var f=new rrdFlot(args['plot_id'],rrd_data,graph_opts,ds_graph_opts, args['si_suffix']);
+	if (rrd_data_arr.length == 1)
+          var f=new rrdFlot(args['plot_id'],rrd_data_arr[0],graph_opts,ds_graph_opts, args['si_suffix']);
+	else {
+	  var t = new RRDFileSum(rrd_data_arr, false);
+          var f=new rrdFlot(args['plot_id'],t,graph_opts,ds_graph_opts, args['si_suffix']);
+	}
       }
 
       function update_fname_handler(bf, args) {
           var rrd_data=undefined;
+          var fname = args['name'];
+          var output = args['output'];
           try {
-            var rrd_data=new RRDFile(bf);            
+            var rrd_data=new RRDFile(bf);
           } catch(err) {
             alert("File "+fname+" is not a valid RRD archive!");
           }
           if (rrd_data!=undefined) {
-            update_fname(rrd_data, args);
+	    output.push(rrd_data);
+            if (output.length >= args['rrd_count']) {
+              update_fname(output, args);
+            }
           }
       }
 
       function fname_update(fname, plot_id, si_suffix) {
-        try {
-          FetchBinaryURLAsync(fname, update_fname_handler, {plot_id: plot_id, si_suffix: si_suffix});
-        } catch (err) {
-           alert("Failed loading "+fname+"\n"+err);
+	var o = new Array();
+        for (var i = 0; i < fname.length; i++) {
+          try {
+            FetchBinaryURLAsync(fname[i], update_fname_handler, {plot_id: plot_id,
+                                     si_suffix: si_suffix, rrd_count: fname.length, name: fname[i],
+                                     output: o});
+          } catch (err) {
+             alert("Failed loading "+fname[i]+"\n"+err);
+          }
         }
       }
 
       [% FOREACH item IN plotdata %]
-          fname_update("[% item.url %]", "plot_[% item.name %]", [% item.si ? "true" : "false" %]);
+        fname_update([
+          [% FOREACH url IN item.url %]
+            "[% url %]",
+          [% END %]
+        ], "plot_[% item.name %]", [% item.si ? "true" : "false" %]);
       [% END %]
 
     </script>