From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 proxmox 03/22] notify: matcher: support lists of values for 'exact' match-field mode
Date: Wed, 13 Dec 2023 17:37:42 +0100 [thread overview]
Message-ID: <20231213163801.392492-4-l.wagner@proxmox.com> (raw)
In-Reply-To: <20231213163801.392492-1-l.wagner@proxmox.com>
For example, one can now use:
match-field exact:type=vzdump,replication
to match on vzdump AND replication events.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
proxmox-notify/src/matcher.rs | 43 +++++++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/proxmox-notify/src/matcher.rs b/proxmox-notify/src/matcher.rs
index 42d988a..3fdc887 100644
--- a/proxmox-notify/src/matcher.rs
+++ b/proxmox-notify/src/matcher.rs
@@ -160,7 +160,7 @@ trait MatchDirective {
pub enum FieldMatcher {
Exact {
field: String,
- matched_value: String,
+ matched_values: Vec<String>,
},
Regex {
field: String,
@@ -176,12 +176,12 @@ impl MatchDirective for FieldMatcher {
Ok(match self {
FieldMatcher::Exact {
field,
- matched_value,
+ matched_values,
} => {
let value = notification.metadata.additional_fields.get(field);
if let Some(value) = value {
- matched_value == value
+ matched_values.contains(value)
} else {
// Metadata field does not exist, so we do not match
false
@@ -212,9 +212,10 @@ impl fmt::Display for FieldMatcher {
match self {
FieldMatcher::Exact {
field,
- matched_value,
+ matched_values,
} => {
- write!(f, "exact:{field}={matched_value}")
+ let values = matched_values.join(",");
+ write!(f, "exact:{field}={values}")
}
FieldMatcher::Regex {
field,
@@ -256,10 +257,17 @@ impl FromStr for FieldMatcher {
None => Err(Error::FilterFailed(format!(
"invalid match-field statement: {s}"
))),
- Some((field, expected_value)) => Ok(Self::Exact {
- field: field.into(),
- matched_value: expected_value.into(),
- }),
+ Some((field, expected_values)) => {
+ let values: Vec<String> = expected_values
+ .split(',')
+ .map(str::trim)
+ .map(String::from)
+ .collect();
+ Ok(Self::Exact {
+ field: field.into(),
+ matched_values: values,
+ })
+ }
}
} else {
Err(Error::FilterFailed(format!(
@@ -460,6 +468,23 @@ mod tests {
let matcher: FieldMatcher = "regex:notthere=b.*".parse().unwrap();
assert!(!matcher.matches(¬ification).unwrap());
+ let matcher: FieldMatcher = "exact:foo=bar,test".parse().unwrap();
+ assert!(matcher.matches(¬ification).unwrap());
+
+ let mut fields = HashMap::new();
+ fields.insert("foo".into(), "test".into());
+
+ let notification =
+ Notification::new_templated(Severity::Notice, "test", "test", Value::Null, fields);
+ assert!(matcher.matches(¬ification).unwrap());
+
+ let mut fields = HashMap::new();
+ fields.insert("foo".into(), "notthere".into());
+
+ let notification =
+ Notification::new_templated(Severity::Notice, "test", "test", Value::Null, fields);
+ assert!(!matcher.matches(¬ification).unwrap());
+
assert!("regex:'3=b.*".parse::<FieldMatcher>().is_err());
assert!("invalid:'bar=b.*".parse::<FieldMatcher>().is_err());
}
--
2.39.2
next prev parent reply other threads:[~2023-12-13 16:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 16:37 [pve-devel] [PATCH v2 many 00/22] notifications: notification metadata matching improvements Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox 01/22] notify: include 'hostname' metadata field for forwarded mails Lukas Wagner
2024-01-10 11:40 ` [pve-devel] applied: " Wolfgang Bumiller
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox 02/22] notify: include 'type' " Lukas Wagner
2023-12-13 16:37 ` Lukas Wagner [this message]
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 04/22] api: notifications: add 'smtp' to target index Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 05/22] api: jobs: vzdump: pass job 'id' parameter Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 06/22] ui: dc: backup: send 'id' property when starting a backup job manually Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 07/22] ui: dc: backup: show 'Job ID' column Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 08/22] ui: dc: backup: allow to set custom job id in advanced settings Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 09/22] api: replication: add 'replication-job' to notification metadata Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 10/22] ui: replication: show 'Job ID' column Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 11/22] vzdump: apt: notification: do not include domain in 'hostname' field Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 12/22] api: replication: include 'hostname' field for notifications Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 13/22] api: notification: add API for getting known metadata fields/values Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 14/22] ui: utils: add overrides for translatable notification fields/values Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 15/22] combogrid: add 'showClearTrigger' config Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 16/22] notification: matcher: match-field: show known fields/values Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 17/22] notification: matcher: move match-field formulas to local viewModel Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 18/22] notification: matcher: move match-calendar fields to panel Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 19/22] notification: matcher: move match-severity " Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-docs 20/22] notification: clarify that 'hostname' does not include the domain Lukas Wagner
2023-12-13 16:38 ` [pve-devel] [PATCH v2 pve-docs 21/22] notifications: describe new notification metadata fields Lukas Wagner
2023-12-13 16:38 ` [pve-devel] [PATCH v2 pve-docs 22/22] notifications: match-field 'exact'-mode can now match multiple values Lukas Wagner
2024-01-08 10:43 ` [pve-devel] [PATCH v2 many 00/22] notifications: notification metadata matching improvements Lukas Wagner
2024-02-16 9:19 ` 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=20231213163801.392492-4-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