This create 1 single rrd for each metric allowed paths:
pve2-metrics/vms/<vmid>/<metric> pve2-metrics/nodes/<node>/<metric> pve2-metrics/storages/<node>/<storage>/<metric> Signed-off-by: Alexandre Derumier <aderum...@odiso.com> --- 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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel