Skip to content

Add pci slot as unique key to vga card inventory #861

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add pci slot as unique key to vga card inventory #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fc3a74
Add pci slot as unique key to vga card inventory
mayrstefan Oct 12, 2025
0a731c3
Merge branch 'Checkmk:master' into fix-multiple-vga-cards
mayrstefan Nov 18, 2025
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
26 changes: 19 additions & 7 deletions cmk/plugins/collection/agent_based/inventory_lnx_video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,18 @@
from collections.abc import Mapping
from dataclasses import dataclass

from cmk.agent_based.v2 import AgentSection, InventoryPlugin, InventoryResult, StringTable, TableRow
from cmk.agent_based.v2 import (
AgentSection,
InventoryPlugin,
InventoryResult,
StringTable,
TableRow,
)


@dataclass
class GraphicsCard:
slot: str
name: str
subsystem: str | None = None
driver: str | None = None
Expand All @@ -40,20 +47,24 @@ class GraphicsCard:
def parse_lnx_video(string_table: StringTable) -> Section:
parsed_section: dict[str, GraphicsCard] = {}

current_slot: str = ""
current_name: str = ""
for line in string_table:
if len(line) <= 1:
continue

if "VGA compatible controller" in line[-2]:
current_slot = ":".join(line).split()[0]
current_name = line[-1].strip()
if current_name:
parsed_section.setdefault(current_name, GraphicsCard(name=current_name))
elif current_name:
if current_slot:
parsed_section.setdefault(
current_slot, GraphicsCard(slot=current_slot, name=current_name)
)
elif current_slot:
if line[0] == "Subsystem":
parsed_section[current_name].subsystem = line[1].strip()
parsed_section[current_slot].subsystem = line[1].strip()
elif line[0] == "Kernel driver in use":
parsed_section[current_name].driver = line[1].strip()
parsed_section[current_slot].driver = line[1].strip()

return parsed_section

Expand All @@ -70,9 +81,10 @@ def inventory_lnx_video(section: Section) -> InventoryResult:
yield TableRow(
path=["hardware", "video"],
key_columns={
"name": graphics_card.name,
"slot": graphics_card.slot,
},
inventory_columns={
"name": graphics_card.name,
"subsystem": graphics_card.subsystem,
"driver": graphics_card.driver,
},
Expand Down
1 change: 1 addition & 0 deletions cmk/plugins/collection/inventory_ui/hardware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@
title=Title("Graphic cards"),
table=Table(
columns={
"slot": TextField(Title("Slot")),
"name": TextField(Title("Graphic card name")),
"subsystem": TextField(Title("Vendor and device ID")),
"driver": TextField(Title("Driver")),
Expand Down
1 change: 1 addition & 0 deletions tests/unit/cmk/gui/views/inventory/test_display_hints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ def test_paths() -> None:
"physical_volume_free_partitions",
],
("hardware", "video"): [
"slot",
"name",
"subsystem",
"driver",
Expand Down
57 changes: 53 additions & 4 deletions tests/unit/cmk/plugins/collection/agent_based/test_inventory_lnx_video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
TableRow(
path=["hardware", "video"],
key_columns={
"name": "Advanced Micro Devices [AMD] nee ATI Cape Verde PRO [Radeon HD 7700 Series] (prog-if 00 [VGA controller])",
"slot": "05:00.0",
},
inventory_columns={
"name": "Advanced Micro Devices [AMD] nee ATI Cape Verde PRO [Radeon HD 7700 Series] (prog-if 00 [VGA controller])",
"subsystem": "Hightech Information System Ltd. Device 200b",
"driver": "fglrx_pci",
},
Expand All @@ -53,9 +54,10 @@
TableRow(
path=["hardware", "video"],
key_columns={
"name": "Advanced Micro Devices [AMD] nee ATI Cape Verde PRO [Radeon HD 7700 Series] (prog-if 00 [VGA controller])",
"slot": "05:00.0",
},
inventory_columns={
"name": "Advanced Micro Devices [AMD] nee ATI Cape Verde PRO [Radeon HD 7700 Series] (prog-if 00 [VGA controller])",
"subsystem": None,
"driver": None,
},
Expand Down Expand Up @@ -88,9 +90,10 @@
TableRow(
path=["hardware", "video"],
key_columns={
"name": "Intel Corporation Device 9a49 (rev 01) (prog-if 00 [VGA controller])",
"slot": "0000:00:02.0",
},
inventory_columns={
"name": "Intel Corporation Device 9a49 (rev 01) (prog-if 00 [VGA controller])",
"subsystem": "Dell Device 0a38",
"driver": "i915",
},
Expand All @@ -99,9 +102,10 @@
TableRow(
path=["hardware", "video"],
key_columns={
"name": "Second graphics card",
"slot": "00:03.0",
},
inventory_columns={
"name": "Second graphics card",
"subsystem": "Some subsystem",
"driver": "Some driver",
},
Expand All @@ -110,6 +114,51 @@
],
id="Two graphics cards",
),
pytest.param(
[
[
"00",
"08.0 VGA compatible controller",
" Microsoft Corporation Hyper-V virtual VGA (prog-if 00 [VGA controller])",
],
["Subsystem", " Hightech Information System Ltd. Device 200b"],
["Kernel driver in use", " hyperv_drm"],
[
"00",
"08.1 VGA compatible controller",
" Microsoft Corporation Hyper-V virtual VGA (prog-if 00 [VGA controller])",
],
["Subsystem", " Hightech Information System Ltd. Device 200c"],
["Kernel driver in use", " hyperv_drm"],
],
[
TableRow(
path=["hardware", "video"],
key_columns={
"slot": "00:08.0",
},
inventory_columns={
"name": "Microsoft Corporation Hyper-V virtual VGA (prog-if 00 [VGA controller])",
"subsystem": "Hightech Information System Ltd. Device 200b",
"driver": "hyperv_drm",
},
status_columns={},
),
TableRow(
path=["hardware", "video"],
key_columns={
"slot": "00:08.1",
},
inventory_columns={
"name": "Microsoft Corporation Hyper-V virtual VGA (prog-if 00 [VGA controller])",
"subsystem": "Hightech Information System Ltd. Device 200c",
"driver": "hyperv_drm",
},
status_columns={},
),
],
id="Two identical graphics cards",
),
pytest.param(
[
[
Expand Down