Fix Gitea issues #1 and #2, add firewall automation, forwarder telemetry, and dynamic key rotation

2026-10-02 21:39:51 +02:00
parent 0edae4d797
commit 909dc640e3
7 changed files with 488 additions and 13 deletions
@@ -23,7 +23,8 @@ from log_collector import (
    get_machine_identifier,
    is_path_writable,
    get_default_data_dir,
-    resolve_writable_path
+    resolve_writable_path,
+    collect_system_metrics
 )

 CONFIG_FILE_NAME = "client_config.json"
@@ -247,7 +248,8 @@ def send_encrypted_logs_over_socket(
            payload = {
                "server": actual_machine_id,
                "timestamp": datetime.now(timezone.utc).isoformat(),
-                "logs": logs
+                "logs": logs,
+                "metrics": collect_system_metrics()
            }
            payload_bytes = json.dumps(payload).encode("utf-8")
            frame = struct.pack(">I", len(payload_bytes)) + payload_bytes
@@ -283,7 +285,8 @@ def send_encrypted_logs_over_socket(
    payload = {
        "server": actual_machine_id,
        "timestamp": datetime.now(timezone.utc).isoformat(),
-        "logs": logs
+        "logs": logs,
+        "metrics": collect_system_metrics()
    }
    payload_json = json.dumps(payload)
    pgp_msg = pgpy.PGPMessage.new(payload_json)