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 E9D04CC11 for ; Tue, 12 Apr 2022 15:34:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E16B2101B3 for ; Tue, 12 Apr 2022 15:34:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 7FAB310151 for ; Tue, 12 Apr 2022 15:34:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4D8AB41694 for ; Tue, 12 Apr 2022 15:34:24 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 12 Apr 2022 15:34:11 +0200 Message-Id: <20220412133423.1021857-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220412133423.1021857-1-d.csapak@proxmox.com> References: <20220412133423.1021857-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.139 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datacenterconfig.pm] Subject: [pve-devel] [PATCH cluster v6 3/3] datacenter.cfg: add option for tag-tree-style and tag-colors 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: Tue, 12 Apr 2022 13:34:56 -0000 Signed-off-by: Dominik Csapak --- data/PVE/DataCenterConfig.pm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/PVE/DataCenterConfig.pm b/data/PVE/DataCenterConfig.pm index 6c0fa5b..c21dbb7 100644 --- a/data/PVE/DataCenterConfig.pm +++ b/data/PVE/DataCenterConfig.pm @@ -106,6 +106,10 @@ sub pve_verify_mac_prefix { return $mac_prefix; } +my $TAG_RE = '[a-zA-Z0-9_][a-zA-Z0-9_\-\+\.]*'; +my $COLOR_RE = '[0-9a-fA-F]{6}'; +my $OVERRIDE_RE = "(?:${TAG_RE}=${COLOR_RE}(?:\:${COLOR_RE})?)"; + my $datacenter_schema = { type => "object", additionalProperties => 0, @@ -222,6 +226,20 @@ my $datacenter_schema = { maxLength => 64 * 1024, optional => 1, }, + 'tag-tree-style' => { + optional => 1, + type => 'string', + enum => ['full', 'circle', 'dense', 'none'], + default => 'circle', + description => "Tag style in tree.", + }, + 'tag-colors' => { + optional => 1, + type => 'string', + pattern => "${OVERRIDE_RE}(?:\,$OVERRIDE_RE)*", + typetext => '=[:][,=...]', + description => "Manual color mapping for tags (comma separated).", + }, }, }; -- 2.30.2