8 Commits

Author SHA1 Message Date
Ducky SSH User
50dcfcdc83 Add logging and fix /agents/ route error
All checks were successful
Build and Release / build (push) Successful in 35s
2025-12-20 07:34:02 +00:00
Ducky SSH User
761b91b031 Add hostname editing feature to agent detail page
- Create enhanced agent detail template with all stats and hostname edit form
- Add UpdateHostname method to store for agent hostname updates
- Add UpdateAgentHostname handler in UI for web form submissions
- Add UpdateHostname endpoint in API handler for JSON requests
- Register new POST /agents/{id}/hostname route for hostname updates
- Improve agent detail page layout with Settings and Danger Zone sections
- Add error handling for missing agents and empty hostname values
2025-12-20 06:51:27 +00:00
Ducky SSH User
0a37b04506 Fix Alpine Linux addgroup/adduser syntax for non-root user creation
All checks were successful
Build and Release / build (push) Successful in 12s
2025-12-20 06:45:21 +00:00
Ducky SSH User
a5a683d1de Fix Docker Compose and Dockerfile issues: remove image pull, fix entrypoint permissions 2025-12-20 06:36:20 +00:00
Ducky SSH User
e0b8f8650b Fix wget --post-file usage with temporary files for API calls
All checks were successful
Build and Release / build (push) Successful in 11s
2025-12-20 06:31:33 +00:00
Ducky SSH User
3a7b5a0f9a Replace curl with wget in CI/CD workflow for Gitea runner compatibility 2025-12-20 06:31:02 +00:00
Ducky SSH User
999a595b9c Remove jq dependency from release workflow
Some checks failed
Build and Release / build (push) Failing after 12s
- Replace jq with grep for parsing JSON responses
- Use curl -w to capture HTTP response codes
- Improve error handling and logging
- Check HTTP response codes for upload success
- Should work on runners without jq installed
- Fixes 'command not found' error on release creation
2025-12-20 06:28:25 +00:00
Ducky SSH User
e6f705486d Fix git tag checkout in Gitea Actions workflow
Some checks failed
Build and Release / build (push) Failing after 10s
- For tags: fetch with explicit ref mapping to refs/tags/
- For branches: fetch with explicit ref mapping to refs/remotes/origin/
- Properly checkout tag refs using refs/tags/ path
- Fixes 'pathspec did not match any file(s)' error on tag builds
2025-12-20 06:24:56 +00:00
14 changed files with 322 additions and 119 deletions

View File

