[pve-devel] r6063 - pve-manager/pve2/www/manager/storage

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-31 11:19:11 +0200 (Tue, 31 May 2011)
New Revision: 6063

Modified:
   pve-manager/pve2/www/manager/storage/StatusView.js
   pve-manager/pve2/www/manager/storage/Summary.js
Log:
add RRD graph


Modified: pve-manager/pve2/www/manager/storage/StatusView.js
===================================================================
--- pve-manager/pve2/www/manager/storage/StatusView.js	2011-05-31 09:00:54 UTC (rev 6062)
+++ pve-manager/pve2/www/manager/storage/StatusView.js	2011-05-31 09:19:11 UTC (rev 6063)
@@ -47,8 +47,7 @@
 	};
 
 	Ext.applyIf(me, {
-	    url: "/api2/json/nodes/" + nodename + "/storage",
-	    extraParams: { storage: storage },
+	    url: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/status",
 	    cwidth1: 150,
 	    interval: 30000,
 	    height: 205,

Modified: pve-manager/pve2/www/manager/storage/Summary.js
===================================================================
--- pve-manager/pve2/www/manager/storage/Summary.js	2011-05-31 09:00:54 UTC (rev 6062)
+++ pve-manager/pve2/www/manager/storage/Summary.js	2011-05-31 09:19:11 UTC (rev 6063)
@@ -21,6 +21,8 @@
 
 	var rstore = statusview.rstore;
 
+	var rrdurl = "/api2/png/nodes/" + nodename + "/storage/" + storage + "/rrd";
+
 	Ext.apply(me, {
 	    layout: {
 		type: 'table',
@@ -31,9 +33,22 @@
 	    defaults: {
 		style: 'padding-bottom:10px'
 	    },		
-	    //tbar: tbar,
+	    tbar: [
+		'->',
+		{
+		    xtype: 'pveRRDTypeSelector'
+		}
+	    ],
 	    items: [
-		statusview
+		statusview,
+		{
+		    xtype: 'pveRRDView',
+		    title: "Usage",
+		    pveSelNode: me.pveSelNode,
+		    datasource: 'total,used',
+		    rrdurl: rrdurl
+		},
+
 	    ]
 	});