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 9BEB1B9715 for ; Mon, 11 Dec 2023 13:50:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84AEB16193 for ; Mon, 11 Dec 2023 13:50:08 +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 ; Mon, 11 Dec 2023 13:50:07 +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 EDED4452E4 for ; Mon, 11 Dec 2023 13:50:06 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 11 Dec 2023 13:49:35 +0100 Message-Id: <20231211124955.211219-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231211124955.211219-1-l.wagner@proxmox.com> References: <20231211124955.211219-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.057 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far 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 - Subject: [pve-devel] [PATCH proxmox 01/21] notify: include 'hostname' metadata field for forwarded mails 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: Mon, 11 Dec 2023 12:50:38 -0000 Signed-off-by: Lukas Wagner --- proxmox-notify/src/lib.rs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/proxmox-notify/src/lib.rs b/proxmox-notify/src/lib.rs index 1fb9623..f3ee3ad 100644 --- a/proxmox-notify/src/lib.rs +++ b/proxmox-notify/src/lib.rs @@ -231,6 +231,9 @@ impl Notification { let title = message.subject().unwrap_or_default().into(); let body = message.body_text(0).unwrap_or_default().into(); + let mut additional_fields = HashMap::new(); + additional_fields.insert("hostname".into(), proxmox_sys::nodename().into()); + Ok(Self { // Unfortunately we cannot reasonably infer the severity from the // mail contents, so just set it to the highest for now so that @@ -243,7 +246,7 @@ impl Notification { }, metadata: Metadata { severity: Severity::Unknown, - additional_fields: Default::default(), + additional_fields, timestamp: proxmox_time::epoch_i64(), }, }) @@ -278,14 +281,21 @@ impl Config { if let Some(obj) = value.as_object_mut() { obj.insert("origin".to_string(), Value::String("builtin".into())); } else { - log::error!("section config entry is not an object. This should not happen"); + log::error!( + "section config entry is not an object. This should not happen" + ); } } else { // Entry is built-in, but it has been modified by the user. if let Some(obj) = value.as_object_mut() { - obj.insert("origin".to_string(), Value::String("modified-builtin".into())); + obj.insert( + "origin".to_string(), + Value::String("modified-builtin".into()), + ); } else { - log::error!("section config entry is not an object. This should not happen"); + log::error!( + "section config entry is not an object. This should not happen" + ); } } } else { -- 2.39.2