Skip to content

Tag values with ip #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staeglis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tag values with ip #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions smc_ipmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []

Expand Down Expand Up @@ -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


Expand All @@ -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 = []

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down