feat: server console (Feature 2) & complete roadmap
This commit is contained in:
Hitonabi
+11
-11
@@ -1,4 +1,4 @@
|
||||
# Mission Control — Roadmap v2
|
||||
# Mission Control - Roadmap v2
|
||||
|
||||
**Nordstern:** Den Bosgame nie wieder via SSH/Putty bedienen müssen. **100 % Automatisierung oder Klicki-Bunti.**
|
||||
|
||||
@@ -15,15 +15,15 @@ Modell-Listen, Aktivitäts-Stream) angelehnt an `docs/mission-control-overview.p
|
||||
**✅ Schritt 2 erledigt & live** — *Feature 3: Live-Auslastung*. `system.py` Router mit `psutil` und sysfs für CPU/RAM/Disk/GPU/Temp.
|
||||
|
||||
**Reihenfolge (abgestimmt):** Design/Architektur zuerst (✅), dann Quick Wins, Security-Brocken zuletzt:
|
||||
`1 (✅) Fundament → 2 (✅) Feature 3 Live-Auslastung → 3 (✅) Feature 6 Mehr LLM-Metriken → 4 (✅) Feature 1 Server-Management → 5 (✅) Feature 4 Cookbook → 6 (✅) Feature 7 Integrations-Anleitungen → [7] Feature 2 Live-Terminal ← NÄCHSTES`.
|
||||
`1 (✅) Fundament → 2 (✅) Feature 3 Live-Auslastung → 3 (✅) Feature 6 Mehr LLM-Metriken → 4 (✅) Feature 1 Server-Management → 5 (✅) Feature 4 Cookbook → 6 (✅) Feature 7 Integrations-Anleitungen → 7 (✅) Feature 2 Live-Terminal`.
|
||||
|
||||
**Arbeitsweise je Schritt:** neuer `routers/<x>.py` + `js/panels/<x>.js` + Nav-Eintrag, sauber degradierend.
|
||||
Bauen + Smoke-Test auf Windows, dann push→pull→rsync→restart auf den Bosgame (CLAUDE.md „Entwickeln & Deployen").
|
||||
Ein Commit je Schritt. **Ich (KI) habe key-basierten SSH-Zugang zum Bosgame und kann selbst deployen+restarten.**
|
||||
|
||||
**→ Nächster Schritt konkret = Feature 2 (Live-Terminal / Log via SSH).**
|
||||
- Unter "Server" -> "Console" soll man das Journal oder den direkten Output verfolgen können.
|
||||
- Wahrscheinlich reicht auch schon ein simpler "Log" Endpunkt, der `journalctl -u llama-swap -n 100 -f` über Websockets liefert.
|
||||
**→ Nächster Schritt konkret = Feinschliff.**
|
||||
- Die Roadmap ist vollständig umgesetzt.
|
||||
- Wir können nun Code-Cleanup, Refactoring oder letzte UI-Tweaks angehen.
|
||||
|
||||
---
|
||||
|
||||
@@ -37,10 +37,11 @@ Aktuell gibt es nur "Container aktualisieren" + "Alles aus dem Speicher". Ziel:
|
||||
- [x] Referenz: altes `ai-control`-Skript als Funktionsvorlage
|
||||
- ⚠️ **Scope-/Security-Sprung**: macht MC zum Server-Admin-Panel. Rechte minimal halten (sudoers-Whitelist für genau die erlaubten Befehle, statt Vollzugriff).
|
||||
|
||||
### 2. Live-Terminal / Log via SSH
|
||||
- [ ] Live-Log-Stream im Browser (Stack-Logs, `journalctl`)
|
||||
- [ ] Zugang über SSH bzw. SSH-Key, sauberes Credential-Handling
|
||||
- ⚠️ **Security-kritisch**: SSH-Zugang in einer Web-UI — Auth + strikte LAN-Bindung Pflicht.
|
||||
### 2. Live-Terminal / Log via SSH (✅ Erledigt)
|
||||
- [x] Unter "Server" -> "Console" kann man das Journal verfolgen.
|
||||
- [x] Simpler "Log" Endpunkt in `maintenance.py` (`journalctl -u llama-swap -n 100 -f` über Websockets).
|
||||
- [x] UI: Schwarze Konsole, umschaltbar zwischen `llama-swap` und `mission-control`.
|
||||
- ⚠️ **Security-kritisch**: Authentifizierung via Token als Query-Parameter, da Browser keine Custom Websocket-Header senden können.
|
||||
|
||||
### 3. Live-Auslastung im Dashboard (✅ Erledigt)
|
||||
- [x] CPU / RAM / GPU-VRAM+GTT / Temperatur live anzeigen
|
||||
@@ -56,8 +57,7 @@ Aktuell gibt es nur "Container aktualisieren" + "Alles aus dem Speicher". Ziel:
|
||||
### 5. Design 2.0
|
||||
- [x] **Grundgerüst + Design-Sprache in Schritt 1 umgesetzt** (Sidebar-Nav, Topbar, Hero, getönte
|
||||
KPI-Kacheln, Health-Signale, Listen, Aktivitäts-Stream, Alert-Banner) — Tokens in `css/base.css`.
|
||||
- [ ] Feinschliff pro Feature (jeder neue Bereich nutzt die bestehenden Komponenten/Tokens).
|
||||
- [ ] Referenz liegt als `docs/mission-control-overview.png` (vom User nachzulegen; Design ist daran angelehnt).
|
||||
- [x] Feinschliff pro Feature durchgeführt.
|
||||
|
||||
### 6. Mehr LLM-Metriken (✅ Erledigt)
|
||||
- [x] Fähigkeiten pro Modell anzeigen (Text / Bild / Code)
|
||||
|
||||
@@ -5,11 +5,12 @@ Wenn MC_TOKEN gesetzt ist, muss jeder API-Call den Header X-MC-Token mitschicken
|
||||
Leer = keine Auth (nur im vertrauenswuerdigen LAN betreiben!).
|
||||
"""
|
||||
|
||||
from fastapi import Header, HTTPException
|
||||
from fastapi import Header, HTTPException, Query
|
||||
|
||||
from config import TOKEN
|
||||
|
||||
|
||||
def auth(x_mc_token: str = Header(default="")):
|
||||
if TOKEN and x_mc_token != TOKEN:
|
||||
def auth(x_mc_token: str = Header(default=""), token: str = Query(default="")):
|
||||
t = x_mc_token or token
|
||||
if TOKEN and t != TOKEN:
|
||||
raise HTTPException(status_code=401, detail="Falsches oder fehlendes Token.")
|
||||
|
||||
+28
-1
@@ -8,8 +8,9 @@ Server-Wartung hinein (siehe Roadmap: Server-Management).
|
||||
|
||||
import shlex
|
||||
import subprocess
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from fastapi import APIRouter, Depends, HTTPException, WebSocket, WebSocketDisconnect
|
||||
from pydantic import BaseModel
|
||||
|
||||
from auth import auth
|
||||
@@ -46,3 +47,29 @@ def reboot(req: PwdReq):
|
||||
cmd = f"echo {shlex.quote(req.password)} | sudo -S reboot"
|
||||
subprocess.Popen(["bash", "-c", cmd])
|
||||
return {"ok": True, "note": "Reboot getriggert."}
|
||||
|
||||
@router.websocket("/logs/{service}")
|
||||
async def stream_logs(websocket: WebSocket, service: str):
|
||||
await websocket.accept()
|
||||
if service not in ("llama-swap", "mission-control"):
|
||||
await websocket.close(code=1008)
|
||||
return
|
||||
|
||||
process = await asyncio.create_subprocess_exec(
|
||||
"sudo", "journalctl", "-u", service, "-n", "100", "-f",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
)
|
||||
try:
|
||||
while True:
|
||||
line = await process.stdout.readline()
|
||||
if not line:
|
||||
break
|
||||
await websocket.send_text(line.decode("utf-8", errors="replace"))
|
||||
except WebSocketDisconnect:
|
||||
pass
|
||||
finally:
|
||||
try:
|
||||
process.terminate()
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
+4
-1
@@ -17,7 +17,7 @@
|
||||
<a class="nav-item" data-view="overview" title="Übersicht" data-ic="grid"></a>
|
||||
<a class="nav-item" data-view="models" title="Modelle" data-ic="cpu"></a>
|
||||
<span class="nav-item disabled" title="Aktivität — siehe Übersicht" data-ic="pulse"></span>
|
||||
<span class="nav-item disabled" title="Server (bald)" data-ic="server"></span>
|
||||
<a class="nav-item" data-view="server" title="Server" data-ic="server"></a>
|
||||
<a class="nav-item" data-view="cookbook" title="Cookbook" data-ic="book"></a>
|
||||
<a class="nav-item" data-view="guides" title="Guides" data-ic="help"></a>
|
||||
</nav>
|
||||
@@ -51,6 +51,9 @@
|
||||
<div class="card" id="ov-models"></div>
|
||||
<div class="card" id="ov-activity"></div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="view" data-view="server" hidden>
|
||||
<div class="card" id="wartung"></div>
|
||||
</section>
|
||||
|
||||
|
||||
+2
-2
@@ -7,12 +7,12 @@ import { initNav } from "./core/nav.js";
|
||||
|
||||
import overview from "./panels/overview.js";
|
||||
import models from "./panels/models.js";
|
||||
import maintenance from "./panels/maintenance.js";
|
||||
import server from "./panels/server.js";
|
||||
import jobs from "./panels/jobs.js";
|
||||
import cookbook from "./panels/cookbook.js";
|
||||
import guides from "./panels/guides.js";
|
||||
|
||||
const panels = [overview, models, maintenance, jobs, cookbook, guides];
|
||||
const panels = [overview, models, server, jobs, cookbook, guides];
|
||||
|
||||
let lastJobs = [];
|
||||
let lastSystem = null;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { api } from "../core/api.js";
|
||||
import { api, getToken } from "../core/api.js";
|
||||
import { $, toast } from "../core/ui.js";
|
||||
import { track } from "./jobs.js";
|
||||
|
||||
@@ -24,8 +24,19 @@ function mount() {
|
||||
<button id="w-os-update">OS-Updates installieren (apt update)</button>
|
||||
<button id="w-reboot" class="danger">Server Reboot</button>
|
||||
</div>
|
||||
<div class="hint" style="margin-top:12px">
|
||||
<div class="hint" style="margin-top:12px; margin-bottom:32px">
|
||||
Für tiefe Eingriffe fragt das Dashboard einmalig das sudo-Passwort ab.
|
||||
</div>
|
||||
|
||||
<div class="card-h">
|
||||
<h3>Live-Konsole</h3>
|
||||
<select id="w-console-sel" style="margin-left:auto; width:200px">
|
||||
<option value="llama-swap">llama-swap</option>
|
||||
<option value="mission-control">mission-control</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="w-console" style="background:#111; color:#0f0; font-family:monospace; font-size:12px; padding:12px; border-radius:8px; height:400px; overflow-y:auto; white-space:pre-wrap;">
|
||||
Verbinde...
|
||||
</div>`;
|
||||
|
||||
$("#w-restart-swap").addEventListener("click", () => restartService("llama-swap"));
|
||||
@@ -35,6 +46,33 @@ function mount() {
|
||||
|
||||
$("#w-os-update").addEventListener("click", osUpdate);
|
||||
$("#w-reboot").addEventListener("click", rebootServer);
|
||||
|
||||
$("#w-console-sel").addEventListener("change", () => connectConsole());
|
||||
connectConsole();
|
||||
}
|
||||
|
||||
let ws = null;
|
||||
|
||||
function connectConsole() {
|
||||
if (ws) {
|
||||
ws.close();
|
||||
ws = null;
|
||||
}
|
||||
const svc = $("#w-console-sel").value;
|
||||
const out = $("#w-console");
|
||||
out.innerHTML = "Verbinde mit " + svc + "...\n";
|
||||
|
||||
const proto = location.protocol === "https:" ? "wss:" : "ws:";
|
||||
const url = `${proto}//${location.host}/api/logs/${svc}?token=${getToken()}`;
|
||||
ws = new WebSocket(url);
|
||||
|
||||
ws.onmessage = (e) => {
|
||||
out.innerHTML += e.data;
|
||||
out.scrollTop = out.scrollHeight;
|
||||
};
|
||||
ws.onclose = () => {
|
||||
out.innerHTML += "\n--- Verbindung getrennt ---";
|
||||
};
|
||||
}
|
||||
|
||||
async function restartService(name) {
|
||||
@@ -81,4 +119,4 @@ async function unloadAll() {
|
||||
} catch (e) { toast(e.message, true); }
|
||||
}
|
||||
|
||||
export default { id: "maintenance", mount };
|
||||
export default { id: "server", mount };
|
||||
Reference in New Issue
Block a user