From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EAB5360AC0 for ; Wed, 18 Nov 2020 11:04:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E8DDE19B61 for ; Wed, 18 Nov 2020 11:04:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 79FBA19B34 for ; Wed, 18 Nov 2020 11:04:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 48F2C43987 for ; Wed, 18 Nov 2020 11:04:25 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 18 Nov 2020 11:04:17 +0100 Message-Id: <20201118100420.21167-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201118100420.21167-1-f.ebner@proxmox.com> References: <20201118100420.21167-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.010 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [api2tools.pm, cluster.pm] Subject: [pve-devel] [PATCH v4 manager 1/4] cluster resources: include content type for storages X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2020 10:04:27 -0000 Signed-off-by: Fabian Ebner --- New in v4 PVE/API2/Cluster.pm | 6 ++++++ PVE/API2Tools.pm | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm index e768cbc6..8eb913b6 100644 --- a/PVE/API2/Cluster.pm +++ b/PVE/API2/Cluster.pm @@ -282,6 +282,12 @@ __PACKAGE__->register_method({ optional => 1, renderer => 'bytes', }, + content => { + description => "Allowed storage content types (when type == storage).", + type => 'string', + format => 'pve-storage-content-list', + optional => 1, + }, }, }, }, diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm index b90c5488..3e2626ae 100644 --- a/PVE/API2Tools.pm +++ b/PVE/API2Tools.pm @@ -14,6 +14,7 @@ use Digest::MD5 qw(md5_hex); use URI; use URI::Escape; use PVE::SafeSyslog; +use PVE::Storage::Plugin; my $hwaddress; @@ -120,6 +121,8 @@ sub extract_vm_stats { sub extract_storage_stats { my ($storeid, $scfg, $node, $rrd) = @_; + my $content = PVE::Storage::Plugin::content_hash_to_string($scfg->{content}); + my $entry = { id => "storage/$node/$storeid", storage => $storeid, @@ -127,6 +130,7 @@ sub extract_storage_stats { type => 'storage', status => 'unknown', shared => $scfg->{shared} || 0, + content => $content, }; if (my $d = $rrd->{"pve2-storage/$node/$storeid"}) { -- 2.20.1