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

Add Ceph, iscsi and more disk and zfs information to pvereport

Browse Source 
Following items added to pvereport:

* more details about disks
* iscsi information
* more zfs information
* ceph information (only when ceph.conf exists)

When running from command line now report progress is shown at the console (STDERR)
This commit is contained in:
Friedrich Ramberger 2019-04-03 08:25:06 +00:00 committed by Thomas Lamprecht
parent b545329ad9
commit e60cdf1df0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/Report.pm
View File

@ -60,6 +60,9 @@ my $report_def = {
],
disks => [
'lsblk --ascii',
'ls -l /dev/disk/by-*/',
'iscsiadm -m node',
'iscsiadm -m session',
],
volumes => [
'pvs',
@ -71,7 +74,14 @@ my $report_def = {
my @report_order = ('general', 'storage', 'virtual guests', 'network',
'firewall', 'cluster', 'bios', 'pci', 'disks', 'volumes');
push @{$report_def->{volumes}}, 'zpool status', 'zfs list' if cmd_exists('zfs');
push @{$report_def->{volumes}}, 'zpool status', 'zpool list -v', 'zfs list' if cmd_exists('zfs');
if (-e '/etc/ceph/ceph.conf') {
my $crbd = eval "`ceph osd pool ls | sed -e 's/^/echo /' | sed 'p;s/echo/rbd ls/g'`";
push @{$report_def->{volumes}}, 'ceph status', 'ceph osd status', 'ceph df', 'pveceph status', 'pveceph lspools', $crbd;
}
push @{$report_def->{disk}}, 'multipath -ll', 'multipath -v3' if cmd_exists('multipath');
@ -119,6 +129,7 @@ sub generate {
$report .= "\n==== $title ====\n";
foreach my $command (@$commands) {
print STDERR "Process ".$command."...";
eval {
if (ref $command eq 'CODE') {
PVE::Tools::run_with_timeout($cmd_timeout, $command);
@ -126,7 +137,9 @@ sub generate {
$report .= "\n# $command\n";
PVE::Tools::run_command($command, %$run_cmd_params);
}
print STDERR "OK";
};
print STDERR "\n";
$report .= "\nERROR: $@\n" if $@;
}
}