From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox 05/18] notification: allow adding new sendmail endpoints / filters
Date: Mon, 27 Mar 2023 17:18:44 +0200 [thread overview]
Message-ID: <20230327151857.495565-6-l.wagner@proxmox.com> (raw)
In-Reply-To: <20230327151857.495565-1-l.wagner@proxmox.com>
This is needed to migrate the PVE codebase from sendmail to the new
notification module - there, every place in the code that currently
sends out mails will add an 'ephemeral' sendmail endpoint, and also a
simple severity filter if needed. This ensures that there is a smooth
migration to the new notification module, without any events going
unnoticed.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
proxmox-notification/src/lib.rs | 1 +
proxmox-notification/src/methods.rs | 55 +++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 proxmox-notification/src/methods.rs
diff --git a/proxmox-notification/src/lib.rs b/proxmox-notification/src/lib.rs
index fc724dd..24429e4 100644
--- a/proxmox-notification/src/lib.rs
+++ b/proxmox-notification/src/lib.rs
@@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
mod config;
mod endpoints;
pub mod filter;
+pub mod methods;
#[api()]
#[derive(Clone, Debug, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd)]
diff --git a/proxmox-notification/src/methods.rs b/proxmox-notification/src/methods.rs
new file mode 100644
index 0000000..4f841e3
--- /dev/null
+++ b/proxmox-notification/src/methods.rs
@@ -0,0 +1,55 @@
+use anyhow::Error;
+
+use crate::{
+ endpoints::sendmail::{SendmailConfig, SENDMAIL_TYPENAME},
+ filter::{FilterConfig, FilterModeOperator, FILTER_TYPENAME},
+ Config, Severity,
+};
+
+pub fn add_sendmail_endpoint(
+ config: &mut Config,
+ name: &str,
+ recipient: Vec<String>,
+ from_address: Option<String>,
+ author: Option<String>,
+ filter: Option<String>,
+) -> Result<(), Error> {
+ config.0.set_data(
+ name,
+ SENDMAIL_TYPENAME,
+ &SendmailConfig {
+ name: name.into(),
+ recipient,
+ from_address,
+ author,
+ filter,
+ },
+ )?;
+
+ Ok(())
+}
+
+pub fn add_filter(
+ config: &mut Config,
+ name: &str,
+ min_severity: Option<Severity>,
+ sub_filter: Option<Vec<String>>,
+ mode: Option<FilterModeOperator>,
+ match_property: Option<Vec<String>>,
+ invert_match: Option<bool>,
+) -> Result<(), Error> {
+ config.0.set_data(
+ name,
+ FILTER_TYPENAME,
+ &FilterConfig {
+ name: name.into(),
+ min_severity,
+ sub_filter,
+ mode,
+ match_property,
+ invert_match,
+ },
+ )?;
+
+ Ok(())
+}
--
2.30.2
next prev parent reply other threads:[~2023-03-27 15:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 15:18 [pve-devel] [PATCH cluster/manager/ha-manager/proxmox{, -perl-rs} 00/18] fix #4156: introduce new notification module Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox 01/18] add proxmox-notification crate Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox 02/18] notification: implement sendmail endpoint Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox 03/18] notification: add notification filter mechanism Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox 04/18] notification: implement gotify endpoint Lukas Wagner
2023-03-27 15:18 ` Lukas Wagner [this message]
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox 06/18] notification: add debian packaging Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox-perl-rs 07/18] log: set default log level to 'info', add product specfig logging env var1 Lukas Wagner
2023-03-31 9:17 ` Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH proxmox-perl-rs 08/18] add basic bindings for the proxmox_notification crate Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-cluster 09/18] cluster files: add notifications.cfg Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 10/18] test: fix names of .PHONY targets Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 11/18] add PVE::Notification module Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 12/18] vzdump: send notifications via new notification module Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 13/18] vzdump: rename 'sendmail' sub to 'send_notification' Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 14/18] test: rename mail_test.pl to vzdump_notification_test.pl Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 15/18] api: apt: send notification via new notification module Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-manager 16/18] api: replication: send notifications " Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-ha-manager 17/18] manager: " Lukas Wagner
2023-03-27 15:18 ` [pve-devel] [PATCH pve-ha-manager 18/18] manager: rename 'sendmail' --> 'send_notification' Lukas Wagner
2023-04-14 6:19 ` [pve-devel] [PATCH cluster/manager/ha-manager/proxmox{, -perl-rs} 00/18] fix #4156: introduce new notification module Thomas Lamprecht
2023-04-14 9:47 ` Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230327151857.495565-6-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox