--- check_ram.py.orig	2008-11-14 16:37:43.000000000 +0100
+++ check_ram.py	2008-11-14 17:26:20.000000000 +0100
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #
 #   Copyright Hari Sekhon 2007
+#   Copyright 2008 Christian Heim
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -64,27 +65,30 @@
     total_used_megs = float(memtotal-memfree) / 1024
     total_free_megs = float(total_free) / 1024
     memtotal_megs   = float(memtotal) / 1024
+    
+    total_warning_threshold_megs = round(float(memtotal) * float(warning_threshold) / 100 / 1024)
+    total_critical_threshold_megs = round(float(memtotal) * float(critical_threshold) / 100 / 1024)
 
     if percent == True:
         percentage_free = int( float(total_free) / float(memtotal) * 100 )
         if percentage_free < critical_threshold:
-            print "RAM CRITICAL: %d%% ram free (%d/%d MB used)" % (percentage_free,total_used_megs,memtotal_megs)
+            print "RAM CRITICAL - %d%% free (%d MB out of %d MB) |ram=%dMB;%d;%d;0;%d" % (percentage_free,total_free_megs,memtotal_megs,total_free_megs,total_warning_threshold_megs,total_critical_threshold_megs,memtotal_megs)
             return CRITICAL
         elif percentage_free < warning_threshold:
-            print "RAM WARNING: %d%% ram free (%d/%d MB used)" % (percentage_free,total_used_megs,memtotal_megs)
+            print "RAM WARNING - %d%% free (%d MB out of %d MB) |ram=%dMB;%d;%d;0;%d" % (percentage_free,total_free_megs,memtotal_megs,total_free_megs,total_warning_threshold_megs,total_critical_threshold_megs,memtotal_megs)
             return WARNING
         else:
-            print "RAM OK: %d%% ram free" % percentage_free
+            print "RAM OK - %d%% free (%d MB out of %d MB) |ram=%dMB;%d;%d;0;%d" % (percentage_free,total_free_megs,memtotal_megs,total_free_megs,total_warning_threshold_megs,total_critical_threshold_megs,memtotal_megs)
             return OK
     else:
         if total_free < critical_threshold:
-            print "RAM CRITICAL: %dMB ram free (%d/%d MB used)" % (total_free_megs,total_used_megs,memtotal_megs)
+            print "RAM CRITICAL - %d%% free (%d MB out of %d MB) |ram=%dMB;%d;%d;0;%d" % (percentage_free,total_free_megs,memtotal_megs,total_free_megs,total_warning_threshold_megs,total_critical_threshold_megs,memtotal_megs)
             return CRITICAL
         if total_free < warning_threshold:
-            print "RAM WARNING: %dMB ram free (%d/%d MB used)" % (total_free_megs,total_used_megs,memtotal_megs)
+            print "RAM WARNING - %d%% free (%d MB out of %d MB) |ram=%dMB;%d;%d;0;%d" % (percentage_free,total_free_megs,memtotal_megs,total_free_megs,total_warning_threshold_megs,total_critical_threshold_megs,memtotal_megs)
             return WARNING
         else:
-            print "RAM OK: %dMB ram free" % (total_free_megs)
+            print "RAM OK - %d%% free (%d MB out of %d MB) |ram=%dMB;%d;%d;0;%d" % (percentage_free,total_free_megs,memtotal_megs,total_free_megs,total_warning_threshold_megs,total_critical_threshold_megs,memtotal_megs)
             return OK