fireeye: inline useless helper

Change-Id: I2147d35e4f256d933a67a02e09655756affed49e

Author: mo-ki

cmk/base/check_legacy_includes/fireeye.py

@@ -5,22 +5,6 @@
 
 # mypy: disable-error-code="type-arg"
 
-from collections.abc import Iterator
-
-
-def inventory_fireeye_generic(
-    info: list[list[str]], has_item: bool, has_params: bool = False
-) -> Iterator[tuple[str | None, dict | None]]:
-    if info:
-        params: dict | None = None
-        if has_params:
-            params = {}
-        for line in info:
-            item = None
-            if has_item:
-                item = line[0]
-            yield item, params
-
 
 def check_fireeye_states(states: list[tuple[str, str]]) -> dict[str, tuple[int, str]]:
     # Now we only known the OK states and health states

cmk/base/legacy_checks/fireeye_fans.py

@@ -12,7 +12,7 @@
     LegacyDiscoveryResult,
 )
 from cmk.agent_based.v2 import SNMPTree, StringTable
-from cmk.base.check_legacy_includes.fireeye import check_fireeye_states, inventory_fireeye_generic
+from cmk.base.check_legacy_includes.fireeye import check_fireeye_states
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -67,8 +67,8 @@ def parse_fireeye_fans(string_table: StringTable) -> StringTable:
 
 
 def discover_fireeye_fans(info: StringTable) -> LegacyDiscoveryResult:
-    for item, params in inventory_fireeye_generic(info, True):
-        yield item, params or {}
+    for line in info:
+        yield line[0], {}
 
 
 check_info["fireeye_fans"] = LegacyCheckDefinition(

cmk/base/legacy_checks/fireeye_lic_active.py

@@ -9,7 +9,6 @@
 
 from cmk.agent_based.legacy.v0_unstable import LegacyCheckDefinition
 from cmk.agent_based.v2 import SNMPTree, StringTable
-from cmk.base.check_legacy_includes.fireeye import inventory_fireeye_generic
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -33,7 +32,7 @@ def parse_fireeye_lic_active(string_table: StringTable) -> StringTable:
 
 
 def discover_fireeye_lic_active(info):
-    return inventory_fireeye_generic(info, False)
+    yield from [(None, None)] if info else []
 
 
 check_info["fireeye_lic_active"] = LegacyCheckDefinition(

cmk/base/legacy_checks/fireeye_mail.py

@@ -11,7 +11,6 @@
 
 from cmk.agent_based.legacy.v0_unstable import check_levels, LegacyCheckDefinition
 from cmk.agent_based.v2 import get_average, get_rate, get_value_store, SNMPTree, StringTable
-from cmk.base.check_legacy_includes.fireeye import inventory_fireeye_generic
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -71,7 +70,7 @@ def parse_fireeye_mail(string_table: StringTable) -> StringTable:
 
 
 def discover_fireeye_mail(info):
-    return inventory_fireeye_generic(info, False, True)
+    yield from [(None, {})] if info else []
 
 
 check_info["fireeye_mail"] = LegacyCheckDefinition(
@@ -137,7 +136,7 @@ def check_fireeye_attachment(_no_item, params, info):
 
 
 def discover_fireeye_mail_attachment(info):
-    return inventory_fireeye_generic(info, False, True)
+    yield from [(None, {})] if info else []
 
 
 check_info["fireeye_mail.attachment"] = LegacyCheckDefinition(
@@ -178,7 +177,7 @@ def check_fireeye_url(_no_item, params, info):
 
 
 def discover_fireeye_mail_url(info):
-    return inventory_fireeye_generic(info, False, True)
+    yield from [(None, {})] if info else []
 
 
 check_info["fireeye_mail.url"] = LegacyCheckDefinition(
@@ -249,7 +248,7 @@ def check_fireeye_mail_statistics(_no_item, params, info):
 
 
 def discover_fireeye_mail_statistics(info):
-    return inventory_fireeye_generic(info, False, True)
+    yield from [(None, {})] if info else []
 
 
 check_info["fireeye_mail.statistics"] = LegacyCheckDefinition(
@@ -292,7 +291,7 @@ def check_fireeye_mail_received(_no_item, params, info):
 
 
 def discover_fireeye_mail_received(info):
-    return inventory_fireeye_generic(info, False, True)
+    yield from [(None, {})] if info else []
 
 
 check_info["fireeye_mail.received"] = LegacyCheckDefinition(

cmk/base/legacy_checks/fireeye_powersupplies.py

@@ -9,7 +9,7 @@
 
 from cmk.agent_based.legacy.v0_unstable import LegacyCheckDefinition
 from cmk.agent_based.v2 import SNMPTree, StringTable
-from cmk.base.check_legacy_includes.fireeye import check_fireeye_states, inventory_fireeye_generic
+from cmk.base.check_legacy_includes.fireeye import check_fireeye_states
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -31,7 +31,7 @@ def parse_fireeye_powersupplies(string_table: StringTable) -> StringTable:
 
 
 def discover_fireeye_powersupplies(info):
-    return inventory_fireeye_generic(info, False)
+    yield from [(None, None)] if info else []
 
 
 check_info["fireeye_powersupplies"] = LegacyCheckDefinition(

cmk/base/legacy_checks/fireeye_raid.py

@@ -11,7 +11,7 @@
 
 from cmk.agent_based.legacy.v0_unstable import LegacyCheckDefinition
 from cmk.agent_based.v2 import SNMPTree
-from cmk.base.check_legacy_includes.fireeye import check_fireeye_states, inventory_fireeye_generic
+from cmk.base.check_legacy_includes.fireeye import check_fireeye_states
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -58,7 +58,7 @@ def check_fireeye_raid(_no_item, _no_params, parsed):
 
 
 def discover_fireeye_raid(parsed):
-    return inventory_fireeye_generic(parsed.get("raid", []), False)
+    yield from [(None, None)] if parsed.get("raid", []) else []
 
 
 check_info["fireeye_raid"] = LegacyCheckDefinition(
@@ -101,7 +101,8 @@ def check_fireeye_raid_disks(item, _no_params, parsed):
 
 
 def discover_fireeye_raid_disks(parsed):
-    return inventory_fireeye_generic(parsed.get("disks", []), True)
+    for line in parsed.get("disks", []):
+        yield line[0], None
 
 
 check_info["fireeye_raid.disks"] = LegacyCheckDefinition(

cmk/base/legacy_checks/fireeye_smtp_conn.py

@@ -9,7 +9,6 @@
 
 from cmk.agent_based.legacy.v0_unstable import LegacyCheckDefinition
 from cmk.agent_based.v2 import SNMPTree, StringTable
-from cmk.base.check_legacy_includes.fireeye import inventory_fireeye_generic
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -27,7 +26,7 @@ def parse_fireeye_smtp_conn(string_table: StringTable) -> StringTable:
 
 
 def discover_fireeye_smtp_conn(info):
-    return inventory_fireeye_generic(info, False)
+    yield from [(None, None)] if info else []
 
 
 check_info["fireeye_smtp_conn"] = LegacyCheckDefinition(

cmk/base/legacy_checks/fireeye_sys_image.py

@@ -9,7 +9,6 @@
 
 from cmk.agent_based.legacy.v0_unstable import LegacyCheckDefinition
 from cmk.agent_based.v2 import SNMPTree, StringTable
-from cmk.base.check_legacy_includes.fireeye import inventory_fireeye_generic
 from cmk.plugins.fireeye.lib import DETECT
 
 check_info = {}
@@ -37,7 +36,7 @@ def parse_fireeye_sys_image(string_table: StringTable) -> StringTable:
 
 
 def discover_fireeye_sys_image(info):
-    return inventory_fireeye_generic(info, False)
+    yield from [(None, None)] if info else []
 
 
 check_info["fireeye_sys_image"] = LegacyCheckDefinition(