From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C7D411FF16F for ; Tue, 24 Jun 2025 13:33:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A1707352F4; Tue, 24 Jun 2025 13:33:35 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 24 Jun 2025 13:33:27 +0200 Message-Id: <20250624113327.134893-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250624113327.134893-1-l.wagner@proxmox.com> References: <20250624113327.134893-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 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. 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 manager 2/2] cli: pve8to9: check for legacy 'notification-{policy, target}' options 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" These were briefly used by the first version of the overhauled notification stack which hit pvetest too soon. They will be dropped from the schema in the major update. Signed-off-by: Lukas Wagner --- PVE/CLI/pve8to9.pm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm index 5a80c40f..19667619 100644 --- a/PVE/CLI/pve8to9.pm +++ b/PVE/CLI/pve8to9.pm @@ -17,6 +17,7 @@ use PVE::Ceph::Tools; use PVE::Cluster; use PVE::Corosync; use PVE::INotify; +use PVE::Jobs; use PVE::JSONSchema; use PVE::NodeConfig; use PVE::RPCEnvironment; @@ -1452,6 +1453,39 @@ sub check_legacy_notification_sections { } } +sub check_legacy_backup_job_options { + log_info( + "Check for legacy 'notification-policy' or 'notification-target' options in /etc/pve/jobs.cfg..." + ); + + my $job_cfg = PVE::Cluster::cfs_read_file('jobs.cfg'); + + my $failed = 0; + + for my $jobid (sort keys $job_cfg->{ids}->%*) { + my $cfg = $job_cfg->{ids}->{$jobid}; + + if (defined($cfg->{'notification-policy'})) { + $failed = 1; + log_fail("found legacy 'notification-policy' option for job '$jobid'"); + } + + if (defined($cfg->{'notification-target'})) { + $failed = 1; + log_fail("found legacy 'notification-target' option for job '$jobid'"); + } + } + + if ($failed) { + log_fail( + "Changing the backup job configuration via the UI will automatically clear these options." + . "Alternatively, you can remove the offending options from /etc/pve/jobs.cfg by hand" + ); + } else { + log_pass("No legacy 'notification-policy' or 'notification-target' options found!"); + } +} + sub check_misc { print_header("MISCELLANEOUS CHECKS"); my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') }; @@ -1562,6 +1596,7 @@ sub check_misc { check_bootloader(); check_dkms_modules(); check_legacy_notification_sections(); + check_legacy_backup_job_options(); } my sub colored_if { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel