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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 836999B2DA for ; Wed, 24 May 2023 16:05:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6B85520499 for ; Wed, 24 May 2023 16:05:45 +0200 (CEST) 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 ; Wed, 24 May 2023 16:05:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AD0AC46E38 for ; Wed, 24 May 2023 15:57:33 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 24 May 2023 15:56:33 +0200 Message-Id: <20230524135649.934881-27-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230524135649.934881-1-l.wagner@proxmox.com> References: <20230524135649.934881-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.151 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. [common.pm] Subject: [pve-devel] [PATCH v2 pve-guest-common 26/42] vzdump: add config options for new notification backend 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: Wed, 24 May 2023 14:05:45 -0000 - Add new option 'notification-mode' Can either be 'mail' or 'channel', selects wheter notifications should be sent via email or via a notification channel - Add new option 'notification-channel' Allows to select a channel via which notifications shall be sent (if 'notification-mode' is set to 'channel') - Add new option 'notification-policy' Replacement for the now deprecated 'mailnotification' option. Mostly just a rename for consistency, but also adds the 'never' option. - Mark 'mailnotification' as deprecated in favor of 'notification-policy' Signed-off-by: Lukas Wagner --- src/PVE/VZDump/Common.pm | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/PVE/VZDump/Common.pm b/src/PVE/VZDump/Common.pm index 4b0e8e0..d3cf8a7 100644 --- a/src/PVE/VZDump/Common.pm +++ b/src/PVE/VZDump/Common.pm @@ -164,16 +164,40 @@ my $confdesc = { type => 'string', format => 'email-or-username-list', description => "Comma-separated list of email addresses or users that should" . - " receive email notifications.", + " receive email notifications. Only has an effect if 'notification-mode' is". + " set to 'mail'.", optional => 1, }, mailnotification => { type => 'string', - description => "Specify when to send an email", + description => "Deprecated: use 'notification-policy' instead.", optional => 1, enum => [ 'always', 'failure' ], default => 'always', }, + 'notification-policy' => { + type => 'string', + description => "Specify when to send a notification", + optional => 1, + enum => [ 'always', 'failure', 'never'], + default => 'always', + }, + 'notification-mode' => { + type => 'string', + description => "Determine whether to notify via email of via a notification channel.", + optional => 1, + enum => [ 'mail', 'channel' ], + default => 'mail', + }, + 'notification-channel' => { + type => 'string', + format => 'pve-configid', + description => "Determine the channel via which notifications should be sent." . + " Only has an effect if 'notification-mode' is set to 'channel'." . + " If 'notification-mode' is set to 'channel' and 'notification-channel' is " . + " not set, then no notification will be sent.", + optional => 1, + }, tmpdir => { type => 'string', description => "Store temporary files to specified directory.", -- 2.30.2