From: Aaron Lauterer <a.lauterer@proxmox.com>
Date: Mon, 21 Dec 2020 15:13:50 +0000 (+0100)
Subject: pvereport: rework report contents
X-Git-Url: https://git.proxmox.com/?p=pve-manager.git;a=commitdiff_plain;h=efef17e0ecbbe9029eb294b6ec58053b5e67273c

pvereport: rework report contents

add:
* HA status
* ceph osd df tree
* ceph conf file and conf db
* ceph versions

removed:
* ceph status, as pveceph status is now printing the same information

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---

diff --git a/PVE/Report.pm b/PVE/Report.pm
index 5ee3453d..f8d5e663 100644
--- a/PVE/Report.pm
+++ b/PVE/Report.pm
@@ -51,7 +51,8 @@ my $init_report_cmds = sub {
 	cluster => [
 	    'pvecm nodes',
 	    'pvecm status',
-	    'cat /etc/pve/corosync.conf 2>/dev/null'
+	    'cat /etc/pve/corosync.conf 2>/dev/null',
+	    'ha-manager status',
 	],
 	bios => [
 	    'dmidecode -t bios',
@@ -76,7 +77,9 @@ my $init_report_cmds = sub {
 
     if (-e '/etc/ceph/ceph.conf') {
 	# TODO: add (now working) rdb ls over all pools? really needed?
-	push @{$report_def->{volumes}}, 'ceph status', 'ceph osd status', 'ceph df', 'pveceph status', 'pveceph pool ls';
+	push @{$report_def->{volumes}}, 'pveceph status', 'ceph osd status',
+		'ceph df', 'ceph osd df tree', 'cat /etc/ceph/ceph.conf',
+		'ceph config dump', 'pveceph pool ls', 'ceph versions';
     }
 
     push @{$report_def->{disks}}, 'multipath -ll', 'multipath -v3'