From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 92F791FF15C for <inbox@lore.proxmox.com>; Fri, 18 Apr 2025 14:40:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF5373B8DC; Fri, 18 Apr 2025 14:40:07 +0200 (CEST) From: Stefan Hanreich <s.hanreich@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 18 Apr 2025 14:39:34 +0200 Message-Id: <20250418123934.2840407-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.232 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [report.pm] Subject: [pve-devel] [PATCH pve-manager 1/1] pvereport: fix sdn output X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.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