From b8ee27eec35f54cf332c11ae9813ba59b4e2a42a Mon Sep 17 00:00:00 2001 From: gh0sted Date: Thu, 18 Jun 2026 14:41:04 +0100 Subject: [PATCH] feat: collect and report 1-min load average --- .env | 7 ++++ go.mod | 16 +++++++ go.sum | 58 ++++++++++++++++++++++++++ internal/agent/agent.go | 2 + internal/aggregate/window.go | 10 ++++- internal/collectors/loadavg/loadavg.go | 41 ++++++++++++++++++ internal/dbmanager/manager.go | 2 +- internal/sender/http.go | 1 + internal/sender/logging.go | 3 +- internal/sender/payload.go | 3 +- 10 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 .env create mode 100644 go.sum create mode 100644 internal/collectors/loadavg/loadavg.go diff --git a/.env b/.env new file mode 100644 index 0000000..675ccb7 --- /dev/null +++ b/.env @@ -0,0 +1,7 @@ +export BUGSWATCH_ENDPOINT=http://172.17.0.1:5173 +export BUGSWATCH_AGENT_ID=59e18c23-7c27-4a78-924e-a9e9b6ebeb9c +export BUGSWATCH_API_TOKEN=bw_957ad1bbbec74ab6adeb40d67a4d2b93 +export BUGSWATCH_HOST_ID=batcave +export BUGSWATCH_ENVIRONMENT=development +export BUGSWATCH_DB_DRIVER=postgres +export BUGSWATCH_DB_DSN=postgres://user:pass@localhost:5432/dbname?sslmode=disable \ No newline at end of file diff --git a/go.mod b/go.mod index afaaab0..6d2b4af 100644 --- a/go.mod +++ b/go.mod @@ -8,3 +8,19 @@ require ( github.com/redis/go-redis/v9 v9.7.3 go.mongodb.org/mongo-driver v1.17.1 ) + +require ( + filippo.io/edwards25519 v1.1.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/montanaflynn/stats v0.7.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.2 // indirect + github.com/xdg-go/stringprep v1.0.4 // indirect + github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/text v0.17.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..cbd56f0 --- /dev/null +++ b/go.sum @@ -0,0 +1,58 @@ +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= +github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= +github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM= +github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM= +go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 88b92b7..8f9953f 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -9,6 +9,7 @@ import ( "bugs.watch/agent/internal/collectors" "bugs.watch/agent/internal/collectors/cpu" "bugs.watch/agent/internal/collectors/disk" + "bugs.watch/agent/internal/collectors/loadavg" "bugs.watch/agent/internal/collectors/memory" "bugs.watch/agent/internal/collectors/uptime" "bugs.watch/agent/internal/config" @@ -32,6 +33,7 @@ func Run(ctx context.Context, cfg config.Config) { cpu.New(), memory.New(), disk.New(), + loadavg.New(), } mgr := dbmanager.New(cfg.DBConfigPath) diff --git a/internal/aggregate/window.go b/internal/aggregate/window.go index b61921d..34ca2b2 100644 --- a/internal/aggregate/window.go +++ b/internal/aggregate/window.go @@ -16,7 +16,9 @@ type Window struct { uptime uint64 - // DB metrics — populated only when a DB collector is registered. + load float64 + + // DB metrics. populated only when a DB collector is registered. hasDB bool dbDriver uint8 dbConnPctSum float64 @@ -34,6 +36,7 @@ type Snapshot struct { MemAvg float64 DiskAvg float64 Uptime uint64 + Load float64 // nil when DB monitoring is not enabled. DBDriver *uint8 @@ -66,6 +69,10 @@ func (w *Window) SetUptime(value uint64) { w.uptime = value } +func (w *Window) SetLoad(value float64) { + w.load = value +} + func (w *Window) AddDBConnPct(v float64) { w.dbConnPctSum += v w.dbConnPctCount++ @@ -118,6 +125,7 @@ func (w *Window) Snapshot() Snapshot { MemAvg: memAvg, DiskAvg: diskAvg, Uptime: w.uptime, + Load: w.load, } if w.hasDB { diff --git a/internal/collectors/loadavg/loadavg.go b/internal/collectors/loadavg/loadavg.go new file mode 100644 index 0000000..c2a8dbd --- /dev/null +++ b/internal/collectors/loadavg/loadavg.go @@ -0,0 +1,41 @@ +package loadavg + +import ( + "os" + "strconv" + "strings" + + "bugs.watch/agent/internal/aggregate" +) + +type Collector struct{} + +func New() *Collector { + return &Collector{} +} + +func (c *Collector) Name() string { + return "loadavg" +} + +// Collect reads /proc/loadavg and stores the 1-minute load average. +// Failure is silently ignored by design. +func (c *Collector) Collect(window *aggregate.Window) { + data, err := os.ReadFile("/proc/loadavg") + if err != nil { + return + } + + // Format: " " + fields := strings.Fields(string(data)) + if len(fields) < 1 { + return + } + + load1, err := strconv.ParseFloat(fields[0], 64) + if err != nil { + return + } + + window.SetLoad(load1) +} diff --git a/internal/dbmanager/manager.go b/internal/dbmanager/manager.go index 80ded0a..2fc5291 100644 --- a/internal/dbmanager/manager.go +++ b/internal/dbmanager/manager.go @@ -20,7 +20,7 @@ import ( sqlitecol "bugs.watch/agent/internal/collectors/sqlite" ) -// Driver type identifiers — used as the db_driver field in the health payload +// Driver type identifiers. used as the db_driver field in the health payload // so the dashboard can render the correct icon without parsing strings. const ( DriverNone uint8 = 0 diff --git a/internal/sender/http.go b/internal/sender/http.go index ea984e8..6564487 100644 --- a/internal/sender/http.go +++ b/internal/sender/http.go @@ -38,6 +38,7 @@ func (s *HTTPSender) Send(ctx context.Context, snap aggregate.Snapshot) error { MemAvg: snap.MemAvg, DiskAvg: snap.DiskAvg, Uptime: snap.Uptime, + Load: snap.Load, HostID: s.hostID, Environment: s.env, DBDriver: snap.DBDriver, diff --git a/internal/sender/logging.go b/internal/sender/logging.go index 6e19950..9e4f275 100644 --- a/internal/sender/logging.go +++ b/internal/sender/logging.go @@ -22,11 +22,12 @@ func (s *LoggingSender) Send(ctx context.Context, snap aggregate.Snapshot) error return ctx.Err() default: log.Printf( - "SEND cpu=%.2f%% mem=%.2f%% disk=%.2f%% uptime=%ds", + "SEND cpu=%.2f%% mem=%.2f%% disk=%.2f%% uptime=%ds load=%.2f", snap.CPUAvg, snap.MemAvg, snap.DiskAvg, snap.Uptime, + snap.Load, ) return nil } diff --git a/internal/sender/payload.go b/internal/sender/payload.go index 000ef88..4d69bad 100644 --- a/internal/sender/payload.go +++ b/internal/sender/payload.go @@ -10,11 +10,12 @@ type SnapshotPayload struct { MemAvg float64 `json:"mem_avg"` DiskAvg float64 `json:"disk_avg"` Uptime uint64 `json:"uptime"` + Load float64 `json:"load"` HostID string `json:"host_id,omitempty"` Environment string `json:"environment,omitempty"` - // Optional — only present when DB monitoring is enabled. + // Optional. only present when DB monitoring is enabled. // DBDriver is a numeric identifier: 1=mysql/mariadb 2=postgres 3=redis 4=mongodb 5=sqlite DBDriver *uint8 `json:"db_driver,omitempty"` DBConnPct *float64 `json:"db_conn_pct,omitempty"`