From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 912F11FF165 for ; Thu, 17 Jul 2025 17:36:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AFC513F404; Thu, 17 Jul 2025 17:37:02 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Date: Thu, 17 Jul 2025 17:36:25 +0200 Message-Id: <20250717153625.391842-3-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250717153625.391842-1-m.carrara@proxmox.com> References: <20250717153625.391842-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1752766588172 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.082 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v1 master ceph 2/2] provide another fix that silences invalid escape sequence warning X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" See the added patch for additional details. Signed-off-by: Max R. Carrara --- ...-zabbix-fix-invalid-escape-sequences.patch | 29 +++++++++++++++++++ patches/series | 1 + 2 files changed, 30 insertions(+) create mode 100644 patches/0061-mgr-zabbix-fix-invalid-escape-sequences.patch diff --git a/patches/0061-mgr-zabbix-fix-invalid-escape-sequences.patch b/patches/0061-mgr-zabbix-fix-invalid-escape-sequences.patch new file mode 100644 index 0000000000..9c405d28e1 --- /dev/null +++ b/patches/0061-mgr-zabbix-fix-invalid-escape-sequences.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Max R. Carrara" +Date: Thu, 17 Jul 2025 17:20:08 +0200 +Subject: [PATCH 61/61] mgr/zabbix: fix invalid escape sequences + +Even though the `zabbix` module is deprecated and will be removed +soon [1], fix the warning regarding invalid escape sequences here +also, as it might look scary for some users. + +[1]: https://github.com/ceph/ceph/pull/57299 + +Signed-off-by: Max R. Carrara +--- + src/pybind/mgr/zabbix/module.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pybind/mgr/zabbix/module.py b/src/pybind/mgr/zabbix/module.py +index 638b688562f..2e348ab0391 100644 +--- a/src/pybind/mgr/zabbix/module.py ++++ b/src/pybind/mgr/zabbix/module.py +@@ -131,7 +131,7 @@ class Module(MgrModule): + self._zabbix_hosts = list() + servers = cast(str, self.config['zabbix_host']).split(",") + for server in servers: +- uri = re.match("(?:(?:\[?)([a-z0-9-\.]+|[a-f0-9:\.]+)(?:\]?))(?:((?::))([0-9]{1,5}))?$", server) ++ uri = re.match(r"(?:(?:\[?)([a-z0-9-\.]+|[a-f0-9:\.]+)(?:\]?))(?:((?::))([0-9]{1,5}))?$", server) + if uri: + zabbix_host, sep, opt_zabbix_port = uri.groups() + if sep == ':': diff --git a/patches/series b/patches/series index d6c765677d..a2e222551c 100644 --- a/patches/series +++ b/patches/series @@ -54,3 +54,4 @@ 0058-pybind-mgr-restful-provide-workaround-for-PyO3-Impor.patch 0059-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch 0060-mgr-osd_perf_query-fix-ivalid-escape-sequence.patch +0061-mgr-zabbix-fix-invalid-escape-sequences.patch -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel