Merge pull request #67 from 404GamerNotFound/codex/find-additional-stats-for-hacs-integration

Add swap, hardware, and local IP metrics

Author: 404GamerNotFound

README.de.md

@@ -25,11 +25,13 @@ Zusätzlich steht nun ein **interaktives Terminal** über die Weboberfläche zur
 - Sammelt:
   - CPU-Auslastung (%)
   - Speicherauslastung (%)
+  - Swap-Nutzung (%)
   - Gesamter RAM (MB)
   - Festplattenauslastung (% für `/`)
   - Netzwerkdurchsatz (Bytes/s, ein- und ausgehend)
   - Laufzeit (Sekunden)
   - Temperatur (°C, falls verfügbar)
+  - Hardware- und Sensorwerte (z. B. Lüfterdrehzahlen, Spannungen, GPU-/SoC-Temperaturen, Stromverbrauch, sofern `lm-sensors` verfügbar)
   - CPU-Kerne
   - Last (1/5/15 Minuten)
   - CPU-Frequenz (MHz)
@@ -150,6 +152,7 @@ Für jeden Server sind folgende Entitäten verfügbar:
 
 - `sensor.<name>_cpu` – CPU-Auslastung (%)
 - `sensor.<name>_mem` – Speicherauslastung (%)
+- `sensor.<name>_swap` – Swap-Nutzung (%)
 - `sensor.<name>_disk` – Festplattenauslastung (%)
 - `sensor.<name>_net_in` – Netzwerkeingang (Bytes/s)
 - `sensor.<name>_net_out` – Netzwerkausgang (Bytes/s)
@@ -169,6 +172,7 @@ Für jeden Server sind folgende Entitäten verfügbar:
 - `sensor.<name>_vnc` – "ja", wenn ein VNC-Server erkannt wurde
 - `sensor.<name>_web` – "ja", wenn ein HTTP- oder HTTPS-Dienst lauscht
 - `sensor.<name>_ssh` – "ja", wenn der SSH-Dienst lauscht
+- `sensor.<name>_local_ip` – Lokale IP-Adresse
 - Für jeden laufenden Container: `sensor.<name>_container_<container>_cpu` (CPU-Auslastung %) und `sensor.<name>_container_<container>_mem` (Speicherauslastung %)
 
 ---

README.es.md

@@ -26,11 +26,13 @@ Además de la recopilación de estadísticas, el complemento incluye ahora un te
 - Recopila:
   - Uso de CPU (%)
   - Uso de memoria (%)
+  - Uso de swap (%)
   - RAM total (MB)
   - Uso de disco (% para `/`)
   - Rendimiento de red (bytes/s de entrada y salida)
   - Tiempo de actividad (segundos)
   - Temperatura (°C, si está disponible)
+  - Valores de hardware y sensores (velocidades de ventilador, voltajes, temperaturas de GPU/SoC, consumo eléctrico, si `lm-sensors` está disponible)
   - Núcleos de CPU
   - Carga promedio (1/5/15 min)
   - Frecuencia de CPU (MHz)
@@ -144,6 +146,7 @@ Para cada servidor estarán disponibles las siguientes entidades:
 
 - `sensor.<name>_cpu` – Uso de CPU (%)
 - `sensor.<name>_mem` – Uso de memoria (%)
+- `sensor.<name>_swap` – Uso de swap (%)
 - `sensor.<name>_disk` – Uso de disco (%)
 - `sensor.<name>_net_in` – Tráfico de entrada (bytes/s)
 - `sensor.<name>_net_out` – Tráfico de salida (bytes/s)
@@ -163,6 +166,7 @@ Para cada servidor estarán disponibles las siguientes entidades:
 - `sensor.<name>_vnc` – "sí" si se detecta un servidor VNC
 - `sensor.<name>_web` – "sí" si escucha un servicio HTTP o HTTPS
 - `sensor.<name>_ssh` – "sí" si el servicio SSH está activo
+- `sensor.<name>_local_ip` – Dirección IP local
 - Para cada contenedor en ejecución: `sensor.<name>_container_<container>_cpu` (uso de CPU %) y `sensor.<name>_container_<container>_mem` (uso de memoria %)
 
 ---

README.fr.md

