From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-perl-rs v2 28/34] notify: add 'migrate_to_expression' parameter for get_matcher
Date: Thu, 1 Oct 2026 10:37:00 +0200 [thread overview]
Message-ID: <20261001083706.144246-29-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261001083706.144246-1-l.wagner@proxmox.com>
If set, we return the matcher with any occurrences of the 'old' match-*,
invert-match and mode keys to an equivalent expression.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
pve-rs/src/bindings/notify.rs | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/pve-rs/src/bindings/notify.rs b/pve-rs/src/bindings/notify.rs
index 820b8c0..da3c056 100644
--- a/pve-rs/src/bindings/notify.rs
+++ b/pve-rs/src/bindings/notify.rs
@@ -12,7 +12,7 @@ pub mod pve_rs_notify {
use std::collections::HashMap;
use std::sync::Mutex;
- use anyhow::{bail, Error};
+ use anyhow::{Error, bail};
use serde_json::Value as JSONValue;
use perlmod::Value;
@@ -33,7 +33,7 @@ pub mod pve_rs_notify {
DeleteableWebhookProperty, WebhookConfig, WebhookConfigUpdater,
};
use proxmox_notify::matcher::{DeleteableMatcherProperty, MatcherConfig, MatcherConfigUpdater};
- use proxmox_notify::{api, Config, Notification, Severity};
+ use proxmox_notify::{Config, Notification, Severity, api};
/// A notification catalog instance.
///
@@ -464,9 +464,15 @@ pub mod pve_rs_notify {
pub fn get_matcher(
#[try_from_ref] this: &NotificationConfig,
id: &str,
+ migrate_to_expression: bool,
) -> Result<MatcherConfig, HttpError> {
let config = this.config.lock().unwrap();
- api::matcher::get_matcher(&config, id)
+
+ if migrate_to_expression {
+ api::matcher::get_matcher_as_expression(&config, id)
+ } else {
+ api::matcher::get_matcher(&config, id)
+ }
}
/// Method: Add a matcher.
--
2.47.3
next prev parent reply other threads:[~2026-10-01 8:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 8:36 [PATCH many v2 00/34] notifications: add nested match expressions Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 01/34] add new proxmox-match-expression crate Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 02/34] notify: log which matchers matched on a notification Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 03/34] notify: promote matcher to dir-style module Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 04/34] notify: fix doc comment Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 05/34] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 06/34] notify: matcher: break out field " Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 07/34] notify: matcher: break out calendar " Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 08/34] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 09/34] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 10/34] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 11/34] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 12/34] notify: matcher: add expression support Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 13/34] notify: api: support new expression parameter Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 14/34] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 15/34] notify: migrate PBS's and PVE's default matcher to expression syntax Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 16/34] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox v2 17/34] notify: matcher: don't allow empty field/severity matchers Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-widget-toolkit v2 18/34] notifications: increase matcher window width Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-widget-toolkit v2 19/34] notifications: matcher: add support for match expressions Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-widget-toolkit v2 20/34] notifications: matcher: add better calendar editor Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-widget-toolkit v2 21/34] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-backup v2 22/34] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-backup v2 23/34] api: notification: add 'migrate-to-expression' parameter to get_matcher Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-backup v2 24/34] ui: notification: enable new matcher UI Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-perl-rs v2 25/34] notify: move proxmox-notify bindings from common to pve-rs Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-perl-rs v2 26/34] notify: matcher: pass matcher config / updater directly Lukas Wagner
2026-10-01 8:36 ` [PATCH proxmox-perl-rs v2 27/34] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-10-01 8:37 ` Lukas Wagner [this message]
2026-10-01 8:37 ` [PATCH pve-cluster v2 29/34] notify: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-10-01 8:37 ` [PATCH manager v2 30/34] vzdump: " Lukas Wagner
2026-10-01 8:37 ` [PATCH manager v2 31/34] api: notification: pass config/updater directly to rust bindings Lukas Wagner
2026-10-01 8:37 ` [PATCH manager v2 32/34] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-10-01 8:37 ` [PATCH manager v2 33/34] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-10-01 8:37 ` [PATCH manager v2 34/34] ui: notification: enable new matcher UI 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=20261001083706.144246-29-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pbs-devel@lists.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