Merge pull request #231 from itsDNNS/fix/ofdm-error-metrics

fix: omit error metrics for channels without error data

Author: itsDNNS

app/analyzer.py

@@ -394,8 +394,8 @@ def analyze(data: dict) -> dict:
             "power": power,
             "modulation": ch.get("modulation") or ch.get("type", ""),
             "snr": snr,
-            "correctable_errors": ch.get("corrErrors", 0),
-            "uncorrectable_errors": ch.get("nonCorrErrors", 0),
+            "correctable_errors": ch.get("corrErrors"),
+            "uncorrectable_errors": ch.get("nonCorrErrors"),
             "docsis_version": "3.0",
             "health": health,
             "health_detail": health_detail,
@@ -416,8 +416,8 @@ def analyze(data: dict) -> dict:
             "power": power,
             "modulation": ch.get("modulation") or ch.get("type", ""),
             "snr": snr,
-            "correctable_errors": ch.get("corrErrors", 0),
-            "uncorrectable_errors": ch.get("nonCorrErrors", 0),
+            "correctable_errors": ch.get("corrErrors"),
+            "uncorrectable_errors": ch.get("nonCorrErrors"),
             "docsis_version": "3.1",
             "health": health,
             "health_detail": health_detail,
@@ -480,8 +480,8 @@ def analyze(data: dict) -> dict:
     us_powers = [c["power"] for c in us_channels if c["power"] is not None]
     ds_snrs = [c["snr"] for c in ds_channels if c["snr"] is not None]
 
-    total_corr = sum(c["correctable_errors"] for c in ds_channels)
-    total_uncorr = sum(c["uncorrectable_errors"] for c in ds_channels)
+    total_corr = sum(c["correctable_errors"] for c in ds_channels if c["correctable_errors"] is not None)
+    total_uncorr = sum(c["uncorrectable_errors"] for c in ds_channels if c["uncorrectable_errors"] is not None)
 
     us_bitrates = [c["theoretical_bitrate"] for c in us_channels if c["theoretical_bitrate"] is not None]
     us_capacity = round(sum(us_bitrates), 1) if us_bitrates else None

app/blueprints/data_bp.py

@@ -133,10 +133,14 @@ def api_export():
         "|----|-----------|-------------|----------|------------|-------------|---------------|--------|--------|",
     ]
     for ch in ds:
+        corr = ch.get("correctable_errors")
+        uncorr = ch.get("uncorrectable_errors")
+        err_corr = f"{corr:,}" if corr is not None else "-"
+        err_uncorr = f"{uncorr:,}" if uncorr is not None else "-"
         lines.append(
             f"| {ch.get('channel_id','')} | {ch.get('frequency','')} | {ch.get('power','')} "
             f"| {ch.get('snr', '-')} | {ch.get('modulation','')} "
-            f"| {ch.get('correctable_errors', 0):,} | {ch.get('uncorrectable_errors', 0):,} "
+            f"| {err_corr} | {err_uncorr} "
             f"| {ch.get('docsis_version','')} | {ch.get('health','')} |"
         )
     lines += [

app/drivers/cm3500.py

@@ -276,8 +276,8 @@ def _parse_ds_ofdm(self, table) -> list:
                     "powerLevel": None,
                     "mer": mer_data,
                     "mse": None,
-                    "corrErrors": 0,
-                    "nonCorrErrors": 0,
+                    "corrErrors": None,
+                    "nonCorrErrors": None,
                 })
                 chan_id += 1
             except (ValueError, TypeError, IndexError) as e:

app/drivers/ultrahub7.py

@@ -308,8 +308,8 @@ def _parse_downstream_channels(self, channels: list) -> list:
                     "mer": snr if snr > 0 else None,  # DOCSIS 3.1 uses MER
                     "mse": None,  # Not provided
                     "latency": 0,
-                    "corrErrors": 0,  # Not provided by Ultra Hub 7 API
-                    "nonCorrErrors": 0  # Not provided by Ultra Hub 7 API
+                    "corrErrors": None,  # Not provided by Ultra Hub 7 API
+                    "nonCorrErrors": None  # Not provided by Ultra Hub 7 API
                 })
 
             except (ValueError, TypeError) as e:

app/prometheus.py

@@ -162,9 +162,10 @@ def format_metrics(analysis, device_info, connection_info, last_poll_timestamp):
             "docsight_downstream_corrected_errors_total",
         )
         for ch in ds_channels:
-            _metric_value(lines, "docsight_downstream_corrected_errors_total",
-                          ch.get("correctable_errors", 0),
-                          _channel_labels(ch))
+            if ch.get("correctable_errors") is not None:
+                _metric_value(lines, "docsight_downstream_corrected_errors_total",
+                              ch["correctable_errors"],
+                              _channel_labels(ch))
 
         _metric_family_open(
             lines,
@@ -173,9 +174,10 @@ def format_metrics(analysis, device_info, connection_info, last_poll_timestamp):
             "docsight_downstream_uncorrected_errors_total",
         )
         for ch in ds_channels:
-            _metric_value(lines, "docsight_downstream_uncorrected_errors_total",
-                          ch.get("uncorrectable_errors", 0),
-                          _channel_labels(ch))
+            if ch.get("uncorrectable_errors") is not None:
+                _metric_value(lines, "docsight_downstream_uncorrected_errors_total",
+                              ch["uncorrectable_errors"],
+                              _channel_labels(ch))
 
         _metric_family_open(
             lines,