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 3431F95468 for ; Fri, 12 Apr 2024 12:06:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09F6B7A5A for ; Fri, 12 Apr 2024 12:06:47 +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 ; Fri, 12 Apr 2024 12:06:43 +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 DBA1245195 for ; Fri, 12 Apr 2024 12:06:40 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 12:06:10 +0200 Message-Id: <20240412100631.94218-13-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240412100631.94218-1-l.wagner@proxmox.com> References: <20240412100631.94218-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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: [pbs-devel] [PATCH proxmox-backup 12/33] api-types: api: datatore: add notification-mode parameter X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2024 10:06:47 -0000 This one lets the user choose between the old notification behavior (selecting an email address/user and always/error/never behavior per datastore) and the new one (emit notification events to the notification system) Signed-off-by: Lukas Wagner --- pbs-api-types/src/datastore.rs | 22 ++++++++++++++++++++++ src/api2/config/datastore.rs | 9 +++++++++ 2 files changed, 31 insertions(+) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 5e13c157..a5da3e94 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -309,6 +309,10 @@ pub struct DataStoreConfig { #[serde(skip_serializing_if = "Option::is_none")] pub notify: Option, + /// Opt-in into the new notification system + #[serde(skip_serializing_if = "Option::is_none")] + pub notification_mode: Option, + /// Datastore tuning options #[serde(skip_serializing_if = "Option::is_none")] pub tuning: Option, @@ -318,6 +322,23 @@ pub struct DataStoreConfig { pub maintenance_mode: Option, } +#[api] +#[derive(Serialize, Deserialize, Updater, Clone, PartialEq, Default)] +#[serde(rename_all = "kebab-case")] +/// Configure how notifications for this datastore should be sent. +/// `legacy-sendmail` sends email notifications to the user configured +/// in `notify-user` via the system's `sendmail` executable. +/// `notification-system` emits matchable notification events to the +/// notification system. +pub enum NotificationMode { + /// Send notifications via the system's sendmail command to the user + /// configured in `notify-user` + #[default] + LegacySendmail, + /// Emit notification events to the notification system + NotificationSystem, +} + impl DataStoreConfig { pub fn new(name: String, path: String) -> Self { Self { @@ -330,6 +351,7 @@ impl DataStoreConfig { verify_new: None, notify_user: None, notify: None, + notification_mode: None, tuning: None, maintenance_mode: None, } diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 3081e1f4..9a64c6a6 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -222,6 +222,8 @@ pub enum DeletableProperty { NotifyUser, /// Delete the notify property Notify, + /// Delete the notification-mode property + NotificationMode, /// Delete the tuning property Tuning, /// Delete the maintenance-mode property @@ -315,6 +317,9 @@ pub fn update_datastore( DeletableProperty::NotifyUser => { data.notify_user = None; } + DeletableProperty::NotificationMode => { + data.notification_mode = None; + } DeletableProperty::Tuning => { data.tuning = None; } @@ -385,6 +390,10 @@ pub fn update_datastore( data.notify_user = update.notify_user; } + if update.notification_mode.is_some() { + data.notification_mode = update.notification_mode; + } + if update.tuning.is_some() { data.tuning = update.tuning; } -- 2.39.2