Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
www/manager6/ceph/Config.js | 4 ++--
www/manager6/ceph/Crush.js | 2 +-
www/manager6/ceph/Disks.js | 6 +++---
www/manager6/ceph/Monitor.js | 4 ++--
www/manager6/ceph/OSD.js | 12 ++++++------
www/manager6/ceph/Pool.js | 18 +++++++++---------
www/manager6/ceph/Status.js | 20 ++++++++++----------
www/manager6/node/Config.js | 10 +++++-----
8 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/www/manager6/ceph/Config.js b/www/manager6/ceph/Config.js
index de40501..b6aba44 100644
--- a/www/manager6/ceph/Config.js
+++ b/www/manager6/ceph/Config.js
@@ -7,7 +7,7 @@ Ext.define('PVE.node.CephConfig', {
scrollable: true,
load: function() {
var me = this;
-
+
PVE.Utils.API2Request({
url: me.url,
waitMsgTarget: me,
@@ -55,7 +55,7 @@ Ext.define('PVE.node.Ceph', {
getHState: function(itemId) {
/*jslint confusion: true */
var me = this;
-
+
if (!itemId) {
itemId = me.getActiveTab().itemId;
}
diff --git a/www/manager6/ceph/Crush.js b/www/manager6/ceph/Crush.js
index 1ecea4e..bd4ad9a 100644
--- a/www/manager6/ceph/Crush.js
+++ b/www/manager6/ceph/Crush.js
@@ -6,7 +6,7 @@ Ext.define('PVE.node.CephCrushMap', {
scrollable: true,
load: function() {
var me = this;
-
+
PVE.Utils.API2Request({
url: me.url,
waitMsgTarget: me,
diff --git a/www/manager6/ceph/Disks.js b/www/manager6/ceph/Disks.js
index 9d9242d..a7526b7 100644
--- a/www/manager6/ceph/Disks.js
+++ b/www/manager6/ceph/Disks.js
@@ -88,7 +88,7 @@ Ext.define('PVE.node.CephDiskList', {
},
handler: function() {
var rec = sm.getSelection()[0];
-
+
var win = Ext.create('PVE.CephCreateOsd', {
nodename: nodename,
dev: rec.data.dev
@@ -116,8 +116,8 @@ Ext.define('PVE.node.CephDiskList', {
Ext.define('ceph-disk-list', {
extend: 'Ext.data.Model',
- fields: [ 'dev', 'used', { name: 'size', type: 'number'},
- {name: 'osdid', type: 'number'},
+ fields: [ 'dev', 'used', { name: 'size', type: 'number'},
+ {name: 'osdid', type: 'number'},
'vendor', 'model', 'serial'],
idProperty: 'dev'
});
diff --git a/www/manager6/ceph/Monitor.js b/www/manager6/ceph/Monitor.js
index 5732130..4a184ae 100644
--- a/www/manager6/ceph/Monitor.js
+++ b/www/manager6/ceph/Monitor.js
@@ -5,7 +5,7 @@ Ext.define('PVE.CephCreateMon', {
subject: 'Ceph Monitor',
showProgress: true,
-
+
setNode: function(nodename) {
var me = this;
@@ -137,7 +137,7 @@ Ext.define('PVE.node.CephMonList', {
}
PVE.Utils.API2Request({
- url: "/nodes/" + rec.data.host + "/ceph/mon/" +
+ url: "/nodes/" + rec.data.host + "/ceph/mon/" +
rec.data.name,
method: 'DELETE',
success: function(response, options) {
diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js
index 9745a70..af0457d 100644
--- a/www/manager6/ceph/OSD.js
+++ b/www/manager6/ceph/OSD.js
@@ -15,7 +15,7 @@ Ext.define('PVE.CephCreateOsd', {
}
me.create = true;
-
+
Ext.applyIf(me, {
url: "/nodes/" + me.nodename + "/ceph/osd",
method: 'POST',
@@ -78,7 +78,7 @@ Ext.define('PVE.CephRemoveOsd', {
me.create = true;
me.title = gettext('Remove') + ': ' + 'Ceph OSD osd.' + me.osdid;
-
+
Ext.applyIf(me, {
url: "/nodes/" + me.nodename + "/ceph/osd/" + me.osdid,
});
@@ -235,7 +235,7 @@ Ext.define('PVE.node.CephOsdTree', {
return;
}
PVE.Utils.API2Request({
- url: "/nodes/" + rec.data.host + "/ceph/osd/" +
+ url: "/nodes/" + rec.data.host + "/ceph/osd/" +
rec.data.id + '/' + cmd,
waitMsgTarget: me,
method: 'POST',
@@ -343,9 +343,9 @@ Ext.define('PVE.node.CephOsdTree', {
tbar: [ reload_btn, start_btn, stop_btn, osd_out_btn, osd_in_btn,
remove_btn ],
rootVisible: false,
fields: ['name', 'type', 'status', 'host', 'in', 'id' ,
- { type: 'number', name: 'reweight' },
- { type: 'number', name: 'percent_used' },
- { type: 'integer', name: 'bytes_used' },
+ { type: 'number', name: 'reweight' },
+ { type: 'number', name: 'percent_used' },
+ { type: 'integer', name: 'bytes_used' },
{ type: 'integer', name: 'total_space' },
{ type: 'integer', name: 'apply_latency_ms' },
{ type: 'integer', name: 'commit_latency_ms' },
diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js
index 3927171..ccff6a0 100644
--- a/www/manager6/ceph/Pool.js
+++ b/www/manager6/ceph/Pool.js
@@ -49,7 +49,7 @@ Ext.define('PVE.CephCreatePool', {
allowBlank: false
}
],
- initComponent : function() {
+ initComponent : function() {
/*jslint confusion: true */
var me = this;
@@ -179,7 +179,7 @@ Ext.define('PVE.node.CephPoolList', {
}
PVE.Utils.API2Request({
- url: "/nodes/" + nodename + "/ceph/pools/" +
+ url: "/nodes/" + nodename + "/ceph/pools/" +
rec.data.pool_name,
method: 'DELETE',
failure: function(response, opts) {
@@ -206,13 +206,13 @@ Ext.define('PVE.node.CephPoolList', {
Ext.define('ceph-pool-list', {
extend: 'Ext.data.Model',
- fields: [ 'pool_name',
- { name: 'pool', type: 'integer'},
- { name: 'size', type: 'integer'},
- { name: 'min_size', type: 'integer'},
- { name: 'pg_num', type: 'integer'},
- { name: 'bytes_used', type: 'integer'},
- { name: 'percent_used', type: 'number'},
+ fields: [ 'pool_name',
+ { name: 'pool', type: 'integer'},
+ { name: 'size', type: 'integer'},
+ { name: 'min_size', type: 'integer'},
+ { name: 'pg_num', type: 'integer'},
+ { name: 'bytes_used', type: 'integer'},
+ { name: 'percent_used', type: 'number'},
{ name: 'crush_ruleset', type: 'integer'}
],
idProperty: 'pool_name'
diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js
index 692fe15..c0833b4 100644
--- a/www/manager6/ceph/Status.js
+++ b/www/manager6/ceph/Status.js
@@ -87,33 +87,33 @@ Ext.define('PVE.node.CephStatus', {
Ext.applyIf(me, {
url: "/api2/json/nodes/" + nodename + "/ceph/status",
rows: {
- health: {
- header: 'health',
- renderer: renderhealth,
+ health: {
+ header: 'health',
+ renderer: renderhealth,
required: true
},
quorum_names: {
header: 'quorum',
- renderer: renderquorum,
+ renderer: renderquorum,
required: true
},
- fsid: {
- header: 'cluster',
+ fsid: {
+ header: 'cluster',
required: true
},
monmap: {
header: 'monmap',
- renderer: rendermonmap,
+ renderer: rendermonmap,
required: true
},
osdmap: {
header: 'osdmap',
- renderer: renderosdmap,
+ renderer: renderosdmap,
required: true
},
pgmap: {
header: 'pgmap',
- renderer: renderpgmap,
+ renderer: renderpgmap,
required: true
}
}
@@ -123,6 +123,6 @@ Ext.define('PVE.node.CephStatus', {
me.on('show', me.rstore.startUpdate);
me.on('hide', me.rstore.stopUpdate);
- me.on('destroy', me.rstore.stopUpdate);
+ me.on('destroy', me.rstore.stopUpdate);
}
});
diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js
index 2d354e5..10d8e44 100644
--- a/www/manager6/node/Config.js
+++ b/www/manager6/node/Config.js
@@ -28,7 +28,7 @@ Ext.define('PVE.node.Config', {
}
});
};
-
+
var actionBtn = Ext.create('Ext.Button', {
text: gettext('More'),
disabled: !caps.nodes['Sys.PowerMgmt'],
@@ -64,7 +64,7 @@ Ext.define('PVE.node.Config', {
if (btn !== 'yes') {
return;
}
-
+
PVE.Utils.API2Request({
url: '/nodes/' + nodename + '/stopall',
method: 'POST',
@@ -88,13 +88,13 @@ Ext.define('PVE.node.Config', {
}
]
})
- });
+ });
var restartBtn = Ext.create('PVE.button.Button', {
text: gettext('Restart'),
disabled: !caps.nodes['Sys.PowerMgmt'],
confirmMsg: Ext.String.format(gettext("Do you really want to
restart node {0}?"), nodename),
- handler: function() {
+ handler: function() {
node_command('reboot');
}
});
@@ -103,7 +103,7 @@ Ext.define('PVE.node.Config', {
text: gettext('Shutdown'),
disabled: !caps.nodes['Sys.PowerMgmt'],
confirmMsg: Ext.String.format(gettext("Do you really want to
shutdown node {0}?"), nodename),
- handler: function() {
+ handler: function() {
node_command('shutdown');
}
});
--
2.1.4
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
