Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

ui: ceph/StatusDetail: cleanups

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-06-03 15:25:39 +02:00
parent 9039633648
commit 2bb04a3f90
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/CLI/pveceph.pm
View File

@ -145,8 +145,8 @@ __PACKAGE__->register_method ({
$repolist = "deb http://download.proxmox.com/debian/ceph-luminous buster main\n";
} elsif ($cephver eq 'octopus') {
die "Not allowed to select version '$cephver'\n" if !$param->{'allow-experimental'};
$repolist = "deb http://repo.proxmox.com/staging/ceph-octopus buster ceph-15\n";
# FIXME: use public mirror once available
$repolist = "deb http://download.proxmox.com/debian/ceph-octopus buster test\n";
# FIXME: use production component once available
#$repolist = "deb http://download.proxmox.com/debian/ceph-octopus buster main\n";
} else {
die "not implemented ceph version: $cephver";

16
www/manager6/ceph/StatusDetail.js
View File

@ -212,15 +212,8 @@ Ext.define('PVE.ceph.StatusDetail', {
});
}
// update PGs sorted
var pgmap = status.pgmap || {};
var health = status.health || {};
var osdmap = status.osdmap || {};
if (typeof osdmap.osdmap != "undefined") {
osdmap = osdmap.osdmap;
}
// update pgs sorted
var pgs_by_state = pgmap.pgs_by_state || [];
pgs_by_state.sort(function(a,b){
return (a.state_name < b.state_name)?-1:(a.state_name === b.state_name)?0:1;
@ -253,6 +246,7 @@ Ext.define('PVE.ceph.StatusDetail', {
var downinregex = /(\d+) osds down/;
var downin_osds = 0;
var health = status.health || {};
// we collect monitor/osd information from the checks
Ext.Object.each(health.checks, function(key, value, obj) {
var found = null;
@ -264,9 +258,11 @@ Ext.define('PVE.ceph.StatusDetail', {
}
});
var osdmap = status.osdmap || {};
if (typeof osdmap.osdmap != "undefined") {
osdmap = osdmap.osdmap;
}
// update osds counts
// pre-octopus || octopus || 0
var total_osds = osdmap.num_osds || 0;
var in_osds = osdmap.num_in_osds || 0;
var up_osds = osdmap.num_up_osds || 0;