From 2bb681ff04940459c103b035570d1eaaa09686ad Mon Sep 17 00:00:00 2001 From: Stefan Staeglich Date: Mon, 28 Nov 2022 11:29:33 +0100 Subject: [PATCH] Tag values with ip --- smc_ipmi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/smc_ipmi.py b/smc_ipmi.py index 15fe216..d633ec0 100644 --- a/smc_ipmi.py +++ b/smc_ipmi.py @@ -11,7 +11,7 @@ def get_ipmi_sensor(path, ip, user, password): return ipmi_output.stdout -def parse_ipmi_sensor(ipmi_sensor_output: str, temp_unit: str): +def parse_ipmi_sensor(ipmi_sensor_output: str, temp_unit: str, ip: str): csv_reader = csv.reader(ipmi_sensor_output.splitlines(), delimiter='|') points = [] @@ -48,7 +48,7 @@ def parse_ipmi_sensor(ipmi_sensor_output: str, temp_unit: str): field += ',value=0' field += ',unit=""' - points.append('smc_ipmi,{} {}'.format(tag, field)) + points.append('smc_ipmi,ip={},{} {}'.format(ip, tag, field)) return points @@ -57,7 +57,7 @@ def get_pminfo(path, ip, user, password): return pminfo_output.stdout -def parse_pminfo(pm_output: str, temp_unit: str): +def parse_pminfo(pm_output: str, temp_unit: str, ip: str): csv_reader = csv.reader(pm_output.splitlines(), delimiter='|') points = [] @@ -85,7 +85,7 @@ def parse_pminfo(pm_output: str, temp_unit: str): value = value.split(' ') field = 'value={},unit="{}"'.format(value[0], value[1]) - points.append('smc_ipmi,{} {}'.format(tag, field)) + points.append('smc_ipmi,ip={},{} {}'.format(ip, tag, field)) return points @@ -103,8 +103,8 @@ def parse_pminfo(pm_output: str, temp_unit: str): ipmi_out = get_ipmi_sensor(args.path, args.ip, args.user, args.password) pminfo_out = get_pminfo(args.path, args.ip, args.user, args.password) - ipmi_points = parse_ipmi_sensor(ipmi_out, args.temp_unit) - pmbus_points = parse_pminfo(pminfo_out, args.temp_unit) + ipmi_points = parse_ipmi_sensor(ipmi_out, args.temp_unit, args.ip) + pmbus_points = parse_pminfo(pminfo_out, args.temp_unit, args.ip) points = ipmi_points + pmbus_points