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 AE224743DB for ; Wed, 1 Jun 2022 10:13:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC4D31A122 for ; Wed, 1 Jun 2022 10:13:03 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (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 E6DEF1A0E9 for ; Wed, 1 Jun 2022 10:13:01 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 4D734F53E; Wed, 1 Jun 2022 10:12:55 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 32B7917671F; Wed, 1 Jun 2022 10:12:55 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Cc: t.lamprecht@proxmox.com, Alexandre Derumier Date: Wed, 1 Jun 2022 10:12:44 +0200 Message-Id: <20220601081253.2542697-2-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601081253.2542697-1-aderumier@odiso.com> References: <20220601081253.2542697-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.132 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-cluster 1/1] add pve2-metrics rrd (single metrics) 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, 01 Jun 2022 08:13:03 -0000 This create 1 single rrd for each metric allowed paths: pve2-metrics/vms// pve2-metrics/nodes// pve2-metrics/storages/// Signed-off-by: Alexandre Derumier --- data/src/status.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/data/src/status.c b/data/src/status.c index 9bceaeb..75ab89e 100644 --- a/data/src/status.c +++ b/data/src/status.c @@ -1097,6 +1097,23 @@ static const char *rrd_def_storage[] = { NULL, }; +static const char *rrd_def_metric[] = { + "DS:metric:GAUGE:120:0:U", + + "RRA:AVERAGE:0.5:1:70", // 1 min avg - one hour + "RRA:AVERAGE:0.5:30:70", // 30 min avg - one day + "RRA:AVERAGE:0.5:180:70", // 3 hour avg - one week + "RRA:AVERAGE:0.5:720:70", // 12 hour avg - one month + "RRA:AVERAGE:0.5:10080:70", // 7 day avg - ony year + + "RRA:MAX:0.5:1:70", // 1 min max - one hour + "RRA:MAX:0.5:30:70", // 30 min max - one day + "RRA:MAX:0.5:180:70", // 3 hour max - one week + "RRA:MAX:0.5:720:70", // 12 hour max - one month + "RRA:MAX:0.5:10080:70", // 7 day max - ony year + NULL, +}; + #define RRDDIR "/var/lib/rrdcached/db" static void @@ -1173,6 +1190,40 @@ update_rrd_data( create_rrd_file(filename, argcount, rrd_def_node); } + } else if ((strncmp(key, "pve2-metrics/", 13) == 0)) { + const char *path = key + 13; + char **pa = g_strsplit(path, "/", -1); + + if (!pa[0] || !pa[1] || !pa[2] || strlen(pa[1]) < 1 || strlen(pa[2]) < 1) { + goto keyerror; + } else { + if (strcmp(pa[0], "vms") == 0 || strcmp(pa[0], "nodes") == 0) { + if (pa[3]) { + goto keyerror; + } + } else if (strcmp(pa[0], "storages") == 0) { + if (pa[4] || !pa[3] || strlen(pa[3]) < 1) { + goto keyerror; + } + } else { + goto keyerror; + } + } + g_strfreev(pa); + + + filename = g_strdup_printf(RRDDIR "/%s", key); + + if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { + + char *dir = g_path_get_dirname(filename); + g_mkdir_with_parents(dir, 0755); + g_free(dir); + + int argcount = sizeof(rrd_def_metric)/sizeof(void*) - 1; + create_rrd_file(filename, argcount, rrd_def_metric); + } + } else if ((strncmp(key, "pve2-vm/", 8) == 0) || (strncmp(key, "pve2.3-vm/", 10) == 0)) { const char *vmid; -- 2.30.2