From: Luke Yeager Date: Thu, 23 Jul 2020 20:49:14 +0000 (-0700) Subject: infiniband: consolidate ib_sm_lid and ib_lid X-Git-Tag: collectd-5.12.0~23^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce673e242762c4760c6cd55228f2f716d724a3c9;p=thirdparty%2Fcollectd.git infiniband: consolidate ib_sm_lid and ib_lid ib_sm_lid becomes type="ib_lid", type_instance="sm" --- diff --git a/src/infiniband.c b/src/infiniband.c index cec3329be..4628ea70e 100644 --- a/src/infiniband.c +++ b/src/infiniband.c @@ -168,7 +168,7 @@ static int ib_read_port(const char *device, const char *port) { &value) == 0) ib_submit(device, port, &value, 1, "ib_lid_mask_count", ""); if (ib_read_value_file(device, port, "sm_lid", DS_TYPE_GAUGE, &value) == 0) - ib_submit(device, port, &value, 1, "ib_sm_lid", ""); + ib_submit(device, port, &value, 1, "ib_lid", "sm"); if (ib_read_value_file(device, port, "sm_sl", DS_TYPE_GAUGE, &value) == 0) ib_submit(device, port, &value, 1, "ib_sm_sl", ""); diff --git a/src/types.db b/src/types.db index 4c84dc0cf..a4fd7be7f 100644 --- a/src/types.db +++ b/src/types.db @@ -123,7 +123,6 @@ ib_octets rx:DERIVE:0:U tx:DERIVE:0:U ib_packets rx:DERIVE:0:U tx:DERIVE:0:U ib_phys_state value:GAUGE:0:15 ib_rate value:GAUGE:0:U -ib_sm_lid value:GAUGE:0:32767 ib_sm_sl value:GAUGE:0:15 ib_state value:GAUGE:0:15 ib_xmit_wait value:DERIVE:0:U