[Feature] Basic systemd service monitoring

agent/agent.go

@@ -31,6 +31,7 @@ type Agent struct {
 	netInterfaces     map[string]struct{}        // Stores all valid network interfaces
 	netIoStats        system.NetIoStats          // Keeps track of bandwidth usage
 	dockerManager     *dockerManager             // Manages Docker API requests
+	systemdManager    *systemdManager            // Manages systemd services
 	sensorConfig      *SensorConfig              // Sensors config
 	systemInfo        system.Info                // Host system info
 	gpuManager        *GPUManager                // Manages GPU data
@@ -88,6 +89,13 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 	// initialize docker manager
 	agent.dockerManager = newDockerManager(agent)
 
+	// initialize systemd manager
+	if sm, err := newSystemdManager(); err != nil {
+		slog.Debug("Systemd", "err", err)
+	} else {
+		agent.systemdManager = sm
+	}
+
 	// initialize GPU manager
 	if gm, err := NewGPUManager(); err != nil {
 		slog.Debug("GPU", "err", err)
@@ -137,6 +145,11 @@ func (a *Agent) gatherStats(sessionID string) *system.CombinedData {
 		}
 	}
 
+	if a.systemdManager != nil {
+		data.SystemdServices = a.systemdManager.getServiceStats()
+		slog.Debug("Systemd services", "data", data.SystemdServices)
+	}
+
 	data.Stats.ExtraFs = make(map[string]*system.FsStats)
 	for name, stats := range a.fsStats {
 		if !stats.Root && stats.DiskTotal > 0 {

agent/systemd.go

@@ -0,0 +1,107 @@
+//go:build linux
+
+package agent
+
+import (
+	"context"
+	"log/slog"
+	"math"
+	"strings"
+	"sync"
+
+	"github.com/coreos/go-systemd/v22/dbus"
+	"github.com/henrygd/beszel/internal/entities/systemd"
+)
+
+// systemdManager manages the collection of systemd service statistics.
+type systemdManager struct {
+	conn            *dbus.Conn
+	serviceStatsMap map[string]*systemd.Service
+	mu              sync.Mutex
+}
+
+// newSystemdManager creates a new systemdManager.
+func newSystemdManager() (*systemdManager, error) {
+	conn, err := dbus.New()
+	if err != nil {
+		if strings.Contains(err.Error(), "permission denied") {
+			slog.Error("Permission denied when connecting to systemd. Run as root or with appropriate user permissions.", "err", err)
+			return nil, err
+		}
+		slog.Error("Error connecting to systemd", "err", err)
+		return nil, err
+	}
+
+	return &systemdManager{
+		conn:            conn,
+		serviceStatsMap: make(map[string]*systemd.Service),
+	}, nil
+}
+
+// getServiceStats collects statistics for all running systemd services.
+func (sm *systemdManager) getServiceStats() []*systemd.Service {
+	units, err := sm.conn.ListUnitsContext(context.Background())
+	if err != nil {
+		slog.Error("Error listing systemd units", "err", err)
+		return nil
+	}
+
+	var services []*systemd.Service
+	for _, unit := range units {
+		if strings.HasSuffix(unit.Name, ".service") {
+			service := sm.updateServiceStats(unit)
+			services = append(services, service)
+		}
+	}
+	return services
+}
+
+// updateServiceStats updates the statistics for a single systemd service.
+func (sm *systemdManager) updateServiceStats(unit dbus.UnitStatus) *systemd.Service {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+
+	props, err := sm.conn.GetUnitTypeProperties(unit.Name, "Service")
+	if err != nil {
+		slog.Debug("could not get unit type properties", "unit", unit.Name, "err", err)
+		return &systemd.Service{
+			Name:   unit.Name,
+			Status: unit.ActiveState,
+		}
+	}
+
+	var cpuUsage uint64
+	if val, ok := props["CPUUsageNSec"]; ok {
+		if v, ok := val.(uint64); ok {
+			cpuUsage = v
+		}
+	}
+
+	var memUsage uint64
+	if val, ok := props["MemoryCurrent"]; ok {
+		if v, ok := val.(uint64); ok {
+			memUsage = v
+		}
+	}
+
+	service, exists := sm.serviceStatsMap[unit.Name]
+	if !exists {
+		service = &systemd.Service{
+			Name:   unit.Name,
+			Status: unit.ActiveState,
+		}
+		sm.serviceStatsMap[unit.Name] = service
+	}
+
+	service.Status = unit.ActiveState
+
+	// If memUsage is MaxUint64 the api is saying it's not available, return 0
+	if memUsage == math.MaxUint64 {
+		memUsage = 0
+	}
+
+	service.Mem = float64(memUsage) / (1024 * 1024) // Convert to MB
+	service.CalculateCPUPercent(cpuUsage)
+
+	return service
+}

agent/systemd_unsupported.go

@@ -0,0 +1,18 @@
+//go:build !linux
+
+package agent
+
+import "github.com/henrygd/beszel/internal/entities/systemd"
+
+// systemdManager manages the collection of systemd service statistics.
+type systemdManager struct{}
+
+// newSystemdManager creates a new systemdManager.
+func newSystemdManager() (*systemdManager, error) {
+	return &systemdManager{}, nil
+}
+
+// getServiceStats returns nil for non-linux systems.
+func (sm *systemdManager) getServiceStats() []*systemd.Service {
+	return nil
+}

go.mod

@@ -7,6 +7,7 @@ replace github.com/nicholas-fedor/shoutrrr => github.com/nicholas-fedor/shoutrrr
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/coreos/go-systemd/v22 v22.6.0
 	github.com/distatus/battery v0.11.0
 	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/gliderlabs/ssh v0.3.8
@@ -40,6 +41,7 @@ require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
 	github.com/go-sql-driver/mysql v1.9.1 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect

go.sum

@@ -9,6 +9,8 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
+github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -49,6 +51,8 @@ github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtS
 github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

internal/entities/system/system.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/henrygd/beszel/internal/entities/container"
+	"github.com/henrygd/beszel/internal/entities/systemd"
 )
 
 type Stats struct {
@@ -121,7 +122,8 @@ type Info struct {
 
 // Final data structure to return to the hub
 type CombinedData struct {
-	Stats      Stats              `json:"stats" cbor:"0,keyasint"`
-	Info       Info               `json:"info" cbor:"1,keyasint"`
-	Containers []*container.Stats `json:"container" cbor:"2,keyasint"`
+	Stats           Stats              `json:"stats" cbor:"0,keyasint"`
+	Info            Info               `json:"info" cbor:"1,keyasint"`
+	Containers      []*container.Stats `json:"container" cbor:"2,keyasint"`
+	SystemdServices []*systemd.Service `json:"systemd,omitempty" cbor:"3,keyasint,omitempty"`
 }

internal/entities/systemd/systemd.go

@@ -0,0 +1,34 @@
+package systemd
+
+import (
+	"runtime"
+	"time"
+)
+
+// Service represents a single systemd service with its stats.
+type Service struct {
+	Name         string    `json:"n" cbor:"0,keyasint"`
+	Status       string    `json:"s" cbor:"1,keyasint"`
+	Cpu          float64   `json:"c" cbor:"2,keyasint"`
+	Mem          float64   `json:"m" cbor:"3,keyasint"`
+	PrevCpuUsage uint64    `json:"-"`
+	PrevReadTime time.Time `json:"-"`
+}
+
+// CalculateCPUPercent calculates the CPU usage percentage for the service.
+func (s *Service) CalculateCPUPercent(cpuUsage uint64) {
+	if s.PrevReadTime.IsZero() {
+		s.Cpu = 0
+	} else {
+		duration := time.Since(s.PrevReadTime).Nanoseconds()
+		if duration > 0 {
+			coreCount := int64(runtime.NumCPU())
+			duration *= coreCount
+			cpuPercent := float64(cpuUsage-s.PrevCpuUsage) / float64(duration)
+			s.Cpu = cpuPercent * 100
+		}
+	}
+
+	s.PrevCpuUsage = cpuUsage
+	s.PrevReadTime = time.Now()
+}

internal/hub/systems/system.go

@@ -161,6 +161,20 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 			return nil, err
 		}
 	}
+	// add new systemd_stats record
+	if len(data.SystemdServices) > 0 {
+		systemdStatsCollection, err := hub.FindCachedCollectionByNameOrId("systemd_stats")
+		if err != nil {
+			return nil, err
+		}
+		systemdStatsRecord := core.NewRecord(systemdStatsCollection)
+		systemdStatsRecord.Set("system", systemRecord.Id)
+		systemdStatsRecord.Set("stats", data.SystemdServices)
+		systemdStatsRecord.Set("type", "1m")
+		if err := hub.SaveNoValidate(systemdStatsRecord); err != nil {
+			return nil, err
+		}
+	}
 	// update system record (do this last because it triggers alerts and we need above records to be inserted first)
 	systemRecord.Set("status", up)
 

internal/migrations/0_collections_snapshot_0_12_0_7.go

@@ -520,6 +520,96 @@ func init() {
 		],
 		"system": false
 	},
+	{
+		"id": "systemd_stats_collection",
+		"listRule": "@request.auth.id != \"\"",
+		"viewRule": null,
+		"createRule": null,
+		"updateRule": null,
+		"deleteRule": null,
+		"name": "systemd_stats",
+		"type": "base",
+		"fields": [
+			{
+				"autogeneratePattern": "[a-z0-9]{15}",
+				"hidden": false,
+				"id": "text3208210256",
+				"max": 15,
+				"min": 15,
+				"name": "id",
+				"pattern": "^[a-z0-9]+$",
+				"presentable": false,
+				"primaryKey": true,
+				"required": true,
+				"system": true,
+				"type": "text"
+			},
+			{
+				"cascadeDelete": true,
+				"collectionId": "2hz5ncl8tizk5nx",
+				"hidden": false,
+				"id": "hutcu6ps",
+				"maxSelect": 1,
+				"minSelect": 0,
+				"name": "system",
+				"presentable": false,
+				"required": true,
+				"system": false,
+				"type": "relation"
+			},
+			{
+				"hidden": false,
+				"id": "r39hhnil",
+				"maxSize": 2000000,
+				"name": "stats",
+				"presentable": false,
+				"required": true,
+				"system": false,
+				"type": "json"
+			},
+			{
+				"hidden": false,
+				"id": "vo7iuj96",
+				"maxSelect": 1,
+				"name": "type",
+				"presentable": false,
+				"required": true,
+				"system": false,
+				"type": "select",
+				"values": [
+					"1m",
+					"10m",
+					"20m",
+					"120m",
+					"480m"
+				]
+			},
+			{
+				"hidden": false,
+				"id": "autodate2990389176",
+				"name": "created",
+				"onCreate": true,
+				"onUpdate": false,
+				"presentable": false,
+				"system": false,
+				"type": "autodate"
+			},
+			{
+				"hidden": false,
+				"id": "autodate3332085495",
+				"name": "updated",
+				"onCreate": true,
+				"onUpdate": true,
+				"presentable": false,
+				"system": false,
+				"type": "autodate"
+			}
+		],
+		"indexes": [
+			"CREATE INDEX ` + "`" + `idx_systemd_stats` + "`" + ` ON ` + "`" + `systemd_stats` + "`" + ` (\n  ` + "`" + `system` + "`" + `,\n  ` + "`" + `type` + "`" + `,\n  ` + "`" + `created` + "`" + `\n)"
+		],
+		"system": false
+	},
 	{
 		"id": "4afacsdnlu8q8r2",
 		"listRule": "@request.auth.id != \"\" && user.id = @request.auth.id",