From 34a0b66bc2d48223748ed1cf5bc1b305c396bd74 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jan 2022 19:05:10 +0100 Subject: Adding upstream version 1.33.0. Signed-off-by: Daniel Baumann --- collectors/proc.plugin/sys_class_infiniband.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'collectors/proc.plugin/sys_class_infiniband.c') diff --git a/collectors/proc.plugin/sys_class_infiniband.c b/collectors/proc.plugin/sys_class_infiniband.c index 1a75ce13f..7e63bcbb4 100644 --- a/collectors/proc.plugin/sys_class_infiniband.c +++ b/collectors/proc.plugin/sys_class_infiniband.c @@ -481,8 +481,11 @@ int do_sys_class_infiniband(int update_every, usec_t dt) if (!p->discovered) info( - "Infiniband card %s port %s at speed %lu width %lu", dev_dent->d_name, port_dent->d_name, - p->speed, p->width); + "Infiniband card %s port %s at speed %" PRIu64 " width %" PRIu64 "", + dev_dent->d_name, + port_dent->d_name, + p->speed, + p->width); p->discovered = 1; } @@ -537,7 +540,8 @@ int do_sys_class_infiniband(int update_every, usec_t dt) rrdset_flag_set(port->st_bytes, RRDSET_FLAG_DETAIL); // On this chart, we want to have a KB/s so the dashboard will autoscale it // The reported values are also per-lane, so we must multiply it by the width - FOREACH_COUNTER_BYTES(GEN_RRD_DIM_ADD_CUSTOM, port, 8 * port->width, 1024, RRD_ALGORITHM_INCREMENTAL) + // x4 lanes multiplier as per Documentation/ABI/stable/sysfs-class-infiniband + FOREACH_COUNTER_BYTES(GEN_RRD_DIM_ADD_CUSTOM, port, 4 * 8 * port->width, 1024, RRD_ALGORITHM_INCREMENTAL) port->stv_speed = rrdsetvar_custom_chart_variable_create(port->st_bytes, "link_speed"); } else -- cgit v1.2.3