[pve-devel] r6080 - in pve-manager/pve2: bin www/manager/node www/manager/qemu www/manager/storage

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-15 10:16:42 +0200 (Wed, 15 Jun 2011)
New Revision: 6080

Modified:
   pve-manager/pve2/bin/pvestatd
   pve-manager/pve2/www/manager/node/StatusView.js
   pve-manager/pve2/www/manager/node/Summary.js
   pve-manager/pve2/www/manager/qemu/Summary.js
   pve-manager/pve2/www/manager/storage/StatusView.js
   pve-manager/pve2/www/manager/storage/Summary.js
Log:
add diskread/diskwrite statistic, layout fixes


Modified: pve-manager/pve2/bin/pvestatd
===================================================================
--- pve-manager/pve2/bin/pvestatd	2011-06-15 07:41:08 UTC (rev 6079)
+++ pve-manager/pve2/bin/pvestatd	2011-06-15 08:16:42 UTC (rev 6080)
@@ -182,12 +182,13 @@
 	    $data = "$d->{uptime}:$d->{name}:$ctime:$d->{cpus}:$d->{cpu}:" .
 		"$d->{maxmem}:$d->{mem}:" .
 		"$d->{maxdisk}:$d->{disk}:" .
-		"$d->{netin}:$d->{netout}";
+		"$d->{netin}:$d->{netout}:" .
+		"$d->{diskread}:$d->{diskwrite}";
 	} else {
 	    $data = "0:$d->{name}:$ctime:$d->{cpus}::" .
 		"$d->{maxmem}::" .
 		"$d->{maxdisk}:$d->{disk}:" .
-		":";
+		":::";
 	}
 	PVE::Cluster::broadcast_rrd("pve2-vm/$vmid", $data);
     }

Modified: pve-manager/pve2/www/manager/node/StatusView.js
===================================================================
--- pve-manager/pve2/www/manager/node/StatusView.js	2011-06-15 07:41:08 UTC (rev 6079)
+++ pve-manager/pve2/www/manager/node/StatusView.js	2011-06-15 08:16:42 UTC (rev 6080)
@@ -46,7 +46,7 @@
 	    url: "/api2/json/nodes/" + nodename + "/status",
 	    cwidth1: 150,
 	    interval: 1000,
-	    height: 286,
+	    //height: 276,
 	    rows: rows
 	});
 

Modified: pve-manager/pve2/www/manager/node/Summary.js
===================================================================
--- pve-manager/pve2/www/manager/node/Summary.js	2011-06-15 07:41:08 UTC (rev 6079)
+++ pve-manager/pve2/www/manager/node/Summary.js	2011-06-15 08:16:42 UTC (rev 6080)
@@ -12,7 +12,7 @@
 	var statusview = Ext.create('PVE.node.StatusView', {
 	    title: 'Status',
 	    pveSelNode: me.pveSelNode,
-	    width: 800
+	    style: 'padding-top:0px'
 	});
 
 	var rstore = statusview.rstore;
@@ -89,14 +89,11 @@
 	});
 
 	Ext.apply(me, {
-	    layout: {
-		type: 'table',
-		columns: 1
-	    },
 	    autoScroll: true,
 	    bodyStyle: 'padding:10px',
 	    defaults: {
-		style: 'padding-bottom:10px'
+		width: 800,
+		style: 'padding-top:10px'
 	    },		
 	    tbar: tbar,
 	    items: [

Modified: pve-manager/pve2/www/manager/qemu/Summary.js
===================================================================
--- pve-manager/pve2/www/manager/qemu/Summary.js	2011-06-15 07:41:08 UTC (rev 6079)
+++ pve-manager/pve2/www/manager/qemu/Summary.js	2011-06-15 08:16:42 UTC (rev 6080)
@@ -141,22 +141,19 @@
 
 	Ext.apply(me, {
 	    tbar: tbar,
-	    layout: {
-		type: 'table',
-		columns: 1
-	    },
 	    autoScroll: true,
 	    bodyStyle: 'padding:10px',
 	    defaults: {
-		style: 'padding-bottom:10px'
+		style: 'padding-top:10px',
+		width: 800
 	    },		
 	    items: [
 		{
+		    style: 'padding-top:0px',
 		    layout: {
 			type: 'hbox',
 			align: 'stretchmax'
 		    },
-		    width: 800,
 		    border: false,
 		    items: [
 			statusview,
@@ -190,6 +187,13 @@
 		    pveSelNode: me.pveSelNode,
 		    datasource: 'netin,netout',
 		    rrdurl: rrdurl
+		},
+		{
+		    xtype: 'pveRRDView',
+		    title: "Disk IO",
+		    pveSelNode: me.pveSelNode,
+		    datasource: 'diskread,diskwrite',
+		    rrdurl: rrdurl
 		}
 	    ]
 	});

Modified: pve-manager/pve2/www/manager/storage/StatusView.js
===================================================================
--- pve-manager/pve2/www/manager/storage/StatusView.js	2011-06-15 07:41:08 UTC (rev 6079)
+++ pve-manager/pve2/www/manager/storage/StatusView.js	2011-06-15 08:16:42 UTC (rev 6080)
@@ -60,7 +60,7 @@
 	    url: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/status",
 	    cwidth1: 150,
 	    interval: 30000,
-	    height: 205,
+	    //height: 195,
 	    rows: rows
 	});
 

Modified: pve-manager/pve2/www/manager/storage/Summary.js
===================================================================
--- pve-manager/pve2/www/manager/storage/Summary.js	2011-06-15 07:41:08 UTC (rev 6079)
+++ pve-manager/pve2/www/manager/storage/Summary.js	2011-06-15 08:16:42 UTC (rev 6080)
@@ -16,7 +16,7 @@
 	var statusview = Ext.create('PVE.storage.StatusView', {
 	    title: 'Status',
 	    pveSelNode: me.pveSelNode,
-	    width: 800
+	    style: 'padding-top:0px'
 	});
 
 	var rstore = statusview.rstore;
@@ -24,14 +24,11 @@
 	var rrdurl = "/api2/png/nodes/" + nodename + "/storage/" + storage + "/rrd";
 
 	Ext.apply(me, {
-	    layout: {
-		type: 'table',
-		columns: 1
-	    },
 	    autoScroll: true,
 	    bodyStyle: 'padding:10px',
 	    defaults: {
-		style: 'padding-bottom:10px'
+		style: 'padding-top:10px',
+		width: 800
 	    },		
 	    tbar: [
 		'->',