ceph: config hash fallback style improvement

[pve-manager.git] / PVE / Report.pm

diff --git a/PVE/Report.pm b/PVE/Report.pm
index 90b7cb1cfd84868ecbf2b07eb7461e5ed08d1c9e..9c46aa9b77a9dccccac49c1e8c09483337d72ad8 100644 (file)
--- a/PVE/Report.pm
+++ b/PVE/Report.pm
@@ -10,9 +10,10 @@ my sub dir2text {
     my ($target_dir, $regexp) = @_;
 
     print STDERR "dir2text '${target_dir}${regexp}'...";
-    my $text = '';
+    my $text = "# output '${target_dir}${regexp}' file(s)\n";
     PVE::Tools::dir_glob_foreach($target_dir, $regexp, sub {
        my ($file) = @_;
+       return if $file eq '.' || $file eq '..';
        $text .=  "\n# cat $target_dir$file\n";
        $text .= PVE::Tools::file_get_contents($target_dir.$file)."\n";
     });
@@ -29,6 +30,7 @@ my $init_report_cmds = sub {
            order => 10,
            cmds => [
                'hostname',
+               'date -R',
                'pveversion --verbose',
                'cat /etc/hosts',
                'pvesubscription get',
@@ -74,6 +76,8 @@ my $init_report_cmds = sub {
                'ip -details -4 route show',
                'ip -details -6 route show',
                'cat /etc/network/interfaces',
+               sub { dir2text('/etc/network/interfaces.d/', '.*') },
+               sub { dir2text('/etc/pve/sdn/', '.*') },
            ],
        },
        firewall => {
@@ -81,7 +85,7 @@ my $init_report_cmds = sub {
            cmds => [
                sub { dir2text('/etc/pve/firewall/', '.*fw') },
                'cat /etc/pve/local/host.fw',
-               'iptables-save',
+               'iptables-save -c | column -t -l4 -o" "',
            ],
        },
        cluster => {
@@ -91,6 +95,7 @@ my $init_report_cmds = sub {
                'pvecm status',
                'cat /etc/pve/corosync.conf 2>/dev/null',
                'ha-manager status',
+               'cat /etc/pve/datacenter.cfg',
            ],
        },
        hardware => {
@@ -139,6 +144,7 @@ my $init_report_cmds = sub {
            'ceph config dump',
            'pveceph pool ls',
            'ceph versions',
+           'ceph health detail',
            ;
     }