From 3dba293d781e8894a9cd87201b72382b3d0b9681 Mon Sep 17 00:00:00 2001
From: Fiona Ebner <f.ebner@proxmox.com>
Date: Fri, 3 May 2024 13:19:55 +0200
Subject: [PATCH 01/55] ui: qemu: hardware: use background delay for
 asynchronous remove tasks

Avoids spawning a progress window for tasks that do complete more
quickly than the background delay.

Currently, the remove task is only asynchronous (i.e. using POST) when
it's for an unused disk, but this might change in the future (e.g. for
hot-unplug).

When adding a disk, a background delay of 5 seconds is already used.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 672a7e1a7..6dcba0719 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -486,17 +486,19 @@ Ext.define('PVE.qemu.HardwareView', {
 		return msg;
 	    },
 	    handler: function(btn, e, rec) {
+		let params = { 'delete': rec.data.key };
+		if (btn.RESTMethod === 'POST') {
+		    params.background_delay = 5;
+		}
 		Proxmox.Utils.API2Request({
 		    url: '/api2/extjs/' + baseurl,
 		    waitMsgTarget: me,
 		    method: btn.RESTMethod,
-		    params: {
-			'delete': rec.data.key,
-		    },
+		    params: params,
 		    callback: () => me.reload(),
 		    failure: response => Ext.Msg.alert('Error', response.htmlStatus),
 		    success: function(response, options) {
-			if (btn.RESTMethod === 'POST') {
+			if (btn.RESTMethod === 'POST' && response.result.data !== null) {
 			    Ext.create('Proxmox.window.TaskProgress', {
 				autoShow: true,
 				upid: response.result.data,

From 5b322518127f9917d6c4e5022ed23f8835a47244 Mon Sep 17 00:00:00 2001
From: Fiona Ebner <f.ebner@proxmox.com>
Date: Fri, 3 May 2024 13:19:56 +0200
Subject: [PATCH 02/55] ui: qemu: hardware: use asynchronous remove API call
 for disk hot-unplug

The backend uses a 10 minute timeout for disk hot-unplug, so avoid
using the synchronous call which only has a 30 second timeout.

Commit 3b2e557f ("close #584: ui qemu: changed remove unused disk to
asynchron call") introduced the necessary functionality when removing
unused disks.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 6dcba0719..e19026951 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -608,6 +608,7 @@ Ext.define('PVE.qemu.HardwareView', {
 
 	    const deleted = !!rec.data.delete;
 	    const pending = deleted || me.hasPendingChanges(key);
+	    const isRunning = me.pveSelNode.data.running;
 
 	    const isCloudInit = isCloudInitKey(value);
 	    const isCDRom = value && !!value.toString().match(/media=cdrom/);
@@ -616,7 +617,7 @@ Ext.define('PVE.qemu.HardwareView', {
 	    const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom;
 	    const isDisk = isUnusedDisk || isUsedDisk;
 	    const isEfi = key === 'efidisk0';
-	    const tpmMoveable = key === 'tpmstate0' && !me.pveSelNode.data.running;
+	    const tpmMoveable = key === 'tpmstate0' && !isRunning;
 
 	    let cannotDelete = deleted || row.never_delete;
 	    cannotDelete ||= isCDRom && !cdromCap;
@@ -625,7 +626,7 @@ Ext.define('PVE.qemu.HardwareView', {
 	    remove_btn.setDisabled(cannotDelete);
 
 	    remove_btn.setText(isUsedDisk && !isCloudInit ? remove_btn.altText : remove_btn.defaultText);
-	    remove_btn.RESTMethod = isUnusedDisk ? 'POST':'PUT';
+	    remove_btn.RESTMethod = isUnusedDisk || (isDisk && isRunning) ? 'POST' : 'PUT';
 
 	    edit_btn.setDisabled(
 	        deleted || !row.editor || isCloudInit || (isCDRom && !cdromCap) || (isDisk && !diskCap));

From d4191941ff77d9ac4e63e45dfb3d02ad23bc957f Mon Sep 17 00:00:00 2001
From: Fiona Ebner <f.ebner@proxmox.com>
Date: Wed, 12 Jun 2024 10:16:34 +0200
Subject: [PATCH 03/55] vzdump config: add fleecing property string

This makes it clear(er) that fleecing can be configured as a node-wide
default too.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 configs/vzdump.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/vzdump.conf b/configs/vzdump.conf
index 54913073c..1835e208f 100644
--- a/configs/vzdump.conf
+++ b/configs/vzdump.conf
@@ -17,3 +17,4 @@
 #pigz: N
 #notes-template: {{guestname}}
 #pbs-change-detection-mode: legacy|data|metadata
+#fleecing: enabled=BOOLEAN,storage=STORAGE_ID

From 3a9037ba259dddfb0ed9b814b7f07d7cfda06f33 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Wed, 24 Apr 2024 13:39:45 +0200
Subject: [PATCH 04/55] ui: fix align mode of two column container

'stretch' is most often the wrong value, as that will stretch
everything, to the height of the whole container, including fields.
That is not desirable, since fields look not good when stretched this
way (e.g. the controls are not correctly aligned).

To fix it, simply set it to 'begin'.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/container/TwoColumnContainer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/container/TwoColumnContainer.js b/www/manager6/container/TwoColumnContainer.js
index e8e5fca9a..b7bf735ae 100644
--- a/www/manager6/container/TwoColumnContainer.js
+++ b/www/manager6/container/TwoColumnContainer.js
@@ -10,7 +10,7 @@ Ext.define('PVE.container.TwoColumnContainer', {
 
     layout: {
 	type: 'hbox',
-	align: 'stretch',
+	align: 'begin',
     },
 
     // The default ratio of the start widget. It an be an integer or a floating point number

From 9c54c52d7996572956e65c4820459ff3a1cda778 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <l.stechauner@proxmox.com>
Date: Fri, 22 Oct 2021 14:23:12 +0200
Subject: [PATCH 05/55] api: aplinfo: rename REs for iso and vztmpl extensions

Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
---
 PVE/APLInfo.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/APLInfo.pm b/PVE/APLInfo.pm
index a0bb92908..821d645c6 100644
--- a/PVE/APLInfo.pm
+++ b/PVE/APLInfo.pm
@@ -84,7 +84,7 @@ sub read_aplinfo_from_fh {
 	    my $template;
 	    if ($res->{location}) {
 		$template = $res->{location};
-		$template =~ s|.*/([^/]+$PVE::Storage::vztmpl_extension_re)$|$1|;
+		$template =~ s|.*/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$|$1|;
 		if ($res->{location} !~ m|^([a-zA-Z]+)\://|) {
 		    # relative localtion (no http:// prefix)
 		    $res->{location} = "$source/$res->{location}";

From c1bbee010521f1b11eadc1cdeedabf00ddfe56ea Mon Sep 17 00:00:00 2001
From: Fiona Ebner <f.ebner@proxmox.com>
Date: Wed, 26 Jun 2024 16:32:30 +0200
Subject: [PATCH 06/55] vzdump: fix unit for bandwidth limit in log message

The documentation 'man vzdump' states that the value is in KiB/s. This
is correct, as seen in the plugin implementations, where the value is
multiplied by 1024.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/VZDump.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 5b7080f35..33e08f9ec 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -1084,7 +1084,7 @@ sub exec_backup_task {
 	$task->{mode} = $mode;
 
    	debugmsg ('info', "backup mode: $mode", $logfd);
-	debugmsg ('info', "bandwidth limit: $opts->{bwlimit} KB/s", $logfd)  if $opts->{bwlimit};
+	debugmsg ('info', "bandwidth limit: $opts->{bwlimit} KiB/s", $logfd)  if $opts->{bwlimit};
 	debugmsg ('info', "ionice priority: $opts->{ionice}", $logfd);
 
 	if ($mode eq 'stop') {

From fb59038a8b110b0b0b438ec035fd41dd9d591232 Mon Sep 17 00:00:00 2001
From: Fiona Ebner <f.ebner@proxmox.com>
Date: Tue, 28 May 2024 12:59:23 +0200
Subject: [PATCH 07/55] pve7to8: allow arbitrary newer running '-pve' kernels
 after upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As recently reported in the community forum [0], 6.8 pve kernels would
not be detected correctly by the script. Allow arbitrary newer
versions if already upgraded for future-proofing.

[0]: https://forum.proxmox.com/threads/145723/post-664612

Suggested-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>

[FG: made `return 0;` explicit in closure]
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/CLI/pve7to8.pm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index b34c83620..940fb5c6f 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -204,17 +204,30 @@ sub check_pve_packages {
 	}
 
 	# FIXME: better differentiate between 6.2 from bullseye or bookworm
-	my ($krunning, $kinstalled) = (qr/6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$/, 'proxmox-kernel-6.2');
+	my $kinstalled = 'proxmox-kernel-6.2';
 	if (!$upgraded) {
 	    # we got a few that avoided 5.15 in cluster with mixed CPUs, so allow older too
-	    ($krunning, $kinstalled) = (qr/(?:5\.(?:13|15)|6\.2)/, 'pve-kernel-5.15');
+	    $kinstalled = 'pve-kernel-5.15';
 	}
 
+	my $kernel_version_is_expected = sub {
+	    my ($version) = @_;
+
+	    return $version =~ m/^(?:5\.(?:13|15)|6\.2)/ if !$upgraded;
+
+	    if ($version =~ m/^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$/) {
+		return 1;
+	    } elsif ($version =~ m/^(\d+).(\d+)[^~]*-pve$/) {
+		return $1 >= 6 && $2 >= 2;
+	    }
+	    return 0;
+	};
+
 	print "\nChecking running kernel version..\n";
 	my $kernel_ver = $proxmox_ve->{RunningKernel};
 	if (!defined($kernel_ver)) {
 	    log_fail("unable to determine running kernel version.");
-	} elsif ($kernel_ver =~ /^$krunning/) {
+	} elsif ($kernel_version_is_expected->($kernel_ver)) {
 	    if ($upgraded) {
 		log_pass("running new kernel '$kernel_ver' after upgrade.");
 	    } else {
@@ -227,7 +240,7 @@ sub check_pve_packages {
 	    log_warn("unexpected running and installed kernel '$kernel_ver'.");
 	}
 
-	if ($upgraded && $kernel_ver =~ /^$krunning/) {
+	if ($upgraded && $kernel_version_is_expected->($kernel_ver)) {
 	    my $outdated_kernel_meta_pkgs = [];
 	    for my $kernel_meta_version ('5.4', '5.11', '5.13', '5.15') {
 		my $pkg = "pve-kernel-${kernel_meta_version}";

From 431ae86b08831565b104261fdedf2b03db206c3f Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 10 Jun 2024 10:40:24 +0200
Subject: [PATCH 08/55] api: replication: add 'job-id' to notification metadata

This allows users to create notification match rules for specific
replication jobs, if they so desire.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 PVE/API2/Replication.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm
index d84ac1ab1..6208a1a2a 100644
--- a/PVE/API2/Replication.pm
+++ b/PVE/API2/Replication.pm
@@ -123,8 +123,8 @@ my sub _handle_job_err {
     };
 
     my $metadata_fields = {
-	# TODO: Add job-id?
 	type => "replication",
+	"job-id" => $job->{id},
     };
 
     eval {

From 2952bfe4137b18f5a14756905b090528d48cdd67 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 10 Jun 2024 10:40:25 +0200
Subject: [PATCH 09/55] vzdump: apt: notification: do not include domain in
 'hostname' field

 - The man page warns about the usage of `hostname -f`, since a host
   may have multiple domains (or none at all)
 - The fallback PVE::INotify::nodename() already only returned the
   hostname without the domain part
 - Fencing notifications didn't include the domain part anyway

This may result in soft-breakage for any users who have already relied
on the domain being present. If there is need for it, it could include
a fqdn metadata field.

The hostname property used for rendering the notification template
is unaffected for now.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 PVE/API2/APT.pm | 3 ++-
 PVE/VZDump.pm   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index ec7c21b2f..47c509619 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -348,7 +348,8 @@ __PACKAGE__->register_method({
 		# matchers.
 		my $metadata_fields = {
 		    type => 'package-updates',
-		    hostname => $hostname,
+		    # Hostname (without domain part)
+		    hostname => PVE::INotify::nodename(),
 		};
 
 		PVE::Notify::info(
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 33e08f9ec..8dbcc4a92 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -516,10 +516,9 @@ sub send_notification {
 	    "See Task History for details!\n";
     };
 
-    my $hostname = get_hostname();
-
     my $notification_props = {
-	"hostname" => $hostname,
+	# Hostname, might include domain part
+	"hostname" => get_hostname(),
 	"error-message" => $err,
 	"guest-table" => build_guest_table($tasklist),
 	"logs" => $text_log_part,
@@ -533,7 +532,8 @@ sub send_notification {
 	# backup job id here... (I think pvescheduler would need
 	# to pass that to the vzdump call?)
 	type => "vzdump",
-	hostname => $hostname,
+	# Hostname (without domain part)
+	hostname => PVE::INotify::nodename(),
     };
 
     my $severity = $failed ? "error" : "info";

From d915b6990717acc0da045af6b6477aee4e3730d4 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 10 Jun 2024 10:40:26 +0200
Subject: [PATCH 10/55] api: replication: include 'hostname' field for
 notifications

The field contains the hostname of the host (without any domain part)
which sends the notification. This field can be used in match-field
match rules.

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

diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm
index 6208a1a2a..e4a7180f0 100644
--- a/PVE/API2/Replication.pm
+++ b/PVE/API2/Replication.pm
@@ -125,6 +125,8 @@ my sub _handle_job_err {
     my $metadata_fields = {
 	type => "replication",
 	"job-id" => $job->{id},
+	# Hostname (without domain part)
+	hostname => PVE::INotify::nodename(),
     };
 
     eval {

From 8763c263d1ac26a21a2b6443fa08895d392249e4 Mon Sep 17 00:00:00 2001
From: Stoiko Ivanov <s.ivanov@proxmox.com>
Date: Wed, 10 Jul 2024 12:59:36 +0200
Subject: [PATCH 11/55] pve7to8: fix typo in log message

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 PVE/CLI/pve7to8.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 940fb5c6f..416ec79b0 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -235,7 +235,7 @@ sub check_pve_packages {
 	    }
 	} elsif ($get_pkg->($kinstalled)) {
 	    # with 6.2 kernel being available in both we might want to fine-tune the check?
-	    log_warn("a suitable kernel ($kinstalled) is intalled, but an unsuitable ($kernel_ver) is booted, missing reboot?!");
+	    log_warn("a suitable kernel ($kinstalled) is installed, but an unsuitable ($kernel_ver) is booted, missing reboot?!");
 	} else {
 	    log_warn("unexpected running and installed kernel '$kernel_ver'.");
 	}

From 8504a0e29132e01101a28f9dafcc930fd6cab95d Mon Sep 17 00:00:00 2001
From: Christian Ebner <c.ebner@proxmox.com>
Date: Wed, 26 Jun 2024 09:00:13 +0200
Subject: [PATCH 12/55] www: backup: clarify experimental change detection
 modes

Currently, the whole mode selector is labeled as experimental, this
does however give the impression that also the default legacy mode is
an experimental mode.
To clarify that only the `data` and `metadata` change detection modes
are experimental, move the experimental label to the individual
modes and explicitly mention the experimental modes in the message.

Also, make it more clear that the archive encoding format depends on
the selected mode.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 www/manager6/panel/BackupAdvancedOptions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
index 7dd19f96d..f6822c0aa 100644
--- a/www/manager6/panel/BackupAdvancedOptions.js
+++ b/www/manager6/panel/BackupAdvancedOptions.js
@@ -249,14 +249,14 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
 		value: '__default__',
 		comboItems: [
 		    ['__default__', "Default"],
-		    ['data', "Data"],
-		    ['metadata', "Metadata"],
+		    ['data', "Data (experimental)"],
+		    ['metadata', "Metadata (experimental)"],
 		],
 	    },
 	    endFlex: 2,
 	    endColumn: {
 		xtype: 'displayfield',
-		value: gettext("EXPERIMENTAL: Mode to detect file changes and archive encoding format for container backups."),
+		value: gettext("Mode to detect file changes and switch archive encoding format for container backups (NOTE: `data` and `metadata` modes are experimental)."),
 	    },
 	},
 	{

From 6d4c9cade77570400a6e1f53fa5d44d17de84168 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 15 Jul 2024 09:44:25 +0200
Subject: [PATCH 13/55] api: node status: fix description of current-kernel
 schema entry

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/API2/Nodes.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index fb4fd4d66..6d1112e5a 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -417,7 +417,7 @@ __PACKAGE__->register_method({
 		},
 	    },
 	    'current-kernel' => {
-		description => "The uptime of the system in seconds.",
+		description => "Meta-information about the currently booted kernel of this node.",
 		type => 'object',
 		properties => {
 		    sysname => {

From 1d4dd057efc53dbb1055261b028b0fb3adc9fcf0 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Wed, 17 Jul 2024 14:21:09 +0200
Subject: [PATCH 14/55] changelog: fix typos

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 debian/changelog | 94 ++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2504d5a2..cccc1975a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -584,7 +584,7 @@ pve-manager (8.0.0~9) bookworm; urgency=medium
   * ui: create VM: use new x86-64-v2-AES as new default vCPU type.
     The x86-64-v2-aes is compatible with Intel Westmere, launched in 2010 and
     Opteron 6200-series "Interlagos" launched in 2011.
-    This model provides a few important extra fetures over the qemu64/kvm64
+    This model provides a few important extra features over the qemu64/kvm64
     model (which are basically v1 minus the -vme,-cx16 CPU flags) like SSE4.1
     and additionally also AES, while not supported by all v2 models it is by
     all recent ones, improving performance of many computing operations
@@ -689,7 +689,7 @@ pve-manager (8.0.0~7) bookworm; urgency=medium
 
 pve-manager (8.0.0~6) bookworm; urgency=medium
 
-  * vzdump: prepare to support 'exclude-path' as arry (multiple lines in the
+  * vzdump: prepare to support 'exclude-path' as array (multiple lines in the
     config)
 
  -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Jun 2023 10:05:00 +0200
@@ -769,7 +769,7 @@ pve-manager (7.4-2) bullseye; urgency=medium
 
   * ui: lvm-thin: fix not being able to edit the storage
 
-  * replication: fix uninitalized warning
+  * replication: fix uninitialized warning
 
   * api: apt: versions: also list Proxmox libraries for interfacing with
     Rust
@@ -1002,7 +1002,7 @@ pve-manager (7.2-15) bullseye; urgency=medium
     keypresses
 
   * ui: tags: implement dirty tracking for inline editing and highlight finish
-    inline editing button if there are uncomitted changes
+    inline editing button if there are uncommitted changes
 
   * ui: datacenter options: add basic editor for Cluster Resource Scheduling
     setting
@@ -1334,7 +1334,7 @@ pve-manager (7.1-13) bullseye; urgency=medium
     to a slower frequency to better convey that there may be an acute failing,
     not just a flapping error like one mail could suggest.
 
-  * replication: include more info in mail like failure-count, last succesful
+  * replication: include more info in mail like failure-count, last successful
     sync, next try and current target node.
 
   * ui: sdn: zone evpn: delete exitnodes-primary if empty
@@ -1474,7 +1474,7 @@ pve-manager (7.1-8) bullseye; urgency=medium
   * ui: upload/download image: trim whitespace from checksum value
 
   * ui: calendar event: add an once-daily example and clarify workday at 00:00
-    one slighlty
+    one slightly
 
   * ui: container: allow one to set the 'lazytime' mount option
 
@@ -1554,7 +1554,7 @@ pve-manager (7.1-1) bullseye; urgency=medium
 
   * api/services: add pvescheduler to the service list
 
-  * ui: ceph: add more compatibilty code for versions
+  * ui: ceph: add more compatibility code for versions
 
   * ui: backup: show retention settings in own column
 
@@ -1609,7 +1609,7 @@ pve-manager (7.0-15) bullseye; urgency=medium
 
   * ui: dc/options: display WebAuthn and add editor
 
-  * api: ceph-mds: get mds state when multple ceph filesystems exist
+  * api: ceph-mds: get mds state when multiple ceph filesystems exist
 
   * ceph fs: support creating multiple CephFS via UI/API
 
@@ -1690,7 +1690,7 @@ pve-manager (7.0-12) bullseye; urgency=medium
 
   * ui: backup job detail view: merge mail notification when/to fields
 
-  * ui: improve ACME edit/apply button visibilty
+  * ui: improve ACME edit/apply button visibility
 
   * fix #3620: ui: dc/storage: delete empty pbs fingerprint on edit
 
@@ -1728,7 +1728,7 @@ pve-manager (7.0-11) bullseye; urgency=medium
 
   * ui: node/ZFS: add zstd to possible compression methods
 
-  * vzdump: use storage plugins to determine backup feasability
+  * vzdump: use storage plugins to determine backup feasibility
 
   * ui: lxc/CreateWizard: add a 'nesting' checkbox and enable it by default
 
@@ -1757,7 +1757,7 @@ pve-manager (7.0-10) bullseye; urgency=medium
 
 pve-manager (7.0-9) bullseye; urgency=medium
 
-  * pve6to7: sync new checks and adaptions from stable-6 branch for consitency
+  * pve6to7: sync new checks and adaptions from stable-6 branch for consistency
 
   * fix #3490: do not filter out 'Generic System Peripheral' PCI(e) devices by
     default
@@ -1787,7 +1787,7 @@ pve-manager (7.0-8) bullseye; urgency=medium
   * pveceph: also install nvme-cli
 
   * ui: dc/guests: change layouting to a flexbox, fixing render issues in
-    Firefox on somes systems
+    Firefox on some systems
 
   * pve6to7: sync new checks from stable-6 branch
 
@@ -1882,7 +1882,7 @@ pve-manager (7.0-3) bullseye; urgency=medium
     snapshots got pruned
 
   * node config: limit description/comment length to 64 KiB and check in
-    pve6to7 for overly long exisitng notes.
+    pve6to7 for overly long existing notes.
 
   * ui: fix unlimited height of VM/CT Summary notes-view, noticeable on long text
 
@@ -1912,7 +1912,7 @@ pve-manager (7.0-1) bullseye; urgency=medium
 
   * re-build for Proxmox VE 7 based on Debian Bullseye
 
-  * d/control: order ifupdown2 as first, prefered, dependency
+  * d/control: order ifupdown2 as first, preferred, dependency
 
   * enable installation of ceph 16.2 pacific release
 
@@ -1939,7 +1939,7 @@ pve-manager (6.4-6) pve; urgency=medium
     the IPv6 network stack system-wide (which should be done by setting the
     `net.ipv6.conf.all.disable_ipv6` sysctl, not over the kernel command line)
 
-  * ui: storage status: use SI (base ten) units for usage for consitency with
+  * ui: storage status: use SI (base ten) units for usage for consistency with
     RRD chart
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 07 May 2021 18:17:25 +0200
@@ -2010,7 +2010,7 @@ pve-manager (6.4-1) pve; urgency=medium
   * fix #417: proxy: allow one to configure a address where the pveproxy and
     spiceproxy should listen and default to listening on both, IPv6 and IPv4.
     This changes the log format for IPv4 addresses, as ::ffff: will be prefixed.
-    Either adpat any matching software (for example, fail2ban) or disable this
+    Either adapt any matching software (for example, fail2ban) or disable this
     by setting the LISTEN_IP to 0.0.0.0, if this is not wanted.
 
   * ui: safe destroy guest: add checkbox for removal of unreferenced disks
@@ -2092,7 +2092,7 @@ pve-manager (6.3-5) pve; urgency=medium
 
 pve-manager (6.3-4) pve; urgency=medium
 
-  * pveceph: improve useability of 'status' command
+  * pveceph: improve usability of 'status' command
 
   * fix #3203: ui: VM hardware: use correct OS default model for network device
     type
@@ -2256,7 +2256,7 @@ pve-manager (6.2-13) pve; urgency=medium
 
   * partially fix #3056: namespace vzdump temporary directory with VMID
 
-  * ceph: allow to alter settings of an exisiting pool, only over API/CLI for
+  * ceph: allow to alter settings of an existing pool, only over API/CLI for
     now
 
   * ceph: add option to control placement-group autoscale mode on pool create
@@ -2397,7 +2397,7 @@ pve-manager (6.2-6) pve; urgency=medium
 
 pve-manager (6.2-5) pve; urgency=medium
 
-  * improve ACME interaces
+  * improve ACME interfaces
 
   * fix #2747: ui: API token create: always reset base submit URL
 
@@ -2606,7 +2606,7 @@ pve-manager (6.1-4) pve; urgency=medium
 
 pve-manager (6.1-3) pve; urgency=medium
 
-  * api: apt/versions: improve stabillity under edge cases
+  * api: apt/versions: improve stability under edge cases
 
   * improve pveversion for removed but not yet purged packages
 
@@ -2618,7 +2618,7 @@ pve-manager (6.1-2) pve; urgency=medium
 
   * ui: dc/options: add onlineHelp to u2f and ha edit window
 
-  * LXC: Disable resize button when volume is unusued
+  * LXC: Disable resize button when volume is unused
 
   * ui: dc/options: fix capabillities for u2f, bwlimits, ha settings
 
@@ -2797,7 +2797,7 @@ pve-manager (6.0-7) pve; urgency=medium
 
   * fix #2340: gui: ceph: handle 'null' versions for hosts
 
-  * fix #2341: ceph: osd create: allow db/wal on partioned disks
+  * fix #2341: ceph: osd create: allow db/wal on partitioned disks
 
   * ui: allow one to add the AES flag explicitly to VMs
 
@@ -2976,7 +2976,7 @@ pve-manager (6.0-0+3) pve; urgency=medium
   * VM migrate: do some initial checks before a migrate is triggered to notify
     users about problems earlier
 
-  * ceph: init: update inital config for nautilus
+  * ceph: init: update initial config for nautilus
 
   * ceph: improve monitor creation and adapt for Nautilus
 
@@ -3189,7 +3189,7 @@ pve-manager (5.3-10) unstable; urgency=medium
 
   * fix #2096: enable resume in context menu for guest triggered sleep
 
-  * default to unpriviledged CT in the GUI
+  * default to unprivileged CT in the GUI
 
   * fix #1769: restart mode for bulk lxc migration
 
@@ -3332,7 +3332,7 @@ pve-manager (5.2-11) unstable; urgency=medium
 
   * Update default CIPHERS to a more current list
 
-  * close #584: ui qemu: changed remove unused disk to asynchron call
+  * close #584: ui qemu: changed remove unused disk to asynchronous call
 
   * dc/user: render user fullnames htmlEncoded
 
@@ -3652,7 +3652,7 @@ pve-manager (5.1-46) stable; urgency=medium
 
   * fix #1635: correctly change maxIds in ControllerSelector in wizard
 
-  * enable/disable xtermjs depending on the existance of a serial port
+  * enable/disable xtermjs depending on the existence of a serial port
 
   * show serial ports on the gui
 
@@ -4084,7 +4084,7 @@ pve-manager (5.0-12) unstable; urgency=medium
 
   * translate params in bulk migrate window
 
-  * change to debians font-awesome package
+  * change to debian's font-awesome package
 
   * mark node shutdown/reboot buttons as dangerous
 
@@ -4326,7 +4326,7 @@ pve-manager (4.4-9) unstable; urgency=medium
 
   * use new PVE::Storage::check_volume_access()
 
-  * pvestatd.pm: corretly use new RPCEnvironment
+  * pvestatd.pm: correctly use new RPCEnvironment
 
   * pveproxy: do not expose /pve2/js/ (no longer required)
 
@@ -4394,7 +4394,7 @@ pve-manager (4.4-6) unstable; urgency=medium
 
   * remove vznet.conf
 
-  * Reload the Ceph OSDTree afer adding an OSD
+  * Reload the Ceph OSDTree after adding an OSD
 
   * fix #1230: add blocksize for ZFSPoolPlugin
 
@@ -4408,7 +4408,7 @@ pve-manager (4.4-6) unstable; urgency=medium
 
 pve-manager (4.4-5) unstable; urgency=medium
 
-  * add unpriviledged flag to container restore window
+  * add unprivileged flag to container restore window
 
  -- Proxmox Support Team <support@proxmox.com>  Tue, 27 Dec 2016 11:29:31 +0100
 
@@ -4561,7 +4561,7 @@ pve-manager (4.3-11) unstable; urgency=medium
 
   * API2Client: allow to set ssl options
 
-  * fix #1196: make restriced/nofailback boolean in gui
+  * fix #1196: make restricted/nofailback boolean in gui
 
   * disable rules copy button if not 'in' or 'out' rule
 
@@ -4859,7 +4859,7 @@ pve-manager (4.2-17) unstable; urgency=medium
 
   * Add some extra debug information to the report.
 
-  * add ca-certificates as required depency
+  * add ca-certificates as required dependency
 
   * lxc/status: show disk usage on running containers
 
@@ -4917,7 +4917,7 @@ pve-manager (4.2-13) unstable; urgency=medium
 
 pve-manager (4.2-12) unstable; urgency=medium
 
-  * Rename the SCSI VirtIO controller to better differenciate from VirtIO blk
+  * Rename the SCSI VirtIO controller to better differentiate from VirtIO blk
 
   * fix #778: Case fix for VMware
 
@@ -5064,7 +5064,7 @@ pve-manager (4.1-33) unstable; urgency=medium
 
 pve-manager (4.1-32) unstable; urgency=medium
 
-  * GUI: enhace visibillity of dialog window border
+  * GUI: enhance visibility of dialog window border
 
   * fix #143: add disk/mem percent sort
 
@@ -5369,7 +5369,7 @@ pve-manager (4.0-63) unstable; urgency=medium
 
   * pvestatd: use 'priv' environment for service
 
-  * improve log messages at sytem shutdown
+  * improve log messages at system shutdown
 
   * pveproxy.service: add Wants=ssh.service
 
@@ -5391,11 +5391,11 @@ pve-manager (4.0-61) unstable; urgency=medium
 
   * ceph.conf : remove auth_supported
 
-  * Allow email adresses with a top level domain of up to 63 characters
+  * Allow email addresses with a top level domain of up to 63 characters
 
   * fix bug #575: fork at shutdown, so that partent starts new worker
 
-  * update build infrastucture to be able to develop with Ext6
+  * update build infrastructure to be able to develop with Ext6
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Nov 2015 10:05:01 +0100
 
@@ -5463,7 +5463,7 @@ pve-manager (4.0-51) unstable; urgency=medium
 
 pve-manager (4.0-50) unstable; urgency=medium
 
-  * fix bug #756: force macro setting to emtpy string when
+  * fix bug #756: force macro setting to empty string when
     user erases the content
 
  -- Proxmox Support Team <support@proxmox.com>  Thu, 15 Oct 2015 17:41:02 +0200
@@ -5540,7 +5540,7 @@ pve-manager (4.0-39) unstable; urgency=medium
 
   * update sencha touch sources to 2.4.2
 
-  * Allow email adresses with a top level domain of up to 63 characters
+  * Allow email addresses with a top level domain of up to 63 characters
 
   * Deny stop mode backups from HA managed and enabled services
 
@@ -5947,7 +5947,7 @@ pve-manager (3.3-12) unstable; urgency=low
 
 pve-manager (3.3-11) unstable; urgency=low
   
-  * New 'disconnect' button on the network edit pannel.
+  * New 'disconnect' button on the network edit panel.
 
   * Fix backup failure at shutdown (stop backup on host shutdown)
   
@@ -5997,7 +5997,7 @@ pve-manager (3.3-5) unstable; urgency=low
 
 pve-manager (3.3-4) unstable; urgency=low
 
-  * pveproxy: limit ourselfes to tlsv1 
+  * pveproxy: limit ourselves to tlsv1
 
  -- Proxmox Support Team <support@proxmox.com>  Wed, 15 Oct 2014 15:49:17 +0200
 
@@ -6486,7 +6486,7 @@ pve-manager (3.1-14) unstable; urgency=low
 
 pve-manager (3.1-13) unstable; urgency=low
 
-  * dissable SSL compression (avoid TLS CRIME vulnerability)
+  * disable SSL compression (avoid TLS CRIME vulnerability)
 
  -- Proxmox Support Team <support@proxmox.com>  Tue, 17 Sep 2013 07:17:17 +0200
 
@@ -6703,7 +6703,7 @@ pve-manager (3.0-23) unstable; urgency=low
   
   * fix bug #401: disable connection timeout during API call processing
 
-  * add suport for new qemu-server async configuration API
+  * add support for new qemu-server async configuration API
   
  -- Proxmox Support Team <support@proxmox.com>  Fri, 07 Jun 2013 11:52:15 +0200
 
@@ -7049,7 +7049,7 @@ pve-manager (2.2-19) unstable; urgency=low
 
 pve-manager (2.2-18) unstable; urgency=low
 
-  * add workaroud to correctly show scrollbars
+  * add workaround to correctly show scrollbars
 
  -- Proxmox Support Team <support@proxmox.com>  Wed, 26 Sep 2012 11:22:16 +0200
 
@@ -7522,7 +7522,7 @@ pve-manager (2.0-14) unstable; urgency=low
 
 pve-manager (2.0-13) unstable; urgency=low
 
-  * implemente openvz migration ('pvectl migrate')
+  * implement openvz migration ('pvectl migrate')
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 02 Dec 2011 10:37:28 +0100
 
@@ -7560,7 +7560,7 @@ pve-manager (2.0-8) unstable; urgency=low
 
 pve-manager (2.0-7) unstable; urgency=low
 
-  * imlement openvz GUI 
+  * implement openvz GUI
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 07 Oct 2011 13:56:03 +0200
 
@@ -7642,7 +7642,7 @@ pve-manager (1.5-3) unstable; urgency=low
 
 pve-manager (1.5-2) unstable; urgency=low
 
-  * add CPUs settings for OpenVZ (work now withe kernel 2.6.18)
+  * add CPUs settings for OpenVZ (work now with kernel 2.6.18)
 
  -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Jan 2010 09:42:08 +0100
 

From 2b0c7293a0921ba80529d6703e00a91be6d343ca Mon Sep 17 00:00:00 2001
From: Max Carrara <m.carrara@proxmox.com>
Date: Mon, 1 Jul 2024 16:10:31 +0200
Subject: [PATCH 15/55] ceph: tools: refactor installation check as guard
 clause

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Igor Thaller <igor.thaller@brg9.at>
---
 PVE/Ceph/Tools.pm | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm
index 9b97171e1..087c4ef3f 100644
--- a/PVE/Ceph/Tools.pm
+++ b/PVE/Ceph/Tools.pm
@@ -57,24 +57,25 @@ my $config_files = {
 sub get_local_version {
     my ($noerr) = @_;
 
-    if (check_ceph_installed('ceph_bin', $noerr)) {
-	my $ceph_version;
-	run_command(
-	    [ $ceph_service->{ceph_bin}, '--version' ],
-	    noerr => $noerr,
-	    outfunc => sub { $ceph_version = shift if !defined $ceph_version },
-	);
-	return undef if !defined $ceph_version;
+    return undef if !check_ceph_installed('ceph_bin', $noerr);
 
-	if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
-	    my ($version, $buildcommit) = ($1, $2);
-	    my $subversions = [ split(/\.|-/, $version) ];
+    my $ceph_version;
+    run_command(
+	[ $ceph_service->{ceph_bin}, '--version' ],
+	noerr => $noerr,
+	outfunc => sub { $ceph_version = shift if !defined $ceph_version },
+    );
 
-	    # return (version, buildid, major, minor, ...) : major;
-	    return wantarray
-		? ($version, $buildcommit, $subversions)
-		: $subversions->[0];
-	}
+    return undef if !defined $ceph_version;
+
+    if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
+	my ($version, $buildcommit) = ($1, $2);
+	my $subversions = [ split(/\.|-/, $version) ];
+
+	# return (version, buildid, major, minor, ...) : major;
+	return wantarray
+	    ? ($version, $buildcommit, $subversions)
+	    : $subversions->[0];
     }
 
     return undef;

From 344b0a18d28149a47663ec7a2b957d92f21d3a20 Mon Sep 17 00:00:00 2001
From: Max Carrara <m.carrara@proxmox.com>
Date: Mon, 1 Jul 2024 16:10:32 +0200
Subject: [PATCH 16/55] ceph: tools: parse Ceph version in separate sub and
 update regex

The part of the `get_local_version` sub that's concerned with actually
parsing the Ceph version is factored into a separate sub
`parse_ceph_version`. That way the parsing logic can easily be reused.

Make the version regex more maintainable declaring it as a variable,
breaking it up and commenting it by using the x flag.

Also remove the part that parses our Debian revision (e.g. -pve1) from
the version, as we do not actually include that in our Ceph builds.

The part of the regex that parses the build commit hash is made
mandatory (remove '?' after its group).

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Igor Thaller <igor.thaller@brg9.at>
---
 PVE/Ceph/Tools.pm | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm
index 087c4ef3f..903133538 100644
--- a/PVE/Ceph/Tools.pm
+++ b/PVE/Ceph/Tools.pm
@@ -68,11 +68,33 @@ sub get_local_version {
 
     return undef if !defined $ceph_version;
 
-    if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
+    my ($version, $buildcommit, $subversions) = parse_ceph_version($ceph_version);
+
+    return undef if !defined($version);
+
+    # return (version, buildid, [major, minor, ...]) : major;
+    return wantarray ? ($version, $buildcommit, $subversions) : $subversions->[0];
+}
+
+sub parse_ceph_version : prototype($) {
+    my ($ceph_version) = @_;
+
+    my $re_ceph_version = qr/
+	# Skip ahead to the version, which may optionally start with 'v'
+	^ceph.*\sv?
+
+	# Parse the version X.Y, X.Y.Z, etc.
+	( \d+ (?:\.\d+)+ ) \s+
+
+	# Parse the git commit hash between parentheses
+	(?: \( ([a-zA-Z0-9]+) \) )
+    /x;
+
+    if ($ceph_version =~ /$re_ceph_version/) {
 	my ($version, $buildcommit) = ($1, $2);
 	my $subversions = [ split(/\.|-/, $version) ];
 
-	# return (version, buildid, major, minor, ...) : major;
+	# return (version, buildid, [major, minor, ...]) : major;
 	return wantarray
 	    ? ($version, $buildcommit, $subversions)
 	    : $subversions->[0];

From f09b26ae56490efaa6c47d705da39f3069156f72 Mon Sep 17 00:00:00 2001
From: Max Carrara <m.carrara@proxmox.com>
Date: Mon, 1 Jul 2024 16:10:33 +0200
Subject: [PATCH 17/55] ceph: services: remove old cluster broadcast

The `ceph-version` key is not used anymore, so it can go.

Double-checked by `rg`ing through all of our repositories.

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Igor Thaller <igor.thaller@brg9.at>
---
 PVE/Ceph/Services.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/PVE/Ceph/Services.pm b/PVE/Ceph/Services.pm
index e0f31e8eb..f51096554 100644
--- a/PVE/Ceph/Services.pm
+++ b/PVE/Ceph/Services.pm
@@ -60,8 +60,6 @@ sub broadcast_ceph_versions {
 		return; # up to date, nothing to do so avoid (not exactly cheap) broadcast
 	    }
 	}
-	# FIXME: remove with 8.0 (or 7.2, its not _that_ bad) - for backward compat only
-	PVE::Cluster::broadcast_node_kv("ceph-version", $version);
 
 	my $node_versions = {
 	    version => {

From ddf6263191c653307fc467d48dbb0f30f7aa5cb3 Mon Sep 17 00:00:00 2001
From: Max Carrara <m.carrara@proxmox.com>
Date: Mon, 1 Jul 2024 16:10:34 +0200
Subject: [PATCH 18/55] ceph: services: refactor version existence check as
 guard clause

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Igor Thaller <igor.thaller@brg9.at>
---
 PVE/Ceph/Services.pm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/PVE/Ceph/Services.pm b/PVE/Ceph/Services.pm
index f51096554..0b8c207ea 100644
--- a/PVE/Ceph/Services.pm
+++ b/PVE/Ceph/Services.pm
@@ -50,26 +50,26 @@ sub broadcast_ceph_services {
 sub broadcast_ceph_versions {
     my ($version, $buildcommit, $vers_parts) = PVE::Ceph::Tools::get_local_version(1);
 
-    if ($version) {
-	my $nodename = PVE::INotify::nodename();
-	my $old = PVE::Cluster::get_node_kv("ceph-versions", $nodename);
-	if (defined($old->{$nodename})) {
-	    $old = eval { decode_json($old->{$nodename}) };
-	    warn $@ if $@; # should not happen
-	    if (defined($old) && $old->{buildcommit} eq $buildcommit && $old->{version}->{str} eq $version) {
-		return; # up to date, nothing to do so avoid (not exactly cheap) broadcast
-	    }
-	}
+    return undef if !$version;
 
-	my $node_versions = {
-	    version => {
-		str => $version,
-		parts => $vers_parts,
-	    },
-	    buildcommit => $buildcommit,
-	};
-	PVE::Cluster::broadcast_node_kv("ceph-versions", encode_json($node_versions));
+    my $nodename = PVE::INotify::nodename();
+    my $old = PVE::Cluster::get_node_kv("ceph-versions", $nodename);
+    if (defined($old->{$nodename})) {
+	$old = eval { decode_json($old->{$nodename}) };
+	warn $@ if $@; # should not happen
+	if (defined($old) && $old->{buildcommit} eq $buildcommit && $old->{version}->{str} eq $version) {
+	    return; # up to date, nothing to do so avoid (not exactly cheap) broadcast
+	}
     }
+
+    my $node_versions = {
+	version => {
+	    str => $version,
+	    parts => $vers_parts,
+	},
+	buildcommit => $buildcommit,
+    };
+    PVE::Cluster::broadcast_node_kv("ceph-versions", encode_json($node_versions));
 }
 
 sub get_ceph_versions {

From 48b64ef35ba7d10551a7a11f4fa0054490505d25 Mon Sep 17 00:00:00 2001
From: Max Carrara <m.carrara@proxmox.com>
Date: Mon, 1 Jul 2024 16:10:35 +0200
Subject: [PATCH 19/55] utils: align regex of parse_ceph_version with Perl
 equivalent

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Igor Thaller <igor.thaller@brg9.at>
---
 www/manager6/Utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index f5608944d..74e466944 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -118,7 +118,8 @@ Ext.define('PVE.Utils', {
 	}
 
 	if (service.ceph_version) {
-	    var match = service.ceph_version.match(/version (\d+(\.\d+)*)/);
+	    // See PVE/Ceph/Tools.pm - get_local_version
+	    const match = service.ceph_version.match(/^ceph.*\sv?(\d+(?:\.\d+)+)/);
 	    if (match) {
 		return match[1];
 	    }

From d76c2b0f9e2fe43bc83d71d8b959a2ee9d302a6d Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Wed, 17 Jul 2024 14:16:46 +0200
Subject: [PATCH 20/55] fix typos in comments

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 PVE/API2/Nodes.pm                       | 2 +-
 PVE/APLInfo.pm                          | 2 +-
 PVE/CLI/pveceph.pm                      | 2 +-
 PVE/Service/pvestatd.pm                 | 2 +-
 PVE/Status/Plugin.pm                    | 2 +-
 www/manager6/Parser.js                  | 2 +-
 www/manager6/ceph/Services.js           | 2 +-
 www/manager6/dc/ACMEPluginEdit.js       | 2 +-
 www/manager6/form/BandwidthSelector.js  | 2 +-
 www/manager6/lxc/ResourceEdit.js        | 2 +-
 www/manager6/qemu/OSDefaults.js         | 2 +-
 www/manager6/qemu/PCIEdit.js            | 2 +-
 www/manager6/qemu/ProcessorEdit.js      | 2 +-
 www/manager6/window/Migrate.js          | 2 +-
 www/manager6/window/Restore.js          | 2 +-
 www/manager6/window/TreeSettingsEdit.js | 2 +-
 www/u2f-api.js                          | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 6d1112e5a..9920e9779 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -399,7 +399,7 @@ __PACKAGE__->register_method({
 	type => "object",
 	additionalProperties => 1,
 	properties => {
-	    # TODO: document remaing ones
+	    # TODO: document remaining ones
 	    'boot-info' => {
 		description => "Meta-information about the boot mode.",
 		type => 'object',
diff --git a/PVE/APLInfo.pm b/PVE/APLInfo.pm
index 821d645c6..9ea206782 100644
--- a/PVE/APLInfo.pm
+++ b/PVE/APLInfo.pm
@@ -86,7 +86,7 @@ sub read_aplinfo_from_fh {
 		$template = $res->{location};
 		$template =~ s|.*/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$|$1|;
 		if ($res->{location} !~ m|^([a-zA-Z]+)\://|) {
-		    # relative localtion (no http:// prefix)
+		    # relative location (no http:// prefix)
 		    $res->{location} = "$source/$res->{location}";
 		}
 	    } else {
diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 5f45610b7..b7b921875 100755
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -216,7 +216,7 @@ __PACKAGE__->register_method ({
 
 	print "start installation\n";
 
-	# this flag helps to determine when apt is actually done installing (vs. partial extracing)
+	# this flag helps to determine when apt is actually done installing (vs. partial extracting)
 	my $install_flag_fn = PVE::Ceph::Tools::ceph_install_flag_file();
 	open(my $install_flag, '>', $install_flag_fn) or die "could not create install flag - $!\n";
 	close $install_flag;
diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm
index 8661f7744..458f22f77 100755
--- a/PVE/Service/pvestatd.pm
+++ b/PVE/Service/pvestatd.pm
@@ -103,7 +103,7 @@ sub update_supported_cpuflags {
 
 	$supported_cpuflags = {};
     } else {
-	# only set cached version if there's actually something to braodcast
+	# only set cached version if there's actually something to broadcast
 	$cached_kvm_version = $kvm_version;
     }
 
diff --git a/PVE/Status/Plugin.pm b/PVE/Status/Plugin.pm
index 97976b978..1b3de52fa 100644
--- a/PVE/Status/Plugin.pm
+++ b/PVE/Status/Plugin.pm
@@ -89,7 +89,7 @@ sub _send_batch_size {
     return $mtu - 50; # a bit more than 48byte to allow for safe room
 }
 
-# call with the smalles $data chunks possible
+# call with the smallest $data chunks possible
 sub add_metric_data {
     my ($class, $txn, $data) = @_;
     return if !defined($data);
diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js
index 77b2b2fc6..07eb9b176 100644
--- a/www/manager6/Parser.js
+++ b/www/manager6/Parser.js
@@ -65,7 +65,7 @@ Ext.define('PVE.Parser', {
 		    if (Ext.isDefined(res[defaultKey])) {
 			throw 'defaultKey may be only defined once in propertyString';
 		    }
-		    res[defaultKey] = k; // k ist the value in this case
+		    res[defaultKey] = k; // k is the value in this case
 		} else {
 		    throw `Failed to parse key-value pair: ${property}`;
 		}
diff --git a/www/manager6/ceph/Services.js b/www/manager6/ceph/Services.js
index b9fc52c81..dfafee43e 100644
--- a/www/manager6/ceph/Services.js
+++ b/www/manager6/ceph/Services.js
@@ -265,7 +265,7 @@ Ext.define('PVE.ceph.ServiceList', {
 		});
 		me.ids.push(list[i].id);
 	    } else {
-		delete pendingRemoval[list[i].id]; // drop exisiting from for-removal
+		delete pendingRemoval[list[i].id]; // drop existing from for-removal
 	    }
 	    service.updateService(list[i].title, list[i].text, list[i].health);
 	}
diff --git a/www/manager6/dc/ACMEPluginEdit.js b/www/manager6/dc/ACMEPluginEdit.js
index 570b4dd20..62ecbccee 100644
--- a/www/manager6/dc/ACMEPluginEdit.js
+++ b/www/manager6/dc/ACMEPluginEdit.js
@@ -124,7 +124,7 @@ Ext.define('PVE.dc.ACMEPluginEditor', {
 		datafield.setValue(extradata.join('\n'));
 		if (!me.createdInitially) {
 		    datafield.resetOriginalValue();
-		    me.createdInitially = true; // save that we initally set that
+		    me.createdInitially = true; // save that we initially set that
 		}
 	    },
 	    onGetValues: function(values) {
diff --git a/www/manager6/form/BandwidthSelector.js b/www/manager6/form/BandwidthSelector.js
index 6f20af3ae..50c5d671b 100644
--- a/www/manager6/form/BandwidthSelector.js
+++ b/www/manager6/form/BandwidthSelector.js
@@ -37,7 +37,7 @@ Ext.define('PVE.form.SizeField', {
     unit: 'MiB',
     unitPostfix: '',
 
-    // use this if the backend saves values in another unit tha bytes, e.g.,
+    // use this if the backend saves values in a unit other than bytes, e.g.,
     // for KiB set it to 'KiB'
     backendUnit: undefined,
 
diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 9f4f7e08d..a0d868eec 100644
--- a/www/manager6/lxc/ResourceEdit.js
+++ b/www/manager6/lxc/ResourceEdit.js
@@ -43,7 +43,7 @@ Ext.define('PVE.lxc.CPUEdit', {
     },
 });
 
-// The view model of the parent shoul contain a 'cgroupMode' variable (or params for v2 are used).
+// The view model of the parent should contain a 'cgroupMode' variable (or params for v2 are used).
 Ext.define('PVE.lxc.CPUInputPanel', {
     extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcCPUInputPanel',
diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js
index 58bc76ffb..d3ee49463 100644
--- a/www/manager6/qemu/OSDefaults.js
+++ b/www/manager6/qemu/OSDefaults.js
@@ -61,7 +61,7 @@ Ext.define('PVE.qemu.OSDefaults', {
 	    networkCard: 'virtio',
 	});
 
-	// recommandation from http://wiki.qemu.org/Windows2000
+	// recommendation from http://wiki.qemu.org/Windows2000
 	addOS({
 	    pveOS: 'w2k',
 	    parent: 'generic',
diff --git a/www/manager6/qemu/PCIEdit.js b/www/manager6/qemu/PCIEdit.js
index 8cef1b105..970e81c28 100644
--- a/www/manager6/qemu/PCIEdit.js
+++ b/www/manager6/qemu/PCIEdit.js
@@ -180,7 +180,7 @@ Ext.define('PVE.qemu.PCIInputPanel', {
 		columnWidth: 1,
 		padding: '0 0 10 0',
 		itemId: 'iommuwarning',
-		value: 'The selected Device is not in a seperate IOMMU group, make sure this is intended.',
+		value: 'The selected Device is not in a separate IOMMU group, make sure this is intended.',
 		userCls: 'pmx-hint',
 	    },
 	];
diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js
index b35387274..7aa98eb6f 100644
--- a/www/manager6/qemu/ProcessorEdit.js
+++ b/www/manager6/qemu/ProcessorEdit.js
@@ -1,4 +1,4 @@
-// The view model of the parent shoul contain a 'cgroupMode' variable (or params for v2 are used).
+// The view model of the parent should contain a 'cgroupMode' variable (or params for v2 are used).
 Ext.define('PVE.qemu.ProcessorInputPanel', {
     extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuProcessorPanel',
diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js
index 5473821b9..78d03921e 100644
--- a/www/manager6/window/Migrate.js
+++ b/www/manager6/window/Migrate.js
@@ -102,7 +102,7 @@ Ext.define('PVE.window.Migrate', {
 	},
 
 	onTargetChange: function(nodeSelector) {
-	    // Always display the storages of the currently seleceted migration target
+	    // Always display the storages of the currently selected migration target
 	    this.lookup('pveDiskStorageSelector').setNodename(nodeSelector.value);
 	    this.checkMigratePreconditions();
 	},
diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js
index 36aecc392..6efe13130 100644
--- a/www/manager6/window/Restore.js
+++ b/www/manager6/window/Restore.js
@@ -132,7 +132,7 @@ Ext.define('PVE.window.Restore', {
 
 			if (key === '#qmdump#map') {
 			    let match = value.match(/^(\S+):(\S+):(\S*):(\S*):$/) ?? [];
-			    // if a /dev/XYZ disk was backed up, ther is no storage hint
+			    // if a /dev/XYZ disk was backed up, there is no storage hint
 			    allStoragesAvailable &&= !!match[3] && !!PVE.data.ResourceStore.getById(
 				`storage/${view.nodename}/${match[3]}`);
 			} else if (key === 'name' || key === 'hostname') {
diff --git a/www/manager6/window/TreeSettingsEdit.js b/www/manager6/window/TreeSettingsEdit.js
index ed8b7aded..b48415bcb 100644
--- a/www/manager6/window/TreeSettingsEdit.js
+++ b/www/manager6/window/TreeSettingsEdit.js
@@ -5,7 +5,7 @@ Ext.define('PVE.window.TreeSettingsEdit', {
     title: gettext('Tree Settings'),
     isCreate: false,
 
-    url: '#', // ignored as submit() gets overriden here, but the parent class requires it
+    url: '#', // ignored as submit() gets overridden here, but the parent class requires it
 
     width: 450,
     fieldDefaults: {
diff --git a/www/u2f-api.js b/www/u2f-api.js
index 9244d14e7..60c1355c8 100644
--- a/www/u2f-api.js
+++ b/www/u2f-api.js
@@ -37,7 +37,7 @@ var js_api_version;
 
 
 /**
- * Message types for messsages to/from the extension
+ * Message types for messages to/from the extension
  * @const
  * @enum {string}
  */

From 00830b8717e32264c24a4c21152fc325d4194363 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Wed, 17 Jul 2024 14:16:47 +0200
Subject: [PATCH 21/55] ui: ceph: rename wizzard variable to wizard

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 www/manager6/window/CephInstall.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/manager6/window/CephInstall.js b/www/manager6/window/CephInstall.js
index 432c6719f..326051291 100644
--- a/www/manager6/window/CephInstall.js
+++ b/www/manager6/window/CephInstall.js
@@ -66,12 +66,12 @@ Ext.define('PVE.ceph.Install', {
 	    },
 	    handler: function() {
 		let view = this.up('pveCephInstallWindow');
-		let wizzard = Ext.create('PVE.ceph.CephInstallWizard', {
+		let wizard = Ext.create('PVE.ceph.CephInstallWizard', {
 		    nodename: view.nodename,
 		});
-		wizzard.getViewModel().set('isInstalled', this.getViewModel().get('isInstalled'));
-		wizzard.show();
-		view.mon(wizzard, 'beforeClose', function() {
+		wizard.getViewModel().set('isInstalled', this.getViewModel().get('isInstalled'));
+		wizard.show();
+		view.mon(wizard, 'beforeClose', function() {
 		    view.fireEvent("cephInstallWindowClosed");
 		    view.close();
 		});

From d801ff78c07c209b46239a50e1aa4bbfa4f75002 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Wed, 17 Jul 2024 14:16:48 +0200
Subject: [PATCH 22/55] guest import: fix attaced typo in translatable string

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 www/manager6/window/GuestImport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js
index 4bedc211f..2577ece23 100644
--- a/www/manager6/window/GuestImport.js
+++ b/www/manager6/window/GuestImport.js
@@ -929,7 +929,7 @@ Ext.define('PVE.window.GuestImport', {
 	let renderWarning = w => {
 	    const warningsCatalogue = {
 		'cdrom-image-ignored': gettext("CD-ROM images cannot get imported, if required you can reconfigure the '{0}' drive in the 'Advanced' tab."),
-		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attaced as SCSI"),
+		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attached as SCSI"),
 		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, scsi hardware was set to '{1}'"),
 		'serial-port-socket-only': gettext("Serial socket '{0}' will be mapped to a socket"),
 		'guest-is-running': gettext('Virtual guest seems to be running on source host. Import might fail or have inconsistent state!'),

From ef7e0ee2b2a50c77bb6b8ee779f22e08be9d4e0d Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Wed, 17 Jul 2024 14:16:49 +0200
Subject: [PATCH 23/55] makefile: fix waring typo

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 bin/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/Makefile b/bin/Makefile
index 180a91b55..82d5c633c 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -68,7 +68,7 @@ pve7to8.1:
 	printf ".TH PVE7TO8 1\n.SH NAME\npve7to8 \- Proxmox VE upgrade checker script for 7.4+ to current 8.x\n" > $@.tmp
 	printf ".SH DESCRIPTION\nThis tool will help you to detect common pitfalls and misconfguration\
 	 before, and during the upgrade of a Proxmox VE system\n" >> $@.tmp
-	printf "Any failure must be addressed before the upgrade, and any waring must be addressed, \
+	printf "Any failure must be addressed before the upgrade, and any warning must be addressed, \
 	 or at least carefully evaluated, if a false-positive is suspected\n" >> $@.tmp
 	printf ".SH SYNOPSIS\npve7to8 [--full]\n" >> $@.tmp
 	mv $@.tmp $@

From 641cc888b5bd1abfdd462819021da71c523bb08a Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Wed, 17 Jul 2024 14:16:50 +0200
Subject: [PATCH 24/55] ceph: osd: fix canot typo

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 PVE/API2/Ceph/OSD.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm
index 2893456af..5e39eed7a 100644
--- a/PVE/API2/Ceph/OSD.pm
+++ b/PVE/API2/Ceph/OSD.pm
@@ -323,7 +323,7 @@ __PACKAGE__->register_method ({
 	# 'ceph-volume lvm batch' and they don't make a lot of sense on fast NVMEs anyway.
 	if ($param->{'osds-per-device'}) {
 	    for my $type ( qw(db_dev wal_dev) ) {
-		raise_param_exc({ $type => "canot use 'osds-per-device' parameter with '${type}'" })
+		raise_param_exc({ $type => "cannot use 'osds-per-device' parameter with '${type}'" })
 		    if $param->{$type};
 	    }
 	}

From ec0aff2abb83730f3e569ec943b502a0142367b7 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <c.heiss@proxmox.com>
Date: Wed, 17 Jul 2024 14:49:50 +0200
Subject: [PATCH 25/55] www: utils: fix `maxcpu` validity check in
 render_hostcpu()

Comparing with Proxmox.Utils.render_cpu() seems just a slight oversight
in the condition. Fix it by aligning it with how it is done in
Proxmox.Utils.render_cpu() for consistency.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 www/manager6/Utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 74e466944..b2fb3ac32 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1074,7 +1074,7 @@ Ext.define('PVE.Utils', {
 	}
 	var maxcpu = node.data.maxcpu || 1;
 
-	if (!Ext.isNumeric(maxcpu) && (maxcpu >= 1)) {
+	if (!Ext.isNumeric(maxcpu) || maxcpu < 1) {
 	    return '';
 	}
 

From 7b524c5e3b8c30c65a49d20928da552c161c725b Mon Sep 17 00:00:00 2001
From: Christoph Heiss <c.heiss@proxmox.com>
Date: Wed, 17 Jul 2024 14:49:51 +0200
Subject: [PATCH 26/55] www: utils: fix inconsistency in host cpu usage display
 in search view

Between the number of CPUs and the actual label, a space was missing -
resulting in an inconsistency vs. the "CPU usage" column.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 www/manager6/Utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index b2fb3ac32..ca90e138f 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1079,8 +1079,9 @@ Ext.define('PVE.Utils', {
 	}
 
 	var per = (record.data.cpu/maxcpu) * record.data.maxcpu * 100;
+	const cpu_label = maxcpu > 1 ? 'CPUs' : 'CPU';
 
-	return per.toFixed(1) + '% of ' + maxcpu.toString() + (maxcpu > 1 ? 'CPUs' : 'CPU');
+	return `${per.toFixed(1)}% of ${maxcpu} ${cpu_label}`;
     },
 
     render_bandwidth: function(value) {

From 2989f3a9b8cba39f2cb46cf39fe6480619684200 Mon Sep 17 00:00:00 2001
From: Stefan Hanreich <s.hanreich@proxmox.com>
Date: Wed, 17 Jul 2024 15:06:03 +0200
Subject: [PATCH 27/55] sdn: ipam: fix editing custom mappings

Currently custom mappings cannot be edited, due to them having no VMID
value. The VMID parameter was always sent by the frontend to the
update call - even if it was empty - leading to validation failure on
the backend. Fix this by only sending the vmid parameter when it is
actually set.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 www/manager6/tree/DhcpTree.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/www/manager6/tree/DhcpTree.js b/www/manager6/tree/DhcpTree.js
index d0b80803d..6868bb60d 100644
--- a/www/manager6/tree/DhcpTree.js
+++ b/www/manager6/tree/DhcpTree.js
@@ -156,15 +156,20 @@ Ext.define('PVE.sdn.DhcpTree', {
 	openEditWindow: function(data) {
 	    let me = this;
 
+	    let extraRequestParams = {
+		mac: data.mac,
+		zone: data.zone,
+		vnet: data.vnet,
+	    };
+
+	    if (data.vmid) {
+		extraRequestParams.vmid = data.vmid;
+	    }
+
 	    Ext.create('PVE.sdn.IpamEdit', {
 		autoShow: true,
 		mapping: data,
-		extraRequestParams: {
-		    vmid: data.vmid,
-		    mac: data.mac,
-		    zone: data.zone,
-		    vnet: data.vnet,
-		},
+		extraRequestParams,
 		listeners: {
 		    destroy: () => me.reload(),
 		},

From 9477cb4b76149983933bb51242f50b9fc3a4b5e7 Mon Sep 17 00:00:00 2001
From: Aaron Lauterer <a.lauterer@proxmox.com>
Date: Wed, 10 Jul 2024 14:42:59 +0200
Subject: [PATCH 28/55] api: ceph mds: avoid creating MDS when ID starts with
 number

Ceph MDS IDs cannot start with a number [0].

[0] https://docs.ceph.com/en/latest/man/8/ceph-mds/

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
Tested-by: Christoph Heiss <c.heiss@proxmox.com>
Reviewed-by: Christoph Heiss <c.heiss@proxmox.com>
---
 PVE/API2/Ceph/MDS.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PVE/API2/Ceph/MDS.pm b/PVE/API2/Ceph/MDS.pm
index 6fc0ae450..d99eebe6b 100644
--- a/PVE/API2/Ceph/MDS.pm
+++ b/PVE/API2/Ceph/MDS.pm
@@ -133,6 +133,8 @@ __PACKAGE__->register_method ({
 
 	my $mds_id = $param->{name} // $nodename;
 
+	die "ID of the MDS cannot start with a number!\n" if ($mds_id =~ /^[0-9]/);
+
 	my $worker = sub {
 	    my $timeout = PVE::Ceph::Tools::get_config('long_rados_timeout');
 	    my $rados = PVE::RADOS->new(timeout => $timeout);

From 0fd676f902f28457556fcf930d5cff2d7c7994ca Mon Sep 17 00:00:00 2001
From: Aaron Lauterer <a.lauterer@proxmox.com>
Date: Wed, 10 Jul 2024 14:43:00 +0200
Subject: [PATCH 29/55] fix #5570 ui: ceph: make MDS ID configurable

Since the ID of an MDS cannot start with a number [0], we cannot just
use the hostname in all situations, as they are allowed to start with
a number.

By having an extra field for the MDS ID, we can check for that via a
regex. This field is filled with the hostname when the host on which
it should be installed is selected.

This means, we can remove the extra ID field, as additional MDS, and
their unique ID can be set with the new ID field.

[0] https://docs.ceph.com/en/latest/man/8/ceph-mds/

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
Tested-by: Christoph Heiss <c.heiss@proxmox.com>
Reviewed-by: Christoph Heiss <c.heiss@proxmox.com>
 [ TL: use camelCase for local serviceID variable ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 www/manager6/ceph/ServiceList.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/www/manager6/ceph/ServiceList.js b/www/manager6/ceph/ServiceList.js
index 767101465..32d1d6c64 100644
--- a/www/manager6/ceph/ServiceList.js
+++ b/www/manager6/ceph/ServiceList.js
@@ -13,18 +13,17 @@ Ext.define('PVE.CephCreateService', {
 	me.nodename = node;
 	me.updateUrl();
     },
-    setExtraID: function(extraID) {
+    setServiceID: function(value) {
 	let me = this;
-	me.extraID = me.type === 'mds' ? `-${extraID}` : '';
+	me.serviceID = value;
 	me.updateUrl();
     },
     updateUrl: function() {
 	let me = this;
-
-	let extraID = me.extraID ?? '';
 	let node = me.nodename;
+	let serviceID = me.serviceID ?? me.nodename;
 
-	me.url = `/nodes/${node}/ceph/${me.type}/${node}${extraID}`;
+	me.url = `/nodes/${node}/ceph/${me.type}/${serviceID}`;
     },
 
     defaults: {
@@ -40,15 +39,17 @@ Ext.define('PVE.CephCreateService', {
 	    listeners: {
 		change: function(f, value) {
 		    let view = this.up('pveCephCreateService');
+		    view.lookup('mds-id').setValue(value);
 		    view.setNode(value);
 		},
 	    },
 	},
 	{
 	    xtype: 'textfield',
-	    fieldLabel: gettext('Extra ID'),
-	    regex: /[a-zA-Z0-9]+/,
-	    regexText: gettext('ID may only consist of alphanumeric characters'),
+	    reference: 'mds-id',
+	    fieldLabel: gettext('MDS ID'),
+	    regex: /^([a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?)$/,
+	    regexText: gettext('ID may consist of alphanumeric characters and hyphen. It cannot start with a number or end in a hyphen.'),
 	    submitValue: false,
 	    emptyText: Proxmox.Utils.NoneText,
 	    cbind: {
@@ -58,7 +59,7 @@ Ext.define('PVE.CephCreateService', {
 	    listeners: {
 		change: function(f, value) {
 		    let view = this.up('pveCephCreateService');
-		    view.setExtraID(value);
+		    view.setServiceID(value);
 		},
 	    },
 	},
@@ -73,7 +74,7 @@ Ext.define('PVE.CephCreateService', {
 	    cbind: {
 		hidden: get => get('type') !== 'mds',
 	    },
-	    html: gettext('The Extra ID allows creating multiple MDS per node, which increases redundancy with more than one CephFS.'),
+	    html: gettext('By using different IDs, you can have multiple MDS per node, which increases redundancy with more than one CephFS.'),
 	},
     ],
 

From d69d4ed8cb276b492a5fe7883f94db777e06d2b2 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 22 Jul 2024 18:54:15 +0200
Subject: [PATCH 30/55] ui: cephfs: disallow blank field for now required MDS
 ID

while the ID part was formerly added to the nodename, and thus could
be completely left out, it's now used as full ID, so it must not be
empty as otherwise one gets an error from the API.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 www/manager6/ceph/ServiceList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/ceph/ServiceList.js b/www/manager6/ceph/ServiceList.js
index 32d1d6c64..2dd80c14a 100644
--- a/www/manager6/ceph/ServiceList.js
+++ b/www/manager6/ceph/ServiceList.js
@@ -51,7 +51,7 @@ Ext.define('PVE.CephCreateService', {
 	    regex: /^([a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?)$/,
 	    regexText: gettext('ID may consist of alphanumeric characters and hyphen. It cannot start with a number or end in a hyphen.'),
 	    submitValue: false,
-	    emptyText: Proxmox.Utils.NoneText,
+	    allowBlank: false,
 	    cbind: {
 		disabled: get => get('type') !== 'mds',
 		hidden: get => get('type') !== 'mds',

From 76ed490012e6c747a07f32a97898f50d5dac0c92 Mon Sep 17 00:00:00 2001
From: Aaron Lauterer <a.lauterer@proxmox.com>
Date: Tue, 9 Jul 2024 13:41:16 +0200
Subject: [PATCH 31/55] fix #5010: ceph: pool set only changed properties

By only setting properties that have changed, we can avoid potential
errors in the task.

For example, if one configures the "nosizechange" property on a pool,
to prevent accidental size changes, the task will now only error if
the user is actually trying to change the size.

Prior to this patch, we would always try to set all parameters, even if
they were the same value. In the above example, this would result in the
task ending in error state, as we are not allowed to change the size.

To disable size changing you can run the following command:
 ceph osd pool set {pool} nosizechange 1

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
Reviewed-by: Christoph Heiss <c.heiss@proxmox.com>
Tested-by: Christoph Heiss <c.heiss@proxmox.com>
---
 PVE/Ceph/Tools.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm
index 903133538..ee16161c4 100644
--- a/PVE/Ceph/Tools.pm
+++ b/PVE/Ceph/Tools.pm
@@ -285,9 +285,17 @@ sub set_pool {
     my $keys = [ grep { $_ ne 'size' } sort keys %$param ];
     unshift @$keys, 'size' if exists $param->{size};
 
+    my $current_properties = get_pool_properties($pool, $rados);
+
     for my $setting (@$keys) {
 	my $value = $param->{$setting};
 
+	if (defined($current_properties->{$setting}) && $value eq $current_properties->{$setting}) {
+	    print "skipping '${setting}', did not change\n";
+	    delete $param->{$setting};
+	    next;
+	}
+
 	print "pool $pool: applying $setting = $value\n";
 	if (my $err = $set_pool_setting->($pool, $setting, $value, $rados)) {
 	    print "$err";

From f5a97f1f5da7ea281643bea09a142443acb147e2 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 8 Jul 2024 11:38:01 +0200
Subject: [PATCH 32/55] api: jobs: vzdump: pass job 'job-id' parameter

This allows us to access the backup job id in the send_notification
function, where we can set it as metadata for the notification.
The 'job-id' parameter can only be used by 'root@pam' to prevent
abuse. This has the side effect that manually triggered backup jobs
cannot have the 'job-id' parameter at the moment. To mitigate that,
manually triggered backup jobs could be changed so that they
are not performed by a direct API call by the UI, but by requesting
pvescheduler to execute the job in the near future (similar to how
manually triggered replication jobs work).

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
 [ TL: fleece in d/control bump for guest-common now that the version
   is known ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/API2/Backup.pm |  2 +-
 PVE/API2/VZDump.pm | 13 +++++++++++--
 PVE/Jobs/VZDump.pm |  4 +++-
 PVE/VZDump.pm      |  6 +++---
 debian/control     |  2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm
index 881403238..48598b8f4 100644
--- a/PVE/API2/Backup.pm
+++ b/PVE/API2/Backup.pm
@@ -45,7 +45,7 @@ sub assert_param_permission_common {
     my ($rpcenv, $user, $param, $is_delete) = @_;
     return if $user eq 'root@pam'; # always OK
 
-    for my $key (qw(tmpdir dumpdir script)) {
+    for my $key (qw(tmpdir dumpdir script job-id)) {
 	raise_param_exc({ $key => "Only root may set this option."}) if exists $param->{$key};
     }
 
diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm
index 7f92e7ec4..15c9b0dcd 100644
--- a/PVE/API2/VZDump.pm
+++ b/PVE/API2/VZDump.pm
@@ -42,8 +42,8 @@ __PACKAGE__->register_method ({
     permissions => {
 	description => "The user needs 'VM.Backup' permissions on any VM, and "
 	    ."'Datastore.AllocateSpace' on the backup storage (and fleecing storage when fleecing "
-	    ."is used). The 'tmpdir', 'dumpdir' and 'script' parameters are restricted to the "
-	    ."'root\@pam' user. The 'maxfiles' and 'prune-backups' settings require "
+	    ."is used). The 'tmpdir', 'dumpdir', 'script' and 'job-id' parameters are restricted "
+	    ."to the 'root\@pam' user. The 'maxfiles' and 'prune-backups' settings require "
 	    ."'Datastore.Allocate' on the backup storage. The 'bwlimit', 'performance' and "
 	    ."'ionice' parameters require 'Sys.Modify' on '/'.",
 	user => 'all',
@@ -53,6 +53,15 @@ __PACKAGE__->register_method ({
     parameters => {
 	additionalProperties => 0,
 	properties => PVE::VZDump::Common::json_config_properties({
+	    'job-id' => {
+		description => "The ID of the backup job. If set, the 'backup-job' metadata field"
+		    . " of the backup notification will be set to this value. Only root\@pam"
+		    . " can set this parameter.",
+		type => 'string',
+		format => 'pve-configid',
+		maxLength => 256,
+		optional => 1,
+	    },
 	    stdout => {
 		type => 'boolean',
 		description => "Write tar to stdout, not to a file.",
diff --git a/PVE/Jobs/VZDump.pm b/PVE/Jobs/VZDump.pm
index b8e57945c..2dad3f55f 100644
--- a/PVE/Jobs/VZDump.pm
+++ b/PVE/Jobs/VZDump.pm
@@ -12,7 +12,7 @@ use PVE::API2::VZDump;
 use base qw(PVE::VZDump::JobBase);
 
 sub run {
-    my ($class, $conf) = @_;
+    my ($class, $conf, $job_id) = @_;
 
     my $props = $class->properties();
     # remove all non vzdump related options
@@ -20,6 +20,8 @@ sub run {
 	delete $conf->{$opt} if !defined($props->{$opt});
     }
 
+    $conf->{'job-id'} = $job_id;
+
     # Required as string parameters # FIXME why?! we could just check ref()
     for my $key (keys $PVE::VZDump::Common::PROPERTY_STRINGS->%*) {
 	if ($conf->{$key} && ref($conf->{$key}) eq 'HASH') {
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 8dbcc4a92..f1a6b2206 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -483,6 +483,7 @@ sub send_notification {
     my ($self, $tasklist, $total_time, $err, $detail_pre, $detail_post) = @_;
 
     my $opts = $self->{opts};
+    my $job_id = $opts->{'job-id'};
     my $mailto = $opts->{mailto};
     my $cmdline = $self->{cmdline};
     my $policy = $opts->{mailnotification} // 'always';
@@ -528,13 +529,12 @@ sub send_notification {
     };
 
     my $fields = {
-	# TODO: There is no straight-forward way yet to get the
-	# backup job id here... (I think pvescheduler would need
-	# to pass that to the vzdump call?)
 	type => "vzdump",
 	# Hostname (without domain part)
 	hostname => PVE::INotify::nodename(),
     };
+    # Add backup-job metadata field in case this is a backup job.
+    $fields->{'job-id'} = $job_id if $job_id;
 
     my $severity = $failed ? "error" : "info";
     my $email_configured = $mailto && scalar(@$mailto);
diff --git a/debian/control b/debian/control
index d4c254d44..9dced68f0 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,7 @@ Depends: apt (>= 1.5~),
          libpve-cluster-api-perl (>= 7.0-5),
          libpve-cluster-perl (>= 7.2-3),
          libpve-common-perl (>= 8.2.0),
-         libpve-guest-common-perl (>= 5.1.0),
+         libpve-guest-common-perl (>= 5.1.4),
          libpve-http-server-perl (>= 4.1-1),
          libpve-notify-perl (>= 8.0.5),
          libpve-rs-perl (>= 0.7.1),

From a0f4fb98235d6cdb565ea94f0f5755b5a12ae409 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 8 Jul 2024 11:38:02 +0200
Subject: [PATCH 33/55] ui: dc: backup: allow to set custom job id in advanced
 settings

This might be useful if somebody wants to match on the new
'backup-job' field in a notification match rule.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
---
 www/manager6/dc/Backup.js                   |  4 ----
 www/manager6/panel/BackupAdvancedOptions.js | 23 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index 4ba80b315..381402ca6 100644
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -45,10 +45,6 @@ Ext.define('PVE.dc.BackupEdit', {
 		Proxmox.Utils.assemble_field_data(values, { 'delete': 'notification-target' });
 	    }
 
-	    if (!values.id && isCreate) {
-		values.id = 'backup-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
-	    }
-
 	    let selMode = values.selMode;
 	    delete values.selMode;
 
diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
index f6822c0aa..baa35e7f1 100644
--- a/www/manager6/panel/BackupAdvancedOptions.js
+++ b/www/manager6/panel/BackupAdvancedOptions.js
@@ -37,6 +37,10 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
 	    return {};
 	}
 
+	if (!formValues.id && me.isCreate) {
+	    formValues.id = 'backup-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
+	}
+
 	let options = {};
 
 	if (!me.isCreate) {
@@ -108,6 +112,25 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
     },
 
     items: [
+	{
+	    xtype: 'pveTwoColumnContainer',
+	    startColumn: {
+		xtype: 'pmxDisplayEditField',
+		vtype: 'ConfigId',
+		fieldLabel: gettext('Job ID'),
+		emptyText: gettext('Autogenerate'),
+		name: 'id',
+		allowBlank: true,
+		cbind: {
+		    editable: '{isCreate}',
+		},
+	    },
+	    endFlex: 2,
+	    endColumn: {
+		xtype: 'displayfield',
+		value: gettext('Can be used in notification matchers to match this job.'),
+	    },
+	},
 	{
 	    xtype: 'pveTwoColumnContainer',
 	    startColumn: {

From 7d004d69f0c2af2f185f48b95dff581339031236 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 8 Jul 2024 11:38:03 +0200
Subject: [PATCH 34/55] api: notification: add API for getting known metadata
 fields/values

This new API route returns known notification metadata fields and
a list of known possible values. This will be used by the UI to
provide suggestions when adding/modifying match rules.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
---
 PVE/API2/Cluster/Notifications.pm | 139 ++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm
index 68fdda2ae..2b202c281 100644
--- a/PVE/API2/Cluster/Notifications.pm
+++ b/PVE/API2/Cluster/Notifications.pm
@@ -79,12 +79,151 @@ __PACKAGE__->register_method ({
 	    { name => 'endpoints' },
 	    { name => 'matchers' },
 	    { name => 'targets' },
+	    { name => 'matcher-fields' },
+	    { name => 'matcher-field-values' },
 	];
 
 	return $result;
     }
 });
 
+__PACKAGE__->register_method ({
+    name => 'get_matcher_fields',
+    path => 'matcher-fields',
+    method => 'GET',
+    description => 'Returns known notification metadata fields',
+    permissions => {
+	check => ['or',
+	    ['perm', '/mapping/notifications', ['Mapping.Modify']],
+	    ['perm', '/mapping/notifications', ['Mapping.Audit']],
+	],
+    },
+    protected => 0,
+    parameters => {
+	additionalProperties => 0,
+	properties => {},
+    },
+    returns => {
+	type => 'array',
+	items => {
+	    type => 'object',
+	    properties => {
+		name => {
+		    description => 'Name of the field.',
+		    type => 'string',
+		},
+	    },
+	},
+	links => [ { rel => 'child', href => '{name}' } ],
+    },
+    code => sub {
+	# TODO: Adapt this API handler once we have a 'notification registry'
+
+	my $result = [
+	    { name => 'type' },
+	    { name => 'hostname' },
+	    { name => 'job-id' },
+	];
+
+	return $result;
+    }
+});
+
+__PACKAGE__->register_method ({
+    name => 'get_matcher_field_values',
+    path => 'matcher-field-values',
+    method => 'GET',
+    description => 'Returns known notification metadata fields and their known values',
+    permissions => {
+	check => ['or',
+	    ['perm', '/mapping/notifications', ['Mapping.Modify']],
+	    ['perm', '/mapping/notifications', ['Mapping.Audit']],
+	],
+    },
+    protected => 1,
+    parameters => {
+	additionalProperties => 0,
+    },
+    returns => {
+	type => 'array',
+	items => {
+	    type => 'object',
+	    properties => {
+		'value' => {
+		    description => 'Notification metadata value known by the system.',
+		    type => 'string'
+		},
+		'comment' => {
+		    description => 'Additional comment for this value.',
+		    type => 'string',
+		    optional => 1,
+		},
+		'field' => {
+		    description => 'Field this value belongs to.',
+		    type => 'string',
+		},
+	    },
+	},
+    },
+    code => sub {
+	# TODO: Adapt this API handler once we have a 'notification registry'
+	my $rpcenv = PVE::RPCEnvironment::get();
+	my $user = $rpcenv->get_user();
+
+	my $values = [
+	    {
+		value => 'package-updates',
+		field => 'type',
+	    },
+	    {
+		value => 'fencing',
+		field => 'type',
+	    },
+	    {
+		value => 'replication',
+		field => 'type',
+	    },
+	    {
+		value => 'vzdump',
+		field => 'type',
+	    },
+	    {
+		value => 'system-mail',
+		field => 'type',
+	    },
+	];
+
+	# Here we need a manual permission check.
+	if ($rpcenv->check($user, "/", ["Sys.Audit"], 1)) {
+	    for my $backup_job (@{PVE::API2::Backup->index({})}) {
+		push @$values, {
+		    value => $backup_job->{id},
+		    comment => $backup_job->{comment},
+		    field => 'job-id'
+		};
+	    }
+	}
+	# The API call returns only returns jobs for which the user
+	# has adequate permissions.
+	for my $sync_job (@{PVE::API2::ReplicationConfig->index({})}) {
+	    push @$values, {
+		value => $sync_job->{id},
+		comment => $sync_job->{comment},
+		field => 'job-id'
+	    };
+	}
+
+	for my $node (@{PVE::Cluster::get_nodelist()}) {
+	    push @$values, {
+		value => $node,
+		field => 'hostname',
+	    }
+	}
+
+	return $values;
+    }
+});
+
 __PACKAGE__->register_method ({
     name => 'endpoints_index',
     path => 'endpoints',

From cb8c1ae7c8048429e6da463ea548f7adb60eda16 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 8 Jul 2024 11:38:04 +0200
Subject: [PATCH 35/55] ui: utils: add overrides for translatable notification
 fields/values

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
---
 www/manager6/Utils.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index ca90e138f..db86fa9a3 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -2061,6 +2061,17 @@ Ext.define('PVE.Utils', {
 	    zfscreate: [gettext('ZFS Storage'), gettext('Create')],
 	    zfsremove: ['ZFS Pool', gettext('Remove')],
 	});
+
+	Proxmox.Utils.overrideNotificationFieldName({
+	    'job-id': gettext('Job ID'),
+	});
+
+	Proxmox.Utils.overrideNotificationFieldValue({
+	    'package-updates': gettext('Package updates are available'),
+	    'vzdump': gettext('Backup notifications'),
+	    'replication': gettext('Replication job notifications'),
+	    'fencing': gettext('Node fencing notifications'),
+	});
     },
 
 });

From 876e531ad7e1d11240f94d833d363f604ed3d79c Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 8 Jul 2024 11:38:05 +0200
Subject: [PATCH 36/55] d/control: bump proxmox-widget-toolkit dependency to
 4.1.4

We need
  "utils: add mechanism to add and override translatable notification
  event descriptions in the product specific UIs"
otherwise there is an error in the browser console.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 9dced68f0..b86daa356 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 13),
                libtemplate-perl,
                libtest-mockmodule-perl,
                lintian,
-               proxmox-widget-toolkit (>= 4.0.7),
+               proxmox-widget-toolkit (>= 4.1.4),
                pve-cluster,
                pve-container,
                pve-doc-generator (>= 8.0.5),

From fcf103ffd435cefa17e6cf0a9eec520716b314e2 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Fri, 26 Jul 2024 09:40:17 +0200
Subject: [PATCH 37/55] ui: resource mappings: fix editing of mapping for non
 first node

when editing the pci mapping, we set the nodename of the pci/usbselector
to the selected node. At the same time we disable and hide the node
selector, but it still changes it's value to the 'first' node
(alphabetically sorted) and that triggers a change event.

To prevent that we accidentally set the node of the pci/usbselector
too, we need to check here if the field is disabled.

There seems to be a race when loading the nodes for the nodeselector
which leads to inconsistent behaviour, so this was only encountered for
the pciselector, but theoretically it could also happen for the
usbselector so adding that condition to both.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/window/PCIMapEdit.js | 6 ++++--
 www/manager6/window/USBMapEdit.js | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/www/manager6/window/PCIMapEdit.js b/www/manager6/window/PCIMapEdit.js
index d43f04eb2..faf58255f 100644
--- a/www/manager6/window/PCIMapEdit.js
+++ b/www/manager6/window/PCIMapEdit.js
@@ -126,8 +126,10 @@ Ext.define('PVE.window.PCIMapEditWindow', {
 	    this.lookup('pciselector').setMdev(value);
 	},
 
-	nodeChange: function(_field, value) {
-	    this.lookup('pciselector').setNodename(value);
+	nodeChange: function(field, value) {
+	    if (!field.isDisabled()) {
+		this.lookup('pciselector').setNodename(value);
+	    }
 	},
 
 	pciChange: function(_field, value) {
diff --git a/www/manager6/window/USBMapEdit.js b/www/manager6/window/USBMapEdit.js
index 358f0778b..69a400266 100644
--- a/www/manager6/window/USBMapEdit.js
+++ b/www/manager6/window/USBMapEdit.js
@@ -101,9 +101,11 @@ Ext.define('PVE.window.USBMapEditWindow', {
 	    usbsel.setDisabled(!value);
 	},
 
-	nodeChange: function(_field, value) {
-	    this.lookup('id').setNodename(value);
-	    this.lookup('path').setNodename(value);
+	nodeChange: function(field, value) {
+	    if (!field.isDisabled()) {
+		this.lookup('id').setNodename(value);
+		this.lookup('path').setNodename(value);
+	    }
 	},
 
 

From ef3c6d04d16743a7206c21f38fd95e2e9562b145 Mon Sep 17 00:00:00 2001
From: Stefan Hanreich <s.hanreich@proxmox.com>
Date: Fri, 22 Dec 2023 11:43:16 +0100
Subject: [PATCH 38/55] sdn: vnets: hide irrelevant fields depending on zone
 type

Not all fields in the VnetEdit dialog are necessary for every zone
type. This lead to confusion for some users. Hide fields in the
VNetEdit dialog depending on which kind of zone is selected in order
to prevent potential confusion.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Tested-by: Theodor Fumics <theodor.fumics@gmx.net>
Reviewed-by: Theodor Fumics <theodor.fumics@gmx.net>
---
 www/manager6/form/SDNZoneSelector.js |  2 +-
 www/manager6/sdn/VnetEdit.js         | 40 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/www/manager6/form/SDNZoneSelector.js b/www/manager6/form/SDNZoneSelector.js
index 28c3457d2..0d0327529 100644
--- a/www/manager6/form/SDNZoneSelector.js
+++ b/www/manager6/form/SDNZoneSelector.js
@@ -40,7 +40,7 @@ Ext.define('PVE.form.SDNZoneSelector', {
 }, function() {
     Ext.define('pve-sdn-zone', {
 	extend: 'Ext.data.Model',
-	fields: ['zone'],
+	fields: ['zone', 'type'],
 	proxy: {
             type: 'proxmox',
 	    url: "/api2/json/cluster/sdn/zones",
diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js
index cdd83ed40..9fb6cd6c7 100644
--- a/www/manager6/sdn/VnetEdit.js
+++ b/www/manager6/sdn/VnetEdit.js
@@ -12,6 +12,13 @@ Ext.define('PVE.sdn.VnetInputPanel', {
 	return values;
     },
 
+    initComponent: function() {
+	let me = this;
+
+	me.callParent();
+	me.setZoneType(undefined);
+    },
+
     items: [
 	{
 	    xtype: 'pmxDisplayEditField',
@@ -40,9 +47,21 @@ Ext.define('PVE.sdn.VnetInputPanel', {
 	    name: 'zone',
 	    value: '',
 	    allowBlank: false,
+	    listeners: {
+		change: function() {
+		    let me = this;
+
+		    let record = me.findRecordByValue(me.value);
+		    let zoneType = record?.data?.type;
+
+		    let panel = me.up('panel');
+		    panel.setZoneType(zoneType);
+		},
+	    },
 	},
 	{
 	    xtype: 'proxmoxintegerfield',
+	    itemId: 'sdnVnetTagField',
 	    name: 'tag',
 	    minValue: 1,
 	    maxValue: 16777216,
@@ -54,6 +73,7 @@ Ext.define('PVE.sdn.VnetInputPanel', {
 	},
 	{
 	    xtype: 'proxmoxcheckbox',
+	    itemId: 'sdnVnetVlanAwareField',
 	    name: 'vlanaware',
 	    uncheckedValue: null,
 	    checked: false,
@@ -63,6 +83,26 @@ Ext.define('PVE.sdn.VnetInputPanel', {
 	    },
 	},
     ],
+
+    setZoneType: function(zoneType) {
+	let me = this;
+
+	let tagField = me.down('#sdnVnetTagField');
+	if (!zoneType || zoneType === 'simple') {
+	    tagField.setVisible(false);
+	    tagField.setValue('');
+	} else {
+	    tagField.setVisible(true);
+	}
+
+	let vlanField = me.down('#sdnVnetVlanAwareField');
+	if (!zoneType || zoneType === 'evpn') {
+	    vlanField.setVisible(false);
+	    vlanField.setValue('');
+	} else {
+	    vlanField.setVisible(true);
+	}
+    },
 });
 
 Ext.define('PVE.sdn.VnetEdit', {

From b5600e66838db39de74d892098fe865557c96b40 Mon Sep 17 00:00:00 2001
From: Igor Thaller <igor.thaller@aon.at>
Date: Wed, 31 Jul 2024 14:14:09 +0200
Subject: [PATCH 39/55] ui: dc summary: fix calculation of storage size

The issue is related to the 'Summary' tab under 'Datacenter' inside a
cluster. To get a steady reading of the storage size data, the
frontend requests the '/api2/json/cluster/resources' every three
seconds to retrieve the necessary data to calculate the used and total
storage size.

The problem occurs when a shared storage is defined and a node goes
offline. As the node is not online, it cannot report the shared
storage size (both used and total) back to the other nodes. The order
of the JSON response is not always the same, so it is possible that
the offline node will appear first. Consequently, the frontend will
display the wrong total and used storage. This is because the shared
storage data has both the maximum disk size and the used disk set to
zero when the node is offline. This causes the total and used space
data to be calculated and displayed incorrectly, leading to
fluctuations in the displayed percentage of used disk space.

To fix this, add a conditional check to skip the storage report if its
status is 'unknown' (regardless of if the storage is local or shared).
This prevents the unreliable data from being processed.

Reported-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Igor Thaller <igor.thaller@aon.at>
---
 www/manager6/dc/Summary.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/manager6/dc/Summary.js b/www/manager6/dc/Summary.js
index efb44daed..ae3f95661 100644
--- a/www/manager6/dc/Summary.js
+++ b/www/manager6/dc/Summary.js
@@ -170,6 +170,11 @@ Ext.define('PVE.dc.Summary', {
 			} else if (countedStorage[sid]) {
 			    break;
 			}
+
+			if (data.status === "unknown") {
+			    break;
+			}
+
 			used += data.disk;
 			total += data.maxdisk;
 			countedStorage[sid] = true;

From e6efc75389c04dd02dbbf9b593058ec10e891f8b Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Tue, 6 Aug 2024 15:09:38 +0200
Subject: [PATCH 40/55] ui: backup job detail: fix wrong gettext

'suspend' mode should not be shown as `gettext('Snapshot')`

reported in the forum:
https://forum.proxmox.com/threads/152365/

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/dc/BackupJobDetail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/dc/BackupJobDetail.js b/www/manager6/dc/BackupJobDetail.js
index d00006b5b..85bb036a0 100644
--- a/www/manager6/dc/BackupJobDetail.js
+++ b/www/manager6/dc/BackupJobDetail.js
@@ -238,7 +238,7 @@ Ext.define('PVE.dc.BackupInfo', {
 		const modeToDisplay = {
 		    snapshot: gettext('Snapshot'),
 		    stop: gettext('Stop'),
-		    suspend: gettext('Snapshot'),
+		    suspend: gettext('Suspend'),
 		};
 		return modeToDisplay[value] ?? gettext('Unknown');
 	    },

From 5732ad658435abecbc25586eff4050cb4fe3b496 Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 12 Aug 2024 10:36:05 +0200
Subject: [PATCH 41/55] pvestatd: store subsystem status data in a shared cache

This commit adds a new module PVE::PullMetric. This module allows
us to store the status data of various subsystems, including status
data for the most recent pvestatd update loops. Right now, we
store 6 old generations - including the most recent values, that gives
70 seconds of stat history (based on a 10 second pvestatd update loop
interval).

This cache allows us to add support for pull-style metric collection
systems, be it Prometheus/OpenMetrics or some custom, JSON based
metric format.

This patch raises the required lib{proxmox,pve}-perl-rs version
requirements, since we need the new bindings for proxmox-shared-cache.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
[WB: actually bump *runtime* deps in d/control]
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 PVE/Makefile            |  1 +
 PVE/PullMetric.pm       | 54 +++++++++++++++++++++++++++++++++++++++++
 PVE/Service/pvestatd.pm | 33 +++++++++++++++++++------
 debian/control          |  8 +++---
 4 files changed, 84 insertions(+), 12 deletions(-)
 create mode 100644 PVE/PullMetric.pm

diff --git a/PVE/Makefile b/PVE/Makefile
index 660de4d02..efcb250d0 100644
--- a/PVE/Makefile
+++ b/PVE/Makefile
@@ -13,6 +13,7 @@ PERLSOURCE = 			\
 	HTTPServer.pm		\
 	Jobs.pm			\
 	NodeConfig.pm		\
+	PullMetric.pm		\
 	Report.pm		\
 	VZDump.pm
 
diff --git a/PVE/PullMetric.pm b/PVE/PullMetric.pm
new file mode 100644
index 000000000..c7cc12fb8
--- /dev/null
+++ b/PVE/PullMetric.pm
@@ -0,0 +1,54 @@
+package PVE::PullMetric;
+use strict;
+use warnings;
+
+use Proxmox::RS::SharedCache;
+use PVE::Network;
+
+use constant OLD_GENERATIONS => 180;
+use constant LOCK_TIMEOUT => 2;
+
+my $cache;
+my $get_cache = sub {
+    if (!defined($cache)) {
+
+	my $uid = getpwnam('root');
+	my $gid = getgrnam('www-data');
+
+	$cache = Proxmox::RS::SharedCache->new({
+		path => "/run/pve/metrics",
+		owner => $uid,
+		group => $gid,
+		entry_mode =>  0640, # Entry permissions
+		keep_old => OLD_GENERATIONS,
+	    }
+	);
+    }
+
+    return $cache;
+};
+
+# Return the number of generations stored by the metrics cache
+sub max_generations {
+    # Number of old stats plus the most recent ones
+    return OLD_GENERATIONS + 1;
+}
+
+sub transaction_start {
+    return {};
+}
+
+sub transaction_finish {
+    my ($txn) = @_;
+
+    $get_cache->()->set($txn, 2);
+}
+
+sub update {
+    my ($txn, $subsystem, $data, $timestamp) = @_;
+
+    $txn->{$subsystem}->{data} = $data;
+    $txn->{$subsystem}->{timestamp} = $timestamp;
+}
+
+1;
diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm
index 458f22f77..7fa003feb 100755
--- a/PVE/Service/pvestatd.pm
+++ b/PVE/Service/pvestatd.pm
@@ -31,6 +31,7 @@ use PVE::Ceph::Tools;
 use PVE::pvecfg;
 
 use PVE::ExtMetric;
+use PVE::PullMetric;
 use PVE::Status::Plugin;
 
 use base qw(PVE::Daemon);
@@ -147,7 +148,7 @@ my sub broadcast_static_node_info {
 }
 
 sub update_node_status {
-    my ($status_cfg) = @_;
+    my ($status_cfg, $pull_txn) = @_;
 
     my ($uptime) = PVE::ProcFSTools::read_proc_uptime();
 
@@ -199,6 +200,8 @@ sub update_node_status {
     PVE::ExtMetric::update_all($transactions, 'node', $nodename, $node_metric, $ctime);
     PVE::ExtMetric::transactions_finish($transactions);
 
+    PVE::PullMetric::update($pull_txn, 'node', $node_metric, $ctime);
+
     broadcast_static_node_info($maxcpu, $meminfo->{memtotal});
 }
 
@@ -231,7 +234,7 @@ sub auto_balloning {
 }
 
 sub update_qemu_status {
-    my ($status_cfg) = @_;
+    my ($status_cfg, $pull_txn) = @_;
 
     my $ctime = time();
     my $vmstatus = PVE::QemuServer::vmstatus(undef, 1);
@@ -261,6 +264,8 @@ sub update_qemu_status {
     }
 
     PVE::ExtMetric::transactions_finish($transactions);
+
+    PVE::PullMetric::update($pull_txn, 'qemu', $vmstatus, $ctime);
 }
 
 sub remove_stale_lxc_consoles {
@@ -440,7 +445,7 @@ sub rebalance_lxc_containers {
 }
 
 sub update_lxc_status {
-    my ($status_cfg) = @_;
+    my ($status_cfg, $pull_txn) = @_;
 
     my $ctime = time();
     my $vmstatus = PVE::LXC::vmstatus();
@@ -469,10 +474,12 @@ sub update_lxc_status {
 	PVE::ExtMetric::update_all($transactions, 'lxc', $vmid, $d, $ctime, $nodename);
     }
     PVE::ExtMetric::transactions_finish($transactions);
+
+    PVE::PullMetric::update($pull_txn, 'lxc', $vmstatus, $ctime);
 }
 
 sub update_storage_status {
-    my ($status_cfg) = @_;
+    my ($status_cfg, $pull_txn) = @_;
 
     my $cfg = PVE::Storage::config();
     my $ctime = time();
@@ -492,6 +499,8 @@ sub update_storage_status {
 	PVE::ExtMetric::update_all($transactions, 'storage', $nodename, $storeid, $d, $ctime);
     }
     PVE::ExtMetric::transactions_finish($transactions);
+
+    PVE::PullMetric::update($pull_txn, 'storage', $info, $ctime);
 }
 
 sub rotate_authkeys {
@@ -532,6 +541,8 @@ sub update_status {
     # correct list in case of an unexpected crash.
     my $rpcenv = PVE::RPCEnvironment::get();
 
+    my $pull_txn = PVE::PullMetric::transaction_start();
+
     eval {
 	my $tlist = $rpcenv->active_workers();
 	PVE::Cluster::broadcast_tasklist($tlist);
@@ -542,19 +553,19 @@ sub update_status {
     my $status_cfg = PVE::Cluster::cfs_read_file('status.cfg');
 
     eval {
-	update_node_status($status_cfg);
+	update_node_status($status_cfg, $pull_txn);
     };
     $err = $@;
     syslog('err', "node status update error: $err") if $err;
 
     eval {
-	update_qemu_status($status_cfg);
+	update_qemu_status($status_cfg, $pull_txn);
     };
     $err = $@;
     syslog('err', "qemu status update error: $err") if $err;
 
     eval {
-	update_lxc_status($status_cfg);
+	update_lxc_status($status_cfg, $pull_txn);
     };
     $err = $@;
     syslog('err', "lxc status update error: $err") if $err;
@@ -566,7 +577,7 @@ sub update_status {
     syslog('err', "lxc cpuset rebalance error: $err") if $err;
 
     eval {
-	update_storage_status($status_cfg);
+	update_storage_status($status_cfg, $pull_txn);
     };
     $err = $@;
     syslog('err', "storage status update error: $err") if $err;
@@ -600,6 +611,12 @@ sub update_status {
     };
     $err = $@;
     syslog('err', "version info update error: $err") if $err;
+
+    eval {
+	PVE::PullMetric::transaction_finish($pull_txn);
+    };
+    $err = $@;
+    syslog('err', "could not populate metric data cache: $err") if $err;
 }
 
 my $next_update = 0;
diff --git a/debian/control b/debian/control
index b86daa356..d844cc15d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
                libhttp-daemon-perl,
                libpod-parser-perl,
                libproxmox-acme-perl,
-               libproxmox-rs-perl (>= 0.2.0),
+               libproxmox-rs-perl (>= 0.3.4),
                libpve-access-control (>= 8.0.7),
                libpve-cluster-api-perl,
                libpve-cluster-perl (>= 6.1-6),
@@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13),
                libpve-guest-common-perl (>= 5.1.1),
                libpve-http-server-perl (>= 2.0-12),
                libpve-notify-perl,
-               libpve-rs-perl (>= 0.7.1),
+               libpve-rs-perl (>= 0.8.10),
                libpve-storage-perl (>= 6.3-2),
                libtemplate-perl,
                libtest-mockmodule-perl,
@@ -56,7 +56,7 @@ Depends: apt (>= 1.5~),
          libnet-dns-perl,
          libproxmox-acme-perl,
          libproxmox-acme-plugins,
-         libproxmox-rs-perl (>= 0.2.0),
+         libproxmox-rs-perl (>= 0.3.4),
          libpve-access-control (>= 8.1.3),
          libpve-cluster-api-perl (>= 7.0-5),
          libpve-cluster-perl (>= 7.2-3),
@@ -64,7 +64,7 @@ Depends: apt (>= 1.5~),
          libpve-guest-common-perl (>= 5.1.4),
          libpve-http-server-perl (>= 4.1-1),
          libpve-notify-perl (>= 8.0.5),
-         libpve-rs-perl (>= 0.7.1),
+         libpve-rs-perl (>= 0.8.10),
          libpve-storage-perl (>= 8.1.5),
          librados2-perl (>= 1.3-1),
          libtemplate-perl,

From 073b53ae716416c6536a7bc790cb7a0685c995ff Mon Sep 17 00:00:00 2001
From: Lukas Wagner <l.wagner@proxmox.com>
Date: Mon, 12 Aug 2024 10:36:06 +0200
Subject: [PATCH 42/55] metrics: add /cluster/metrics/export endpoint

This new endpoint returns node, storage and guest metrics in JSON
format. The endpoint supports history/max-age parameters, allowing
the caller to query the recent metric history as recorded by the
PVE::PullMetric module.

The returned data format is quite simple, being an array of
metric records, including a value, a metric name, an id to identify
the object (e.g. qemu/100, node/foo), a timestamp and a type
('gauge', 'derive', ...). The latter property makes the format
self-describing and aids the metric collector in choosing a
representation for storing the metric data.

    [
        ...
        {
            "metric": "cpu_avg1",
            "value": 0.12,
            "timestamp": 170053205,
            "id": "node/foo",
            "type": "gauge"
        },
        ...
    ]

Some experiments were made in regards to making the format
more 'efficient', e.g. by grouping based on timestamps/ids, resulting
in a much more nested/complicated data format. While that
certainly reduces the size of the raw JSON response by quite a bit,
after GZIP compression the differences are negligible (the
simple, flat data format as described above compresses by a factor
of 25 for large clusters!). Also, the slightly increased CPU load
of compressing the larger amount of data when e.g. polling once a
minute is so small that it's indistinguishable from noise in relation
to a usual hypervisor workload. Thus the simpler, format was
chosen. One benefit of this format is that it is more or less already
the exact same format as the one Prometheus uses, but in JSON format -
so adding a Prometheus metric scraping endpoint should not be much
work at all.

The API endpoint collects metrics for the whole cluster by calling
the same endpoint for all cluster nodes. To avoid endless request
recursion, the 'local-only' request parameter is provided. If this
parameter is set, the endpoint implementation will only return metrics
for the local node, avoiding a loop.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
[WB: remove unused $start_time leftover from benchmarks]
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 PVE/API2/Cluster/MetricServer.pm | 183 +++++++++++++++++++++++++++++++
 PVE/PullMetric.pm                | 171 +++++++++++++++++++++++++++++
 2 files changed, 354 insertions(+)

diff --git a/PVE/API2/Cluster/MetricServer.pm b/PVE/API2/Cluster/MetricServer.pm
index 882cda101..209b92a75 100644
--- a/PVE/API2/Cluster/MetricServer.pm
+++ b/PVE/API2/Cluster/MetricServer.pm
@@ -6,8 +6,11 @@ use strict;
 use PVE::Tools qw(extract_param extract_sensitive_params);
 use PVE::Exception qw(raise_perm_exc raise_param_exc);
 use PVE::JSONSchema qw(get_standard_option);
+use PVE::INotify;
 use PVE::RPCEnvironment;
 use PVE::ExtMetric;
+use PVE::PullMetric;
+use PVE::SafeSyslog;
 
 use PVE::RESTHandler;
 
@@ -288,4 +291,184 @@ __PACKAGE__->register_method ({
 	return;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'export',
+    path => 'export',
+    method => 'GET',
+    protected => 1,
+    description => "Retrieve metrics of the cluster.",
+    permissions => {
+	check => ['perm', '/', ['Sys.Audit']],
+    },
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    'local-only' => {
+		type => 'boolean',
+		description =>
+		    'Only return metrics for the current node instead of the whole cluster',
+		optional => 1,
+		default => 0,
+	    },
+	    'start-time' => {
+		type => 'integer',
+		description => 'Only include metrics with a timestamp > start-time.',
+		optional => 1,
+		default => 0,
+	    },
+	    'history' => {
+		type => 'boolean',
+		description => 'Also return historic values.'
+		  . ' Returns full available metric history unless `start-time` is also set',
+		optional => 1,
+		default => 0,
+	    },
+	},
+    },
+    returns => {
+	type => 'object',
+	additionalProperties => 0,
+	properties => {
+	    data => {
+		type => 'array',
+		description => 'Array of system metrics. Metrics are sorted by their timestamp.',
+		items => {
+		    type => 'object',
+		    additionalProperties => 0,
+		    properties => {
+			timestamp => {
+			    type => 'integer',
+			    description => 'Time at which this metric was observed',
+			},
+			id => {
+			    type => 'string',
+			    description => "Unique identifier for this metric object,"
+				. " for instance 'node/<nodename>' or"
+				. " 'qemu/<vmid>'."
+			},
+			metric => {
+			    type => 'string',
+			    description => "Name of the metric.",
+			},
+			value => {
+			    type => 'number',
+			    description => 'Metric value.',
+			},
+			type => {
+			    type => 'string',
+			    description => 'Type of the metric.',
+			    enum => [qw(gauge counter derive)],
+			}
+		    }
+		},
+
+	    },
+
+	}
+    },
+    code => sub {
+	my ($param) = @_;
+	my $local_only = $param->{'local-only'} // 0;
+	my $start = $param->{'start-time'};
+	my $history = $param->{'history'} // 0;
+
+	my $now = time();
+
+	my $generations;
+	if ($history) {
+	    # Assuming update loop time of pvestatd of 10 seconds.
+	    if (defined($start)) {
+		my $delta = $now - $start;
+		$generations = int($delta / 10);
+	    } else {
+		$generations = PVE::PullMetric::max_generations();
+	    }
+
+	} else {
+	    $generations = 0;
+	};
+
+	my @metrics = @{PVE::PullMetric::get_local_metrics($generations)};
+
+	if (defined($start)) {
+	    @metrics = grep {
+		$_->{timestamp} > ($start)
+	    } @metrics;
+	}
+
+	my $nodename = PVE::INotify::nodename();
+
+	# Fan out to cluster members
+	# Do NOT remove this check
+	if (!$local_only) {
+	    my $members = PVE::Cluster::get_members();
+
+	    my $rpcenv = PVE::RPCEnvironment::get();
+	    my $authuser = $rpcenv->get_user();
+
+	    my ($user, undef) = PVE::AccessControl::split_tokenid($authuser, 1);
+
+	    my $ticket;
+	    if ($user) {
+		# Theoretically, we might now bypass token privilege separation, since
+		# we use the regular user instead of the token, but
+		# since we already passed the permission check for this handler,
+		# this should be fine.
+		$ticket = PVE::AccessControl::assemble_ticket($user);
+	    } else {
+		$ticket = PVE::AccessControl::assemble_ticket($authuser);
+	    }
+
+	    for my $name (keys %$members) {
+		if ($name eq $nodename) {
+		    # Skip own node, for that one we already have the metrics
+		    next;
+		}
+
+		if (!$members->{$name}->{online}) {
+		    next;
+		}
+
+		my $status = eval {
+		    my $fingerprint = PVE::Cluster::get_node_fingerprint($name);
+		    my $ip = scalar(PVE::Cluster::remote_node_ip($name));
+
+		    my $conn_args = {
+			protocol => 'https',
+			host => $ip,
+			port => 8006,
+			ticket => $ticket,
+			timeout => 5,
+		    };
+
+		    $conn_args->{cached_fingerprints} = { $fingerprint => 1 };
+
+		    my $api_client = PVE::APIClient::LWP->new(%$conn_args);
+
+		    my $params = {
+			# Do NOT remove 'local-only' - potential for request recursion!
+			'local-only' => 1,
+			history => $history,
+		    };
+		    $params->{'start-time'} = $start if defined($start);
+
+		    $api_client->get('/cluster/metrics/export', $params);
+		};
+
+		if ($@) {
+		    syslog('warning', "could not fetch metrics from $name: $@");
+		} else {
+		    push @metrics, $status->{data}->@*;
+		}
+	    }
+	}
+
+	my @sorted = sort {$a->{timestamp} <=> $b->{timestamp}} @metrics;
+
+	return {
+	    data => \@sorted,
+	};
+    },
+});
+
 1;
diff --git a/PVE/PullMetric.pm b/PVE/PullMetric.pm
index c7cc12fb8..92f4daef1 100644
--- a/PVE/PullMetric.pm
+++ b/PVE/PullMetric.pm
@@ -51,4 +51,175 @@ sub update {
     $txn->{$subsystem}->{timestamp} = $timestamp;
 }
 
+my sub gauge {
+    my ($id, $timestamp, $metric, $value) = @_;
+
+    return {
+	metric => $metric,
+	id => $id,
+	value => $value + 0,
+	timestamp => $timestamp + 0,
+	type => 'gauge',
+    }
+}
+
+my sub derive {
+    my ($id, $timestamp, $metric, $value) = @_;
+
+    return {
+	metric => $metric,
+	id => $id,
+	value => $value + 0,
+	timestamp => $timestamp + 0,
+	type => 'derive',
+    }
+}
+
+my $nodename = PVE::INotify::nodename();
+
+my sub get_node_metrics {
+    my ($stats) = @_;
+
+    my $metrics = [];
+
+    my $data = $stats->{data};
+    my $timestamp = $stats->{timestamp};
+
+    my $id = "node/$nodename";
+
+    push @$metrics, gauge($id, $timestamp, "uptime", $data->{uptime});
+
+    my ($netin, $netout) = (0, 0);
+    for my $dev (grep { /^$PVE::Network::PHYSICAL_NIC_RE$/ } keys $data->{nics}->%*) {
+	$netin += $data->{nics}->{$dev}->{receive};
+	$netout += $data->{nics}->{$dev}->{transmit};
+    }
+    push @$metrics, derive($id, $timestamp, "net_in", $netin);
+    push @$metrics, derive($id, $timestamp, "net_out", $netout);
+
+    my $cpustat = $data->{cpustat};
+    push @$metrics, gauge($id, $timestamp, "cpu_avg1", $cpustat->{avg1});
+    push @$metrics, gauge($id, $timestamp, "cpu_avg5", $cpustat->{avg5});
+    push @$metrics, gauge($id, $timestamp, "cpu_avg15", $cpustat->{avg15});
+    push @$metrics, gauge($id, $timestamp, "cpu_max", $cpustat->{cpus});
+    push @$metrics, gauge($id, $timestamp, "cpu_current", $cpustat->{cpu});
+    push @$metrics, gauge($id, $timestamp, "cpu_iowait", $cpustat->{iowait});
+
+    my $memory = $data->{memory};
+    push @$metrics, gauge($id, $timestamp, "mem_total", $memory->{memtotal});
+    push @$metrics, gauge($id, $timestamp, "mem_used", $memory->{memused});
+    push @$metrics, gauge($id, $timestamp, "swap_total", $memory->{swaptotal});
+    push @$metrics, gauge($id, $timestamp, "swap_used", $memory->{swapused});
+
+    my $blockstat = $data->{blockstat};
+    my $dused = $blockstat->{blocks} - $blockstat->{bfree};
+    push @$metrics, gauge($id, $timestamp, "disk_total", $blockstat->{blocks});
+    push @$metrics, gauge($id, $timestamp, "disk_used", $dused);
+
+    return $metrics;
+}
+
+my sub get_qemu_metrics {
+    my ($stats) = @_;
+
+    my $metrics = [];
+
+    my $timestamp = $stats->{timestamp};
+
+    for my $vmid (keys $stats->{data}->%*) {
+	my $id = "qemu/$vmid";
+	my $guest_data = $stats->{data}->{$vmid};
+
+	if ($guest_data->{status} eq 'running') {
+	    push @$metrics, gauge($id, $timestamp, "cpu_current", $guest_data->{cpu});
+	    push @$metrics, gauge($id, $timestamp, "mem_used", $guest_data->{mem});
+	    push @$metrics, derive($id, $timestamp, "disk_read", $guest_data->{diskread});
+	    push @$metrics, derive($id, $timestamp, "disk_write", $guest_data->{diskwrite});
+	    push @$metrics, derive($id, $timestamp, "net_in", $guest_data->{netin});
+	    push @$metrics, derive($id, $timestamp, "net_out", $guest_data->{netout});
+	}
+
+	push @$metrics, gauge($id, $timestamp, "uptime", $guest_data->{uptime});
+	push @$metrics, gauge($id, $timestamp, "cpu_max", $guest_data->{cpus});
+	push @$metrics, gauge($id, $timestamp, "mem_total", $guest_data->{maxmem});
+	push @$metrics, gauge($id, $timestamp, "disk_total", $guest_data->{maxdisk});
+	# TODO: This one always seems to be 0?
+	# push @$metrics, num_metric("disk_used", $id, $guest_data->{disk}, $timestamp);
+    }
+
+    return $metrics;
+}
+
+my sub get_lxc_metrics {
+    my ($stats) = @_;
+
+    my $metrics = [];
+
+    my $timestamp = $stats->{timestamp};
+
+    for my $vmid (keys $stats->{data}->%*) {
+	my $id = "lxc/$vmid";
+	my $guest_data = $stats->{data}->{$vmid};
+
+	if ($guest_data->{status} eq 'running') {
+	    push @$metrics, gauge($id, $timestamp, "cpu_current", $guest_data->{cpu});
+	    push @$metrics, gauge($id, $timestamp, "mem_used", $guest_data->{mem});
+	    push @$metrics, derive($id, $timestamp, "disk_read", $guest_data->{diskread});
+	    push @$metrics, derive($id, $timestamp, "disk_write", $guest_data->{diskwrite});
+	    push @$metrics, derive($id, $timestamp, "net_in", $guest_data->{netin});
+	    push @$metrics, derive($id, $timestamp, "net_out", $guest_data->{netout});
+	    push @$metrics, gauge($id, $timestamp, "disk_used", $guest_data->{disk});
+	}
+
+	push @$metrics, gauge($id, $timestamp, "uptime", $guest_data->{uptime});
+	push @$metrics, gauge($id, $timestamp, "cpu_max", $guest_data->{cpus});
+	push @$metrics, gauge($id, $timestamp, "mem_total", $guest_data->{maxmem});
+	push @$metrics, gauge($id, $timestamp, "disk_total", $guest_data->{maxdisk});
+    }
+
+    return $metrics;
+}
+
+my sub get_storage_metrics {
+    my ($stats) = @_;
+
+    my $metrics = [];
+
+    my $timestamp = $stats->{timestamp};
+
+    for my $sid (keys $stats->{data}->%*) {
+	my $id = "storage/$nodename/$sid";
+	my $data = $stats->{data}->{$sid};
+
+	push @$metrics, gauge($id, $timestamp, "disk_total", $data->{total});
+	push @$metrics, gauge($id, $timestamp, "disk_used", $data->{used});
+    }
+
+    return $metrics;
+}
+
+# Return local metrics, including some recent history if needed.
+#
+sub get_local_metrics {
+    my ($history) = @_;
+
+    # If we do not provide the history parameter, set it to 0 -> only
+    # query most recent metrics from the cache.
+    $history = $history // 0;
+    $history = int($history);
+
+    my $metrics = [];
+
+    my $data = $get_cache->()->get_last($history);
+
+    for my $stat_gen ($data->@*) {
+	push @$metrics, get_node_metrics($stat_gen->{node})->@*;
+	push @$metrics, get_qemu_metrics($stat_gen->{qemu})->@*;
+	push @$metrics, get_lxc_metrics($stat_gen->{lxc})->@*;
+	push @$metrics, get_storage_metrics($stat_gen->{storage})->@*;
+    }
+
+    return $metrics;
+}
+
 1;

From 72c274754d88e50908d43645ab323ff338569351 Mon Sep 17 00:00:00 2001
From: Friedrich Weber <f.weber@proxmox.com>
Date: Mon, 5 Aug 2024 15:33:37 +0200
Subject: [PATCH 43/55] ui: qemu: hardware: fix permission check for adding
 tpmstate volume

Previously, the "Add -> TPM State" menu item in the GUI was disabled
if the user did not have Sys.Console privileges. This deviated from
the permission check in the backend, which does not require
Sys.Console but (among others) VM.Config.Disk.

Fix this inconsistency by checking for VM.Config.Disk in the frontend
instead of Sys.Console.

Reported in enterprise support.

Signed-off-by: Friedrich Weber <f.weber@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index e19026951..86d5f4cf3 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -593,7 +593,7 @@ Ext.define('PVE.qemu.HardwareView', {
 	    me.down('#addNet').setDisabled(noVMConfigNetPerm || isAtLimit('net'));
 	    me.down('#addRng').setDisabled(noSysConsolePerm || isAtLimit('rng'));
 	    efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk'));
-	    me.down('#addTpmState').setDisabled(noSysConsolePerm || isAtLimit('tpmstate'));
+	    me.down('#addTpmState').setDisabled(noVMConfigDiskPerm || isAtLimit('tpmstate'));
 	    me.down('#addCloudinitDrive').setDisabled(noVMConfigCDROMPerm || noVMConfigCloudinitPerm || hasCloudInit);
 
 	    if (!rec) {

From 218baa5ef72dbdeeaaa470f407309d39f6ab6514 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 12 Sep 2024 08:40:26 +0200
Subject: [PATCH 44/55] update shipped appliance info index

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 aplinfo/aplinfo.dat | 155 ++++++++++++++++++++------------------------
 1 file changed, 70 insertions(+), 85 deletions(-)

diff --git a/aplinfo/aplinfo.dat b/aplinfo/aplinfo.dat
index 49d70775c..c513effac 100644
--- a/aplinfo/aplinfo.dat
+++ b/aplinfo/aplinfo.dat
@@ -5,17 +5,17 @@ Description: News displayed on the admin interface
   <a href='https://www.proxmox.com' target='_blank'>www.proxmox.com</a>
 
 Package: almalinux-9-default
-Version: 20221108
+Version: 20240911
 Type: lxc
 OS: almalinux
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Architecture: amd64
-Location: system/almalinux-9-default_20221108_amd64.tar.xz
-md5sum: 03e6d335c14b96501bc39e7852da9772
-sha512sum: 9b4561fad0de45943c0c46d9a075796533b0941c442cb70a5f9a323a601aba41f2e5e86d5e1600e5538b1470cf29f0cfd9f7f7c54ca9529cb9cbe234f2c6f440
+Location: system/almalinux-9-default_20240911_amd64.tar.xz
+md5sum: aec3769056165ed72a2523e6a2e0b12f
+sha512sum: 4c3c5c2616b46fbb0b831a87669e6f323167c2f67cca487723ff3b00284309c547fec03d5e87678c3c6d306a764d9875fbcd01c46e1caf8203784c4957a907f0
 Infopage: https://linuxcontainers.org
-Description: LXC default image for almalinux 9 (20221108)
+Description: LXC default image for almalinux 9 (20240911)
 
 Package: alpine-3.18-default
 Version: 20230607
@@ -43,32 +43,45 @@ sha512sum: dec171b608802827a2b47ae6c473f71fdea5fae0064a7928749fc5a854a7220a3244e
 Infopage: https://linuxcontainers.org
 Description: LXC default image for alpine 3.19 (20240207)
 
+Package: alpine-3.20-default
+Version: 20240908
+Type: lxc
+OS: alpine
+Section: system
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Architecture: amd64
+Location: system/alpine-3.20-default_20240908_amd64.tar.xz
+md5sum: ea04f7220f47522341a1ac7c4a728344
+sha512sum: 8b675c373533c096ded4168edbf2fba2a6e3ed2d91a550b0d128e472d2a0d65a8f2e5e7dde772932d8d3fd9d93ca21b3e5e3b8a4c91bc479977e3f6ce1468ba9
+Infopage: https://linuxcontainers.org
+Description: LXC default image for alpine 3.20 (20240908)
+
 Package: archlinux-base
-Version: 20230608-1
+Version: 20240911-1
 Type: lxc
 OS: archlinux
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Architecture: amd64
-Location: system/archlinux-base_20230608-1_amd64.tar.zst
-md5sum: 581d33c1c8b71aa72df47d84285eef8e
-sha512sum: 7f1ece6ded3d8571da8e0e20695e68391bec7585746632c6d555c8a8ecff3611fd87cf136c823d33d795e2c9adae9501190796a6d54c097c134afb965c97600f
+Location: system/archlinux-base_20240911-1_amd64.tar.zst
+md5sum: 2c137021b89cc583297eed26b10f46dc
+sha512sum: 05b36399c801b774d9540ddbae6be6fc26803bc161e7888722f8f36c48569010e12392c6741bf263336b8542c59f18f67cf4f311d52b3b8dd58640efca765b85
 Infopage: https://www.archlinux.org
 Description: ArchLinux base image.
  ArchLinux template with the 'base' group and the 'openssh' package installed.
 
 Package: centos-9-stream-default
-Version: 20221109
+Version: 20240828
 Type: lxc
 OS: centos
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Architecture: amd64
-Location: system/centos-9-stream-default_20221109_amd64.tar.xz
-md5sum: 13fccdcc2358b795ee613501eb88c850
-sha512sum: 04bb902992f74edf2333d215837e9bb21258dfcdb7bf23bd659176641f6538aeb25bc44286c9caffb10ceb87288ce93668c9410f4a69b8a3b316e09032ead3a8
+Location: system/centos-9-stream-default_20240828_amd64.tar.xz
+md5sum: 159f3f7dd7e2d6188867e7fecb4b4bbd
+sha512sum: de6ec0a6ffc2e980d4baa11185765ba925822462f14c387b8e50ffda0f2281e8fb8bebc53c84d39b8073dd543ea98496685c828ab713f2ec0ba56dd25e6ddbef
 Infopage: https://linuxcontainers.org
-Description: LXC default image for centos 9-stream (20221109)
+Description: LXC default image for centos 9-stream (20240828)
 
 Package: debian-11-standard
 Version: 11.7-1
@@ -85,45 +98,32 @@ Description: Debian 11 Bullseye (standard)
  A small Debian Bullseye system including all standard packages.
 
 Package: debian-12-standard
-Version: 12.2-1
+Version: 12.7-1
 Type: lxc
 OS: debian-12
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Architecture: amd64
-Location: system/debian-12-standard_12.2-1_amd64.tar.zst
-md5sum: 0c40b2b49499c827bbf7db2d7a3efadc
-sha512sum: 1846c5e64253256832c6f7b8780c5cb241abada3ab0913940b831bf8f7f869220277f5551f0abeb796852e448c178be22bd44eb1af8c0be3d5a13decf943398a
+Location: system/debian-12-standard_12.7-1_amd64.tar.zst
+md5sum: 0b6959720ebd506b5ddb2fbf8780ca6c
+sha512sum: 39f6d06e082d6a418438483da4f76092ebd0370a91bad30b82ab6d0f442234d63fe27a15569895e34d6d1e5ca50319f62637f7fb96b98dbde4f6103cf05bff6d
 Infopage: https://pve.proxmox.com/wiki/Linux_Container#pct_supported_distributions
 Description: Debian 12 Bookworm (standard)
  A small Debian Bullseye system including all standard packages.
 
-Package: devuan-4.0-standard
-Version: 4.0
+Package: devuan-5.0-standard
+Version: 5.0
 Type: lxc
-OS: devuan-4.0
+OS: devuan-5.0
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Architecture: amd64
-Location: system/devuan-4.0-standard_4.0_amd64.tar.gz
-md5sum: 515a89407afd96c3128125b427366aa0
-sha512sum: af909d1c3af35a53d063bc273d7a9e7df08fb5a914432d7fba8cdd3271132cf8e7b2c53306d59ef01e53693081dd2127be2fb790d2ff5e98cb3e860f5d257d89
+Location: system/devuan-5.0-standard_5.0_amd64.tar.gz
+md5sum: 4e1aadd38db6f0ec628f7fa042cde11f
+sha512sum: a70bf2f0851d1ad55bf0c92808e1543173daf30ed6e0af792bc0288dde9b15a841f4eb3ad4440fdb88333250cdcf8f01a6ed446ba9354c33fda68523bd88a9b5
 Infopage: https://devuan.org
-Description: Devuan 4.0 (standard)
- A small Devuan Chimaera system including a minimal set of essential packages.
-
-Package: fedora-38-default
-Version: 20230607
-Type: lxc
-OS: fedora
-Section: system
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Architecture: amd64
-Location: system/fedora-38-default_20230607_amd64.tar.xz
-md5sum: 45bbf8c641320aa91f2c8cf52a5280cc
-sha512sum: 54328a3338ca9657d298a8a5d2ca15fe76f66fd407296d9e3e1c236ee60ea075d3406c175fdb46fe5c29e664224f2ce33bfe8cd1f634b7ea08d0183609d5e93c
-Infopage: https://linuxcontainers.org
-Description: LXC default image for fedora 38 (20230607)
+Description: Devuan 5 (standard)
+ A small Devuan Daedalus system including a minimal set of essential packages.
 
 Package: fedora-39-default
 Version: 20231118
@@ -138,6 +138,19 @@ sha512sum: 921cde6021e3c109e0d560b3e8ff4968c885fad8bcd8c2796d9ca733d362be8dd407d
 Infopage: https://linuxcontainers.org
 Description: LXC default image for fedora 39 (20231118)
 
+Package: fedora-40-default
+Version: 20240909
+Type: lxc
+OS: fedora
+Section: system
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Architecture: amd64
+Location: system/fedora-40-default_20240909_amd64.tar.xz
+md5sum: c4fc793117e000edb6835c7c863c8683
+sha512sum: 1d13bbebf18b01917c05e46e1d6d5ce4c8a8c015a510f9a526783e57e2b4821cd8f549abc8d080cba26377dfdb9094941e7a155acc4f5aced5ba3b682bb5b382
+Infopage: https://linuxcontainers.org
+Description: LXC default image for fedora 40 (20240909)
+
 Package: gentoo-current-openrc
 Version: 20231009
 Type: lxc
@@ -151,19 +164,6 @@ sha512sum: 40926859f0a777e8dfa7de10c76eb78ee92aa554e0598a09beec7f260ec7a02f19dfc
 Infopage: https://linuxcontainers.org
 Description: LXC openrc image for gentoo current (20231009)
 
-Package: opensuse-15.4-default
-Version: 20221109
-Type: lxc
-OS: opensuse
-Section: system
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Architecture: amd64
-Location: system/opensuse-15.4-default_20221109_amd64.tar.xz
-md5sum: 1c66c3549b0684e788c17aa94c384262
-sha512sum: 8089309652a0db23ddff826d1e343e79c6eccb7b615fb309e0a6f6f1983ea697aa94044a795f3cbe35156b1a1b2f60489eb20ecb54c786cec23c9fd89e0f29c5
-Infopage: https://linuxcontainers.org
-Description: LXC default image for opensuse 15.4 (20221109)
-
 Package: opensuse-15.5-default
 Version: 20231118
 Type: lxc
@@ -177,6 +177,19 @@ sha512sum: f3a6785c347da3867d074345b68db9c99ec2b269e454f715d234935014ca1dc9f7239
 Infopage: https://linuxcontainers.org
 Description: LXC default image for opensuse 15.5 (20231118)
 
+Package: opensuse-15.6-default
+Version: 20240910
+Type: lxc
+OS: opensuse
+Section: system
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Architecture: amd64
+Location: system/opensuse-15.6-default_20240910_amd64.tar.xz
+md5sum: c1de1a7a5fad45ee90bc4d5c98f2ad3f
+sha512sum: a0154162ef5128ebce176cab67d98b3d0c1db7bde92ac13e89b799de81a9b99f80d9f7afaf032a8247808a5d2d13261c5b7b9148fe03d60111666edfffc94523
+Infopage: https://linuxcontainers.org
+Description: LXC default image for opensuse 15.6 (20240910)
+
 Package: proxmox-mail-gateway-8.1-standard
 Version: 8.1-1
 Type: lxc
@@ -206,17 +219,17 @@ Description: Proxmox Mailgateway 7.3
  A full featured mail proxy for spam and virus filtering, optimized for container environment.
 
 Package: rockylinux-9-default
-Version: 20221109
+Version: 20240912
 Type: lxc
 OS: rockylinux
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Architecture: amd64
-Location: system/rockylinux-9-default_20221109_amd64.tar.xz
-md5sum: e6aa40bb6a4e01c61fd27eb3da5446d1
-sha512sum: ddc2a29ee66598d4c3a4224a0fa9868882e80bbabb7a20ae9f53431bb0ff73e73d4bd48b86bb0e9d1330e0af2c500f461ea5dc3c500ef722b472257acdc4ab41
+Location: system/rockylinux-9-default_20240912_amd64.tar.xz
+md5sum: 3a782d5d1c33d05eeff2e21579bdfae8
+sha512sum: 864bcf3f21fd8616d3cd9e2330f7372ad7b29b070b746c4a4bd73f372db7cc5d06f3e7058b5571379e8f6c3c9d987a3ea3b43559c12f63c7ef096e9afa9ead46
 Infopage: https://linuxcontainers.org
-Description: LXC default image for rockylinux 9 (20221109)
+Description: LXC default image for rockylinux 9 (20240912)
 
 Package: ubuntu-20.04-standard
 Version: 20.04-1
@@ -246,34 +259,6 @@ Infopage: https://pve.proxmox.com/wiki/Linux_Container#pct_supported_distributio
 Description: Ubuntu 22.04 Jammy (standard)
  A small Ubuntu 22.04 Jammy Jellyfish system including all standard packages.
 
-Package: ubuntu-23.04-standard
-Version: 23.04-1
-Type: lxc
-OS: ubuntu-23.04
-Section: system
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Architecture: amd64
-Location: system/ubuntu-23.04-standard_23.04-1_amd64.tar.zst
-md5sum: 5dee55750bd72e210be6603e3b87005b
-sha512sum: 6c7d916cc76865d5984b6b41e3d45426071967059ecc0a5d10029d2706cca0ea96a3c4f4dfcede08e7a86f73b9dfbd3d07ac86ee380b0f12be6c35e486033249
-Infopage: https://pve.proxmox.com/wiki/Linux_Container#pct_supported_distributions
-Description: Ubuntu 23.04 Lunar (standard)
- A small Ubuntu 23.04 Lunar Lobster system including all standard packages.
-
-Package: ubuntu-23.10-standard
-Version: 23.10-1
-Type: lxc
-OS: ubuntu-23.10
-Section: system
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Architecture: amd64
-Location: system/ubuntu-23.10-standard_23.10-1_amd64.tar.zst
-md5sum: 91b92c717f09d2172471b4c85a00aea3
-sha512sum: 84bcb7348ba86026176ed35e5b798f89cb64b0bcbe27081e3f97e3002a6ec34d836bbc1e1b1ce5f327151d1bc79cf1d08edf5a9d2b21a60ffa91e96284e5a67f
-Infopage: https://pve.proxmox.com/wiki/Linux_Container#pct_supported_distributions
-Description: Ubuntu 23.10 Mantic (standard)
- A small Ubuntu 23.10 Mantic Minotaur system including all standard packages.
-
 Package: ubuntu-24.04-standard
 Version: 24.04-2
 Type: lxc

From 12c0a597690805472d1d77993af1656094f991af Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 12 Sep 2024 14:37:28 +0200
Subject: [PATCH 45/55] bump version to 8.2.5

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 debian/changelog | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cccc1975a..6692a8a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,74 @@
+pve-manager (8.2.5) bookworm; urgency=medium
+
+  * ui: qemu hardware: use background delay for asynchronous remove tasks so
+    that the task log window doesn't get shown if the task already finished.
+
+  * ui: qemu hardware: use asynchronous remove API call for disk hot-unplug to
+    expand the task duration timeout from 30 seconds to 10 minutes, helping
+    overloaded and/or slow systems.
+
+  * vzdump config: add fleecing property string to make it clear that fleecing
+    can be configured as a node-wide default too.
+
+  * ui: fix align mode of the two-column container widget, which is used for
+    the advanced tab of the backup job edit window.
+
+  * vzdump: fix unit for bandwidth limit in log message, it's in KiB (base 2)
+    not KB (base 10)
+
+  * pve7to8: allow one to run arbitrary newer Proxmox kernels after upgrade
+
+  * api: replication: add 'job-id' to notification metadata to allow users to
+    create notification match rules for specific replication jobs.
+
+  * vzdump: apt: notification: do not include domain in 'hostname' field.
+
+  * api: replication: include 'hostname' field for notifications.
+
+  * pve7to8: fix typo in log message.
+
+  * ui: backup job: clarify experimental change detection modes.
+
+  * ui: fix `maxcpu` validity check in the host CPU renderer to add a missing
+    space, making it consistent with the CPU usage column.
+
+  * ui: utils: fix inconsistency in host cpu usage display in search view,
+    adding a missing space between the number of CPUs and the actual label.
+
+  * ui: sdn ipam: fix editing custom mappings
+
+  * api: ceph mds: ensure the ID for a new MDS does not start with a number,
+    as Ceph doesn't supports that.
+
+  * fix #5570 ui: ceph: make the MDS ID fully configurable to avoid a issue
+    when the hostname, which is was used as base for the ID, starts with a
+    number. This also made the "extra ID" field redundant.
+
+  * fix #5010: ceph: pool set only properties that actually changed to avoid
+    false-positive errors.
+
+  * api: backup jobs: pass the job ID parameter to make it accessible for the
+    notification system.
+
+  * ui: backup jobs: allow one to set custom job ID in advanced settings
+
+  * ui: resource mappings: fix editing of mapping for non first node
+
+  * ui: sdn vnets: hide irrelevant fields depending on zone type
+
+  * ui: dc summary: fix calculation of storage size when one or more nodes are
+    offline
+
+
+  * api: metrics: add /cluster/metrics/export endpoint
+
+  * ui: qemu: hardware: fix permission check for enabling the button to add a
+    TPM-state volume
+
+  * update shipped appliance info index
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Sep 2024 14:37:24 +0200
+
 pve-manager (8.2.4) bookworm; urgency=medium
 
   * pvestatd: clear trailing newlines

From ce602b2d5486503bea214813334f0295adebb671 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 16 Sep 2024 13:59:02 +0200
Subject: [PATCH 46/55] d/copyright: run wrap-and-sort -tkn

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 debian/copyright | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 218738096..19752ee0b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,10 +26,10 @@ http://www.sencha.com/license
 
 Open Source License
 ----------------------------------------------------------------------------
-This version of Ext JS is licensed under the terms of the 
-Open Source GPL 3.0 license. 
+This version of Ext JS is licensed under the terms of the
+Open Source GPL 3.0 license.
 
-http://www.gnu.org/licenses/gpl.html (/usr/share/common-licenses/GPL-3) 
+http://www.gnu.org/licenses/gpl.html (/usr/share/common-licenses/GPL-3)
 
 There are several FLOSS exceptions available for use with this release for
 open source applications that are distributed under a license other than GPL.

From bab934c4fa169d6ab4c2a9c367db14bcf1325da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Fri, 20 Sep 2024 11:05:05 +0200
Subject: [PATCH 47/55] vzdump jobs: make job ID a standard option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and put it into PVE::VZDump because there is a cycle between

PVE::Jobs::VZDump, PVE::API2::VZDump and PVE::API2::Backups

that prevents any of those containing it for now.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/Backup.pm | 18 ++++++------------
 PVE/VZDump.pm      | 10 ++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm
index 48598b8f4..f37e23931 100644
--- a/PVE/API2/Backup.pm
+++ b/PVE/API2/Backup.pm
@@ -10,7 +10,7 @@ use PVE::Tools qw(extract_param);
 use PVE::Cluster qw(cfs_lock_file cfs_read_file cfs_write_file);
 use PVE::RESTHandler;
 use PVE::RPCEnvironment;
-use PVE::JSONSchema;
+use PVE::JSONSchema qw(get_standard_option);
 use PVE::Storage;
 use PVE::Exception qw(raise_param_exc);
 use PVE::VZDump;
@@ -34,12 +34,6 @@ sub verify_day_of_week {
     die "invalid day '$value'\n";
 }
 
-my $vzdump_job_id_prop = {
-    type => 'string',
-    description => "The job ID.",
-    maxLength => 50
-};
-
 # NOTE: also used by the vzdump API call.
 sub assert_param_permission_common {
     my ($rpcenv, $user, $param, $is_delete) = @_;
@@ -142,7 +136,7 @@ __PACKAGE__->register_method({
 	items => {
 	    type => "object",
 	    properties => {
-		id => $vzdump_job_id_prop
+		id => get_standard_option('pve-backup-jobid'),
 	    },
 	},
 	links => [ { rel => 'child', href => "{id}" } ],
@@ -298,7 +292,7 @@ __PACKAGE__->register_method({
     parameters => {
     	additionalProperties => 0,
 	properties => {
-	    id => $vzdump_job_id_prop
+	    id => get_standard_option('pve-backup-jobid'),
 	},
     },
     returns => {
@@ -346,7 +340,7 @@ __PACKAGE__->register_method({
     parameters => {
     	additionalProperties => 0,
 	properties => {
-	    id => $vzdump_job_id_prop
+	    id => get_standard_option('pve-backup-jobid'),
 	},
     },
     returns => { type => 'null' },
@@ -412,7 +406,7 @@ __PACKAGE__->register_method({
     parameters => {
     	additionalProperties => 0,
 	properties => PVE::VZDump::Common::json_config_properties({
-	    id => $vzdump_job_id_prop,
+	    id => get_standard_option('pve-backup-jobid'),
 	    schedule => {
 		description => "Backup schedule. The format is a subset of `systemd` calendar events.",
 		type => 'string', format => 'pve-calendar-event',
@@ -570,7 +564,7 @@ __PACKAGE__->register_method({
     parameters => {
 	additionalProperties => 0,
 	properties => {
-	    id => $vzdump_job_id_prop
+	    id => get_standard_option('pve-backup-jobid'),
 	},
     },
     returns => {
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index f1a6b2206..44963a2d6 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -27,6 +27,16 @@ use PVE::VZDump::Plugin;
 use PVE::Tools qw(extract_param split_list);
 use PVE::API2Tools;
 
+# section config header/ID, this needs to cover UUIDs, user given values
+# and `$digest:$counter` values converted from vzdump.cron
+# TODO move to a better place once cycle
+# Jobs::VZDump -> API2::VZDump -> API2::Backups -> Jobs::VZDump is broken..
+PVE::JSONSchema::register_standard_option('pve-backup-jobid', {
+    type => 'string',
+    description => "The job ID.",
+    maxLength => 50,
+});
+
 my @posix_filesystems = qw(ext3 ext4 nfs nfs4 reiserfs xfs);
 
 my $lockfile = '/var/run/vzdump.lock';

From ad984948f9380672be54903dac1197249405e67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Fri, 20 Sep 2024 11:05:06 +0200
Subject: [PATCH 48/55] fix #5731: vzdump jobs: fix execution of converted jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

jobs converted from vzdump.cron have an ID of the format

$digest:$counter

where $digest is the hash of the vzdump.cron file, and $counter is the
position of the job within the crontab.

while the section config schema pretends jobs.cfg's section IDs are
of type pve-configid, that is not enforced anywhere, and the API
endpoints managing such jobs allowed arbitrary strings in the past.

the ':' character is not allowed by `pve-configid`, but it is by the
section config parsers and the Job API.

convert the API schema to use the unification of previous definition
used by the job API, and what the section config parser accepts.

Fixes: f5a97f1f5 (api: jobs: vzdump: pass job 'job-id' parameter)
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/VZDump.pm | 7 ++-----
 PVE/VZDump.pm      | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm
index 15c9b0dcd..6fcac5ba7 100644
--- a/PVE/API2/VZDump.pm
+++ b/PVE/API2/VZDump.pm
@@ -53,15 +53,12 @@ __PACKAGE__->register_method ({
     parameters => {
 	additionalProperties => 0,
 	properties => PVE::VZDump::Common::json_config_properties({
-	    'job-id' => {
+	    'job-id' => get_standard_option('pve-backup-jobid', {
 		description => "The ID of the backup job. If set, the 'backup-job' metadata field"
 		    . " of the backup notification will be set to this value. Only root\@pam"
 		    . " can set this parameter.",
-		type => 'string',
-		format => 'pve-configid',
-		maxLength => 256,
 		optional => 1,
-	    },
+	    }),
 	    stdout => {
 		type => 'boolean',
 		description => "Write tar to stdout, not to a file.",
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 44963a2d6..fd89945ee 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -35,6 +35,7 @@ PVE::JSONSchema::register_standard_option('pve-backup-jobid', {
     type => 'string',
     description => "The job ID.",
     maxLength => 50,
+    pattern => '\S+',
 });
 
 my @posix_filesystems = qw(ext3 ext4 nfs nfs4 reiserfs xfs);

From 414ce79a1d42d6bc4daf3c9978c378ba91e0a6e7 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 20 Sep 2024 17:47:21 +0200
Subject: [PATCH 49/55] bump version to 8.2.6

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6692a8a13..5bcbd764c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-manager (8.2.6) bookworm; urgency=medium
+
+  * fix #5731: vzdump jobs: fix execution of converted jobs
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Sep 2024 17:47:17 +0200
+
 pve-manager (8.2.5) bookworm; urgency=medium
 
   * ui: qemu hardware: use background delay for asynchronous remove tasks so

From 7641dcb6d9662ae9eed398c3597fef45d6a4999a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Thu, 19 Sep 2024 15:19:47 +0200
Subject: [PATCH 50/55] api: annotate download endpoints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

both the task and system log API endpoints support downloading the log data.

annotate the API method schema accordingly to allow passing the newly
introduced checks in the API handler that limit download functionality to
annotated endpoints.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/Nodes.pm | 1 +
 PVE/API2/Tasks.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 9920e9779..298570fda 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -906,6 +906,7 @@ __PACKAGE__->register_method({
 	check => ['perm', '/nodes/{node}', [ 'Sys.Syslog' ]],
     },
     protected => 1,
+    download => 1,
     parameters => {
 	additionalProperties => 0,
 	properties => {
diff --git a/PVE/API2/Tasks.pm b/PVE/API2/Tasks.pm
index 98cecf01b..67aaf1d75 100644
--- a/PVE/API2/Tasks.pm
+++ b/PVE/API2/Tasks.pm
@@ -327,6 +327,7 @@ __PACKAGE__->register_method({
 	user => 'all',
     },
     protected => 1,
+    download => 1,
     description => "Read task log.",
     proxyto => 'node',
     parameters => {

From 2e489489abd259fe7fa862d86a2cd487d1590a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Thu, 19 Sep 2024 15:19:48 +0200
Subject: [PATCH 51/55] pvesh: limit download handling to annotated endpoints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

to unify the behaviour with pve-http-server.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/CLI/pvesh.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm
index d373ae29f..4a340ed9d 100755
--- a/PVE/CLI/pvesh.pm
+++ b/PVE/CLI/pvesh.pm
@@ -351,7 +351,7 @@ sub call_api_method {
 
 	$data = $handler->handle($info, $param);
 
-	if (ref($data) eq 'HASH' && ref($data->{download}) eq 'HASH') {
+	if (ref($data) eq 'HASH' && ref($data->{download}) eq 'HASH' && $info->{download}) {
 	    $data = $handle_streamed_response->($data->{download})
 	}
     }

From 69698ccc63c67b9b1989bc1cb70d0c08acbc4956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Thu, 19 Sep 2024 15:19:49 +0200
Subject: [PATCH 52/55] download handling: adapt to method schema field rename
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/Nodes.pm | 2 +-
 PVE/API2/Tasks.pm | 2 +-
 PVE/CLI/pvesh.pm  | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 298570fda..e8ff6dd98 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -906,7 +906,7 @@ __PACKAGE__->register_method({
 	check => ['perm', '/nodes/{node}', [ 'Sys.Syslog' ]],
     },
     protected => 1,
-    download => 1,
+    download_allowed => 1,
     parameters => {
 	additionalProperties => 0,
 	properties => {
diff --git a/PVE/API2/Tasks.pm b/PVE/API2/Tasks.pm
index 67aaf1d75..b763b74d8 100644
--- a/PVE/API2/Tasks.pm
+++ b/PVE/API2/Tasks.pm
@@ -327,7 +327,7 @@ __PACKAGE__->register_method({
 	user => 'all',
     },
     protected => 1,
-    download => 1,
+    download_allowed => 1,
     description => "Read task log.",
     proxyto => 'node',
     parameters => {
diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm
index 4a340ed9d..0c21dd4e7 100755
--- a/PVE/CLI/pvesh.pm
+++ b/PVE/CLI/pvesh.pm
@@ -351,7 +351,12 @@ sub call_api_method {
 
 	$data = $handler->handle($info, $param);
 
-	if (ref($data) eq 'HASH' && ref($data->{download}) eq 'HASH' && $info->{download}) {
+	# TODO: remove 'download' check with PVE 9.0
+	if (
+	    ref($data) eq 'HASH'
+	    && ref($data->{download}) eq 'HASH'
+	    && ($info->{download_allowed} || $info->{download})
+	) {
 	    $data = $handle_streamed_response->($data->{download})
 	}
     }

From 50e7a31db3678c66884b2571b07fae235d9678bd Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 23 Sep 2024 11:24:42 +0200
Subject: [PATCH 53/55] d/control: bump versioned dependency of common and
 http-server

to ensure the 'dowload_allowed' schema property is understood.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 debian/control | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d844cc15d..336b11ea2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
                libpve-access-control (>= 8.0.7),
                libpve-cluster-api-perl,
                libpve-cluster-perl (>= 6.1-6),
-               libpve-common-perl (>= 8.1.2),
+               libpve-common-perl (>= 8.2.3),
                libpve-guest-common-perl (>= 5.1.1),
                libpve-http-server-perl (>= 2.0-12),
                libpve-notify-perl,
@@ -60,9 +60,9 @@ Depends: apt (>= 1.5~),
          libpve-access-control (>= 8.1.3),
          libpve-cluster-api-perl (>= 7.0-5),
          libpve-cluster-perl (>= 7.2-3),
-         libpve-common-perl (>= 8.2.0),
+         libpve-common-perl (>= 8.2.3),
          libpve-guest-common-perl (>= 5.1.4),
-         libpve-http-server-perl (>= 4.1-1),
+         libpve-http-server-perl (>= 5.1.1),
          libpve-notify-perl (>= 8.0.5),
          libpve-rs-perl (>= 0.8.10),
          libpve-storage-perl (>= 8.1.5),

From 3e0176e6bb2ade3b9031c4b179f29315fa8c4acf Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 23 Sep 2024 11:43:28 +0200
Subject: [PATCH 54/55] bump version to 8.2.7

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5bcbd764c..61bd8602f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pve-manager (8.2.7) bookworm; urgency=medium
+
+  * api: add missing schema annotations for download endpoints and adapt
+    existing ones to renaming the respective property to 'download_allowed'.
+
+  * pvesh: limit download handling to annotated endpoints to unify the
+    behaviour with pve-http-server.
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Sep 2024 11:43:24 +0200
+
 pve-manager (8.2.6) bookworm; urgency=medium
 
   * fix #5731: vzdump jobs: fix execution of converted jobs

From 5d24b7d37eb43fe782aaac8e2cf3f3765a6aaecd Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Mon, 23 Sep 2024 12:33:31 +0200
Subject: [PATCH 55/55] fix #5734: provide missing methods for Proxmox.Utils
 for mobile ui

since the mobile ui shares the Utils code with the desktop web ui, (but
not the proxmox-widget-toolkit) all methods used in constructors, etc.
there must be available in the mobile ui too.

We don't have any notification configuration options in the mobile ui,
and AFAIK we don't plan to add those there, so we can just implement
stub functions. This way the Utils constructor can proceed without
errors, fixing loading the mobile ui.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/mobile/WidgetToolkitUtils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/www/mobile/WidgetToolkitUtils.js b/www/mobile/WidgetToolkitUtils.js
index b292fcd5d..ea710faf1 100644
--- a/www/mobile/WidgetToolkitUtils.js
+++ b/www/mobile/WidgetToolkitUtils.js
@@ -586,6 +586,15 @@ utilities: {
 	}
     },
 
+    overrideNotificationFieldName: function(extra) {
+	// do nothing, we don't have notification configuration in mobile ui
+    },
+
+    overrideNotificationFieldValue: function(extra) {
+	// do nothing, we don't have notification configuration in mobile ui
+    },
+
+
     format_task_description: function(type, id) {
 	let farray = Proxmox.Utils.task_desc_table[type];
 	let text;