YuruC3/SNMP-Influx-collector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added timeout exception for timeoud handling

Browse Source
This commit is contained in:
YuruC3
2026-03-07 22:00:53 +01:00
parent 10d14a06db
commit c9d07e7cef
3 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cont/idrac/idrac78.py
View File

@@ -71,23 +71,30 @@ async def idrac7_8PoolRemote_v3(remoteIP: str, queueToInsrt: asyncio.Queue):
for oid, val in mainVarBinds: for oid, val in mainVarBinds:
print(f"{oid.prettyPrint()} = {val.prettyPrint()}") print(f"{oid.prettyPrint()} = {val.prettyPrint()}")
try:
# Get PSU1 current, [PSU2 current], total board power draw in watts
currentsCurrentResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.6")
# PSU1 OID name, [PSU2 OID name], system board power draw
currentsNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.8")
# Get PSU1 current, [PSU2 current], total board power draw in watts # Inlet OID name .1, [Exhaust OID name], CPU1 temp OID name, [CPU2 tempOID name]
currentsCurrentResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.6") sensorNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.8")
# PSU1 OID name, [PSU2 OID name], system board power draw # Inlet temp, [Exhaust temp], CPU1 temp, [CPU2 temp]
currentsNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.8") sensorValuesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.6")
# Inlet OID name .1, [Exhaust OID name], CPU1 temp OID name, [CPU2 tempOID name] # .1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1
sensorNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.8") voltResult = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1")
# Inlet temp, [Exhaust temp], CPU1 temp, [CPU2 temp]
sensorValuesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.6")
# .1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1 hasExhaust = any("exhaust" in str(thing).lower() for thing in sensorNamesResults.values())
voltResult = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1") hasCPU2 = any("cpu2" in str(thing).lower() for thing in sensorNamesResults.values())
hasPSU2 = any("ps2" in str(thing).lower() for thing in currentsNamesResults.values())
hasExhaust = any("exhaust" in str(thing).lower() for thing in sensorNamesResults.values()) except SNMPTimeoutError as e:
hasCPU2 = any("cpu2" in str(thing).lower() for thing in sensorNamesResults.values()) print(f"{e}\nContinuing regardless...")
hasPSU2 = any("ps2" in str(thing).lower() for thing in currentsNamesResults.values()) return 1
except RuntimeError as e:
print(f"SNMP error on {remoteIP}: {e}")
return 1
snmpEngine.close_dispatcher() snmpEngine.close_dispatcher()

32
cont/idrac/idrac9.py
View File

@@ -1,6 +1,10 @@
import os, asyncio import os, asyncio
from models.idracModel import snmpPyIDRACData from models.idracModel import snmpPyIDRACData
from models.snmpTimeOut import SNMPTimeoutError
from snmp.walker import walk_column_v3 from snmp.walker import walk_column_v3
from typing import Annotated, Final from typing import Annotated, Final
# SNMP # SNMP
@@ -73,22 +77,30 @@ async def idrac9PoolRemote_v3(remoteIP: str, queueToInsrt: asyncio.Queue):
print(f"{oid.prettyPrint()} = {val.prettyPrint()}") print(f"{oid.prettyPrint()} = {val.prettyPrint()}")
try:
# Get PSU1 current, [PSU2 current], total board power draw in watts # Get PSU1 current, [PSU2 current], total board power draw in watts
currentsCurrentResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.6") currentsCurrentResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.6")
# PSU1 OID name, [PSU2 OID name], system board power draw # PSU1 OID name, [PSU2 OID name], system board power draw
currentsNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.8") currentsNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.30.1.8")
# CPU1 OID name .1, [CPU2 OID name], Inlet temp OID name, [Exhaust temp OID name] # CPU1 OID name .1, [CPU2 OID name], Inlet temp OID name, [Exhaust temp OID name]
sensorNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.8") sensorNamesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.8")
# CPU1 temp, [CPU2 temp], Inlet temp, [Exhaust temp] # CPU1 temp, [CPU2 temp], Inlet temp, [Exhaust temp]
sensorValuesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.6") sensorValuesResults = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.700.20.1.6")
# .1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1 # .1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1
voltResult = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1") voltResult = await walk_column_v3(snmpEngine, remoteIP, ".1.3.6.1.4.1.674.10892.5.4.600.20.1.6.1")
except SNMPTimeoutError as e:
print(f"{e}\nContinuing regardless...")
return 1
except RuntimeError as e:
print(f"SNMP error on {remoteIP}: {e}")
return 1
snmpEngine.close_dispatcher() snmpEngine.close_dispatcher()
hasExhaust = any("exhaust" in str(thing).lower() for thing in sensorNamesResults.values()) hasExhaust = any("exhaust" in str(thing).lower() for thing in sensorNamesResults.values())
hasCPU2 = any("cpu2" in str(thing).lower() for thing in sensorNamesResults.values()) hasCPU2 = any("cpu2" in str(thing).lower() for thing in sensorNamesResults.values())
hasPSU2 = any("ps2" in str(thing).lower() for thing in currentsNamesResults.values()) hasPSU2 = any("ps2" in str(thing).lower() for thing in currentsNamesResults.values())

6
cont/snmp/walker.py
View File

@@ -2,6 +2,7 @@ import asyncio, os
from typing import Annotated, Final from typing import Annotated, Final
# SNMP # SNMP
from pysnmp.hlapi.v3arch.asyncio import * from pysnmp.hlapi.v3arch.asyncio import *
from models.snmpTimeOut import SNMPTimeoutError
# SNMP ENV------------------------------------------- # SNMP ENV-------------------------------------------
ROUND_PREC: Final[int] = int(os.getenv("ROUND_PREC", 2)) ROUND_PREC: Final[int] = int(os.getenv("ROUND_PREC", 2))
@@ -54,9 +55,8 @@ async def walk_column_v3(snmpEngine, remoteIP: str, base_oid: str) -> dict:
): ):
if errInd: if errInd:
print(f"\n\n{errInd}\n\n") print(f"\n\n{errInd}\n\n")
if "No SNMP response received before timeout" in errInd: if "No SNMP response received before timeout" in str(errInd):
print(f"Host {remoteIP} timed out.\nContinuing...") raise SNMPTimeoutError(f"Host {remoteIP} timed out while walking {base_oid}")
return 1
raise RuntimeError(errInd) raise RuntimeError(errInd)
if errStat: if errStat:
raise RuntimeError(errStat.prettyPrint()) raise RuntimeError(errStat.prettyPrint())