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

api: ceph: ensure calls get proxied to correct node

Browse Source 
If calls aren't proxied to the selected node, which seems legit in
 some cases, this will cause some misleading errors while ceph is
 not installed on that node. Therefor the calls should now always get
 proxied.

Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx 2019-03-28 12:16:06 +01:00 committed by Thomas Lamprecht
parent 5c1c3a536c
commit 410f2cb0c6
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PVE/API2/Ceph.pm
View File

@ -172,6 +172,7 @@ __PACKAGE__->register_method ({
name => 'config', name => 'config',
path => 'config', path => 'config',
method => 'GET', method => 'GET',
proxyto => 'node',
permissions => { permissions => {
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },

1
PVE/API2/Ceph/FS.pm
View File

@ -19,6 +19,7 @@ __PACKAGE__->register_method ({
name => 'index', name => 'index',
path => '', path => '',
method => 'GET', method => 'GET',
proxyto => 'node',
description => "Directory index.", description => "Directory index.",
permissions => { permissions => {
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],

8
www/manager6/ceph/FS.js
View File

@ -152,6 +152,10 @@ Ext.define('PVE.NodeCephFSPanel', {
interval: 5 * 1000, interval: 5 * 1000,
autoStart: true, autoStart: true,
storeid: 'pve-ceph-fs', storeid: 'pve-ceph-fs',
proxy: {
type: 'proxmox',
url: '/api2/json/nodes/' + view.nodename + '/ceph/fs'
},
model: 'pve-ceph-fs' model: 'pve-ceph-fs'
}); });
view.setStore(Ext.create('Proxmox.data.DiffStore', { view.setStore(Ext.create('Proxmox.data.DiffStore', {
@ -245,6 +249,10 @@ Ext.define('PVE.NodeCephFSPanel', {
interval: 3 * 1000, interval: 3 * 1000,
autoStart: true, autoStart: true,
storeid: 'pve-ceph-mds', storeid: 'pve-ceph-mds',
proxy: {
type: 'proxmox',
url: '/api2/json/nodes/'+ view.nodename +'/ceph/mds'
},
model: 'pve-ceph-mds' model: 'pve-ceph-mds'
}); });
view.setStore(Ext.create('Proxmox.data.DiffStore', { view.setStore(Ext.create('Proxmox.data.DiffStore', {