From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 86B7DC1E86 for ; Fri, 19 Jan 2024 11:30:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 64B6F1FE33 for ; Fri, 19 Jan 2024 11:30:55 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 19 Jan 2024 11:30:54 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2570148B6C for ; Fri, 19 Jan 2024 11:30:54 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Fri, 19 Jan 2024 11:30:45 +0100 Message-Id: <20240119103045.80373-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datacenterconfig.pm] Subject: [pve-devel] [PATCH cluster] datacenter config: mark notification settings as deprecated/unused 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: , X-List-Received-Date: Fri, 19 Jan 2024 10:30:55 -0000 These were part of the first version of the notification overhaul which was already rolled out in pvetest. To avoid breakage for users who may have used the version from pvetest, we do not remove them yet and only mark them as unused or deprecated. They can be removed at some point in the future. Signed-off-by: Lukas Wagner --- src/PVE/DataCenterConfig.pm | 47 ++++++++++--------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/src/PVE/DataCenterConfig.pm b/src/PVE/DataCenterConfig.pm index c80872c..abd0bbf 100644 --- a/src/PVE/DataCenterConfig.pm +++ b/src/PVE/DataCenterConfig.pm @@ -52,8 +52,10 @@ my $notification_format = { 'package-updates' => { type => 'string', enum => ['auto', 'always', 'never'], - description => "Control when the daily update job should send out notifications.", - verbose_description => "Control how often the daily update job should send out notifications:\n" + description => "DEPRECATED: Use datacenter notification settings instead." + ." Control when the daily update job should send out notifications.", + verbose_description => "DEPRECATED: Use datacenter notification settings instead.\n" + ."Control how often the daily update job should send out notifications:\n" ."* 'auto' daily for systems with a valid subscription, as those are assumed to be " ." production-ready and thus should know about pending updates.\n" ."* 'always' every update, if there are new pending updates.\n" @@ -61,62 +63,37 @@ my $notification_format = { default => 'auto', optional => 1, }, + # TODO: These are the left-overs of the first version of the overhauled notification system. + # It was already available on pvetest, thus we should keep these entries here for a while to + # avoid any breakage. 'target-package-updates' => { type => 'string', format_description => 'TARGET', - description => "Control where notifications about available updates should be sent to.", - verbose_description => "Control where notifications about available" - . " updates should be sent to." - . " Has to be the name of a notification target (endpoint or notification group)." - . " If the 'target-package-updates' parameter is not set, the system will send mails" - . " to root via a 'sendmail' notification endpoint.", + description => "UNUSED - Use datacenter notification settings instead.", optional => 1, }, 'fencing' => { type => 'string', enum => ['always', 'never'], - description => "Control if notifications about node fencing should be sent.", - verbose_description => "Control if notifications about node fencing should be sent.\n" - . "* 'always' always send out notifications\n" - . "* 'never' never send out notifications.\n" - . "For production systems, turning off node fencing notifications is not" - . "recommended!\n", - default => 'always', + description => "UNUSED - Use datacenter notification settings instead.", optional => 1, }, 'target-fencing' => { type => 'string', format_description => 'TARGET', - description => "Control where notifications about fenced cluster nodes should be sent to.", - verbose_description => "Control where notifications about fenced cluster nodes" - . " should be sent to." - . " Has to be the name of a notification target (endpoint or notification group)." - . " If the 'target-fencing' parameter is not set, the system will send mails" - . " to root via a 'sendmail' notification endpoint.", + description => "UNUSED - Use datacenter notification settings instead.", optional => 1, }, 'replication' => { type => 'string', enum => ['always', 'never'], - description => "Control if notifications for replication failures should be sent.", - verbose_description => "Control if notifications for replication failures should be sent.\n" - . "* 'always' always send out notifications\n" - . "* 'never' never send out notifications.\n" - . "For production systems, turning off replication notifications is not" - . "recommended!\n", - default => 'always', + description => "UNUSED - Use datacenter notification settings instead.", optional => 1, }, 'target-replication' => { type => 'string', format_description => 'TARGET', - description => "Control where notifications for failed storage replication jobs should" - . " be sent to.", - verbose_description => "Control where notifications for failed storage replication jobs" - . " should be sent to." - . " Has to be the name of a notification target (endpoint or notification group)." - . " If the 'target-replication' parameter is not set, the system will send mails" - . " to root via a 'sendmail' notification endpoint.", + description => "UNUSED - Use datacenter notification settings instead.", optional => 1, }, }; -- 2.39.2