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.wag...@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 42b7073b..9d00e064 100644
--- a/PVE/CLI/pve8to9.pm
+++ b/PVE/CLI/pve8to9.pm
@@ -1372,6 +1372,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 by hand from /etc/pve/notifications.cfg.");
+ } 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')
};
@@ -1474,6 +1510,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
