From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 3439C1FF0A3 for ; Thu, 01 Oct 2026 10:39:39 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 5762121638; Thu, 01 Oct 2026 10:37:53 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Subject: [PATCH many v2 00/34] notifications: add nested match expressions Date: Thu, 1 Oct 2026 10:36:32 +0200 Message-ID: <20261001083706.144246-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1790843854256 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.437 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: C6Z3HRXLDOGX4YDMLVYBFU6AW6Y5EKWG X-Message-ID-Hash: C6Z3HRXLDOGX4YDMLVYBFU6AW6Y5EKWG X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: NOTE: I have a couple of other patches planned for the notification stack (**); so I guess it would make sense wait a bit before applying this -- just to avoid too many version bumps and too much maintainer churn. I have a patch series already in the works that builds on top of this one, so I would prefer to perform any non-trivial changes to this feature as follow-ups; rebasing the new series I'm working on right now is a huge pain, as it moves a lot of code around in proxmox-notify (preparations for proxmox-notify v2, essentially) This resolves a long-standing limitation of notification matchers. Up until now, notification match rules could only be one level deep, so one top-level combinator (all/any) and an arbitrary number of match rules as direct children. This severely limits which kind of matching behaviors can be represented. The notification stack was always designed with the possibility of arbitrarily nested match rules, however, due to limitations in our API and config formats (lacking support for nested data structures), this was not implemented yet. A prior attempt to resolve the limitations imposed by the lack of nesting was to add 'sub-matchers', where one matcher could evaluate the result of another matcher. After some consideration, I decided not to pursue this approach further, due to concerns about the UX of that approach [1]. This new series chooses a different approach. Nested match rules can now be represented by a single matcher in the config. The lack of support for nested data structures in the API was circumvented by storing a serialized form of the 'rule tree' as a JSON blob in a single new configuration parameter 'expression'. If this new key is set, the old 'match-*', 'invert-match' and 'mode' keys are ignored; 'expression' is intended as a replacement for these keys. I have not yet marked the old keys as deprecated. Theoretically these can stay supported for now, however when editing a matcher via the UI, the old keys will always be translated into an equivalent 'expression'. For any new products receiving the notification stack, we can drop the support for the old keys by compiling proxmox-notify without the 'legacy-matchers' flag. The expression evaluation logic was implemented in a new generic crate 'proxmox-match-expression'. 'proxmox-notify' is the first user of this crate, however it is generic enough to be potentially useful in other contexts as well. Bumps: - pve-rs needs proxmox-notify bumped - pve-cluster (libpve-notify-perl) needs pve-rs bumped - pve-manager needs pve-cluster (libpve-notify-perl), pve-rs and widget-toolkit bumped - proxmox-backup needs widget-toolkit and proxmox-notify bumped - proxmox-notify needs a first release of proxmox-match-expression - proxmox-mail-forward needs to be rebuilt against bumped proxmox-notify (unless it has already been changed to not call into proxmox-notify anymore, see below) [1] https://lore.proxmox.com/pbs-devel/20250521142309.264719-1-l.wagner@proxmox.com/ (**): Some of the things I want to improve/implement: - Migrate PVE to use a worker-based approach, same as in PBS -> once that is done, we can fully migrate proxmox-mail-forward to use the worker/spool dir approach, instead of using proxmox-notify directly - Introduce a notification history - Refactor error types in proxmox-notify a bit Changes since v1: - Move Proxmox::RS::Notify module to PVE::RS::Notify, since it is only used by PVE - Fix legacy-sendmail mode, the calling code was not adapted to the new API of Proxmox::RS::Notify in v1 - proxmox-match-expression: all-of([]) now evaluates to true, similar to Iterator::all or all([]) in python - proxmox-notify: Don't allow empty all-of/any-of/one-of rules (in both UI and API, proxmox-match-expression still allow them) - Also don't allow empty severity/field matchers (empty arrays of matched values) - Fix slight inconsistency with the default notification matcher for PBS; now prune notifications with severity 'notice' are included once more - Other minor review comments - Overall polish of the new matcher UI - Add hint about nodes being drag&drop'able - Add error field if a node is invalid - Fixed erroreous caldendar string generated by the UI under certain circumenstances Thanks go to Wolfgang and Arthur for their feedback of v1. proxmox: Lukas Wagner (17): add new proxmox-match-expression crate notify: log which matchers matched on a notification notify: promote matcher to dir-style module notify: fix doc comment notify: matcher: break out severity matcher into submodule notify: matcher: break out field matcher into submodule notify: matcher: break out calendar matcher into submodule notify: matcher: calendar: add basic unit test notify: matcher: add InlineSeverityMatcher notify: matcher: add InlineFieldMatcher notify: matcher: add InlineCalendarMatcher notify: matcher: add expression support notify: api: support new expression parameter notify: api: add `get_matcher_as_expression` notify: migrate PBS's and PVE's default matcher to expression syntax notify: move legacy matcher keys behind feature flag notify: matcher: don't allow empty field/severity matchers Cargo.toml | 3 + proxmox-match-expression/Cargo.toml | 18 + proxmox-match-expression/debian/changelog | 6 + proxmox-match-expression/debian/control | 34 ++ proxmox-match-expression/debian/copyright | 18 + proxmox-match-expression/debian/debcargo.toml | 7 + proxmox-match-expression/src/lib.rs | 524 +++++++++++++++++ proxmox-notify/Cargo.toml | 7 +- proxmox-notify/src/api/matcher.rs | 248 +++++++- proxmox-notify/src/context/mod.rs | 4 +- proxmox-notify/src/context/pbs.rs | 87 ++- proxmox-notify/src/context/pve.rs | 67 ++- proxmox-notify/src/context/test.rs | 9 +- proxmox-notify/src/lib.rs | 29 +- proxmox-notify/src/matcher.rs | 532 ------------------ proxmox-notify/src/matcher/calendar.rs | 158 ++++++ proxmox-notify/src/matcher/expression.rs | 97 ++++ proxmox-notify/src/matcher/field.rs | 249 ++++++++ proxmox-notify/src/matcher/mod.rs | 531 +++++++++++++++++ proxmox-notify/src/matcher/severity.rs | 119 ++++ 20 files changed, 2149 insertions(+), 598 deletions(-) create mode 100644 proxmox-match-expression/Cargo.toml create mode 100644 proxmox-match-expression/debian/changelog create mode 100644 proxmox-match-expression/debian/control create mode 100644 proxmox-match-expression/debian/copyright create mode 100644 proxmox-match-expression/debian/debcargo.toml create mode 100644 proxmox-match-expression/src/lib.rs delete mode 100644 proxmox-notify/src/matcher.rs create mode 100644 proxmox-notify/src/matcher/calendar.rs create mode 100644 proxmox-notify/src/matcher/expression.rs create mode 100644 proxmox-notify/src/matcher/field.rs create mode 100644 proxmox-notify/src/matcher/mod.rs create mode 100644 proxmox-notify/src/matcher/severity.rs proxmox-widget-toolkit: Lukas Wagner (4): notifications: increase matcher window width notifications: matcher: add support for match expressions notifications: matcher: add better calendar editor notifications: matcher: consistently use title case for UI elements src/Makefile | 1 + src/Schema.js | 10 + src/Utils.js | 2 +- src/css/ext6-pmx.css | 51 + .../NotificationMatchExpressionEditPanel.js | 886 ++++++++++++++++++ src/proxmox-dark/scss/extjs/_treepanel.scss | 5 + src/proxmox-dark/scss/proxmox/_general.scss | 4 + src/window/NotificationMatcherEdit.js | 354 ++++++- 8 files changed, 1293 insertions(+), 20 deletions(-) create mode 100644 src/panel/NotificationMatchExpressionEditPanel.js proxmox-backup: Lukas Wagner (3): notification: opt into 'legacy-matchers' feature in proxmox-notify api: notification: add 'migrate-to-expression' parameter to get_matcher ui: notification: enable new matcher UI Cargo.toml | 2 +- src/api2/config/notifications/matchers.rs | 18 ++++++++++++++++-- www/Utils.js | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) proxmox-perl-rs: Lukas Wagner (4): notify: move proxmox-notify bindings from common to pve-rs notify: matcher: pass matcher config / updater directly notify: opt into 'legacy-matchers' feature in proxmox-notify notify: add 'migrate_to_expression' parameter for get_matcher common/pkg/Makefile | 1 - common/src/bindings/mod.rs | 3 - pmg-rs/Cargo.toml | 1 - pve-rs/Cargo.toml | 2 +- pve-rs/Makefile | 1 + pve-rs/src/bindings/mod.rs | 3 + {common => pve-rs}/src/bindings/notify.rs | 212 ++++------------------ 7 files changed, 40 insertions(+), 183 deletions(-) rename {common => pve-rs}/src/bindings/notify.rs (73%) pve-cluster: Lukas Wagner (1): notify: adapt to changed module prefix for PVE::RS::Notify src/PVE/Notify.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) pve-manager: Lukas Wagner (5): vzdump: adapt to changed module prefix for PVE::RS::Notify api: notification: pass config/updater directly to rust bindings api: notification: get_matcher: add 'migrate-to-expression' parameter api: notification: add 'expression' to matcher parameter schema ui: notification: enable new matcher UI PVE/API2/Cluster/Notifications.pm | 165 ++++++++---------------------- PVE/VZDump.pm | 21 ++-- www/manager6/Utils.js | 2 + 3 files changed, 53 insertions(+), 135 deletions(-) Summary over all repositories: 42 files changed, 3557 insertions(+), 941 deletions(-) -- Generated by murpp 0.12.1