all lists on 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 v7 25/41] api: notification: add 'migrate-to-expression' parameter to get_matcher
Date: Tue,  3 Nov 2026 11:48:42 +0100	[thread overview]
Message-ID: <20261103104859.172466-26-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261103104859.172466-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-03 10:52 UTC|newest]

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

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=20261103104859.172466-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal