proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 01:28:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gui: ceph: make status panel node independant

Browse Source 
and use the cluster wide api call if no nodename is given

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-05-27 14:14:01 +02:00 committed by Thomas Lamprecht
parent 0bf3c58193
commit 2365c5c18f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/manager6/ceph/Status.js
View File

@ -278,17 +278,15 @@ Ext.define('PVE.node.CephStatus', {
var me = this; var me = this;
var nodename = me.pveSelNode.data.node; var nodename = me.pveSelNode.data.node;
if (!nodename) {
throw "no node name specified";
}
me.callParent(); me.callParent();
var baseurl = '/api2/json' + (nodename ? '/nodes/' + nodename : '/cluster') + '/ceph/';
me.store = Ext.create('Proxmox.data.UpdateStore', { me.store = Ext.create('Proxmox.data.UpdateStore', {
storeid: 'ceph-status-' + nodename, storeid: 'ceph-status-' + (nodename || 'cluster'),
interval: 5000, interval: 5000,
proxy: { proxy: {
type: 'proxmox', type: 'proxmox',
url: '/api2/json/nodes/' + nodename + '/ceph/status' url: baseurl + '/status'
} }
}); });
@ -307,7 +305,7 @@ Ext.define('PVE.node.CephStatus', {
var regex = new RegExp("not (installed|initialized)", "i"); var regex = new RegExp("not (installed|initialized)", "i");
PVE.Utils.handleStoreErrorOrMask(me, me.store, regex, function(me, error){ PVE.Utils.handleStoreErrorOrMask(me, me.store, regex, function(me, error){
me.store.stopUpdate(); me.store.stopUpdate();
PVE.Utils.showCephInstallOrMask(me, error.statusText, nodename, PVE.Utils.showCephInstallOrMask(me, error.statusText, (nodename || 'localhost'),
function(win){ function(win){
me.mon(win, 'cephInstallWindowClosed', function(){ me.mon(win, 'cephInstallWindowClosed', function(){
me.store.startUpdate(); me.store.startUpdate();