Skip to content
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

Jump to bottom

Fix parsing of current nvidia_smi section #681

Closed
wants to merge 4 commits into from
Closed

Fix parsing of current nvidia_smi section #681

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9265afc
Fix parsing of current nvidia_smi section
mayrstefan Mar 27, 2024
4b7e18f
Make Python formatting test happy
mayrstefan Mar 27, 2024
7a6e996
Make pylint happy
mayrstefan Mar 27, 2024
57d0faa
Make Python formatting test happy
mayrstefan Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 22 additions & 8 deletions cmk/base/plugins/agent_based/nvidia_smi.py
View file
Open in desktop
Expand Up @@ -146,6 +146,11 @@ def _let_pydantic_check_power_state(value: str | None) -> PowerState:

def parse_nvidia_smi(string_table: StringTable) -> Section:
xml = ElementTree.fromstring("".join([element[0] for element in string_table]))
# find the element name for power_readings
power_readings_element = "gpu_power_readings"
if xml.find(f"gpu/{ power_readings_element }") is None:
power_readings_element = "power_readings"
has_power_management = xml.find(f"gpu/{ power_readings_element }/power_management") is not None
return Section(
timestamp=(
datetime.strptime(timestamp, "%a %b %d %H:%M:%S %Y")
Expand All @@ -162,24 +167,33 @@ def parse_nvidia_smi(string_table: StringTable) -> Section:
product_brand=get_text_from_element(gpu.find("product_brand")),
power_readings=PowerReadings(
power_state=_let_pydantic_check_power_state(
get_text_from_element(gpu.find("power_readings/power_state")),
get_text_from_element(gpu.find(f"{ power_readings_element }/power_state"))
),
power_management=PowerManagement(
get_text_from_element(gpu.find("power_readings/power_management"))
# assume power management is supported because newer versions of the xml don't contain it anymore
get_text_from_element(
gpu.find(f"{ power_readings_element }/power_management")
)
if has_power_management
else "Supported"
),
power_draw=get_float_from_element(
gpu.find(f"{ power_readings_element }/power_draw"), "W"
),
power_limit=get_float_from_element(
gpu.find(f"{ power_readings_element }/power_limit"), "W"
),
power_draw=get_float_from_element(gpu.find("power_readings/power_draw"), "W"),
power_limit=get_float_from_element(gpu.find("power_readings/power_limit"), "W"),
default_power_limit=get_float_from_element(
gpu.find("power_readings/default_power_limit"), "W"
gpu.find(f"{ power_readings_element }/default_power_limit"), "W"
),
enforced_power_limit=get_float_from_element(
gpu.find("power_readings/enforced_power_limit"), "W"
gpu.find(f"{ power_readings_element }/enforced_power_limit"), "W"
),
min_power_limit=get_float_from_element(
gpu.find("power_readings/min_power_limit"), "W"
gpu.find(f"{ power_readings_element }/min_power_limit"), "W"
),
max_power_limit=get_float_from_element(
gpu.find("power_readings/max_power_limit"), "W"
gpu.find(f"{ power_readings_element }/max_power_limit"), "W"
),
),
temperature=Temperature(
Expand Down