From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.stechauner@proxmox.com>
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 8CD947247A
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:28:16 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 834492C719
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:27:46 +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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 1C6D62C710
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:27:46 +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 E8E1646646
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:27:45 +0200 (CEST)
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 25 May 2021 15:27:17 +0200
Message-Id: <20210525132717.108343-1-l.stechauner@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.347 Adjusted score from AWL reputation of From: address
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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [influxdb.pm]
Subject: [pve-devel] [PATCH manager] fix #3440: influxdb: remove duplicate
vmid tag
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 25 May 2021 13:28:16 -0000
remove vmid from data part, it is already contained in object part.
Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
---
Tested with local udp listener. works as expected.
PVE/Status/InfluxDB.pm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/PVE/Status/InfluxDB.pm b/PVE/Status/InfluxDB.pm
index 9e4b0d96..c50aa9c8 100644
--- a/PVE/Status/InfluxDB.pm
+++ b/PVE/Status/InfluxDB.pm
@@ -94,6 +94,8 @@ sub update_qemu_status {
}
$object =~ s/\s/\\ /g;
+ # Duplicate keys may result in unwanted behavior
+ delete $data->{vmid};
build_influxdb_payload($class, $txn, $data, $ctime, $object);
}
@@ -108,6 +110,8 @@ sub update_lxc_status {
}
$object =~ s/\s/\\ /g;
+ # Duplicate keys may result in unwanted behavior
+ delete $data->{vmid};
build_influxdb_payload($class, $txn, $data, $ctime, $object);
}
--
2.20.1