removed ethtool blanket analyzer arg

Author: sunnyhe2

nodescraper/plugins/inband/network/analyzer_args.py

@@ -675,16 +675,12 @@ class Cx7EthtoolStatistics(BaseModel):
     Cx7EthtoolStatistics,
 ]
 
-VendorEthtoolStatisticsCls = Union[
-    type[PollaraEthtoolStatistics],
-    type[Thor2EthtoolStatistics],
-    type[Cx7EthtoolStatistics],
-]
+
+VendorEthtoolStatisticsCls = type[VendorEthtoolStatisticsModel]
 
 
-# Map ifname prefixes to vendor-specific statistic models
-# If netdev is ens, use Cx7
-# If netdev is benic, check if it starts with ionic or bnxt to determine if it's Pollara or Thor2
+# Map kernel driver name prefixes (from `ethtool -i`) to vendor-specific models
+# ionic -> Pollara, bnxt  -> Thor2, mlx   -> ConnectX-7
 VENDOR_PREFIX_MAP: dict[str, VendorEthtoolStatisticsCls] = {
     "ionic": PollaraEthtoolStatistics,
     "bnxt": Thor2EthtoolStatistics,

nodescraper/plugins/inband/network/ethtool_vendor.py

@@ -24,34 +24,25 @@
 #
 ###############################################################################
 import re
-from typing import Optional
 
-from nodescraper.base.regexanalyzer import ErrorRegex, RegexAnalyzer
+from nodescraper.base.regexanalyzer import RegexAnalyzer
 from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus
 from nodescraper.models import TaskResult
 
-from .analyzer_args import NetworkAnalyzerArgs
 from .networkdata import NetworkDataModel
 
 
-class NetworkAnalyzer(RegexAnalyzer[NetworkDataModel, NetworkAnalyzerArgs]):
+class NetworkAnalyzer(RegexAnalyzer[NetworkDataModel, None]):
     """Check network statistics for errors."""
 
     DATA_MODEL = NetworkDataModel
 
-    # No built-in regex patterns: RDMA-scoped counter classification lives in the vendor
-    # ethtool models (ethtool_vendor.py). This list is only extended by user-supplied
-    # NetworkAnalyzerArgs.error_regex patterns.
-    ERROR_REGEX: list[ErrorRegex] = []
-
-    def analyze_data(
-        self, data: NetworkDataModel, args: Optional[NetworkAnalyzerArgs] = None
-    ) -> TaskResult:
-        """Analyze ethtool -S statistics via RDMA-scoped vendor models and any user-supplied regex.
+    def analyze_data(self, data: NetworkDataModel, args=None) -> TaskResult:
+        """Analyze ethtool -S statistics via RDMA-scoped vendor models.
 
         Args:
-            data: Network data model with ethtool_info and/or ethtool_statistics.
-            args: Optional analyzer arguments with custom error regex support.
+            data: Network data model with ethtool_statistics.
+            args: Unused; retained for analyzer interface compatibility.
 
         Returns:
             TaskResult with OK, WARNING (no devices, or only warning-tier counters), or ERROR.
@@ -61,52 +52,6 @@ def analyze_data(
             self.result.status = ExecutionStatus.WARNING
             return self.result
 
-        if not args:
-            args = NetworkAnalyzerArgs()
-
-        final_error_regex = self._convert_and_extend_error_regex(args.error_regex, self.ERROR_REGEX)
-
-        regex_error = False
-        regex_warning = False
-        for interface_name, ethtool_info in data.ethtool_info.items():
-            matches_on_interface: list[tuple[str, int, EventPriority]] = []
-            for stat_name, stat_value in ethtool_info.statistics.items():
-                for error_regex_obj in final_error_regex:
-                    if error_regex_obj.regex.match(stat_name):
-                        try:
-                            value = int(stat_value)
-                        except (ValueError, TypeError):
-                            break
-
-                        if value > 0:
-                            matches_on_interface.append(
-                                (stat_name, value, error_regex_obj.event_priority)
-                            )
-                        break
-
-            if matches_on_interface:
-                has_error = any(
-                    priority == EventPriority.ERROR for _, _, priority in matches_on_interface
-                )
-                if has_error:
-                    regex_error = True
-                else:
-                    regex_warning = True
-                priority = EventPriority.ERROR if has_error else EventPriority.WARNING
-                severity = "error" if has_error else "warning"
-                match_names = [match[0] for match in matches_on_interface]
-                matches_data = {name: value for name, value, _ in matches_on_interface}
-                self._log_event(
-                    category=EventCategory.NETWORK,
-                    description=f"Network {severity} detected on {interface_name}: [{', '.join(match_names)}]",
-                    data={
-                        "interface": interface_name,
-                        "errors": matches_data,
-                    },
-                    priority=priority,
-                    console_log=True,
-                )
-
         vendor_error = False
         vendor_warning = False
         vendor_error_fields: set[str] = set()
@@ -214,10 +159,10 @@ def analyze_data(
                 ", ".join(sorted(vendor_queue_warning_fields)),
             )
 
-        if regex_error or vendor_error:
+        if vendor_error:
             self.result.message = "Network errors detected in statistics"
             self.result.status = ExecutionStatus.ERROR
-        elif regex_warning or vendor_warning:
+        elif vendor_warning:
             self.result.message = "Network warning counters non-zero in statistics"
             self.result.status = ExecutionStatus.WARNING
         else:

nodescraper/plugins/inband/network/network_analyzer.py

@@ -529,6 +529,9 @@ def _collect_ethtool_statistic(self, netdev: str, driver: str) -> Optional[Ethto
 
         The vendor model is selected by matching ``driver`` (from ``ethtool -i``)
         against the known vendor prefixes in ``VENDOR_PREFIX_MAP``.
+
+        Returns:
+            EthtoolStatistics, or None on command failure.
         """
         cmd_s = self.CMD_ETHTOOL_S_TEMPLATE.format(interface=netdev)
         res = self._run_sut_cmd(cmd_s, sudo=True)
@@ -613,11 +616,7 @@ def _collect_ethtool_statistics(
         """Collect ethtool -S for vendor netdevs discovered from `ip addr`.
 
         Each interface's driver is resolved via `ethtool -i`; only interfaces whose
-        driver matches a known vendor prefix (see VENDOR_PREFIX_MAP) are collected. The
-        matched driver selects the respective vendor data model used to parse the
-        `ethtool -S` counters. Interfaces without a known vendor driver (lo, docker,
-        veth, ...) are skipped, which avoids noisy `ethtool -S` failures. This does not
-        depend on RDMA.
+        driver matches a known vendor prefix (see VENDOR_PREFIX_MAP) are collected.
 
         Args:
             interfaces: Interfaces discovered from `ip addr` to consider.

nodescraper/plugins/inband/network/network_collector.py

@@ -25,14 +25,13 @@
 ###############################################################################
 from nodescraper.base import InBandDataPlugin
 
-from .analyzer_args import NetworkAnalyzerArgs
 from .collector_args import NetworkCollectorArgs
 from .network_analyzer import NetworkAnalyzer
 from .network_collector import NetworkCollector
 from .networkdata import NetworkDataModel
 
 
-class NetworkPlugin(InBandDataPlugin[NetworkDataModel, NetworkCollectorArgs, NetworkAnalyzerArgs]):
+class NetworkPlugin(InBandDataPlugin[NetworkDataModel, NetworkCollectorArgs, None]):
     """Plugin for collection of network configuration data"""
 
     DATA_MODEL = NetworkDataModel
@@ -42,5 +41,3 @@ class NetworkPlugin(InBandDataPlugin[NetworkDataModel, NetworkCollectorArgs, Net
     COLLECTOR_ARGS = NetworkCollectorArgs
 
     ANALYZER = NetworkAnalyzer
-
-    ANALYZER_ARGS = NetworkAnalyzerArgs

nodescraper/plugins/inband/network/network_plugin.py

@@ -105,8 +105,6 @@ class EthtoolInfo(BaseModel):
     port: Optional[str] = None  # Port type (e.g., "Twisted Pair")
     auto_negotiation: Optional[str] = None  # Auto-negotiation status (e.g., "on", "off")
     link_detected: Optional[str] = None  # Link detection status (e.g., "yes", "no")
-    # ethtool -S (statistics) output: parsed key-value for error/health analysis
-    statistics: Dict[str, str] = Field(default_factory=dict)
 
 
 class NetworkDataModel(DataModel):
@@ -116,9 +114,7 @@ class NetworkDataModel(DataModel):
     routes: List[Route] = Field(default_factory=list)
     rules: List[RoutingRule] = Field(default_factory=list)
     neighbors: List[Neighbor] = Field(default_factory=list)
-    ethtool_info: Dict[str, EthtoolInfo] = Field(
-        default_factory=dict
-    )  # Interface name -> EthtoolInfo mapping
+    ethtool_info: Dict[str, EthtoolInfo] = Field(default_factory=dict)
     # ethtool -S vendor-parsed counters for netdevs whose driver matches a known vendor
     ethtool_netdevs: List[str] = Field(default_factory=list)
     ethtool_statistics: List[EthtoolStatistics] = Field(default_factory=list)