konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

notify: include 'hostname' metadata field for forwarded mails

Browse Source 
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2023-12-13 17:37:40 +01:00 committed by Wolfgang Bumiller
parent f0bf95f53b
commit 870d9c2739
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
proxmox-notify/src/lib.rs
View File

@ -231,6 +231,9 @@ impl Notification {
let title = message.subject().unwrap_or_default().into(); let title = message.subject().unwrap_or_default().into();
let body = message.body_text(0).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 { Ok(Self {
// Unfortunately we cannot reasonably infer the severity from the // Unfortunately we cannot reasonably infer the severity from the
// mail contents, so just set it to the highest for now so that // mail contents, so just set it to the highest for now so that
@ -243,7 +246,7 @@ impl Notification {
}, },
metadata: Metadata { metadata: Metadata {
severity: Severity::Unknown, severity: Severity::Unknown,
additional_fields: Default::default(), additional_fields,
timestamp: proxmox_time::epoch_i64(), timestamp: proxmox_time::epoch_i64(),
}, },
}) })
@ -278,14 +281,21 @@ impl Config {
if let Some(obj) = value.as_object_mut() { if let Some(obj) = value.as_object_mut() {
obj.insert("origin".to_string(), Value::String("builtin".into())); obj.insert("origin".to_string(), Value::String("builtin".into()));
} else { } 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 { } else {
// Entry is built-in, but it has been modified by the user. // Entry is built-in, but it has been modified by the user.
if let Some(obj) = value.as_object_mut() { 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 { } 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 { } else {