05ecd65412
- New internal/metrics/telemetry.go: MetricsStore.GetContainerTelemetry() aggregates container memory/CPU from SQLite over the last 15 min - New internal/metrics/logscanner.go: ScanContainerLogs() scans docker logs for errors/warnings, deduplicates via fingerprinting (strips timestamps, replaces 6+ digit numbers, hex strings, UUIDs) - New internal/report/telemetry.go: buildAppTelemetrySection() assembles per-stack AppTelemetry by aggregating container metrics and log summaries - internal/report/types.go: added AppTelemetry field to Report struct plus AppTelemetry type with memory/CPU/log fields and LogIssue references - internal/report/builder.go: calls buildAppTelemetrySection() in BuildReport() - Backward-compatible: old Hub versions silently ignore app_telemetry field Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
120 lines
3.2 KiB
Go
120 lines
3.2 KiB
Go
package report
|
|
|
|
import (
|
|
"log"
|
|
"sort"
|
|
"time"
|
|
|
|
"gitea.dooplex.hu/admin/felhom-controller/internal/metrics"
|
|
"gitea.dooplex.hu/admin/felhom-controller/internal/stacks"
|
|
)
|
|
|
|
// buildAppTelemetrySection collects metrics telemetry and log scans for all
|
|
// non-protected, deployed stacks and returns per-app telemetry data.
|
|
func buildAppTelemetrySection(stackMgr *stacks.Manager, metricsStore *metrics.MetricsStore, logger *log.Logger) []AppTelemetry {
|
|
allStacks := stackMgr.GetStacks()
|
|
|
|
// 1. Get metrics telemetry (last 15 minutes)
|
|
var telemetry []metrics.ContainerTelemetry
|
|
if metricsStore != nil {
|
|
var err error
|
|
telemetry, err = metricsStore.GetContainerTelemetry(time.Now().Add(-15 * time.Minute))
|
|
if err != nil && logger != nil {
|
|
logger.Printf("[WARN] Telemetry metrics query failed: %v", err)
|
|
}
|
|
}
|
|
|
|
// 2. Collect non-protected container names for log scan
|
|
var containerNames []string
|
|
for _, s := range allStacks {
|
|
if s.Protected || !s.Deployed {
|
|
continue
|
|
}
|
|
for _, c := range s.Containers {
|
|
containerNames = append(containerNames, c.Name)
|
|
}
|
|
}
|
|
|
|
// 3. Scan logs
|
|
logs := metrics.ScanContainerLogs(containerNames, 15*time.Minute, logger)
|
|
|
|
// 4. Build per-app telemetry
|
|
return buildAppTelemetry(allStacks, telemetry, logs)
|
|
}
|
|
|
|
// buildAppTelemetry aggregates container-level telemetry and log data into per-stack AppTelemetry entries.
|
|
func buildAppTelemetry(allStacks []stacks.Stack, telemetry []metrics.ContainerTelemetry, logs []metrics.ContainerLogSummary) []AppTelemetry {
|
|
// Build lookup maps
|
|
telemetryMap := make(map[string]metrics.ContainerTelemetry, len(telemetry))
|
|
for _, ct := range telemetry {
|
|
telemetryMap[ct.ContainerName] = ct
|
|
}
|
|
|
|
logMap := make(map[string]metrics.ContainerLogSummary, len(logs))
|
|
for _, ls := range logs {
|
|
logMap[ls.ContainerName] = ls
|
|
}
|
|
|
|
var result []AppTelemetry
|
|
|
|
for _, s := range allStacks {
|
|
if s.Protected || !s.Deployed {
|
|
continue
|
|
}
|
|
|
|
app := AppTelemetry{
|
|
AppName: s.Name,
|
|
DisplayName: s.Meta.DisplayName,
|
|
CatalogEstimate: s.Meta.Resources.MemRequest,
|
|
CatalogLimit: s.Meta.Resources.MemLimit,
|
|
}
|
|
|
|
var mergedIssues []metrics.LogIssue
|
|
|
|
for _, c := range s.Containers {
|
|
app.Containers = append(app.Containers, c.Name)
|
|
|
|
if ct, ok := telemetryMap[c.Name]; ok {
|
|
app.MemoryCurrentMB += ct.MemoryCurrentMB
|
|
app.MemoryAvgMB += ct.MemoryAvgMB
|
|
app.MemoryPeakMB += ct.MemoryPeakMB
|
|
app.CPUAvgPercent += ct.CPUAvgPercent
|
|
}
|
|
|
|
if ls, ok := logMap[c.Name]; ok {
|
|
app.LogErrors += ls.ErrorCount
|
|
app.LogWarnings += ls.WarnCount
|
|
mergedIssues = append(mergedIssues, ls.RecentIssues...)
|
|
}
|
|
}
|
|
|
|
if app.Containers == nil {
|
|
app.Containers = []string{}
|
|
}
|
|
|
|
// Sort and cap merged issues at 10
|
|
sort.Slice(mergedIssues, func(i, j int) bool {
|
|
if mergedIssues[i].Count != mergedIssues[j].Count {
|
|
return mergedIssues[i].Count > mergedIssues[j].Count
|
|
}
|
|
return mergedIssues[i].LastSeen.After(mergedIssues[j].LastSeen)
|
|
})
|
|
if len(mergedIssues) > 10 {
|
|
mergedIssues = mergedIssues[:10]
|
|
}
|
|
app.Issues = mergedIssues
|
|
|
|
result = append(result, app)
|
|
}
|
|
|
|
// Sort by app name
|
|
sort.Slice(result, func(i, j int) bool {
|
|
return result[i].AppName < result[j].AppName
|
|
})
|
|
|
|
if result == nil {
|
|
result = []AppTelemetry{}
|
|
}
|
|
return result
|
|
}
|