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 BEE02956C3 for ; Fri, 12 Apr 2024 12:14:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BF3A824E for ; Fri, 12 Apr 2024 12:14:01 +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:13:59 +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 CB94445182 for ; Fri, 12 Apr 2024 12:06:43 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 12:06:13 +0200 Message-Id: <20240412100631.94218-16-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.005 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [notifications.rs] Subject: [pbs-devel] [PATCH proxmox-backup 15/33] server: notifications: send prune notifications via notification system 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:14:31 -0000 If the `notification-mode` parameter is set to `legacy-sendmail`, then we still use the new infrastructure, but don't consider the notification config and use a hard-coded sendmail endpoint directly. Signed-off-by: Lukas Wagner --- debian/proxmox-backup-server.install | 4 ++ src/server/notifications.rs | 76 ++++++++------------- templates/Makefile | 4 ++ templates/default/prune-err-body.txt.hbs | 10 +++ templates/default/prune-err-subject.txt.hbs | 1 + templates/default/prune-ok-body.txt.hbs | 10 +++ templates/default/prune-ok-subject.txt.hbs | 1 + 7 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 templates/default/prune-err-body.txt.hbs create mode 100644 templates/default/prune-err-subject.txt.hbs create mode 100644 templates/default/prune-ok-body.txt.hbs create mode 100644 templates/default/prune-ok-subject.txt.hbs diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install index 197c070f..7b8183dd 100644 --- a/debian/proxmox-backup-server.install +++ b/debian/proxmox-backup-server.install @@ -45,6 +45,10 @@ usr/share/proxmox-backup/templates/default/gc-err-body.txt.hbs usr/share/proxmox-backup/templates/default/gc-ok-body.txt.hbs usr/share/proxmox-backup/templates/default/gc-err-subject.txt.hbs usr/share/proxmox-backup/templates/default/gc-ok-subject.txt.hbs +usr/share/proxmox-backup/templates/default/prune-err-body.txt.hbs +usr/share/proxmox-backup/templates/default/prune-ok-body.txt.hbs +usr/share/proxmox-backup/templates/default/prune-err-subject.txt.hbs +usr/share/proxmox-backup/templates/default/prune-ok-subject.txt.hbs usr/share/proxmox-backup/templates/default/test-body.txt.hbs usr/share/proxmox-backup/templates/default/test-body.html.hbs usr/share/proxmox-backup/templates/default/test-subject.txt.hbs diff --git a/src/server/notifications.rs b/src/server/notifications.rs index 720ae5ff..73de961e 100644 --- a/src/server/notifications.rs +++ b/src/server/notifications.rs @@ -87,34 +87,6 @@ Local Source Store: {{job.remote-store}} Synchronization failed: {{error}} -Please visit the web interface for further details: - - - -"###; - -const PRUNE_OK_TEMPLATE: &str = r###" - -Job ID: {{jobname}} -Datastore: {{store}} - -Pruning successful. - - -Please visit the web interface for further details: - - - -"###; - -const PRUNE_ERR_TEMPLATE: &str = r###" - -Job ID: {{jobname}} -Datastore: {{store}} - -Pruning failed: {{error}} - - Please visit the web interface for further details: @@ -223,9 +195,6 @@ lazy_static::lazy_static! { hb.register_template_string("sync_ok_template", SYNC_OK_TEMPLATE)?; hb.register_template_string("sync_err_template", SYNC_ERR_TEMPLATE)?; - hb.register_template_string("prune_ok_template", PRUNE_OK_TEMPLATE)?; - hb.register_template_string("prune_err_template", PRUNE_ERR_TEMPLATE)?; - hb.register_template_string("tape_backup_ok_template", TAPE_BACKUP_OK_TEMPLATE)?; hb.register_template_string("tape_backup_err_template", TAPE_BACKUP_ERR_TEMPLATE)?; @@ -490,16 +459,6 @@ pub fn send_prune_status( jobname: &str, result: &Result<(), Error>, ) -> Result<(), Error> { - let (email, notify) = match lookup_datastore_notify_settings(store) { - (Some(email), notify, _) => (email, notify), - (None, _, _) => return Ok(()), - }; - - let notify_prune = notify.prune.unwrap_or(Notify::Error); - if notify_prune == Notify::Never || (result.is_ok() && notify_prune == Notify::Error) { - return Ok(()); - } - let (fqdn, port) = get_server_url(); let mut data = json!({ "jobname": jobname, @@ -508,20 +467,39 @@ pub fn send_prune_status( "port": port, }); - let text = match result { - Ok(()) => HANDLEBARS.render("prune_ok_template", &data)?, + let (template, severity) = match result { + Ok(()) => ("prune-ok", Severity::Info), Err(err) => { data["error"] = err.to_string().into(); - HANDLEBARS.render("prune_err_template", &data)? + ("prune-err", Severity::Error) } }; - let subject = match result { - Ok(()) => format!("Pruning datastore '{store}' successful"), - Err(_) => format!("Pruning datastore '{store}' failed"), - }; + let metadata = HashMap::from([ + ("datastore".into(), store.into()), + ("hostname".into(), proxmox_sys::nodename().into()), + ("type".into(), "prune".into()), + ]); - send_job_status_mail(&email, &subject, &text)?; + let notification = Notification::from_template(severity, template, data, metadata); + + let (email, notify, mode) = lookup_datastore_notify_settings(store); + match mode { + NotificationMode::LegacySendmail => { + let notify = notify.prune.unwrap_or(Notify::Error); + + if notify == Notify::Never || (result.is_ok() && notify == Notify::Error) { + return Ok(()); + } + + if let Some(email) = email { + send_sendmail_legacy_notification(notification, &email)?; + } + } + NotificationMode::NotificationSystem => { + send_notification(notification)?; + } + } Ok(()) } diff --git a/templates/Makefile b/templates/Makefile index 7d4cb19f..1f556aba 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -5,6 +5,10 @@ NOTIFICATION_TEMPLATES= \ default/gc-ok-body.txt.hbs \ default/gc-err-subject.txt.hbs \ default/gc-ok-subject.txt.hbs \ + default/prune-err-body.txt.hbs \ + default/prune-ok-body.txt.hbs \ + default/prune-err-subject.txt.hbs \ + default/prune-ok-subject.txt.hbs \ default/test-body.txt.hbs \ default/test-body.html.hbs \ default/test-subject.txt.hbs \ diff --git a/templates/default/prune-err-body.txt.hbs b/templates/default/prune-err-body.txt.hbs new file mode 100644 index 00000000..0973c3d9 --- /dev/null +++ b/templates/default/prune-err-body.txt.hbs @@ -0,0 +1,10 @@ + +Job ID: {{jobname}} +Datastore: {{store}} + +Pruning failed: {{error}} + + +Please visit the web interface for further details: + + diff --git a/templates/default/prune-err-subject.txt.hbs b/templates/default/prune-err-subject.txt.hbs new file mode 100644 index 00000000..836ae722 --- /dev/null +++ b/templates/default/prune-err-subject.txt.hbs @@ -0,0 +1 @@ +Pruning datastore '{{ store }}' failed diff --git a/templates/default/prune-ok-body.txt.hbs b/templates/default/prune-ok-body.txt.hbs new file mode 100644 index 00000000..b7e449e3 --- /dev/null +++ b/templates/default/prune-ok-body.txt.hbs @@ -0,0 +1,10 @@ + +Job ID: {{jobname}} +Datastore: {{store}} + +Pruning successful. + + +Please visit the web interface for further details: + + diff --git a/templates/default/prune-ok-subject.txt.hbs b/templates/default/prune-ok-subject.txt.hbs new file mode 100644 index 00000000..3227a062 --- /dev/null +++ b/templates/default/prune-ok-subject.txt.hbs @@ -0,0 +1 @@ +Pruning datastore '{{ store }}' successful -- 2.39.2