Revert cpu clock to mean of all core clocks, fix warning message for empty net interfaces

Author: mathoudebine

library/sensors/sensors_librehardwaremonitor.py

@@ -6,6 +6,7 @@
 import math
 import os
 import sys
+from statistics import mean
 from typing import Tuple
 
 import clr  # Clr is from pythonnet package. Do not install clr package
@@ -106,8 +107,8 @@ def frequency() -> float:
                 # Keep only real core clocks, ignore effective core clocks
                 if "Core #" in str(sensor.Name) and "Effective" not in str(sensor.Name):
                     frequencies.append(float(sensor.Value))
-        # Take the highest core clock as "CPU clock"
-        return max(frequencies)
+        # Take mean of all core clock as "CPU clock"
+        return mean(frequencies)
 
     @staticmethod
     def load() -> Tuple[float, float, float]:  # 1 / 5 / 15min avg:

library/sensors/sensors_python.py

@@ -262,18 +262,19 @@ def stats(if_name, interval) -> Tuple[
         download_rate = 0
         downloaded = 0
 
-        if if_name in pnic_after:
-            try:
-                upload_rate = (pnic_after[if_name].bytes_sent - PNIC_BEFORE[if_name].bytes_sent) / interval
-                uploaded = pnic_after[if_name].bytes_sent
-                download_rate = (pnic_after[if_name].bytes_recv - PNIC_BEFORE[if_name].bytes_recv) / interval
-                downloaded = pnic_after[if_name].bytes_recv
-            except:
-                # Interface might not be in PNIC_BEFORE for now
-                pass
-
-            PNIC_BEFORE.update({if_name: pnic_after[if_name]})
-        else:
-            logger.warning("Network interface '%s' not found. Check names in config.yaml." % if_name)
+        if if_name != "":
+            if if_name in pnic_after:
+                try:
+                    upload_rate = (pnic_after[if_name].bytes_sent - PNIC_BEFORE[if_name].bytes_sent) / interval
+                    uploaded = pnic_after[if_name].bytes_sent
+                    download_rate = (pnic_after[if_name].bytes_recv - PNIC_BEFORE[if_name].bytes_recv) / interval
+                    downloaded = pnic_after[if_name].bytes_recv
+                except:
+                    # Interface might not be in PNIC_BEFORE for now
+                    pass
+
+                PNIC_BEFORE.update({if_name: pnic_after[if_name]})
+            else:
+                logger.warning("Network interface '%s' not found. Check names in config.yaml." % if_name)
 
         return upload_rate, uploaded, download_rate, downloaded