From 39c1eb7b594c12ed8ca1e85d4af887d8b0f40cdb Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Tue, 13 Sep 2011 14:36:09 +0000
Subject: [PATCH] Change the "free memory" graph to add buffers and cache and
 add a "free swap" graph

---
 lib/admin/Controller/dashboard.pm | 10 ++++++++--
 root/tt/dashboard.tt              |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/admin/Controller/dashboard.pm b/lib/admin/Controller/dashboard.pm
index 2fa7c37..b2fe464 100644
--- a/lib/admin/Controller/dashboard.pm
+++ b/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", 
diff --git a/root/tt/dashboard.tt b/root/tt/dashboard.tt
index e8a797a..600d40c 100644
--- a/root/tt/dashboard.tt
+++ b/root/tt/dashboard.tt
@@ -71,7 +71,11 @@
       }
 
       [% 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>