update shipped appliance info index

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

diff --git a/PVE/Report.pm b/PVE/Report.pm
index e88cfecd1b980900d93a1dd8a85e95630e83521f..1ed91c8e54bb26956ead29a4a7e818d9203fcf69 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,12 +30,16 @@ my $init_report_cmds = sub {
            order => 10,
            cmds => [
                'hostname',
+               'date -R',
+               'cat /proc/cmdline',
                'pveversion --verbose',
                'cat /etc/hosts',
                'pvesubscription get',
                'cat /etc/apt/sources.list',
-               sub { dir2text('/etc/apt/sources.list.d/', '.*list') },
-               sub { dir2text('/etc/apt/sources.list.d/', '.*sources') },
+               sub { dir2text('/etc/apt/sources.list.d/', '.+\.list') },
+               sub { dir2text('/etc/apt/sources.list.d/', '.+\.sources') },
+               'apt-cache policy | grep -vP "^ +origin "',
+               'apt-mark showhold',
                'lscpu',
                'pvesh get /cluster/resources --type node --output-format=yaml',
            ],
@@ -55,32 +60,35 @@ my $init_report_cmds = sub {
                'cat /etc/fstab',
                'findmnt --ascii',
                'df --human -T',
+               'proxmox-boot-tool status',
            ],
        },
        'virtual guests' => {
            order => 40,
            cmds => [
                'qm list',
-               sub { dir2text('/etc/pve/qemu-server/', '\d.*conf') },
+               sub { dir2text('/etc/pve/qemu-server/', '\d+\.conf') },
                'pct list',
-               sub { dir2text('/etc/pve/lxc/', '\d.*conf') },
+               sub { dir2text('/etc/pve/lxc/', '\d+\.conf') },
            ],
        },
        network => {
-           order => 40,
+           order => 45,
            cmds => [
                'ip -details -statistics address',
                '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 => {
            order => 50,
            cmds => [
-               sub { dir2text('/etc/pve/firewall/', '.*fw') },
+               sub { dir2text('/etc/pve/firewall/', '.+\.fw') },
                'cat /etc/pve/local/host.fw',
-               'iptables-save',
+               'iptables-save -c | column -t -l4 -o" "',
            ],
        },
        cluster => {
@@ -90,6 +98,13 @@ my $init_report_cmds = sub {
                'pvecm status',
                'cat /etc/pve/corosync.conf 2>/dev/null',
                'ha-manager status',
+               'cat /etc/pve/datacenter.cfg',
+           ],
+       },
+       jobs => {
+           order => 65,
+           cmds => [
+               'cat /etc/pve/jobs.cfg',
            ],
        },
        hardware => {
@@ -123,6 +138,7 @@ my $init_report_cmds = sub {
            'zpool status',
            'zpool list -v',
            'zfs list',
+           'arcstat',
            ;
     }
 
@@ -137,6 +153,7 @@ my $init_report_cmds = sub {
            'ceph config dump',
            'pveceph pool ls',
            'ceph versions',
+           'ceph health detail',
            ;
     }