@@ -17,10 +17,14 @@ jobs:
cd $GITHUB_WORKSPACE cd $GITHUB_WORKSPACE
git init git init
git remote add origin ${{ github.server_url }}/${{ github.repository }}.git git remote add origin ${{ github.server_url }}/${{ github.repository }}.git
git fetch origin ${{ github.ref }}
if [[ "${{ github.ref }}" == refs/tags/* ]]; then if [[ "${{ github.ref }}" == refs/tags/* ]]; then
git checkout ${{ github.ref_name }} # For tags, fetch the specific tag and checkout the commit it points to
git fetch origin ${{ github.ref }}:refs/tags/${{ github.ref_name }}
git checkout refs/tags/${{ github.ref_name }}
else else
# For branches, fetch and checkout with tracking
git fetch origin ${{ github.ref_name }}:refs/remotes/origin/${{ github.ref_name }}
git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }} git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }}
fi fi
@@ -99,26 +103,32 @@ jobs:
echo "Creating release for tag: $TAG" echo "Creating release for tag: $TAG"
echo "Repository: $REPO_OWNER/$REPO_NAME" echo "Repository: $REPO_OWNER/$REPO_NAME"
# Get or create release # Create release using Gitea API with wget
RELEASE_JSON=$(curl -s -X GET \ echo "Creating new release..."
-H "Authorization: token $GITEA_TOKEN" \
"$GITEA_URL/api/v1/repos/$REPO_OWNER/$REPO_NAME/releases/tags/$TAG" 2>/dev/null || echo "{}")
RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id // empty' 2>/dev/null) # Create JSON payload in a temp file
cat > /tmp/release.json << 'PAYLOAD'
{"tag_name":"TAG_PLACEHOLDER","name":"Release TAG_PLACEHOLDER","draft":false,"prerelease":false}
PAYLOAD
sed -i "s/TAG_PLACEHOLDER/$TAG/g" /tmp/release.json
RESPONSE=$(wget --post-file=/tmp/release.json \
--header="Authorization: token $GITEA_TOKEN" \
--header="Content-Type: application/json" \
-O - -q \
"$GITEA_URL/api/v1/repos/$REPO_OWNER/$REPO_NAME/releases")
# Extract release ID using grep
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | head -1 | grep -o '[0-9]*')
if [ -z "$RELEASE_ID" ]; then if [ -z "$RELEASE_ID" ]; then
echo "Creating new release..." echo "Failed to create release. Response:"
RELEASE_JSON=$(curl -s -X POST \ echo "$RESPONSE"
-H "Authorization: token $GITEA_TOKEN" \ exit 1
-H "Content-Type: application/json" \
-d "{\"tag_name\":\"$TAG\",\"name\":\"Release $TAG\",\"draft\":false,\"prerelease\":false}" \
"$GITEA_URL/api/v1/repos/$REPO_OWNER/$REPO_NAME/releases")
RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
echo "Created release ID: $RELEASE_ID"
else
echo "Using existing release ID: $RELEASE_ID"
fi fi
echo "Created release ID: $RELEASE_ID"
# Upload all binaries # Upload all binaries
echo "Uploading release artifacts..." echo "Uploading release artifacts..."
for file in bin/*; do for file in bin/*; do
@@ -126,15 +136,18 @@ jobs:
filename=$(basename "$file") filename=$(basename "$file")
echo " Uploading: $filename" echo " Uploading: $filename"
curl -s -X POST \ # Upload binary file to Gitea API
-H "Authorization: token $GITEA_TOKEN" \ UPLOAD_RESPONSE=$(wget --post-file="$file" \
-F "attachment=@$file" \ --header="Authorization: token $GITEA_TOKEN" \
"$GITEA_URL/api/v1/repos/$REPO_OWNER/$REPO_NAME/releases/$RELEASE_ID/assets" > /dev/null --header="Content-Type: application/octet-stream" \
-O - -q \
"$GITEA_URL/api/v1/repos/$REPO_OWNER/$REPO_NAME/releases/$RELEASE_ID/assets?name=$filename" 2>&1)
if [ $? -eq 0 ]; then if echo "$UPLOAD_RESPONSE" | grep -q '"id"'; then
echo " ✓ $filename uploaded" echo " ✓ $filename uploaded"
else else
echo " ✗ Failed to upload $filename" echo " ✗ Failed to upload $filename"
echo "Response: $UPLOAD_RESPONSE"
fi fi
fi fi
done done

View File

@@ -1,42 +1,20 @@
# Nerd Monitor - Agent Guidelines # Nerd Monitor - Agent Guidelines
## Build & Test Commands ## Build & Test Commands
- **Generate templates**: `make templ`
- **Build**: `make build` (server + agent) or `make build-server`/`make build-agent`
- **Cross-platform**: `make build-all`
- **Clean**: `make clean`
- **Test all**: `go test ./...`
- **Test single**: `go test -run TestName ./package`
- **Format**: `gofmt -w ./cmd ./internal ./views`
```bash Note: Go 1.23+ project using Templ templating. Run `make templ` before building.
# Generate Templ templates (required before building)
make templ
# Build server and agent for current OS
make build
# Build individual components
make build-server
make build-agent
# Build for all platforms (Linux, macOS, Windows)
make build-all
# Clean build artifacts
make clean
```
Note: This Go 1.21 project uses Templ for templating. Always run `make templ` before building.
## Code Style Guidelines ## Code Style Guidelines
- **Imports**: stdlib → third-party → internal (alphabetical within groups)
**Imports**: Standard library first, then third-party packages, then internal modules. Organize alphabetically within each group. - **Formatting**: `gofmt` standards, explicit exported struct comments
- **Naming**: CamelCase exports, lowercase unexported, single-letter receivers (e.g., `(h *Handler)`)
**Formatting & Types**: Use `gofmt` standards. Explicit struct field comments for exported types. Prefer `error` return values (no panic for recoverable errors). - **Error Handling**: Explicit checks, `http.Error()` for HTTP, contextual wrapping
- **Concurrency**: `sync.RWMutex` for shared state, defer lock releases, small critical sections
**Naming**: CamelCase for exported symbols, lowercase for unexported. Receiver names as single letters (e.g., `(m *Manager)`). Constants use ALL_CAPS_SNAKE_CASE. - **HTTP**: Chi router, `func (h *Handler) Method(w http.ResponseWriter, r *http.Request)`, set Content-Type, validate early
**Error Handling**: Define sentinel errors in dedicated files (e.g., `auth/errors.go`). Check errors explicitly; use `http.Error(w, "message", status)` for HTTP responses. Wrap errors with context when needed.
**Project Structure**:
- `cmd/`: Executable entry points (server, agent)
- `internal/`: Packages (api, auth, stats, store, ui)
- `views/`: Templ templates (*.templ files)
**Concurrency**: Use `sync.RWMutex` for shared state. Always defer lock releases. Keep critical sections small.
**HTTP**: Use Chi router. Handlers follow `func (h *Handler) Name(w http.ResponseWriter, r *http.Request)`. Set Content-Type headers explicitly. Validate query parameters early and return 400/404 appropriately.

View File

@@ -25,21 +25,21 @@ WORKDIR /app
COPY --from=builder /app/nerd-monitor-agent . COPY --from=builder /app/nerd-monitor-agent .
# Create non-root user # Create entrypoint script BEFORE switching users
RUN addgroup -D appgroup && adduser -D appuser -G appgroup RUN echo '#!/bin/sh' > /app/entrypoint.sh && \
USER appuser echo 'SERVER=${SERVER:-localhost:8080}' >> /app/entrypoint.sh && \
echo 'INTERVAL=${INTERVAL:-15s}' >> /app/entrypoint.sh && \
echo 'AGENT_ID=${AGENT_ID:-}' >> /app/entrypoint.sh && \
echo 'if [ -z "$AGENT_ID" ]; then' >> /app/entrypoint.sh && \
echo ' exec ./nerd-monitor-agent --server "$SERVER" --interval "$INTERVAL"' >> /app/entrypoint.sh && \
echo 'else' >> /app/entrypoint.sh && \
echo ' exec ./nerd-monitor-agent --server "$SERVER" --interval "$INTERVAL" --id "$AGENT_ID"' >> /app/entrypoint.sh && \
echo 'fi' >> /app/entrypoint.sh && \
chmod +x /app/entrypoint.sh
# Create entrypoint script to handle environment variables # Create non-root user
RUN echo '#!/bin/sh\n\ RUN addgroup -g 1000 appgroup && adduser -D -u 1000 -G appgroup appuser
SERVER=${SERVER:-localhost:8080}\n\ USER appuser
INTERVAL=${INTERVAL:-15s}\n\
AGENT_ID=${AGENT_ID:-}\n\
if [ -z "$AGENT_ID" ]; then\n\
exec ./nerd-monitor-agent --server "$SERVER" --interval "$INTERVAL"\n\
else\n\
exec ./nerd-monitor-agent --server "$SERVER" --interval "$INTERVAL" --id "$AGENT_ID"\n\
fi\n\
' > /app/entrypoint.sh && chmod +x /app/entrypoint.sh
# Run the agent # Run the agent
ENTRYPOINT ["/app/entrypoint.sh"] ENTRYPOINT ["/app/entrypoint.sh"]

View File

@@ -32,8 +32,17 @@ RUN apk add --no-cache ca-certificates
# Copy binary from builder # Copy binary from builder
COPY --from=builder /app/nerd-monitor-server . COPY --from=builder /app/nerd-monitor-server .
# Create entrypoint script BEFORE switching users
RUN echo '#!/bin/sh' > /app/entrypoint.sh && \
echo 'ADDR=${ADDR:-0.0.0.0}' >> /app/entrypoint.sh && \
echo 'PORT=${PORT:-8080}' >> /app/entrypoint.sh && \
echo 'USERNAME=${USERNAME:-admin}' >> /app/entrypoint.sh && \
echo 'PASSWORD=${PASSWORD:-admin}' >> /app/entrypoint.sh && \
echo 'exec ./nerd-monitor-server -addr "$ADDR" -port "$PORT" -username "$USERNAME" -password "$PASSWORD"' >> /app/entrypoint.sh && \
chmod +x /app/entrypoint.sh
# Create non-root user # Create non-root user
RUN addgroup -D appgroup && adduser -D appuser -G appgroup RUN addgroup -g 1000 appgroup && adduser -D -u 1000 -G appgroup appuser
USER appuser USER appuser
# Expose port # Expose port
@@ -43,14 +52,5 @@ EXPOSE 8080
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
CMD wget --quiet --tries=1 --spider http://localhost:8080/login || exit 1 CMD wget --quiet --tries=1 --spider http://localhost:8080/login || exit 1
# Create entrypoint script to handle environment variables
RUN echo '#!/bin/sh\n\
ADDR=${ADDR:-0.0.0.0}\n\
PORT=${PORT:-8080}\n\
USERNAME=${USERNAME:-admin}\n\
PASSWORD=${PASSWORD:-admin}\n\
exec ./nerd-monitor-server -addr "$ADDR" -port "$PORT" -username "$USERNAME" -password "$PASSWORD"\n\
' > /app/entrypoint.sh && chmod +x /app/entrypoint.sh
# Run the server # Run the server
ENTRYPOINT ["/app/entrypoint.sh"] ENTRYPOINT ["/app/entrypoint.sh"]

BIN
agent Executable file

Binary file not shown.

View File

@@ -5,7 +5,7 @@ import (
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
"log" "log/slog"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@@ -25,8 +25,12 @@ func main() {
) )
flag.Parse() flag.Parse()
// Set up verbose logging
slog.SetLogLoggerLevel(slog.LevelDebug)
if *server == "" { if *server == "" {
log.Fatal("--server flag is required") slog.Error("Server flag is required")
os.Exit(1)
} }
// Normalize server URL (add http:// if missing) // Normalize server URL (add http:// if missing)
@@ -38,12 +42,13 @@ func main() {
var err error var err error
id, err = generateAgentID() id, err = generateAgentID()
if err != nil { if err != nil {
log.Fatalf("Failed to generate agent ID: %v", err) slog.Error("Failed to generate agent ID", "error", err)
os.Exit(1)
} }
} }
log.Printf("Starting agent with ID: %s\n", id) slog.Info("Starting agent", "id", id)
log.Printf("Reporting to: %s every %v\n", *server, *interval) slog.Info("Reporting configuration", "server", *server, "interval", *interval)
// Initialize stats collector // Initialize stats collector
collector := stats.NewCollector() collector := stats.NewCollector()
@@ -64,7 +69,7 @@ func main() {
case <-ticker.C: case <-ticker.C:
reportStats(id, *server, collector) reportStats(id, *server, collector)
case <-sigChan: case <-sigChan:
log.Println("Agent shutting down gracefully...") slog.Info("Agent shutting down gracefully")
os.Exit(0) os.Exit(0)
} }
} }
@@ -79,37 +84,39 @@ func reportStats(agentID, serverURL string, collector *stats.Collector) {
stat, err := collector.Collect(hostname) stat, err := collector.Collect(hostname)
if err != nil { if err != nil {
log.Printf("Error collecting stats: %v", err) slog.Error("Error collecting stats", "agentID", agentID, "hostname", hostname, "error", err)
return return
} }
// Marshal to JSON // Marshal to JSON
body, err := json.Marshal(stat) body, err := json.Marshal(stat)
if err != nil { if err != nil {
log.Printf("Error marshaling stats: %v", err) slog.Error("Error marshaling stats", "agentID", agentID, "error", err)
return return
} }
// Send to server // Send to server
reportURL := fmt.Sprintf("%s/api/report?id=%s", serverURL, agentID) reportURL := fmt.Sprintf("%s/api/report?id=%s", serverURL, agentID)
slog.Debug("Sending stats report", "agentID", agentID, "url", reportURL, "bodySize", len(body))
resp, err := http.Post(reportURL, "application/json", bytes.NewReader(body)) resp, err := http.Post(reportURL, "application/json", bytes.NewReader(body))
if err != nil { if err != nil {
log.Printf("Error reporting stats: %v", err) slog.Error("Error reporting stats", "agentID", agentID, "url", reportURL, "error", err)
return return
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
log.Printf("Server returned status %d", resp.StatusCode) slog.Error("Server returned non-OK status", "agentID", agentID, "statusCode", resp.StatusCode, "url", reportURL)
return return
} }
log.Printf("Stats reported: CPU %.1f%% | RAM %s / %s | Disk %s / %s", slog.Debug("Stats reported successfully",
stat.CPUUsage, "agentID", agentID,
formatBytes(stat.RAMUsage), "cpu", stat.CPUUsage,
formatBytes(stat.RAMTotal), "ramUsage", formatBytes(stat.RAMUsage),
formatBytes(stat.DiskUsage), "ramTotal", formatBytes(stat.RAMTotal),
formatBytes(stat.DiskTotal), "diskUsage", formatBytes(stat.DiskUsage),
"diskTotal", formatBytes(stat.DiskTotal),
) )
} }

View File

@@ -2,7 +2,7 @@ package main
import ( import (
"flag" "flag"
"log" "log/slog"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
@@ -24,6 +24,9 @@ func main() {
) )
flag.Parse() flag.Parse()
// Set up verbose logging
slog.SetLogLoggerLevel(slog.LevelDebug)
// Initialize dependencies // Initialize dependencies
s := store.New() s := store.New()
authMgr := auth.New(*username, *password) authMgr := auth.New(*username, *password)
@@ -45,6 +48,7 @@ func main() {
protectedRoutes.Use(authMgr.Middleware) protectedRoutes.Use(authMgr.Middleware)
protectedRoutes.Get("/", uiHandler.Dashboard) protectedRoutes.Get("/", uiHandler.Dashboard)
protectedRoutes.Get("/agents/{id}", uiHandler.AgentDetail) protectedRoutes.Get("/agents/{id}", uiHandler.AgentDetail)
protectedRoutes.Post("/agents/{id}/hostname", uiHandler.UpdateAgentHostname)
protectedRoutes.Post("/logout", uiHandler.Logout) protectedRoutes.Post("/logout", uiHandler.Logout)
protectedRoutes.Post("/api/agents/remove-stale", uiHandler.RemoveStaleAgents) protectedRoutes.Post("/api/agents/remove-stale", uiHandler.RemoveStaleAgents)
protectedRoutes.Post("/api/agents/{id}/delete", uiHandler.DeleteAgent) protectedRoutes.Post("/api/agents/{id}/delete", uiHandler.DeleteAgent)
@@ -62,14 +66,15 @@ func main() {
go func() { go func() {
<-sigChan <-sigChan
log.Println("Shutting down server...") slog.Info("Shutting down server...")
server.Close() server.Close()
os.Exit(0) os.Exit(0)
}() }()
log.Printf("Starting server on http://%s:%s\n", *addr, *port) slog.Info("Starting server", "addr", *addr+":"+*port, "url", "http://"+*addr+":"+*port)
log.Printf("Login with %s / %s\n", *username, *password) slog.Info("Login credentials", "username", *username, "password", *password)
if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed { if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Fatalf("Server error: %v", err) slog.Error("Server error", "error", err)
os.Exit(1)
} }
} }

View File

@@ -1,5 +1,3 @@
version: '3.8'
# ============================================================================ # ============================================================================
# Nerd Monitor Docker Compose Configuration # Nerd Monitor Docker Compose Configuration
# ============================================================================ # ============================================================================
@@ -40,7 +38,6 @@ services:
context: . context: .
dockerfile: Dockerfile.server dockerfile: Dockerfile.server
container_name: nerd-monitor-server container_name: nerd-monitor-server
image: nerd-monitor-server:latest
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
@@ -82,7 +79,6 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile.agent dockerfile: Dockerfile.agent
image: nerd-monitor-agent:latest
environment: environment:
# Agent configuration # Agent configuration
SERVER: "server:8080" # Connect to the server service SERVER: "server:8080" # Connect to the server service

View File

@@ -2,9 +2,12 @@ package api
import ( import (
"encoding/json" "encoding/json"
"log/slog"
"net/http"
"github.com/go-chi/chi/v5"
"nerd-monitor/internal/stats" "nerd-monitor/internal/stats"
"nerd-monitor/internal/store" "nerd-monitor/internal/store"
"net/http"
) )
// Handler manages HTTP requests. // Handler manages HTTP requests.
@@ -19,57 +22,115 @@ func New(s *store.Store) *Handler {
// ReportStats handles agent stats reports. // ReportStats handles agent stats reports.
func (h *Handler) ReportStats(w http.ResponseWriter, r *http.Request) { func (h *Handler) ReportStats(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming stats report request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
agentID := r.URL.Query().Get("id") agentID := r.URL.Query().Get("id")
if agentID == "" { if agentID == "" {
slog.Warn("Missing agent ID in stats report", "remoteAddr", r.RemoteAddr)
http.Error(w, "missing agent id", http.StatusBadRequest) http.Error(w, "missing agent id", http.StatusBadRequest)
return return
} }
var stat stats.Stats var stat stats.Stats
if err := json.NewDecoder(r.Body).Decode(&stat); err != nil { if err := json.NewDecoder(r.Body).Decode(&stat); err != nil {
slog.Error("Invalid request body in stats report", "agentID", agentID, "error", err)
http.Error(w, "invalid request body", http.StatusBadRequest) http.Error(w, "invalid request body", http.StatusBadRequest)
return return
} }
slog.Debug("Updating agent stats", "agentID", agentID, "hostname", stat.Hostname, "cpu", stat.CPUUsage)
h.store.UpdateAgent(agentID, &stat) h.store.UpdateAgent(agentID, &stat)
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(map[string]string{"status": "ok"}) json.NewEncoder(w).Encode(map[string]string{"status": "ok"})
slog.Debug("Stats report processed successfully", "agentID", agentID)
} }
// GetAgent returns stats for a single agent. // GetAgent returns stats for a single agent.
func (h *Handler) GetAgent(w http.ResponseWriter, r *http.Request) { func (h *Handler) GetAgent(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming get agent request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
agentID := r.URL.Query().Get("id") agentID := r.URL.Query().Get("id")
if agentID == "" { if agentID == "" {
slog.Warn("Missing agent ID in get agent request", "remoteAddr", r.RemoteAddr)
http.Error(w, "missing agent id", http.StatusBadRequest) http.Error(w, "missing agent id", http.StatusBadRequest)
return return
} }
slog.Debug("Retrieving agent stats", "agentID", agentID)
agent := h.store.GetAgent(agentID) agent := h.store.GetAgent(agentID)
if agent == nil { if agent == nil {
slog.Warn("Agent not found", "agentID", agentID)
http.Error(w, "agent not found", http.StatusNotFound) http.Error(w, "agent not found", http.StatusNotFound)
return return
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(agent) json.NewEncoder(w).Encode(agent)
slog.Debug("Agent stats retrieved successfully", "agentID", agentID)
} }
// ListAgents returns all agents. // ListAgents returns all agents.
func (h *Handler) ListAgents(w http.ResponseWriter, r *http.Request) { func (h *Handler) ListAgents(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming list agents request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
slog.Debug("Retrieving all agents")
agents := h.store.GetAllAgents() agents := h.store.GetAllAgents()
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(agents) json.NewEncoder(w).Encode(agents)
slog.Debug("All agents listed successfully", "count", len(agents))
} }
// DeleteAgent removes an agent. // DeleteAgent removes an agent.
func (h *Handler) DeleteAgent(w http.ResponseWriter, r *http.Request) { func (h *Handler) DeleteAgent(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming delete agent request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
agentID := r.URL.Query().Get("id") agentID := r.URL.Query().Get("id")
if agentID == "" { if agentID == "" {
slog.Warn("Missing agent ID in delete agent request", "remoteAddr", r.RemoteAddr)
http.Error(w, "missing agent id", http.StatusBadRequest) http.Error(w, "missing agent id", http.StatusBadRequest)
return return
} }
slog.Info("Deleting agent", "agentID", agentID)
h.store.DeleteAgent(agentID) h.store.DeleteAgent(agentID)
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(map[string]string{"status": "deleted"}) json.NewEncoder(w).Encode(map[string]string{"status": "deleted"})
slog.Info("Agent deleted successfully", "agentID", agentID)
}
// UpdateHostname updates the hostname for an agent.
func (h *Handler) UpdateHostname(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming update hostname request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
if r.Method != http.MethodPost {
slog.Warn("Invalid method for update hostname", "method", r.Method)
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
return
}
agentID := chi.URLParam(r, "id")
if agentID == "" {
slog.Warn("Missing agent ID in update hostname request", "remoteAddr", r.RemoteAddr)
http.Error(w, "missing agent id", http.StatusBadRequest)
return
}
hostname := r.FormValue("hostname")
if hostname == "" {
slog.Warn("Missing hostname in update request", "agentID", agentID)
http.Error(w, "missing hostname", http.StatusBadRequest)
return
}
slog.Info("Updating agent hostname", "agentID", agentID, "newHostname", hostname)
err := h.store.UpdateHostname(agentID, hostname)
if err != nil {
slog.Warn("Failed to update hostname - agent not found", "agentID", agentID, "error", err)
http.Error(w, "agent not found", http.StatusNotFound)
return
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(map[string]string{"status": "updated"})
slog.Info("Agent hostname updated successfully", "agentID", agentID, "hostname", hostname)
} }

View File

@@ -3,6 +3,7 @@ package auth
import ( import (
"crypto/rand" "crypto/rand"
"encoding/hex" "encoding/hex"
"log/slog"
"net/http" "net/http"
"sync" "sync"
"time" "time"
@@ -36,11 +37,13 @@ func New(username, password string) *Manager {
// Login validates credentials and creates a session. // Login validates credentials and creates a session.
func (m *Manager) Login(username, password string) (string, error) { func (m *Manager) Login(username, password string) (string, error) {
if username != m.username || password != m.password { if username != m.username || password != m.password {
slog.Debug("Login failed - invalid credentials", "username", username)
return "", ErrInvalidCredentials return "", ErrInvalidCredentials
} }
token, err := generateToken() token, err := generateToken()
if err != nil { if err != nil {
slog.Error("Failed to generate session token", "error", err)
return "", err return "", err
} }
@@ -52,6 +55,7 @@ func (m *Manager) Login(username, password string) (string, error) {
ExpiresAt: time.Now().Add(m.expiryDur), ExpiresAt: time.Now().Add(m.expiryDur),
} }
slog.Debug("Login successful, session created", "username", username, "token", token[:8]+"...")
return token, nil return token, nil
} }
@@ -62,10 +66,17 @@ func (m *Manager) Validate(token string) bool {
session, ok := m.sessions[token] session, ok := m.sessions[token]
if !ok { if !ok {
slog.Debug("Session validation failed - token not found", "token", token[:8]+"...")
return false return false
} }
return session.ExpiresAt.After(time.Now()) if !session.ExpiresAt.After(time.Now()) {
slog.Debug("Session validation failed - token expired", "token", token[:8]+"...", "expiredAt", session.ExpiresAt)
return false
}
slog.Debug("Session validation successful", "token", token[:8]+"...")
return true
} }
// Logout invalidates a session. // Logout invalidates a session.
@@ -74,16 +85,24 @@ func (m *Manager) Logout(token string) {
defer m.mu.Unlock() defer m.mu.Unlock()
delete(m.sessions, token) delete(m.sessions, token)
slog.Debug("Session logged out", "token", token[:8]+"...")
} }
// Middleware returns a Chi middleware for authentication. // Middleware returns a Chi middleware for authentication.
func (m *Manager) Middleware(next http.Handler) http.Handler { func (m *Manager) Middleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
cookie, err := r.Cookie("session_token") cookie, err := r.Cookie("session_token")
if err != nil || !m.Validate(cookie.Value) { if err != nil {
slog.Debug("Authentication failed - no session cookie", "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
http.Redirect(w, r, "/login", http.StatusSeeOther) http.Redirect(w, r, "/login", http.StatusSeeOther)
return return
} }
if !m.Validate(cookie.Value) {
slog.Debug("Authentication failed - invalid session", "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
http.Redirect(w, r, "/login", http.StatusSeeOther)
return
}
slog.Debug("Authentication successful", "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
}) })
} }

View File

@@ -1,12 +1,19 @@
package store package store
import ( import (
"errors"
"log/slog"
"sync" "sync"
"time" "time"
"nerd-monitor/internal/stats" "nerd-monitor/internal/stats"
) )
var (
// ErrAgentNotFound is returned when an agent is not found.
ErrAgentNotFound = errors.New("agent not found")
)
// AgentStats represents the latest stats for an agent. // AgentStats represents the latest stats for an agent.
type AgentStats struct { type AgentStats struct {
ID string ID string
@@ -47,6 +54,7 @@ func (s *Store) UpdateAgent(id string, stat *stats.Stats) {
DiskTotal: stat.DiskTotal, DiskTotal: stat.DiskTotal,
LastSeen: time.Now(), LastSeen: time.Now(),
} }
slog.Debug("Agent stats updated", "agentID", id, "hostname", stat.Hostname, "cpu", stat.CPUUsage)
} }
// GetAgent retrieves agent stats by ID. // GetAgent retrieves agent stats by ID.
@@ -54,7 +62,13 @@ func (s *Store) GetAgent(id string) *AgentStats {
s.mu.RLock() s.mu.RLock()
defer s.mu.RUnlock() defer s.mu.RUnlock()
return s.agents[id] agent := s.agents[id]
if agent != nil {
slog.Debug("Agent retrieved", "agentID", id, "hostname", agent.Hostname)
} else {
slog.Debug("Agent not found", "agentID", id)
}
return agent
} }
// GetAllAgents returns all agents. // GetAllAgents returns all agents.
@@ -66,6 +80,7 @@ func (s *Store) GetAllAgents() []*AgentStats {
for _, agent := range s.agents { for _, agent := range s.agents {
agents = append(agents, agent) agents = append(agents, agent)
} }
slog.Debug("All agents retrieved", "count", len(agents))
return agents return agents
} }
@@ -75,4 +90,21 @@ func (s *Store) DeleteAgent(id string) {
defer s.mu.Unlock() defer s.mu.Unlock()
delete(s.agents, id) delete(s.agents, id)
slog.Debug("Agent deleted", "agentID", id)
}
// UpdateHostname updates the hostname for an agent.
func (s *Store) UpdateHostname(id string, hostname string) error {
s.mu.Lock()
defer s.mu.Unlock()
agent, exists := s.agents[id]
if !exists {
slog.Debug("Agent not found for hostname update", "agentID", id)
return ErrAgentNotFound
}
agent.Hostname = hostname
slog.Debug("Agent hostname updated", "agentID", id, "hostname", hostname)
return nil
} }

View File

@@ -2,9 +2,11 @@ package ui
import ( import (
"context" "context"
"log/slog"
"net/http" "net/http"
"time" "time"
"github.com/go-chi/chi/v5"
"nerd-monitor/internal/auth" "nerd-monitor/internal/auth"
"nerd-monitor/internal/store" "nerd-monitor/internal/store"
"nerd-monitor/views" "nerd-monitor/views"
@@ -26,30 +28,42 @@ func New(s *store.Store, a *auth.Manager) *Handler {
// Dashboard renders the dashboard page. // Dashboard renders the dashboard page.
func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) { func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming dashboard request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
slog.Debug("Rendering dashboard", "agentCount", len(h.store.GetAllAgents()), "staleAgentCount", len(h.getStaleAgents()))
agents := h.store.GetAllAgents() agents := h.store.GetAllAgents()
staleAgents := h.getStaleAgents() staleAgents := h.getStaleAgents()
component := views.Dashboard(agents, staleAgents) component := views.Dashboard(agents, staleAgents)
component.Render(context.Background(), w) component.Render(context.Background(), w)
slog.Debug("Dashboard rendered successfully")
} }
// AgentDetail renders the agent detail page. // AgentDetail renders the agent detail page.
func (h *Handler) AgentDetail(w http.ResponseWriter, r *http.Request) { func (h *Handler) AgentDetail(w http.ResponseWriter, r *http.Request) {
agentID := r.PathValue("id") slog.Debug("Incoming agent detail request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
agentID := chi.URLParam(r, "id")
slog.Debug("Retrieving agent detail", "agentID", agentID)
agent := h.store.GetAgent(agentID) agent := h.store.GetAgent(agentID)
if agent == nil { if agent == nil {
slog.Warn("Agent not found for detail view", "agentID", agentID)
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
component := views.AgentDetail(agent) component := views.AgentDetail(agent)
component.Render(context.Background(), w) component.Render(context.Background(), w)
slog.Debug("Agent detail rendered successfully", "agentID", agentID)
} }
// Login renders the login page. // Login renders the login page.
func (h *Handler) Login(w http.ResponseWriter, r *http.Request) { func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming login request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
if r.Method == http.MethodGet { if r.Method == http.MethodGet {
slog.Debug("Rendering login page")
component := views.LoginPage("") component := views.LoginPage("")
component.Render(context.Background(), w) component.Render(context.Background(), w)
return return
@@ -59,13 +73,16 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
username := r.FormValue("username") username := r.FormValue("username")
password := r.FormValue("password") password := r.FormValue("password")
slog.Debug("Attempting login", "username", username, "remoteAddr", r.RemoteAddr)
token, err := h.auth.Login(username, password) token, err := h.auth.Login(username, password)
if err != nil { if err != nil {
slog.Warn("Login failed - invalid credentials", "username", username, "remoteAddr", r.RemoteAddr, "error", err)
component := views.LoginPage("Invalid credentials") component := views.LoginPage("Invalid credentials")
component.Render(context.Background(), w) component.Render(context.Background(), w)
return return
} }
slog.Info("Login successful", "username", username, "remoteAddr", r.RemoteAddr)
http.SetCookie(w, &http.Cookie{ http.SetCookie(w, &http.Cookie{
Name: "session_token", Name: "session_token",
Value: token, Value: token,
@@ -79,19 +96,26 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
return return
} }
slog.Warn("Invalid method for login", "method", r.Method)
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed) http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
} }
// Logout handles logout. // Logout handles logout.
func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) { func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming logout request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
slog.Warn("Invalid method for logout", "method", r.Method)
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed) http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return return
} }
cookie, err := r.Cookie("session_token") cookie, err := r.Cookie("session_token")
if err == nil { if err == nil {
slog.Info("Logging out user", "remoteAddr", r.RemoteAddr)
h.auth.Logout(cookie.Value) h.auth.Logout(cookie.Value)
} else {
slog.Debug("Logout attempted without valid session", "remoteAddr", r.RemoteAddr)
} }
http.SetCookie(w, &http.Cookie{ http.SetCookie(w, &http.Cookie{
@@ -107,32 +131,73 @@ func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
// RemoveStaleAgents handles bulk removal of stale agents. // RemoveStaleAgents handles bulk removal of stale agents.
func (h *Handler) RemoveStaleAgents(w http.ResponseWriter, r *http.Request) { func (h *Handler) RemoveStaleAgents(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming remove stale agents request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
slog.Warn("Invalid method for remove stale agents", "method", r.Method)
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed) http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return return
} }
agentIDs := r.Form["agent_ids"] agentIDs := r.Form["agent_ids"]
slog.Info("Removing stale agents", "count", len(agentIDs), "agentIDs", agentIDs)
for _, id := range agentIDs { for _, id := range agentIDs {
h.store.DeleteAgent(id) h.store.DeleteAgent(id)
} }
slog.Info("Stale agents removed successfully", "count", len(agentIDs))
http.Redirect(w, r, "/", http.StatusSeeOther) http.Redirect(w, r, "/", http.StatusSeeOther)
} }
// DeleteAgent handles single agent deletion. // DeleteAgent handles single agent deletion.
func (h *Handler) DeleteAgent(w http.ResponseWriter, r *http.Request) { func (h *Handler) DeleteAgent(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming delete agent request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
slog.Warn("Invalid method for delete agent", "method", r.Method)
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed) http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return return
} }
agentID := r.PathValue("id") agentID := chi.URLParam(r, "id")
slog.Info("Deleting agent", "agentID", agentID)
h.store.DeleteAgent(agentID) h.store.DeleteAgent(agentID)
slog.Info("Agent deleted successfully", "agentID", agentID)
http.Redirect(w, r, "/", http.StatusSeeOther) http.Redirect(w, r, "/", http.StatusSeeOther)
} }
// UpdateAgentHostname handles hostname updates for agents.
func (h *Handler) UpdateAgentHostname(w http.ResponseWriter, r *http.Request) {
slog.Debug("Incoming update agent hostname request", "method", r.Method, "path", r.URL.Path, "remoteAddr", r.RemoteAddr)
if r.Method != http.MethodPost {
slog.Warn("Invalid method for update agent hostname", "method", r.Method)
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
agentID := chi.URLParam(r, "id")
hostname := r.FormValue("hostname")
if hostname == "" {
slog.Warn("Empty hostname provided for update", "agentID", agentID)
http.Error(w, "Hostname cannot be empty", http.StatusBadRequest)
return
}
slog.Info("Updating agent hostname", "agentID", agentID, "newHostname", hostname)
err := h.store.UpdateHostname(agentID, hostname)
if err != nil {
slog.Warn("Failed to update hostname - agent not found", "agentID", agentID, "error", err)
http.NotFound(w, r)
return
}
slog.Info("Agent hostname updated successfully", "agentID", agentID, "hostname", hostname)
http.Redirect(w, r, "/agents/"+agentID, http.StatusSeeOther)
}
// getStaleAgents returns agents that haven't reported in 6 months. // getStaleAgents returns agents that haven't reported in 6 months.
func (h *Handler) getStaleAgents() []*store.AgentStats { func (h *Handler) getStaleAgents() []*store.AgentStats {
const staleThreshold = 6 * 30 * 24 * time.Hour const staleThreshold = 6 * 30 * 24 * time.Hour

BIN
server Executable file

Binary file not shown.

View File

@@ -17,6 +17,7 @@ templ agentDetailContent(agent *store.AgentStats) {
@AgentStatusBadge(agent.LastSeen) @AgentStatusBadge(agent.LastSeen)
</div> </div>
<!-- CPU Usage Card -->
<div class="grid" style="grid-template-columns: 1fr;"> <div class="grid" style="grid-template-columns: 1fr;">
<div class="card"> <div class="card">
<div class="card-title">CPU Usage</div> <div class="card-title">CPU Usage</div>
@@ -32,6 +33,7 @@ templ agentDetailContent(agent *store.AgentStats) {
</div> </div>
</div> </div>
<!-- Memory and Disk Usage Cards -->
<div class="grid" style="margin-top: 1.5rem;"> <div class="grid" style="margin-top: 1.5rem;">
<div class="card"> <div class="card">
<div class="card-title">Memory Usage</div> <div class="card-title">Memory Usage</div>
@@ -43,24 +45,49 @@ templ agentDetailContent(agent *store.AgentStats) {
</div> </div>
</div> </div>
<!-- Agent Information and Settings -->
<div class="card" style="margin-top: 1.5rem;"> <div class="card" style="margin-top: 1.5rem;">
<div class="card-title">Agent Information</div> <div class="card-title">Agent Information</div>
<div class="metric-row"> <div class="metric-row">
<span class="metric-label">Agent ID</span> <span class="metric-label">Agent ID</span>
<span class="metric-value" style="font-family: monospace; font-size: 0.875rem;">{ agent.ID }</span> <span class="metric-value" style="font-family: monospace; font-size: 0.875rem;">{ agent.ID }</span>
</div> </div>
<div class="metric-row">
<span class="metric-label">Hostname</span>
<span class="metric-value">{ agent.Hostname }</span>
</div>
<div class="metric-row"> <div class="metric-row">
<span class="metric-label">Last Seen</span> <span class="metric-label">Last Seen</span>
<span class="metric-value">{ agent.LastSeen.Format("2006-01-02 15:04:05") }</span> <span class="metric-value">{ agent.LastSeen.Format("2006-01-02 15:04:05") }</span>
</div> </div>
</div> </div>
<div class="btn-group" style="margin-top: 1.5rem;"> <!-- Hostname Settings -->
<form method="POST" action={ templ.SafeURL(fmt.Sprintf("/api/agents/%s/delete", agent.ID)) } style="margin: 0;" onsubmit="return confirm('Are you sure you want to remove this agent?');"> <div class="card" style="margin-top: 1.5rem;">
<div class="card-title">Settings</div>
<form method="POST" action={ templ.SafeURL(fmt.Sprintf("/agents/%s/hostname", agent.ID)) } style="display: flex; flex-direction: column; gap: 1rem;">
<div style="display: flex; flex-direction: column; gap: 0.5rem;">
<label for="hostname" style="font-size: 0.875rem; font-weight: 500; color: #cbd5e1;">
Hostname
</label>
<input
type="text"
id="hostname"
name="hostname"
value={ agent.Hostname }
required
style="padding: 0.5rem 0.75rem; background-color: #1e293b; border: 1px solid #475569; border-radius: 0.375rem; color: #e2e8f0; font-size: 0.875rem;"
/>
</div>
<button type="submit" class="btn btn-primary" style="align-self: flex-start;">
Update Hostname
</button>
</form>
</div>
<!-- Danger Zone -->
<div class="card" style="margin-top: 1.5rem; border-left: 3px solid #ef4444;">
<div class="card-title" style="color: #ef4444;">Danger Zone</div>
<p style="margin: 0 0 1rem 0; color: #94a3b8; font-size: 0.875rem;">
Deleting this agent will remove all its data and history.
</p>
<form method="POST" action={ templ.SafeURL(fmt.Sprintf("/api/agents/%s/delete", agent.ID)) } style="margin: 0;" onsubmit="return confirm('Are you sure you want to remove this agent? This action cannot be undone.');">
<button type="submit" class="btn btn-danger">Delete Agent</button> <button type="submit" class="btn btn-danger">Delete Agent</button>
</form> </form>
</div> </div>