合并主库，同步更改日志

PVE/API2/Cluster.pm

@@ -295,13 +295,27 @@ __PACKAGE__->register_method({
 		    optional => 1,
 		    renderer => 'bytes',
 		},
+		netin => {
+		    description => "The amount of traffic in bytes that was sent to the guest over"
+			." the network since it was started. (for type 'qemu' and 'lxc')",
+		    type => 'integer',
+		    optional => 1,
+		    renderer => 'bytes',
+		},
+		netout => {
+		    description => "The amount of traffic in bytes that was sent from the guest over"
+			." the network since it was started. (for type 'qemu' and 'lxc')",
+		    type => 'integer',
+		    optional => 1,
+		    renderer => 'bytes',
+		},
 		level => {
 		    description => "Support level (when type == node).",
 		    type => 'string',
 		    optional => 1,
 		},
 		uptime => {
-		    description => "Node uptime in seconds (when type in node,qemu,lxc).",
+		    description => "Uptime of node or virtual guest in seconds (when type in node,qemu,lxc).",
 		    type => 'integer',
 		    optional => 1,
 		    renderer => 'duration',
@@ -325,6 +339,22 @@ __PACKAGE__->register_method({
 		    renderer => 'bytes',
 		    minimum => 0,
 		},
+		diskread => {
+		    description => "The amount of bytes the guest read from it's block devices since"
+			." the guest was started. This info is not available for all storage types."
+			." (for type 'qemu' and 'lxc')",
+		    type => 'integer',
+		    optional => 1,
+		    renderer => 'bytes',
+		},
+		diskwrite => {
+		    description => "The amount of bytes the guest wrote to it's block devices since"
+			." the guest was started. This info is not available for all storage types."
+			." (for type 'qemu' and 'lxc')",
+		    type => 'integer',
+		    optional => 1,
+		    renderer => 'bytes',
+		},
 		content => {
 		    description => "Allowed storage content types (when type == storage).",
 		    type => 'string',
@@ -345,6 +375,12 @@ __PACKAGE__->register_method({
 		    type => 'integer',
 		    optional => 1,
 		},
+		template => {
+		    description => "Determines if the guest is a template. (type in qemu,lxc)",
+		    type => 'boolean',
+		    optional => 1,
+		    default => 0,
+		},
 	    },
 	},
     },

PVE/API2/Subscription.pm

@@ -120,7 +120,72 @@ __PACKAGE__->register_method ({
 	    node => get_standard_option('pve-node'),
 	},
     },
-    returns => { type => 'object'},
+    returns => {
+	type => 'object',
+	additionalProperties => 0,
+	properties => {
+	    status => {
+		type => 'string',
+		enum => [qw(new notfound active invalid expired suspended)],
+		description => "The current subscription status.",
+	    },
+	    checktime => {
+		type => 'integer',
+		description => 'Timestamp of the last check done.',
+		optional => 1,
+	    },
+	    key => {
+		type => 'string',
+		description => 'The subscription key, if set and permitted to access.',
+		optional => 1,
+	    },
+	    level => {
+		type => 'string',
+		description => 'A short code for the subscription level.',
+		optional => 1,
+	    },
+	    message => {
+		type => 'string',
+		description => 'A more human readable status message.',
+		optional => 1,
+	    },
+	    nextduedate => {
+		type => 'string',
+		description => 'Next due date of the set subscription.',
+		optional => 1,
+	    },
+	    productname => {
+		type => 'string',
+		description => 'Human readable productname of the set subscription.',
+		optional => 1,
+	    },
+	    regdate => {
+		type => 'string',
+		description => 'Register date of the set subscription.',
+		optional => 1,
+	    },
+	    serverid => {
+		type => 'string',
+		description => 'The server ID, if permitted to access.',
+		optional => 1,
+	    },
+	    signature => {
+		type => 'string',
+		description => 'Signature for offline keys',
+		optional => 1,
+	    },
+	    sockets => {
+		type => 'integer',
+		description => 'The number of sockets for this host.',
+		optional => 1,
+	    },
+	    url => {
+		type => 'string',
+		description => 'URL to the web shop.',
+		optional => 1,
+	    },
+	},
+    },
     code => sub {
 	my ($param) = @_;
 

PVE/CLI/pveceph.pm

@@ -192,13 +192,13 @@ __PACKAGE__->register_method ({
 	    if ($param->{'allow-experimental'}) {
 		warn "NOTE: installing experimental/tech-preview Ceph release ${rendered_release}!\n";
 	    } elsif (-t STDOUT) {
-		print "Ceph ${rendered_release} is currently considered experimental for Proxmox VE - continue (y/N)? ";
+		print "Ceph ${rendered_release} is currently considered a technology preview for Proxmox VE - continue (y/N)? ";
 		my $answer = <STDIN>;
 		my $continue = defined($answer) && $answer =~ m/^\s*y(?:es)?\s*$/i;
 
 		die "Aborting installation as requested\n" if !$continue;
 	    } else {
-		die "refusing to instal experimental ceph release ${rendered_release} without 'allow-experimental' parameter!\n";
+		die "refusing to instal tech-preview ceph release ${rendered_release} without 'allow-experimental' parameter!\n";
 	    }
 	}
 

debian/changelog

@@ -1,3 +1,35 @@
+pve-manager (8.2.8-1) bookworm; urgency=medium
+
+  * 同步：合并主库,同步更新版本号为8.2.8-1
+
+  * 修复#5734：为移动UI提供Proxmox.Utils中缺失的方法
+
+  * API：订阅更新：如果删除ceph-auth文件失败，则报告错误
+
+  * 添加模块以集中跟踪后端Ceph版本信息
+
+  * pveceph：在TTY上提示用户安装实验版本
+
+  * Ceph版本：添加19.2 Squid作为可用版本，目前仍为技术预览版
+
+  * 修复#5753：API：在任务状态返回架构中添加'pstart'成员
+
+  * 修复#5302：UI：在硬件概览中显示虚拟机CPU亲和性
+
+  * 修正用户可见字符串中的拼写错误
+
+  * 修复#5632：UI：存储：更正备份视图的在线帮助链接
+
+  * UI：Ceph向导：为处于技术预览状态的版本显示提示
+
+  * UI：Ceph向导：为技术预览版本过滤掉企业存储库
+
+  * UI：Ceph向导：添加可安装的Ceph 19.2 Squid版本
+
+  * API：改进多个API调用的API JSON架构
+
+ -- Proxmox Support Team <ymwlpoolc@qq.com>  Fri, 25 Oct 2024 10:59:58 +0800
+
 pve-manager (8.2.7-1) bookworm; urgency=medium
 
   * 同步：合并主库,同步更新版本号为8.2.7-1
@@ -59,6 +91,37 @@ pve-manager (8.2.5-1) bookworm; urgency=medium
 
  -- Proxmox Support Team <ymwlpoolc@qq.com>  Tue, 17 Sep 2024 11:33:54 +0800
 
+pve-manager (8.2.8) bookworm; urgency=medium
+
+  * fix #5734: provide missing methods for Proxmox.Utils for mobile UI
+
+  * api: subscription update: report error if removing ceph-auth file fails
+
+  * add module to centrally track Ceph release info for the backend
+
+  * pveceph: prompt user on TTY about installing experimental version
+
+  * ceph releases: add 19.2 Squid as available release, currently still as
+    technology preview
+
+  * fix #5753: api: add 'pstart' member to task status return schema
+
+  * fix #5302: ui: vm cpu affinity displayed in hardware overview
+
+  * fix typos in user visible strings
+
+  * fix #5632: ui:storage: correct online help link of backup view
+
+  * ui: ceph wizard: show hint for releases that are in tech-preview state
+
+  * ui: ceph wizard: filter out enterprise repo for tech-preview releases
+
+  * ui: ceph wizard: add Ceph 19.2 Squid as installable release
+
+  * api: improve the API JSON schema of various API calls
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Oct 2024 16:47:02 +0200
+
 
 pve-manager (8.2.7) bookworm; urgency=medium
 

www/manager6/ceph/CephInstallWizard.js

@@ -51,6 +51,7 @@ Ext.define('PVE.ceph.CephVersionSelector', {
 	data: [
 	    { release: "quincy", version: "17.2" },
 	    { release: "reef", version: "18.2" },
+	    { release: "squid", version: "19.2", preview: true /* TODO: drop after stabilisation */ },
 	],
     },
 });
@@ -147,12 +148,13 @@ Ext.define('PVE.ceph.CephInstallWizard', {
     viewModel: {
 	data: {
 	    nodename: '',
-	    cephRelease: 'reef',
+	    cephRelease: 'reef', // default
 	    cephRepo: 'enterprise',
 	    configuration: true,
 	    isInstalled: false,
 	    nodeHasSubscription: true, // avoid warning hint until fully loaded
 	    allHaveSubscription: true, // avoid warning hint until fully loaded
+	    selectedReleaseIsTechPreview: false, // avoid warning hint until fully loaded
 	},
 	formulas: {
 	    repoHintHidden: get => get('allHaveSubscription') && get('cephRepo') === 'enterprise',
@@ -249,6 +251,17 @@ Ext.define('PVE.ceph.CephInstallWizard', {
 			hidden: '{repoHintHidden}',
 		    },
 		},
+		{
+		    xtype: 'displayfield',
+		    fieldLabel: gettext('Note'),
+		    labelClsExtra: 'pmx-hint',
+		    submitValue: false,
+		    labelWidth: 50,
+		    value: gettext('The selected release is currently considered a Technology Preview. Although we are not aware of any major issues, there may be some bugs and the Enterprise Repository is not yet available.'),
+		    bind: {
+			hidden: '{!selectedReleaseIsTechPreview}',
+		    },
+		},
 		{
 		    xtype: 'pveCephHighestVersionDisplay',
 		    labelWidth: 150,
@@ -281,15 +294,28 @@ Ext.define('PVE.ceph.CephInstallWizard', {
 			},
 			listeners: {
 			    change: function(field, release) {
+				let me = this;
 				let wizard = this.up('pveCephInstallWizard');
 				wizard.down('#next').setText(
 				    Ext.String.format(gettext('Start {0} installation'), release),
 				);
+
+				let record = me.store.findRecord('release', release, 0, false, true, true);
+				let releaseIsTechPreview = !!record.data.preview;
+				wizard.getViewModel().set('selectedReleaseIsTechPreview', releaseIsTechPreview);
+
+				let repoSelector = wizard.down('#repoSelector');
+				if (releaseIsTechPreview) {
+				    repoSelector.store.filterBy(entry => entry.get('key') !== 'enterprise');
+				} else {
+				    repoSelector.store.clearFilter();
+				}
 			    },
 			},
 		    },
 		    {
 			xtype: 'proxmoxKVComboBox',
+			id: 'repoSelector', // TODO: use name or reference (how to lookup that here?)
 			fieldLabel: gettext('Repository'),
 			padding: '0 0 0 10',
 			comboItems: [

www/manager6/lxc/DeviceEdit.js

@@ -95,6 +95,13 @@ Ext.define('PVE.lxc.DeviceInputPanel', {
 		return gettext("Access mode has to be an octal number");
 	    },
 	},
+	{
+	    xtype: 'checkbox',
+	    name: 'deny-write',
+	    fieldLabel: gettext('Read only'),
+	    labelWidth: 120,
+	    checked: false,
+	},
     ],
 });
 
@@ -145,6 +152,7 @@ Ext.define('PVE.lxc.DeviceEdit', {
 		    mode: data.mode,
 		    uid: data.uid,
 		    gid: data.gid,
+		    'deny-write': data['deny-write'],
 		};
 
 		ipanel.setValues(values);