[pve-devel] [PATCH pve-manager 1/1] pvereport: fix sdn output

[Stefan Hanreich <s.hanreich@proxmox.com>]

The SDN subfolder on pmxcfs can contain subfolders (fabrics,
firewall). The existing regex matched every element contained in the
sdn subfolder, which caused dir2text to trip up, since it fails when
trying to open directories.

Handle cfg, json and the running-config files separately, so they
are nicely grouped together in the pve report. Add the SDN firewall
subdirectory to the firewall section, since it fits better there than
in the SDN section.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 PVE/Report.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/PVE/Report.pm b/PVE/Report.pm
index 8f53823e6..31ddadf39 100644
--- a/PVE/Report.pm
+++ b/PVE/Report.pm
@@ -80,7 +80,9 @@ my $init_report_cmds = sub {
 		'ip -details -6 route show',
 		'cat /etc/network/interfaces',
 		sub { dir2text('/etc/network/interfaces.d/', '.*') },
-		sub { dir2text('/etc/pve/sdn/', '.*') },
+		'cat /etc/pve/sdn/.running-config',
+		sub { dir2text('/etc/pve/sdn/', '.+\.cfg') },
+		sub { dir2text('/etc/pve/sdn/', '.+\.json') },
 	    ],
 	},
 	firewall => {
@@ -88,6 +90,7 @@ my $init_report_cmds = sub {
 	    cmds => [
 		sub { dir2text('/etc/pve/firewall/', '.+\.fw') },
 		'cat /etc/pve/local/host.fw',
+		sub { dir2text('/etc/pve/sdn/firewall/', '.+\.fw') },
 		'iptables-save -c | column -t -l4 -o" "',
 	    ],
 	},
-- 
2.39.5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel