public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v6 25/43] api: notification: add 'migrate-to-expression' parameter to get_matcher
Date: Mon,  2 Nov 2026 15:57:22 +0100	[thread overview]
Message-ID: <20261102145748.411817-26-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261102145748.411817-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>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
 src/api2/config/notifications/matchers.rs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/api2/config/notifications/matchers.rs b/src/api2/config/notifications/matchers.rs
index fba1859cf..504d26d40 100644
--- a/src/api2/config/notifications/matchers.rs
+++ b/src/api2/config/notifications/matchers.rs
@@ -40,6 +40,11 @@ pub fn list_matchers(
         properties: {
             name: {
                 schema: ENTITY_NAME_SCHEMA,
+            },
+            "migrate-to-expression": {
+                description: "Automatically translate existing 'match-*', 'invert-match' and 'mode' to an equivalent matching 'expression'",
+                optional: true,
+                default: false,
             }
         },
     },
@@ -49,9 +54,18 @@ pub fn list_matchers(
     },
 )]
 /// Get a notification matcher.
-pub fn get_matcher(name: String, rpcenv: &mut dyn RpcEnvironment) -> Result<MatcherConfig, Error> {
+pub fn get_matcher(
+    name: String,
+    migrate_to_expression: bool,
+    rpcenv: &mut dyn RpcEnvironment,
+) -> Result<MatcherConfig, Error> {
     let config = pbs_config::notifications::config()?;
-    let matcher = proxmox_notify::api::matcher::get_matcher(&config, &name)?;
+
+    let matcher = if migrate_to_expression {
+        proxmox_notify::api::matcher::get_matcher_as_expression(&config, &name)?
+    } else {
+        proxmox_notify::api::matcher::get_matcher(&config, &name)?
+    };
 
     rpcenv["digest"] = hex::encode(config.digest()).into();
 
-- 
2.47.3





  parent reply	other threads:[~2026-11-02 15:03 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-02 14:56 [PATCH many v6 00/43] notifications: add nested match expressions Lukas Wagner
2026-11-02 14:56 ` [PATCH proxmox v6 01/43] add new proxmox-match-expression crate Lukas Wagner
2026-11-02 14:56 ` [PATCH proxmox v6 02/43] notify: log which matchers matched on a notification Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 03/43] notify: promote matcher to dir-style module Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 04/43] notify: fix doc comment Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 05/43] notify: matcher: break out severity matcher into submodule Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 06/43] notify: matcher: break out field " Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 07/43] notify: matcher: break out calendar " Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 08/43] notify: matcher: calendar: add basic unit test Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 09/43] notify: matcher: add InlineSeverityMatcher Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 10/43] notify: matcher: add InlineFieldMatcher Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 11/43] notify: matcher: add InlineCalendarMatcher Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 12/43] notify: matcher: add expression support Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 13/43] notify: api: support new expression parameter Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 14/43] notify: api: add `get_matcher_as_expression` Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 15/43] notify: move legacy matcher keys behind feature flag Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 16/43] notify: matcher: don't allow empty field/severity matchers Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 17/43] notify: matcher: re-serialize expression on create/update Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 18/43] notify: matcher: ensure that field names match SAFE_ID_REGEX Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox v6 19/43] notify: matcher: expression: reject ambiguous field matchers Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-widget-toolkit v6 20/43] notifications: increase matcher window width Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-widget-toolkit v6 21/43] notifications: matcher: add support for match expressions Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-widget-toolkit v6 22/43] notifications: matcher: add better calendar editor Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-widget-toolkit v6 23/43] notifications: matcher: consistently use title case for UI elements Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-backup v6 24/43] notification: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-11-02 14:57 ` Lukas Wagner [this message]
2026-11-02 14:57 ` [PATCH proxmox-backup v6 26/43] ui: notification: enable new matcher UI Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-backup v6 27/43] docs: notifications: rework matcher sections, describe expression option Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-perl-rs v6 28/43] notify: move proxmox-notify bindings from common to pve-rs Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-perl-rs v6 29/43] notify: matcher: pass matcher config / updater directly Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-perl-rs v6 30/43] notify: opt into 'legacy-matchers' feature in proxmox-notify Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-perl-rs v6 31/43] notify: add 'migrate_to_expression' parameter for get_matcher Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-perl-rs v6 32/43] debian: document versioned break for PVE::RS::Notify changes Lukas Wagner
2026-11-02 14:57 ` [PATCH pve-cluster v6 33/43] notify: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-11-02 14:57 ` [PATCH pve-cluster v6 34/43] cluster: move pvecfg node version helpers from qemu-server Lukas Wagner
2026-11-02 14:57 ` [PATCH common v6 35/43] tools: move version_cmp() helper " Lukas Wagner
2026-11-02 14:57 ` [PATCH manager v6 36/43] vzdump: adapt to changed module prefix for PVE::RS::Notify Lukas Wagner
2026-11-02 14:57 ` [PATCH manager v6 37/43] api: notification: pass config/updater directly to rust bindings Lukas Wagner
2026-11-02 14:57 ` [PATCH manager v6 38/43] api: notification: get_matcher: add 'migrate-to-expression' parameter Lukas Wagner
2026-11-02 14:57 ` [PATCH manager v6 39/43] api: notification: add 'expression' to matcher parameter schema Lukas Wagner
2026-11-02 14:57 ` [PATCH manager v6 40/43] ui: notification: enable new matcher UI Lukas Wagner
2026-11-02 14:57 ` [PATCH manager v6 41/43] api: notification: reject matchers with expression if not supported by all nodes Lukas Wagner
2026-11-02 14:57 ` [PATCH docs v6 42/43] notifications: rework matcher sections, describe expression option Lukas Wagner
2026-11-02 14:57 ` [PATCH proxmox-mail-forward v6 43/43] cargo: opt into legacy-matchers feature 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=20261102145748.411817-26-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal