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 DEE931FF0C0 for ; Wed, 18 Nov 2026 10:45:35 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 8B7C521684; Wed, 18 Nov 2026 10:44:50 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Subject: [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Date: Wed, 18 Nov 2026 10:42:44 +0100 Message-ID: <20261118094348.273646-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: 1794995034733 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.198 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: OF6YVDYGITDIQYOQVJJAB5OXE5AIIWRE X-Message-ID-Hash: OF6YVDYGITDIQYOQVJJAB5OXE5AIIWRE 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 VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The notification stack will soon be integrated into a new product (PDM), so it makes sense to use this opportunity for any pending breaking changes and general cleanup of the notification stack, partly driven by the worker implementation, pending feature work (notification history), and overdue maintenance work to reduce technical debt. The introduction of a shared worker implementation lifts long-standing limitations in PVE, where only the privileged process could send notifications. The worker will also be used in PDM. ## Refactoring - Refactoring the proxmox_notify::Error type Using the old type was quite annoying (one had to use Error::Generic nearly everywhere), the new one applies the lessons-learned from the old one. While this is technically a breaking change, none of the callers used returned errors other than logging/stringifying them, so the callers need no change - Pass context along with calls, wrapped in a context wrapper type, instead of setting it via set_context - Dropped features - gotify - webhook - sendmail - smtp - mail-forwarder The intention was for products to be able to opt into the endpoints they need. Up until now, there was no instance of one endpoint type not being used by a product, hence they are dropped and replaced by a single 'send-impl' feature. If we ever introduce a type of endpoint that will only used by a single product, we can still introduce a new flag for this one. - New feature flags - send-impl: everything needed to *send* a notification - api-impl: API handler implementations - api-types: API types; useful for the Rust-based PDM UI once we integrate it there - queue-submitter: facilities to submit a notification to the notiticiation queue - queue-worker: implementation of the notification worker and queue consumer - restructuring of module paths - lib.rs was huge, so it was split up into appropriate submodules - api types were moved into an 'api_types' submodule - cleanup of the public crate interface - many types didn't need to be public, so these were removed from the public interface to ease further maintenance - switch to typed section config - don't repeatedly re-parse builtin-configuration; do it once and store it a OnceLock - offer builder for instantiating notifications. This allow us to extend notifications with new optional fields later. - Notifications get a `recipient` field, where a recipient can be a the regular matcher system, a target, or a list of email addresses. The 'target' mode allows us to drop the special-cased 'test_target' API. Now, testing a a target is just a regular send, the 'send receipts' feature described later allows us continue reporting any error to the user when testing a target. The 'email' is a shortcut that creates an implicit 'sendmail' endpoint, which allows us to simplify the 'legacy-sendmail' mode in the application code. Now, it uses a regular proxmox_notify::send and does not need to fake a notification config first. The main motivation of this changes were the introduction of the notification queue and planning of the notification history. The 'recipient' approach allows us to unify a lot of code paths, removing special cases that would need to be considered. Now, *any* notification, goes through the queue and will be eventually be persisted in the notification queue. ## Features - send receipts `proxmox_notify::send` did not return any indiciation whether the notification was sent successfully, it was only logged. This series now returns a 'receipt', that includes information about which matcher matched a notification, which targets were notified, including any errors (per target). Eventually, this receipt will also be recorded in the notification history, giving users a clear picture about which notification was sent when, where and why. - notification queue / worker PBS already used a queue-based approach for sending notifications from the unprivileged proxy process. This series adds a generic queue and worker implementation to proxmox_notify which can be used by all products (PVE and soon PDM). This resolves a long standing issue where a hanging notification send call would would block the cluster resource manager for possibly extended periods of time ## User-facing changes - The switch to the queue-based approach means that any log message produced by the notification stack will not be shown in a task log when sending a notification. For now, these will only show up the system logs. In the future, I'd like to integrate this with the notification history, in the history view it should be possible to retrieve the log messages that were logged for any notification (by entering a tracing span with the notification UUID set as a field, which makes it possible to filter the system log for messages for a specific notification) - In PVE, there is a new daemon 'pve-notify-worker' This one is the host for the notification worker task in PVE. - For forwarded emails: proxmox-mail-forward will now only forward each email once if multiple products are co-installed, with PVE taking precedence over PBS. ## Bumps - proxmox-notify should receive a major version bump (2 -> 3); the API breakage is deliberate for cleaning up tech debt and preparing for the integration in PDM. - libpve-rs-perl must depend on proxmox-notify v3 - proxmox-backup must depend on proxmox-notify v3 - pve-notify-worker needs a first release - libpve-notify-perl must depend on bumped libpve-rs-perl (enqueue method) - pve-manager must depend on bumped libpve-notify-perl (simplified interface for legacy-sendmail) - proxmox-mail-forward must depend on proxmox-notify v3 - proxmox-mail-forward has a Breaks on pve-manager and proxmox-backup-server, must be adadpted when applying Changes since v1: - Verify the template name via SAFE_ID_REGEX on construction and before sending a notification - stub CalendarMatcher::matches on wasm32 for now, just to make it compile. Later, we should go back and have a version of proxmox_time::DailyDuration that also works on wasm32 - Use ConfigDigest::detect_verification - Move pve-notify-worker to the proxmox-mail-forward repo (we might rename the repo at some point) - Harden reading notifications in the worker (don't follow symlinks, maximum size of the notification file, etc.) proxmox: Lukas Wagner (44): notify: disallow `unsafe` code notify: refactor error type notify: move `Endpoint` trait to endpoint module as pub(crate) notify: use ConfigDigest instead of raw byte arrays notify: remove static context and pass context as parameter notify: matcher: drop unused field matcher verifiers notify: introduce 'send-impl', 'api-impl' and 'api-types' features notify: matcher: make matcher validation methods public notify: matcher: stub CalendarMatcher::matches on wasm32 notify: make SendmailEndpoint and SmtpEndpoint private types notify: move `send`, `test_target` and `Bus` to new `send` module notify: move Origin type to api_types module notify: move Target type to api_types module notify: move Config to config module notify: move Notification and sub-types to `notification` module notify: move schema module to api_types notify: move check_matches from api_types::matcher to send::Bus notify: move TemplateSource to context module notify: config: cleanup helper names and visibility notify: config: rename section config parser/writer methods notify: config: pass builtins explicitly when parsing section config notify: implement PartialEq for all Config types notify: use typed SectionConfigData notify: api: api types: rename Deleteable* -> Deletable* notify: context: parse builtin config only once notify: context: parse proxy config in trait impl, not at the callsite notify: gate sub-modules with the appropriate feature flags notify: fold mail-forwarder feature into send-impl notify: forwarded mails: don't hardcode severity and metadata fields notify: don't pass uid when instantiating forwarded mail notifications notify: derive PartialEq for Notification type notify: add getters for severity and fields on Notification type notify: add test suite for Notification type notify: serialize raw, forwarded mail content as base64 notify: unify code paths for legacy-sendmail and regular notifications notify: add backwards-compat note to Notification type notify: remove 'test_target' API notify: replace notification instantiation with builder pattern notify: add send receipts notify: make sure that template name matches SAFE_ID_REGEX notify: implement notification queue submitter notify: context: add read_config notify: queue: add queue consumer notify: queue: add worker task Cargo.toml | 1 + proxmox-notify/Cargo.toml | 75 +- proxmox-notify/src/api/common.rs | 42 +- proxmox-notify/src/api/gotify.rs | 122 ++- proxmox-notify/src/api/matcher.rs | 148 ++-- proxmox-notify/src/api/mod.rs | 191 ++--- proxmox-notify/src/api/sendmail.rs | 76 +- proxmox-notify/src/api/smtp.rs | 133 ++- proxmox-notify/src/api/webhook.rs | 176 ++-- proxmox-notify/src/api_types/gotify.rs | 70 ++ .../src/{ => api_types}/matcher/calendar.rs | 34 +- .../src/{ => api_types}/matcher/expression.rs | 2 +- .../src/{ => api_types}/matcher/field.rs | 101 ++- .../src/{ => api_types}/matcher/mod.rs | 100 +-- .../src/{ => api_types}/matcher/severity.rs | 24 +- proxmox-notify/src/api_types/mod.rs | 79 ++ proxmox-notify/src/api_types/receipt.rs | 138 ++++ proxmox-notify/src/{ => api_types}/schema.rs | 0 proxmox-notify/src/api_types/sendmail.rs | 95 +++ proxmox-notify/src/api_types/smtp.rs | 137 ++++ proxmox-notify/src/api_types/webhook.rs | 211 +++++ proxmox-notify/src/config.rs | 358 +++++---- proxmox-notify/src/context/mod.rs | 79 +- proxmox-notify/src/context/pbs.rs | 52 +- proxmox-notify/src/context/pve.rs | 52 +- proxmox-notify/src/context/test.rs | 50 +- proxmox-notify/src/endpoints/common/mail.rs | 29 +- proxmox-notify/src/endpoints/common/mod.rs | 1 - proxmox-notify/src/endpoints/gotify.rs | 107 +-- proxmox-notify/src/endpoints/mod.rs | 20 +- proxmox-notify/src/endpoints/sendmail.rs | 137 +--- proxmox-notify/src/endpoints/smtp.rs | 209 +---- proxmox-notify/src/endpoints/webhook.rs | 307 ++----- proxmox-notify/src/error.rs | 237 ++++++ proxmox-notify/src/lib.rs | 754 +----------------- proxmox-notify/src/notification.rs | 478 +++++++++++ proxmox-notify/src/queue/consumer.rs | 513 ++++++++++++ proxmox-notify/src/queue/mod.rs | 35 + proxmox-notify/src/queue/submitter.rs | 171 ++++ proxmox-notify/src/queue/worker.rs | 640 +++++++++++++++ proxmox-notify/src/renderer/mod.rs | 44 +- proxmox-notify/src/send.rs | 489 ++++++++++++ .../testdata/notifications-priv.cfg.ref | 8 + proxmox-notify/testdata/notifications.cfg.ref | 29 + 44 files changed, 4524 insertions(+), 2230 deletions(-) create mode 100644 proxmox-notify/src/api_types/gotify.rs rename proxmox-notify/src/{ => api_types}/matcher/calendar.rs (77%) rename proxmox-notify/src/{ => api_types}/matcher/expression.rs (98%) rename proxmox-notify/src/{ => api_types}/matcher/field.rs (73%) rename proxmox-notify/src/{ => api_types}/matcher/mod.rs (84%) rename proxmox-notify/src/{ => api_types}/matcher/severity.rs (83%) create mode 100644 proxmox-notify/src/api_types/mod.rs create mode 100644 proxmox-notify/src/api_types/receipt.rs rename proxmox-notify/src/{ => api_types}/schema.rs (100%) create mode 100644 proxmox-notify/src/api_types/sendmail.rs create mode 100644 proxmox-notify/src/api_types/smtp.rs create mode 100644 proxmox-notify/src/api_types/webhook.rs create mode 100644 proxmox-notify/src/error.rs create mode 100644 proxmox-notify/src/notification.rs create mode 100644 proxmox-notify/src/queue/consumer.rs create mode 100644 proxmox-notify/src/queue/mod.rs create mode 100644 proxmox-notify/src/queue/submitter.rs create mode 100644 proxmox-notify/src/queue/worker.rs create mode 100644 proxmox-notify/src/send.rs create mode 100644 proxmox-notify/testdata/notifications-priv.cfg.ref create mode 100644 proxmox-notify/testdata/notifications.cfg.ref proxmox-backup: Lukas Wagner (4): notifications: don't ignore verification errors in legacy-sendmail mode notifications: adapt to proxmox-notify API changes api: notification: send test notification via proxmox_notify::send notifications: send all notifications via proxmox-notify's queue Cargo.toml | 13 +- pbs-config/Cargo.toml | 10 +- pbs-config/src/notifications.rs | 10 +- src/api2/config/notifications/gotify.rs | 31 +- src/api2/config/notifications/matchers.rs | 29 +- src/api2/config/notifications/sendmail.rs | 29 +- src/api2/config/notifications/smtp.rs | 29 +- src/api2/config/notifications/targets.rs | 46 +- src/api2/config/notifications/webhook.rs | 29 +- src/bin/docgen.rs | 7 +- src/bin/proxmox-backup-api.rs | 3 +- src/bin/proxmox-backup-manager.rs | 1 - src/bin/proxmox-backup-proxy.rs | 1 - src/bin/proxmox-daily-update.rs | 3 - .../notifications/gotify.rs | 2 +- .../notifications/matchers.rs | 2 +- .../notifications/sendmail.rs | 2 +- .../notifications/smtp.rs | 2 +- .../notifications/webhook.rs | 2 +- src/server/notifications/mod.rs | 595 ++++++++---------- tests/data/serialized_notification.json | 1 + tests/notifications.rs | 11 + 22 files changed, 436 insertions(+), 422 deletions(-) create mode 100644 tests/data/serialized_notification.json create mode 100644 tests/notifications.rs proxmox-perl-rs: Lukas Wagner (2): pve: notify: adapt to changes in the public API of proxmox-notify pve: notify: add `PVE::RS::Notify::enqueue` method pve-rs/Cargo.toml | 2 +- pve-rs/src/bindings/mod.rs | 3 - pve-rs/src/bindings/notify.rs | 237 +++++++++++++++++++++++----------- pve-rs/src/lib.rs | 29 +++-- 4 files changed, 179 insertions(+), 92 deletions(-) pve-cluster: Lukas Wagner (1): notify: send notifications via notification queue src/PVE/Notify.pm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) pve-manager: Lukas Wagner (5): vzdump: send legacy-sendmail notifications via simplified API debian: create notification queue directory via tmpfiles debian: add 'pve-notify-worker' as dependecy api: services: add 'pve-notify-worker' as known service services: request pve-notify-worker.service via Wants PVE/API2/Services.pm | 1 + PVE/VZDump.pm | 28 ++-------------------------- debian/control | 1 + debian/tmpfiles | 5 +++-- services/pvedaemon.service | 2 +- services/pvescheduler.service | 1 + 6 files changed, 9 insertions(+), 29 deletions(-) proxmox-mail-forward: Lukas Wagner (7): forward mails via notification queue use return code to signal permanent or temporary failure limit size of mail read from stdin cargo: move mail forwarder into a workspace member crate add crate for code shared between the mail-forwarder and the worker add pve-notify-worker crate and package debian: add versioned break for pve-manager and proxmox-backup-server Cargo.toml | 26 ++-- Makefile | 17 ++- common/Cargo.toml | 13 ++ common/src/lib.rs | 78 ++++++++++ debian/control | 8 ++ debian/proxmox-mail-forward.install | 1 + debian/pve-notify-worker.install | 1 + debian/pve-notify-worker.service | 13 ++ debian/rules | 6 +- proxmox-mail-forward/Cargo.toml | 18 +++ proxmox-mail-forward/src/main.rs | 212 ++++++++++++++++++++++++++++ pve-notify-worker/Cargo.toml | 21 +++ pve-notify-worker/src/main.rs | 64 +++++++++ src/main.rs | 149 ------------------- 14 files changed, 458 insertions(+), 169 deletions(-) create mode 100644 common/Cargo.toml create mode 100644 common/src/lib.rs create mode 100644 debian/proxmox-mail-forward.install create mode 100644 debian/pve-notify-worker.install create mode 100644 debian/pve-notify-worker.service create mode 100644 proxmox-mail-forward/Cargo.toml create mode 100644 proxmox-mail-forward/src/main.rs create mode 100644 pve-notify-worker/Cargo.toml create mode 100644 pve-notify-worker/src/main.rs delete mode 100644 src/main.rs Summary over all repositories: 91 files changed, 5622 insertions(+), 2944 deletions(-) -- Generated by murpp 0.12.1