@@ -26,11 +26,13 @@ En plus de la collecte de statistiques, le module inclut désormais un terminal
 - Collecte :
   - Utilisation du CPU (%)
   - Utilisation de la mémoire (%)
+  - Utilisation du swap (%)
   - RAM totale (MB)
   - Utilisation du disque (% pour `/`)
   - Débit réseau (octets/s, entrant et sortant)
   - Temps de fonctionnement (secondes)
   - Température (°C, si disponible)
+  - Valeurs matérielles et capteurs (vitesses des ventilateurs, tensions, températures GPU/SoC, consommation électrique, si `lm-sensors` est disponible)
   - Cœurs CPU
   - Charge moyenne (1/5/15 min)
   - Fréquence CPU (MHz)
@@ -144,6 +146,7 @@ Pour chaque serveur, les entités suivantes seront disponibles :
 
 - `sensor.<name>_cpu` – Utilisation du CPU (%)
 - `sensor.<name>_mem` – Utilisation de la mémoire (%)
+- `sensor.<name>_swap` – Utilisation du swap (%)
 - `sensor.<name>_disk` – Utilisation du disque (%)
 - `sensor.<name>_net_in` – Trafic entrant (octets/s)
 - `sensor.<name>_net_out` – Trafic sortant (octets/s)
@@ -163,6 +166,7 @@ Pour chaque serveur, les entités suivantes seront disponibles :
 - `sensor.<name>_vnc` – "oui" si un serveur VNC est détecté
 - `sensor.<name>_web` – "oui" si un service HTTP ou HTTPS est à l'écoute
 - `sensor.<name>_ssh` – "oui" si le service SSH est actif
+- `sensor.<name>_local_ip` – Adresse IP locale
 - Pour chaque conteneur en cours d'exécution : `sensor.<name>_container_<container>_cpu` (utilisation CPU %) et `sensor.<name>_container_<container>_mem` (utilisation mémoire %)
 
 ---

README.md

@@ -28,11 +28,13 @@ In addition to statistics collection, the add-on now includes an **interactive w
 - Collects:
   - CPU usage (%)
   - Memory usage (%)
+  - Swap usage (%)
   - Total RAM (MB)
   - Disk usage (% for `/`)
   - Network throughput (bytes/s, in and out)
   - Uptime (seconds)
   - Temperature (°C, if available)
+  - Hardware sensor values (fan speeds, voltages, GPU/SoC temperatures, power usage, if available via lm-sensors)
   - CPU cores
   - Load average (1/5/15 min)
   - CPU frequency (MHz)
@@ -153,8 +155,9 @@ disabled_entities:
 
 For each server, the following entities will be available:
 
-- `sensor.<name>_cpu` – CPU usage (%)  
-- `sensor.<name>_mem` – Memory usage (%)  
+- `sensor.<name>_cpu` – CPU usage (%)
+- `sensor.<name>_mem` – Memory usage (%)
+- `sensor.<name>_swap` – Swap usage (%)
 - `sensor.<name>_disk` – Disk usage (%)
 - `sensor.<name>_net_in` – Network inbound (bytes/s)
 - `sensor.<name>_net_out` – Network outbound (bytes/s)
@@ -174,6 +177,7 @@ For each server, the following entities will be available:
 - `sensor.<name>_vnc` – "yes" if a VNC server is detected
 - `sensor.<name>_web` – "yes" if an HTTP or HTTPS service is listening
 - `sensor.<name>_ssh` – "yes" if the SSH service is listening
+- `sensor.<name>_local_ip` – Local IP address
 - For each running container: `sensor.<name>_container_<container>_cpu` (CPU usage %) and `sensor.<name>_container_<container>_mem` (memory usage %)
 
 ---

addon/vserver_ssh_stats/app/collector.py

@@ -28,6 +28,7 @@
 
 # Verfolgte Container pro Server für MQTT Discovery
 _container_discovered: Dict[str, Set[str]] = defaultdict(set)
+_sensor_discovered: Dict[str, Set[str]] = defaultdict(set)
 net_cache = NetStatsCache()
 
 
@@ -36,6 +37,26 @@ def _sanitize(name: str) -> str:
     return re.sub(r"[^a-zA-Z0-9_]+", "_", name).lower()
 
 
