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 EC64A63D7B for ; Thu, 27 Jan 2022 12:38:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DFC6D222B2 for ; Thu, 27 Jan 2022 12:38:45 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E66B2222A7 for ; Thu, 27 Jan 2022 12:38:44 +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 9B35446C6F for ; Thu, 27 Jan 2022 12:38:44 +0100 (CET) Message-ID: Date: Thu, 27 Jan 2022 12:38:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Thunderbird/97.0 Content-Language: en-US To: Proxmox VE development discussion , markus frank References: <20220127111318.36615-1-m.frank@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220127111318.36615-1-m.frank@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH manager] fix #3815: influxdb vmname should always be a string 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: Thu, 27 Jan 2022 11:38:46 -0000 On 27.01.22 12:13, markus frank wrote: > InfluxDB interprets the vmname 66601 as a number and the vmname vm42 as a String. This leads to problematic metrics, that will be dropped by influxdb. which one will? I'd guess whatever comes first matters in what "schema" is decided on? > To change that I added a $quoted hashmap (simular to $excluded) to quote a value. In this case the value of name. Breaks our commit line style guide: > Make sure the line length of the commit's message is not longer than 70 characters, > HTTPS links are an exception and should not be splitted. https://pve.proxmox.com/wiki/Developer_Documentation#Commits_and_Commit_Messages > > Signed-off-by: markus frank Nit, can you start your name with a captibal letter? Besides those style remarks: * what about nodenames? as in the `host` and `nodename` parameters can also have the same issue in a cluster I'd figure, as those can be fully numeric too * I'd avoid chaining through this as param if we can avoid it for now, handling that more centrally in build_influxdb_payload seems feasible to me at the first look > --- > PVE/Status/InfluxDB.pm | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/PVE/Status/InfluxDB.pm b/PVE/Status/InfluxDB.pm > index def7e2fd..f49feac4 100644 > --- a/PVE/Status/InfluxDB.pm > +++ b/PVE/Status/InfluxDB.pm > @@ -116,7 +116,7 @@ sub update_qemu_status { > $object =~ s/\s/\\ /g; > > # VMID is already added in base $object above, so exclude it from being re-added > - build_influxdb_payload($class, $txn, $data, $ctime, $object, { 'vmid' => 1 }); > + build_influxdb_payload($class, $txn, $data, $ctime, $object, { 'vmid' => 1 }, { 'name' => 1 }); > } > > sub update_lxc_status { > @@ -131,7 +131,7 @@ sub update_lxc_status { > $object =~ s/\s/\\ /g; > > # VMID is already added in base $object above, so exclude it from being re-added > - build_influxdb_payload($class, $txn, $data, $ctime, $object, { 'vmid' => 1 }); > + build_influxdb_payload($class, $txn, $data, $ctime, $object, { 'vmid' => 1 }, { 'name' => 1 }); > } > > sub update_storage_status { > @@ -274,7 +274,7 @@ sub test_connection { > } > > sub build_influxdb_payload { > - my ($class, $txn, $data, $ctime, $tags, $excluded, $measurement, $instance) = @_; > + my ($class, $txn, $data, $ctime, $tags, $excluded, $quoted, $measurement, $instance) = @_; > > my @values = (); > > @@ -283,6 +283,10 @@ sub build_influxdb_payload { > my $value = $data->{$key}; > next if !defined($value); > > + if (defined($quoted) && $quoted->{$key}){ > + $value =~ s/\"/\\\"/g; > + $value = "\"$value\""; > + } indentation for above looks off: https://pve.proxmox.com/wiki/Perl_Style_Guide > if (!ref($value) && $value ne '') { > # value is scalar > > @@ -293,9 +297,9 @@ sub build_influxdb_payload { > # value is a hash > > if (!defined($measurement)) { > - build_influxdb_payload($class, $txn, $value, $ctime, $tags, $excluded, $key); > + build_influxdb_payload($class, $txn, $value, $ctime, $tags, $excluded, $quoted, $key); > } elsif(!defined($instance)) { > - build_influxdb_payload($class, $txn, $value, $ctime, $tags, $excluded, $measurement, $key); > + build_influxdb_payload($class, $txn, $value, $ctime, $tags, $excluded, $quoted, $measurement, $key); > } else { > push @values, get_recursive_values($value); > }