[pve-devel] [PATCH manager 1/2] cli: pve8to9: check for group and filter sections in notifications.cfg

[pve-devel] [PATCH manager 1/2] cli: pve8to9: check for group and filter sections in notifications.cfg

[Lukas Wagner]

The notification stack removes these sections automatically whenever the
configuration is updated, so this should only affect a small number of
people - those who used the notification system while it was only
available in pvetest, created a filter/group and never changed the
configuration afterwards.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 PVE/CLI/pve8to9.pm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
index 89e2a781..5a80c40f 100644
--- a/PVE/CLI/pve8to9.pm
+++ b/PVE/CLI/pve8to9.pm
@@ -1416,6 +1416,42 @@ sub check_dkms_modules {
     }
 }
 
+sub check_legacy_notification_sections {
+    log_info("Check for legacy 'filter' or 'group' sections in /etc/pve/notifications.cfg...");
+
+    my $raw = eval { PVE::Tools::file_get_contents("/etc/pve/notifications.cfg") };
+    return if !defined($raw);
+
+    my $failed = 0;
+    my @lines = split(/\n/, $raw);
+
+    for my $line (@lines) {
+        # Any line in a section config is either a comment (starts with #), a
+        # section header (starts with the section type, without any leading
+        # space) or is a property indented by whitespace. This means we
+        # should be able to reliably detect the legacy sections by just
+        # checking the start of the line.
+
+        if ($line =~ /^filter/) {
+            $failed = 1;
+            log_fail("found legacy 'filter' section: $line");
+        }
+
+        if ($line =~ /^group/) {
+            $failed = 1;
+            log_fail("found legacy 'group' section: $line");
+        }
+    }
+
+    if ($failed) {
+        log_fail("Any modification to the notification configuration via the API or Web UI will"
+            . " automatically remove these sections. Alternatively, you can remove the offending"
+            . " sections from /etc/pve/notifications.cfg by hand.");
+    } else {
+        log_pass("No legacy 'filter' or 'group' sections found!");
+    }
+}
+
 sub check_misc {
     print_header("MISCELLANEOUS CHECKS");
     my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') };
@@ -1525,6 +1561,7 @@ sub check_misc {
     check_nvidia_vgpu_service();
     check_bootloader();
     check_dkms_modules();
+    check_legacy_notification_sections();
 }
 
 my sub colored_if {
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH manager 2/2] cli: pve8to9: check for legacy 'notification-{policy, target}' options

[Lukas Wagner]

These were briefly used by the first version of the overhauled
notification stack which hit pvetest too soon. They will be dropped from
the schema in the major update.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 PVE/CLI/pve8to9.pm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
index 5a80c40f..19667619 100644
--- a/PVE/CLI/pve8to9.pm
+++ b/PVE/CLI/pve8to9.pm
@@ -17,6 +17,7 @@ use PVE::Ceph::Tools;
 use PVE::Cluster;
 use PVE::Corosync;
 use PVE::INotify;
+use PVE::Jobs;
 use PVE::JSONSchema;
 use PVE::NodeConfig;
 use PVE::RPCEnvironment;
@@ -1452,6 +1453,39 @@ sub check_legacy_notification_sections {
     }
 }
 
+sub check_legacy_backup_job_options {
+    log_info(
+        "Check for legacy 'notification-policy' or 'notification-target' options in /etc/pve/jobs.cfg..."
+    );
+
+    my $job_cfg = PVE::Cluster::cfs_read_file('jobs.cfg');
+
+    my $failed = 0;
+
+    for my $jobid (sort keys $job_cfg->{ids}->%*) {
+        my $cfg = $job_cfg->{ids}->{$jobid};
+
+        if (defined($cfg->{'notification-policy'})) {
+            $failed = 1;
+            log_fail("found legacy 'notification-policy' option for job '$jobid'");
+        }
+
+        if (defined($cfg->{'notification-target'})) {
+            $failed = 1;
+            log_fail("found legacy 'notification-target' option for job '$jobid'");
+        }
+    }
+
+    if ($failed) {
+        log_fail(
+            "Changing the backup job configuration via the UI will automatically clear these options."
+                . "Alternatively, you can remove the offending options from /etc/pve/jobs.cfg by hand"
+        );
+    } else {
+        log_pass("No legacy 'notification-policy' or 'notification-target' options found!");
+    }
+}
+
 sub check_misc {
     print_header("MISCELLANEOUS CHECKS");
     my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') };
@@ -1562,6 +1596,7 @@ sub check_misc {
     check_bootloader();
     check_dkms_modules();
     check_legacy_notification_sections();
+    check_legacy_backup_job_options();
 }
 
 my sub colored_if {
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH manager 1/2] cli: pve8to9: check for group and filter sections in notifications.cfg

[Thomas Lamprecht]

On Tue, 24 Jun 2025 13:33:26 +0200, Lukas Wagner wrote:
> The notification stack removes these sections automatically whenever the
> configuration is updated, so this should only affect a small number of
> people - those who used the notification system while it was only
> available in pvetest, created a filter/group and never changed the
> configuration afterwards.
> 
> 
> [...]

Applied, thanks!

[1/2] cli: pve8to9: check for group and filter sections in notifications.cfg
      commit: 1dd43819bacac2f72ab5e6755c764675847acdda
[2/2] cli: pve8to9: check for legacy 'notification-{policy, target}' options
      commit: 542474256991f5cb986b0c697e3b6182b73aea27


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel