2 files changed, 27 insertions, 2 deletions

diff --git a/conf/config.php b/conf/config.php
index b9a5098..246d378 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -26,8 +26,9 @@ $CONFIG['overview'] = array('load', 'cpu', 'memory', 'swap');
 $CONFIG['time_range']['default'] = 86400;
 $CONFIG['time_range']['uptime']  = 31536000;
 
-# show load averages on overview page
+# show load averages and used memory on overview page
 $CONFIG['showload'] = true;
+$CONFIG['showmem'] = true;
 
 $CONFIG['term'] = array(
         '2hour'  => 3600 * 2,
diff --git a/inc/html.inc.php b/inc/html.inc.php
index b4d295a..c657f86 100644
--- a/inc/html.inc.php
+++ b/inc/html.inc.php
@@ -219,7 +219,31 @@ function host_summary($cat, $hosts) {
                                         printf('<td%s>%.2f</td>', $class, $rrd_info[$info]);
                                 }
                         }
-                }
+        }
+
+        if ($CONFIG['showmem']) {
+            $rrd_info_mu = $rrd->rrd_info($CONFIG['datadir'].'/'.$host.'/memory/memory-used.rrd');
+            $rrd_info_mf = $rrd->rrd_info($CONFIG['datadir'].'/'.$host.'/memory/memory-free.rrd');
+            $rrd_info_bf = $rrd->rrd_info($CONFIG['datadir'].'/'.$host.'/memory/memory-buffered.rrd');
+            $rrd_info_ca = $rrd->rrd_info($CONFIG['datadir'].'/'.$host.'/memory/memory-cached.rrd');
+            
+            # ignore if file does not exist
+            if (!$rrd_info_mu || !$rrd_info_mf || !$rrd_info_bf || !$rrd_info_ca)
+                continue;
+
+            $info='ds[value].last_ds';
+            if (isset($rrd_info_mu[$info]) && isset($rrd_info_mf[$info]) && isset($rrd_info_bf[$info]) && isset($rrd_info_ca[$info]) ) {
+                $percent_mem =  $rrd_info_mu[$info] * 100 / ($rrd_info_mu[$info] + $rrd_info_mf[$info] + $rrd_info_bf[$info] + $rrd_info_ca[$info]);
+
+                $class = '';
+                if ($percent_mem > 90)
+                    $class = ' class="crit"';
+                elseif ($percent_mem > 70)
+                    $class = ' class="warn"';
+
+                printf('<td%s>%d</td>', $class, $percent_mem);
+            }
+        }
 
                 print "</tr>\n";
         }