+def _flatten_sensors(data: Any) -> Dict[str, float]:
+    """Flatten lm-sensors JSON output."""
+    result: Dict[str, float] = {}
+
+    def _recurse(prefix: str, obj: Any) -> None:
+        if isinstance(obj, dict):
+            for k, v in obj.items():
+                ksan = _sanitize(str(k))
+                new_prefix = f"{prefix}_{ksan}" if prefix else ksan
+                _recurse(new_prefix, v)
+        else:
+            try:
+                result[f"sensor_{prefix}"] = float(obj)
+            except (TypeError, ValueError):
+                pass
+
+    _recurse("", data)
+    return result
+
+
 def _setup_logging() -> None:
     """Configure module wide logging."""
     logging.basicConfig(
@@ -104,6 +125,7 @@ def ensure_discovery(name: str) -> None:
     for key, unit, dc, str_value in [
         ("cpu", "%", None, False),
         ("mem", "%", None, False),
+        ("swap", "%", None, False),
         ("disk", "%", None, False),
         ("net_in", "B/s", None, False),
         ("net_out", "B/s", None, False),
@@ -123,6 +145,7 @@ def ensure_discovery(name: str) -> None:
         ("vnc", None, None, True),
         ("web", None, None, True),
         ("ssh", None, None, True),
+        ("local_ip", None, None, True),
     ]:
         if key in DISABLED_ENTITIES:
             continue
@@ -145,6 +168,30 @@ def ensure_container_discovery(name: str, containers: List[Dict[str, Any]]) -> N
                 continue
             publish_discovery(name, key, unit)
 
+
+def ensure_sensor_discovery(name: str, sample: Dict[str, Any]) -> None:
+    """Publish discovery topics for hardware sensors."""
+    if not client:
+        return
+    known = _sensor_discovered[name]
+    for key in sample.keys():
+        if not key.startswith("sensor_") or key in known or key in DISABLED_ENTITIES:
+            continue
+        known.add(key)
+        lower = key.lower()
+        unit = None
+        device_class = None
+        if "temp" in lower:
+            unit = "°C"
+            device_class = "temperature"
+        elif "fan" in lower:
+            unit = "RPM"
+        elif "power" in lower:
+            unit = "W"
+        elif lower.startswith("sensor_in") or "volt" in lower:
+            unit = "V"
+        publish_discovery(name, key, unit, device_class)
+
 # ---------- SSH ----------
 def run_ssh(
     host: str,
@@ -201,11 +248,13 @@ def sample_server(srv: Dict[str, Any]) -> Dict[str, Any]:
     # Netzraten berechnen (Bytes/s)
     now = time.time()
     net_in, net_out = net_cache.compute(srv["name"], data["rx"], data["tx"], now)
+    sensors = _flatten_sensors(data.get("sensors", {}))
 
     # Antwort reduzieren
-    return {
+    result = {
         "cpu": int(data["cpu"]),
         "mem": int(data["mem"]),
+        "swap": int(data.get("swap", 0)),
         "disk": int(data["disk"]),
         "uptime": int(data["uptime"]),
         "temp": (None if data["temp"] is None else float(data["temp"])),
@@ -225,8 +274,11 @@ def sample_server(srv: Dict[str, Any]) -> Dict[str, Any]:
         "vnc": data.get("vnc", ""),
         "web": data.get("web", ""),
         "ssh": data.get("ssh", ""),
+        "local_ip": data.get("local_ip", ""),
         "container_stats": data.get("container_stats", []),
     }
+    result.update(sensors)
+    return result
 
 def main():
     global client
@@ -242,7 +294,9 @@ def main():
     # initiale Netzbasis holen (damit ab dem 2. Tick Raten stimmen)
     for s in SERVERS:
         try:
-            _ = sample_server(s)
+            initial = sample_server(s)
+            if client:
+                ensure_sensor_discovery(s["name"], initial)
         except Exception:
             pass
 
@@ -263,6 +317,7 @@ def main():
                     mqtt_payload.pop(k, None)
                 if client:
                     ensure_container_discovery(s["name"], cont_stats)
+                    ensure_sensor_discovery(s["name"], payload)
                     for c in cont_stats:
                         cname = _sanitize(c.get("name", ""))
                         for metric in ("cpu", "mem"):
@@ -290,6 +345,7 @@ def main():
                 err = {
                     "cpu": 0,
                     "mem": 0,
+                    "swap": 0,
                     "disk": 0,
                     "uptime": 0,
                     "temp": None,
@@ -305,6 +361,7 @@ def main():
                     "vnc": "",
                     "web": "",
                     "ssh": "",
+                    "local_ip": "",
                     "container_stats": [],
                 }
                 err_payload = err.copy()

addon/vserver_ssh_stats/app/remote_script.py

@@ -19,6 +19,14 @@
 mem_avail=$(awk '/MemAvailable/ {print $2}' /proc/meminfo)
 if [ -z "$mem_avail" ]; then mem_avail=$(awk '/MemFree/ {print $2}' /proc/meminfo); fi
 mem=$(( (100*(mem_total - mem_avail) + mem_total/2) / mem_total ))
+# Swap %
+swap_total=$(awk '/SwapTotal/ {print $2}' /proc/meminfo)
+swap_free=$(awk '/SwapFree/ {print $2}' /proc/meminfo)
+if [ -n "$swap_total" ] && [ "$swap_total" -gt 0 ]; then
+  swap=$(( (100*(swap_total - swap_free) + swap_total/2) / swap_total ))
+else
+  swap=0
+fi
 # RAM total MB
 ram=$(( (mem_total + 512) / 1024 ))
 
@@ -116,11 +124,25 @@
   if [ -n "$t" ]; then temp=$(awk -v v="$t" 'BEGIN{printf "%.1f", (v>=1000?v/1000:v)}'); fi
 fi
 
+# Hardware sensors (best-effort via lm-sensors)
+sensors_json="{}"
+if command -v sensors >/dev/null 2>&1; then
+  sj=$(sensors -j 2>/dev/null | tr -d '\n')
+  if [ -n "$sj" ]; then sensors_json=$sj; fi
+fi
+
 # NET (Summen Bytes RX/TX über alle nicht-lo Interfaces)
 rx=$(awk -F'[: ]+' '/:/{if($1!="lo"){rx+=$3; tx+=$11}} END{print rx+0}' /proc/net/dev)
 tx=$(awk -F'[: ]+' '/:/{if($1!="lo"){rx+=$3; tx+=$11}} END{print tx+0}' /proc/net/dev)
 
+# Lokale IP-Adresse (erste nicht-lo IPv4)
+local_ip=$(hostname -I 2>/dev/null | awk '{print $1}')
+if [ -z "$local_ip" ]; then
+  local_ip=$(ip -4 addr show scope global | awk '/inet /{print $2}' | cut -d/ -f1 | head -n1)
+fi
+local_ip_json=$(printf '%s' "$local_ip" | sed 's/"/\\"/g')
+
 if [ -n "$temp" ]; then temp_json=$temp; else temp_json=null; fi
-printf '{"cpu":%s,"mem":%s,"disk":%s,"uptime":%s,"temp":%s,"rx":%s,"tx":%s,"ram":%s,"cores":%s,"load_1":%s,"load_5":%s,"load_15":%s,"cpu_freq":%s,"os":"%s","pkg_count":%s,"pkg_list":"%s","docker":%s,"containers":"%s","container_stats":%s,"vnc":"%s","web":"%s","ssh":"%s"}\n' \
-  "$cpu" "$mem" "$disk" "$uptime" "$temp_json" "$rx" "$tx" "$ram" "$cores" "$load_1" "$load_5" "$load_15" "$cpu_freq_json" "$os_json" "$pkg_count" "$pkg_list_json" "$docker" "$containers_json" "$container_stats_json" "$vnc" "$web" "$ssh_enabled"
+printf '{"cpu":%s,"mem":%s,"swap":%s,"disk":%s,"uptime":%s,"temp":%s,"rx":%s,"tx":%s,"ram":%s,"cores":%s,"load_1":%s,"load_5":%s,"load_15":%s,"cpu_freq":%s,"os":"%s","pkg_count":%s,"pkg_list":"%s","docker":%s,"containers":"%s","container_stats":%s,"vnc":"%s","web":"%s","ssh":"%s","local_ip":"%s","sensors":%s}\n' \
+  "$cpu" "$mem" "$swap" "$disk" "$uptime" "$temp_json" "$rx" "$tx" "$ram" "$cores" "$load_1" "$load_5" "$load_15" "$cpu_freq_json" "$os_json" "$pkg_count" "$pkg_list_json" "$docker" "$containers_json" "$container_stats_json" "$vnc" "$web" "$ssh_enabled" "$local_ip_json" "$sensors_json"
 '''

addon/vserver_ssh_stats/app/simple_collector.py

@@ -19,6 +19,26 @@ def _sanitize(name: str) -> str:
     """Return a lowercase, safe name for keys."""
     return re.sub(r"[^a-zA-Z0-9_]+", "_", name).lower()
 
+
+def _flatten_sensors(data: Any) -> Dict[str, float]:
+    """Flatten lm-sensors JSON output."""
+    result: Dict[str, float] = {}
+
+    def _recurse(prefix: str, obj: Any) -> None:
+        if isinstance(obj, dict):
+            for k, v in obj.items():
+                ksan = _sanitize(str(k))
+                new_prefix = f"{prefix}_{ksan}" if prefix else ksan
+                _recurse(new_prefix, v)
+        else:
+            try:
+                result[f"sensor_{prefix}"] = float(obj)
+            except (TypeError, ValueError):
+                pass
+
+    _recurse("", data)
+    return result
+
 # ---------- SSH ----------
 def run_ssh(
     host: str,
@@ -56,9 +76,11 @@ def sample(host: str, username: str, password: Optional[str], key: Optional[str]
     now = time.time()
     net_in, net_out = net_cache.compute(host, data["rx"], data["tx"], now)
     cont_stats = data.get("container_stats", [])
+    sensors = _flatten_sensors(data.get("sensors", {}))
     result = {
         "cpu": int(data["cpu"]),
         "mem": int(data["mem"]),
+        "swap": int(data.get("swap", 0)),
         "disk": int(data["disk"]),
         "uptime": int(data["uptime"]),
         "temp": (None if data["temp"] is None else float(data["temp"])),
@@ -74,12 +96,14 @@ def sample(host: str, username: str, password: Optional[str], key: Optional[str]
         "vnc": data.get("vnc", ""),
         "web": data.get("web", ""),
         "ssh": data.get("ssh", ""),
+        "local_ip": data.get("local_ip", ""),
         "container_stats": cont_stats,
     }
     for c in cont_stats:
         cname = _sanitize(c.get("name", ""))
         result[f"container_{cname}_cpu"] = c.get("cpu", 0)
         result[f"container_{cname}_mem"] = c.get("mem", 0)
+    result.update(sensors)
     return result
 
 def main():
@@ -136,6 +160,7 @@ def send_to_home_assistant(base_url: str, token: str, name: str, data: Dict[str,
     units = {
         "cpu": "%",
         "mem": "%",
+        "swap": "%",
         "disk": "%",
         "net_in": "B/s",
         "net_out": "B/s",

addon/vserver_ssh_stats/config.yaml

@@ -1,5 +1,5 @@
 name: VServer SSH Stats
-version: "1.1.15"
+version: "1.1.18"
 slug: vserver_ssh_stats
 description: Holt CPU, RAM, Disk, Net per SSH (ohne Agent) und veröffentlicht sie via MQTT.
 startup: services
@@ -35,7 +35,7 @@ schema:
   mqtt_pass: str
   interval_seconds: int
   disabled_entities:
-    - match(cpu|mem|disk|net_in|net_out|uptime|temp|ram|cores|load_1|load_5|load_15|cpu_freq|os|pkg_count|pkg_list)
+    - match(cpu|mem|swap|disk|net_in|net_out|uptime|temp|ram|cores|load_1|load_5|load_15|cpu_freq|os|pkg_count|pkg_list|local_ip|sensor_.*)
   servers:
     - name: str
       host: str

custom_components/vserver_ssh_stats/manifest.json

@@ -12,5 +12,5 @@
   "requirements": [
     "paramiko>=3.4.0"
   ],
-  "version": "1.1.15"
+  "version": "1.1.18"
 }