SNMP discovery updates continued

2026-05-26 17:43:33 -06:00
parent e59733d331
commit 6ff452a8a9
10 changed files with 554 additions and 36 deletions
@@ -43,7 +43,7 @@ def discover_snmp(
        retries=int(extra.get("retries") or 1),
    )
    try:
-        discovered = discover_snmp_device(payload.host, credential)
+        discovered = discover_snmp_device(payload.host, credential, asset_type=payload.asset_type)
    except SnmpDiscoveryError as exc:
        raise HTTPException(status_code=502, detail="SNMP discovery failed") from exc

@@ -55,6 +55,7 @@ def _discovery_to_read(credential_profile_id: int, discovered: DiscoveredSnmpDev
        SnmpDiscoveredInterfaceRead(
            index=interface.index,
            name=interface.name,
+            label=interface.label,
            description=interface.description,
            admin_status=interface.admin_status,
            oper_status=interface.oper_status,
@@ -99,7 +100,7 @@ def _monitorable_items(discovered: DiscoveredSnmpDevice) -> list[SnmpDiscoveryIt
        for item in discovered.health_items
    )
    for interface in discovered.interfaces:
-        group = f"Interface {interface.name}"
+        group = f"Interface {interface.label}"
        item_prefix = f"interface.{interface.index}"
        items.extend(
            [
@@ -107,20 +108,20 @@ def _monitorable_items(discovered: DiscoveredSnmpDevice) -> list[SnmpDiscoveryIt
                    item_id=f"{item_prefix}.status",
                    item_type="interface_status",
                    group=group,
-                    label=f"{interface.name} status",
+                    label=f"{interface.label} status",
                ),
                SnmpDiscoveryItemRead(
                    item_id=f"{item_prefix}.traffic",
                    item_type="interface_traffic",
                    group=group,
-                    label=f"{interface.name} traffic",
+                    label=f"{interface.label} traffic",
                    unit="bps",
                ),
                SnmpDiscoveryItemRead(
                    item_id=f"{item_prefix}.errors",
                    item_type="interface_errors",
                    group=group,
-                    label=f"{interface.name} errors and discards",
+                    label=f"{interface.label} errors and discards",
                    unit="count",
                ),
            ]