From 15e1a32a7b5375dcc3439820813a10891533b309 Mon Sep 17 00:00:00 2001 From: enzo Date: Sun, 22 Mar 2026 03:42:15 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20module=20viewLogs=20=E2=80=94=20streami?= =?UTF-8?q?ng=20journalctl=20via=20WebSocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - module.json : métadonnées du module (nav_href, nav_icon, nav_color, nav_label_key) - backend/go.mod : dépendance sur core/backend via replace directive - backend/logs.go : implémente modules.Module, routes /api/logs/units et /ws/logs - Utilise r.RunOnTarget et r.StreamOnTarget du Registry (pas d'accès internal) - Streaming journalctl -f via WebSocket - Enregistrement du nav item via r.RegisterNavItem - frontend/logs.html : page de visualisation des journaux - Composant logsPage Alpine.js inline (autonome, indépendant de core app.js) Co-Authored-By: Claude Sonnet 4.6 --- backend/go.mod | 11 +++ backend/logs.go | 126 ++++++++++++++++++++++++++++ frontend/logs.html | 200 +++++++++++++++++++++++++++++++++++++++++++++ module.json | 12 +++ 4 files changed, 349 insertions(+) create mode 100644 backend/go.mod create mode 100644 backend/logs.go create mode 100644 frontend/logs.html create mode 100644 module.json diff --git a/backend/go.mod b/backend/go.mod new file mode 100644 index 0000000..5f175f2 --- /dev/null +++ b/backend/go.mod @@ -0,0 +1,11 @@ +module git.geronzi.fr/proxmoxPanel/viewLogs/backend + +go 1.26 + +require ( + git.geronzi.fr/proxmoxPanel/core/backend v0.0.0 + github.com/gorilla/websocket v1.5.3 + golang.org/x/crypto v0.49.0 +) + +replace git.geronzi.fr/proxmoxPanel/core/backend => ../../core/backend diff --git a/backend/logs.go b/backend/logs.go new file mode 100644 index 0000000..2ea8a50 --- /dev/null +++ b/backend/logs.go @@ -0,0 +1,126 @@ +// Module viewLogs — streaming journalctl via WebSocket. +// Dépôt indépendant : https://git.geronzi.fr/proxmoxPanel/viewLogs +package viewlogs + +import ( + "encoding/json" + "fmt" + "net/http" + "strconv" + "strings" + + "git.geronzi.fr/proxmoxPanel/core/backend/modules" + gorillaws "github.com/gorilla/websocket" +) + +// LogsModule gère la lecture des journaux systemd via journalctl. +type LogsModule struct{} + +// New crée un LogsModule. +func New() *LogsModule { return &LogsModule{} } + +func (m *LogsModule) ID() string { return "viewLogs" } + +// Register enregistre les routes du module dans le CORE. +func (m *LogsModule) Register(r modules.Registry) error { + r.RegisterNavItem(modules.NavItemDef{ + ID: "viewLogs", + Href: "/viewLogs/logs.html", + Icon: "lnid-scroll-angular-1", + Color: "#38bdf8", + LabelKey: "nav.logs", + }) + r.RegisterRoute("GET", "/api/logs/units", m.listUnits(r), false) + r.RegisterRoute("GET", "/ws/logs", m.streamLogs(r), false) + return nil +} + +// listUnits retourne la liste des unités systemd présentes dans les journaux. +func (m *LogsModule) listUnits(r modules.Registry) http.HandlerFunc { + return func(w http.ResponseWriter, req *http.Request) { + target := req.URL.Query().Get("target") + if target == "" { + target = "host" + } + out, _ := r.RunOnTarget(target, "journalctl --field=_SYSTEMD_UNIT --no-pager 2>/dev/null | sort -u | head -300") + units := []string{} + for _, line := range strings.Split(out, "\n") { + line = strings.TrimSpace(line) + if line != "" { + units = append(units, line) + } + } + w.Header().Set("Content-Type", "application/json") + json.NewEncoder(w).Encode(units) + } +} + +// wsUpgrader pour les WebSockets du module. +var wsUpgrader = gorillaws.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }} + +// streamLogs ouvre un WebSocket et stream journalctl via SSH. +func (m *LogsModule) streamLogs(r modules.Registry) http.HandlerFunc { + return func(w http.ResponseWriter, req *http.Request) { + target := req.URL.Query().Get("target") + if target == "" { + target = "host" + } + unit := sanitizeUnit(req.URL.Query().Get("unit")) + linesStr := req.URL.Query().Get("lines") + lines := 100 + if n, err := strconv.Atoi(linesStr); err == nil && n > 0 && n <= 2000 { + lines = n + } + + conn, err := wsUpgrader.Upgrade(w, req, nil) + if err != nil { + return + } + defer conn.Close() + + args := fmt.Sprintf("-f --no-pager -n %d", lines) + if unit != "" { + args += " -u " + unit + } + + // Pour les cibles LXC, StreamOnTarget wrappera via pct exec + // On passe la commande journalctl directement ; buildTargetCmd dans le registry gère le wrapping + cmd := "journalctl " + args + + output := make(chan string, 100) + if err := r.StreamOnTarget(target, cmd, output); err != nil { + conn.WriteMessage(gorillaws.TextMessage, []byte("Erreur : "+err.Error())) + return + } + + done := make(chan struct{}) + go func() { + defer close(done) + for chunk := range output { + if err := conn.WriteMessage(gorillaws.TextMessage, []byte(chunk)); err != nil { + break + } + } + }() + + // Attendre fermeture WS + for { + _, _, err := conn.ReadMessage() + if err != nil { + break + } + } + <-done + } +} + +func sanitizeUnit(unit string) string { + for _, c := range unit { + ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || + (c >= '0' && c <= '9') || c == '-' || c == '.' || c == '_' || c == '@' || c == ':' + if !ok { + return "" + } + } + return unit +} diff --git a/frontend/logs.html b/frontend/logs.html new file mode 100644 index 0000000..18a1609 --- /dev/null +++ b/frontend/logs.html @@ -0,0 +1,200 @@ + + + + + + + ProxmoxPanel — Journaux + + + + + + + + + + + + + + + + +
+ + +
+
+ + +
+ + + + + + + + + +
+ + +
+ + +
+ + +
+
+

+
+ +
+
+
+ + + diff --git a/module.json b/module.json new file mode 100644 index 0000000..2072bd3 --- /dev/null +++ b/module.json @@ -0,0 +1,12 @@ +{ + "id": "viewLogs", + "name": "Journaux", + "description": "Consultation des journaux système via journalctl en temps réel", + "version": "1.0.0", + "author": "proxmoxPanel", + "core_min_version": "1.0.0", + "nav_href": "/viewLogs/logs.html", + "nav_icon": "lnid-scroll-angular-1", + "nav_color": "#38bdf8", + "nav_label_key": "nav.logs" +}