[pve-devel] [PATCH many v7 00/19] notifications: notification metadata matching improvements
Lukas Wagner
l.wagner at proxmox.com
Mon Jun 10 10:40:19 CEST 2024
This patch series attempts to improve the user experience when creating
notification matchers.
Some of the noteworthy changes:
- Fixup inconsistent 'hostname' field. Some notification events sent
the hostname including a domain, while other did not.
This series unifies the behavior, now the field only includes the hostname
without a domain. Also updated the docs to reflect this change.
- Allow setting a custom backup job ID, similar how we handle it for
sync/prune jobs in PBS (to allow recognizable names used in matchers)
- Adding columns for backup job ID/replication job ID in the UI
- New metadata fields:
- job-id: Job ID for backup-jobs or replication-jobs
- Add an API that enumerates known notification metadata fields/values
- Suggest known fields/values in match rule window
- Some code clean up for match rule edit window
- Extended the 'exact' match-field mode - it now allows setting multiple
allowed values, separated via ',':
e.g. `match-field exact:type=replication,fencing
Originally, I created a separate 'list' match type for this, but
since the semantics for a list with one value and 'exact' mode
are identical, I decided to just extend 'exact'.
This is a safe change since there are are no values where a ','
makes any sense (config IDs, hostnames)
NOTE: Might need a versionened break, since the widget-toolkit-patches
depend on new APIs provided by pve-manager. If the API is not present,
creating matchers with 'match-field' does not work (cannot load lists
of known values/fields)
Inter-Dependencies:
- the widget-toolkit dep in pve-manager needs to be bumped
to at least 4.1.4
(we need "utils: add mechanism to add and override translatable notification event
descriptions in the product specific UIs", otherwise the UI breaks
with the pve-manager patches applied) --> already included a patch for
this
- widget-toolkit relies on a new API endpoint provided by pve-manager:
--> we require a versioned break in widget-toolkit on pve-manager
Changelog:
- v7: incorporated some more feedback from @Fiona, thx!
- Fixed error when switching from 'exact' to 'regex' if the text field
was empty
- rebased to latest master
- 'backport' doc improvements from PBS
- bumped widget-toolkit dep
- v6: incorporate feedback from @Fiona, thx!
- rename 'id' -> 'job-id' in VZDump API handler
- consolidate 'replication-job'/'backup-job' to 'job-id'
- Move 'job-id' setting to advanced tab in backup job edit.
- Don't use 'internal' flag to mark translatable fields, since
the only field where that's necessary is 'type' for now - so
just add a hardcoded check
- v5:
- Rebased onto latest master, resolving some small conflict
- v4:
- widget-toolkit: break out changes for the utils module so that they
can be applied ahead of time to ease dep bumping
- don't show Job IDs in the backup/replication job columns
- v3:
- Drop already applied patches for `proxmox`
- Rebase onto latest master - minor conflict resolution was needed
- v2:
- include 'type' metadata field for forwarded mails
--> otherwise it's not possible to match them
- include Maximilliano's T-b trailer in UI patches
pve-guest-common:
Lukas Wagner (1):
vzdump: common: allow 'job-id' as a parameter without being in schema
src/PVE/VZDump/Common.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
pve-manager:
Lukas Wagner (9):
api: jobs: vzdump: pass job 'job-id' parameter
ui: dc: backup: send 'job-id' property when starting a backup job
manually
ui: dc: backup: allow to set custom job id in advanced settings
api: replication: add 'job-id' to notification metadata
vzdump: apt: notification: do not include domain in 'hostname' field
api: replication: include 'hostname' field for notifications
api: notification: add API for getting known metadata fields/values
ui: utils: add overrides for translatable notification fields/values
d/control: bump proxmox-widget-toolkit dependency to 4.1.4
PVE/API2/APT.pm | 3 +-
PVE/API2/Cluster/Notifications.pm | 139 ++++++++++++++++++++
PVE/API2/Replication.pm | 4 +-
PVE/API2/VZDump.pm | 8 ++
PVE/Jobs/VZDump.pm | 4 +-
PVE/VZDump.pm | 14 +-
debian/control | 2 +-
www/manager6/Utils.js | 12 ++
www/manager6/dc/Backup.js | 7 +-
www/manager6/panel/BackupAdvancedOptions.js | 23 ++++
10 files changed, 200 insertions(+), 16 deletions(-)
proxmox-widget-toolkit:
Lukas Wagner (4):
notification: matcher: match-field: show known fields/values
notification: matcher: move match-field formulas to local viewModel
notification: matcher: move match-calendar fields to panel
notification: matcher: move match-severity fields to panel
src/data/model/NotificationConfig.js | 12 +
src/window/NotificationMatcherEdit.js | 613 ++++++++++++++++++--------
2 files changed, 441 insertions(+), 184 deletions(-)
pve-docs:
Lukas Wagner (5):
notification: clarify that 'hostname' does not include the domain
notifications: describe new notification metadata fields
notifications: match-field 'exact'-mode can now match multiple values
notifications: fix typo in 'notification'
notifications: backport some rephrased parts from PBS docs
notifications.adoc | 137 +++++++++++++++++++++++++++------------------
1 file changed, 84 insertions(+), 53 deletions(-)
Summary over all repositories:
14 files changed, 726 insertions(+), 254 deletions(-)
--
Generated by git-murpp 0.7.1
More information about the pve-devel
mailing list