[pve-devel] r5648 - in pve-manager/pve2: bin www/manager

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-03-07 07:33:02 +0100 (Mon, 07 Mar 2011)
New Revision: 5648

Modified:
   pve-manager/pve2/bin/pvestatd
   pve-manager/pve2/www/manager/NodeConfig.js
Log:
use 120 sedc heartbeat, also store MAX


Modified: pve-manager/pve2/bin/pvestatd
===================================================================
--- pve-manager/pve2/bin/pvestatd	2011-03-07 05:42:04 UTC (rev 5647)
+++ pve-manager/pve2/bin/pvestatd	2011-03-07 06:33:02 UTC (rev 5648)
@@ -151,27 +151,27 @@
     RRDs::create ($filename, 
 		  "-b" => $start,
 		  "--step" => 60,
-		  "DS:loadavg:GAUGE:300:0:U",
-		  "DS:cpu:GAUGE:300:0:1",
-		  "DS:iowait:GAUGE:300:0:1",
-		  "DS:memtotal:GAUGE:300:0:U",
-		  "DS:memused:GAUGE:300:0:U",
-		  "DS:swaptotal:GAUGE:300:0:U",
-		  "DS:swapused:GAUGE:300:0:U",
-		  "DS:roottotal:GAUGE:300:0:U",
-		  "DS:rootused:GAUGE:300:0:U",
+		  "DS:loadavg:GAUGE:120:0:U",
+		  "DS:cpu:GAUGE:120:0:1",
+		  "DS:iowait:GAUGE:120:0:1",
+		  "DS:memtotal:GAUGE:120:0:U",
+		  "DS:memused:GAUGE:120:0:U",
+		  "DS:swaptotal:GAUGE:120:0:U",
+		  "DS:swapused:GAUGE:120:0:U",
+		  "DS:roottotal:GAUGE:120:0:U",
+		  "DS:rootused:GAUGE:120:0:U",
+
 		  "RRA:AVERAGE:0.5:1:70", # 1 min avg - one hour
 		  "RRA:AVERAGE:0.5:30:70", # 30 min avg - one day
 		  "RRA:AVERAGE:0.5:180:70", # 3 hour avg - one week
 		  "RRA:AVERAGE:0.5:720:70", # 12 hour avg - one month
 		  "RRA:AVERAGE:0.5:10080:70", # 7 day avg - ony year
 
-# old settings
-#		  "RRA:AVERAGE:0.5:1:60", # hourly - 1 min avg
-#		  "RRA:AVERAGE:0.5:5:288", # daily - 5 min avg
-#		  "RRA:AVERAGE:0.5:30:336", # 7 days - 30 min avg
-#		  "RRA:AVERAGE:0.5:120:420", # 5 weeks - 2 hour avg
-#		  "RRA:AVERAGE:0.5:1440:366", # yearly - 1 day avg
+		  "RRA:MAX:0.5:1:70", # 1 min max - one hour
+		  "RRA:MAX:0.5:30:70", # 30 min max - one day
+		  "RRA:MAX:0.5:180:70", # 3 hour max - one week
+		  "RRA:MAX:0.5:720:70", # 12 hour max - one month
+		  "RRA:MAX:0.5:10080:70", # 7 day max - ony year
 	);
     check_err();
 

Modified: pve-manager/pve2/www/manager/NodeConfig.js
===================================================================
--- pve-manager/pve2/www/manager/NodeConfig.js	2011-03-07 05:42:04 UTC (rev 5647)
+++ pve-manager/pve2/www/manager/NodeConfig.js	2011-03-07 06:33:02 UTC (rev 5648)
@@ -1123,7 +1123,7 @@
 	});
 
 	var cpustat = new PVE.RRDView({
-	    width: 800,
+	    width: 802,
 	    height: 200,
 	    title: "CPU usage"
 	});