diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index fd3a9df540f..e3b9993c0e6 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -81,10 +81,6 @@ wagner_titanus_topsense_info = [ ] -def wagner_titanus_topsense_scan(oid): - return oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.34187.21501", ".1.3.6.1.4.1.34187.74195"] - - def parse_wagner_titanus_topsens(info): # not much of a parse function. simply retrieves the info blocks that apply for the # respective topsens model and returns only those @@ -334,8 +330,8 @@ wagner_titanus_topsense_airflow_deviation_default_values = (-20.0, -20.0, 20.0, def inventory_wagner_titanus_topsense_airflow_deviation(info): return [ - ("1", "wagner_titanus_topsense_airflow_deviation_default_values"), - ("2", "wagner_titanus_topsense_airflow_deviation_default_values"), + ("1", wagner_titanus_topsense_airflow_deviation_default_values), + ("2", wagner_titanus_topsense_airflow_deviation_default_values), ] diff --git a/checks/winperf b/checks/winperf index f15cc26a8fd..afee90e535c 100644 --- a/checks/winperf +++ b/checks/winperf @@ -63,7 +63,7 @@ def inventory_win_diskstat(info): for line in info: try: if line[0] == "2:16" or line[0] == "2:18": - return [(None, None, None)] + return [(None, None)] except Exception: pass return [] diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 15b6b36c3a7..4a13b5dbc78 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -12,10 +12,6 @@ from cmk.base.check_legacy_includes.humidity import * # pylint: disable=wildcar from cmk.base.check_legacy_includes.temperature import * # pylint: disable=wildcard-import,unused-wildcard-import -def detect_webtherm(oid): - return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5040.1.2.") - - def parse_wut_webtherm(info): map_sensor_type = { "1": "temp", @@ -144,7 +140,7 @@ wut_webtherm_humidity_defaultlevels = (35, 40, 60, 65) def inventory_wut_webtherm_humidity(parsed): return [ - (sensor_id, "wut_webtherm_humidity_defaultlevels") + (sensor_id, wut_webtherm_humidity_defaultlevels) for sensor_id, values in parsed.items() if values["type"] == "humid" ] diff --git a/cmk/base/check_legacy_includes/wmi.py b/cmk/base/check_legacy_includes/wmi.py index 16f45644e8d..13e64403d5d 100644 --- a/cmk/base/check_legacy_includes/wmi.py +++ b/cmk/base/check_legacy_includes/wmi.py @@ -113,7 +113,7 @@ def inventory_wmi_table_instances( # type: ignore[no-untyped-def] tables: WMISection, required_tables: Iterable[str] | None = None, filt: Callable[[WMISection, str | int], bool] | None = None, - levels=None, + levels: tuple | dict | None = None, # important for now: not str! ): if required_tables is None: required_tables = tables @@ -140,7 +140,7 @@ def inventory_wmi_table_total( # type: ignore[no-untyped-def] tables: WMISection, required_tables: Iterable[str] | None = None, filt: Callable[[WMISection, None], bool] | None = None, - levels=None, + levels: tuple | dict | None = None, # important for now: not str! ): if required_tables is None: required_tables = tables