public inbox for pve-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 manager v5 41/42] api: notification: reject matchers with expression if not supported by all nodes
Date: Thu, 22 Oct 2026 14:16:06 +0200	[thread overview]
Message-ID: <20261022121608.271515-42-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261022121608.271515-1-l.wagner@proxmox.com>

The new matcher UI will automatically migrate any existing matcher to
one with an 'expression', and new matchers will also only use this new
parameter. If any of the cluster nodes uses a version of pve-manager
that does not yet support the new parameter, any matcher written by an
updated node will break notifications on the older nodes.

To avoid this, any time before we write the notification config, we walk
the matchers and check if any of them has 'expression' set.
If it is set, we check published pve-manager version of all cluster
nodes and reject the update to the config if any node is too old.

While this still leaves the possibility of an outdated, offline node
coming back online and then failing to parse the migrated notification
config, it would be unreasonable to disallow editing the notification
configuration if any node is offline.

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>
---

Notes:
    New in v3.
    
    Note to maintainers: Please change the version guard to the version
    of pve-manager that actually includes the change.
    
    Change since v3:
      - ran `make tidy`
      - Instead of only when creating/updating matchers, *all* calls that
        potentially write the notification config check for the new
        parameter. This is due to 'expression' being used in the new builtin
        'default-matcher' implementation, which will be written to the
        config on *any* change.
        In v3, if there was no config file there before, creating *any*
        new config entity would cause 'default-matcher' to be serialized,
        breaking notifications on outdated nodes.

 PVE/API2/Cluster/Notifications.pm | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm
index bd3c86cc..ab06b739 100644
--- a/PVE/API2/Cluster/Notifications.pm
+++ b/PVE/API2/Cluster/Notifications.pm
@@ -6,11 +6,13 @@ use strict;
 use Storable qw(dclone);
 use JSON;
 
+use PVE::Cluster;
 use PVE::Exception qw(raise_param_exc);
 use PVE::Tools qw(extract_param);
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::RESTHandler;
 use PVE::Notify;
+use PVE::SafeSyslog;
 
 use base qw(PVE::RESTHandler);
 
@@ -56,6 +58,43 @@ sub raise_api_error {
     die $exc;
 }
 
+my $matcher_expressions_version = "9.2.21";
+my $matcher_expressions_version_array = [9, 2, 21];
+
+my sub matcher_expression_supported_by_all_nodes {
+    my $version_info = PVE::Cluster::get_node_kv('version-info');
+    for my $node (sort keys $version_info->%*) {
+        my $node_info = eval { JSON::decode_json($version_info->{$node}); };
+        if (my $err = $@) { 
+            # warn, but continue.
+            # Rejecting writes to notifications.cfg if a cluster node is
+            # not available or if has not yet published its version through
+            # pvestatd would be unreasonable.
+            syslog('warn', "cannot parse version info for $node as JSON - $err");
+        } elsif (!PVE::Cluster::pvecfg_min_version(
+            $node_info->{version},
+            @$matcher_expressions_version_array,
+        )) {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+# FIXME: MAJOR VERSION: This check can be dropped at the next major version bump.
+my sub ensure_expression_supported_if_used {
+    my ($config) = @_;
+
+    my $matchers = $config->get_matchers();
+    my $has_expression = grep { defined($_->{expression}) } $matchers->@*;
+
+    if ($has_expression && !matcher_expression_supported_by_all_nodes()) {
+        die "At least one cluster node does not support matcher expressions."
+            . " Please upgrade pve-manager to at least $matcher_expressions_version.";
+    }
+}
+
 __PACKAGE__->register_method({
     name => 'index',
     path => '',
@@ -524,6 +563,7 @@ __PACKAGE__->register_method({
 
                 $config->add_sendmail_endpoint($param);
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -583,6 +623,7 @@ __PACKAGE__->register_method({
                     $name, $param, $delete, $digest,
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -619,6 +660,7 @@ __PACKAGE__->register_method({
             PVE::Notify::lock_config(sub {
                 my $config = PVE::Notify::read_config();
                 $config->delete_sendmail_endpoint($name);
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -779,6 +821,7 @@ __PACKAGE__->register_method({
                     },
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -845,6 +888,7 @@ __PACKAGE__->register_method({
                     $digest,
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -881,6 +925,7 @@ __PACKAGE__->register_method({
             PVE::Notify::lock_config(sub {
                 my $config = PVE::Notify::read_config();
                 $config->delete_gotify_endpoint($name);
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1090,6 +1135,7 @@ __PACKAGE__->register_method({
                     },
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1157,6 +1203,7 @@ __PACKAGE__->register_method({
                     $digest,
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1193,6 +1240,7 @@ __PACKAGE__->register_method({
             PVE::Notify::lock_config(sub {
                 my $config = PVE::Notify::read_config();
                 $config->delete_smtp_endpoint($name);
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1368,6 +1416,7 @@ __PACKAGE__->register_method({
                     $param,
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1429,6 +1478,7 @@ __PACKAGE__->register_method({
                     $digest,
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1465,6 +1515,7 @@ __PACKAGE__->register_method({
             PVE::Notify::lock_config(sub {
                 my $config = PVE::Notify::read_config();
                 $config->delete_webhook_endpoint($name);
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1666,6 +1717,7 @@ __PACKAGE__->register_method({
 
                 $config->add_matcher($param);
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1716,6 +1768,7 @@ __PACKAGE__->register_method({
                     $name, $param, $delete, $digest,
                 );
 
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
@@ -1752,6 +1805,7 @@ __PACKAGE__->register_method({
             PVE::Notify::lock_config(sub {
                 my $config = PVE::Notify::read_config();
                 $config->delete_matcher($name);
+                ensure_expression_supported_if_used($config);
                 PVE::Notify::write_config($config);
             });
         };
-- 
2.47.3





  parent reply	other threads:[~2026-10-22 12:23 UTC|newest]

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