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 83C91B9969 for ; Mon, 11 Dec 2023 15:48:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 63A1D19686 for ; Mon, 11 Dec 2023 15:48:14 +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 for ; Mon, 11 Dec 2023 15:48:12 +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 9B2DF45BFE for ; Mon, 11 Dec 2023 15:48:12 +0100 (CET) From: Folke Gleumes To: pve-devel@lists.proxmox.com Date: Mon, 11 Dec 2023 15:47:18 +0100 Message-Id: <20231211144721.212071-2-f.gleumes@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231211144721.212071-1-f.gleumes@proxmox.com> References: <20231211144721.212071-1-f.gleumes@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 - Subject: [pve-devel] [RFC cluster 1/4] rrd: add free, buffer/cache and arc size to memory statistics 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: Mon, 11 Dec 2023 14:48:14 -0000 adding values to the rrd format break compatability with the old file. Therfore the filename/path had to be changed as well. Signed-off-by: Folke Gleumes --- src/pmxcfs/status.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pmxcfs/status.c b/src/pmxcfs/status.c index dc44464..8834644 100644 --- a/src/pmxcfs/status.c +++ b/src/pmxcfs/status.c @@ -1130,7 +1130,10 @@ static const char *rrd_def_node[] = { "DS:cpu:GAUGE:120:0:U", "DS:iowait:GAUGE:120:0:U", "DS:memtotal:GAUGE:120:0:U", + "DS:memfree:GAUGE:120:0:U", "DS:memused:GAUGE:120:0:U", + "DS:membuffercache:GAUGE:120:0:U", + "DS:arcsize:GAUGE:120:0:U", "DS:swaptotal:GAUGE:120:0:U", "DS:swapused:GAUGE:120:0:U", "DS:roottotal:GAUGE:120:0:U", @@ -1252,7 +1255,7 @@ update_rrd_data( int skip = 0; - if (strncmp(key, "pve2-node/", 10) == 0) { + if (strncmp(key, "pve8-node/", 10) == 0) { const char *node = key + 10; skip = 2; @@ -1267,12 +1270,12 @@ update_rrd_data( if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { - mkdir(RRDDIR "/pve2-node", 0755); + mkdir(RRDDIR "/pve8-node", 0755); int argcount = sizeof(rrd_def_node)/sizeof(void*) - 1; create_rrd_file(filename, argcount, rrd_def_node); } - } else if ((strncmp(key, "pve2-vm/", 8) == 0) || + } else if ((strncmp(key, "pve8-vm/", 8) == 0) || (strncmp(key, "pve2.3-vm/", 10) == 0)) { const char *vmid; -- 2.39.2