Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Test

on:
pull_request:
branches: [main]

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: stable

- name: Run unit tests
run: make test

- name: Run integration tests
run: make test-it
37 changes: 30 additions & 7 deletions app/services/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"hostlink/internal/crypto"
"hostlink/internal/networkmetrics"
"hostlink/internal/pgmetrics"
"hostlink/internal/storagemetrics"
"hostlink/internal/sysmetrics"
)

Expand All @@ -26,13 +27,14 @@ type Pusher interface {
}

type metricspusher struct {
apiserver apiserver.MetricsOperations
agentstate agentstate.Operations
metricscollector pgmetrics.Collector
syscollector sysmetrics.Collector
netcollector networkmetrics.Collector
crypto crypto.Service
privateKeyPath string
apiserver apiserver.MetricsOperations
agentstate agentstate.Operations
metricscollector pgmetrics.Collector
syscollector sysmetrics.Collector
netcollector networkmetrics.Collector
storagecollector storagemetrics.Collector
crypto crypto.Service
privateKeyPath string
}

func NewWithConf() (*metricspusher, error) {
Expand All @@ -51,6 +53,7 @@ func NewWithConf() (*metricspusher, error) {
metricscollector: pgmetrics.New(),
syscollector: sysmetrics.New(),
netcollector: networkmetrics.New(),
storagecollector: storagemetrics.New(),
crypto: crypto.NewService(),
privateKeyPath: appconf.AgentPrivateKeyPath(),
}, nil
Expand All @@ -67,6 +70,7 @@ func NewWithDependencies(
pgcollector pgmetrics.Collector,
syscollector sysmetrics.Collector,
netcollector networkmetrics.Collector,
storagecollector storagemetrics.Collector,
crypto crypto.Service,
privateKeyPath string,
) *metricspusher {
Expand All @@ -76,6 +80,7 @@ func NewWithDependencies(
metricscollector: pgcollector,
syscollector: syscollector,
netcollector: netcollector,
storagecollector: storagecollector,
crypto: crypto,
privateKeyPath: privateKeyPath,
}
Expand Down Expand Up @@ -157,6 +162,24 @@ func (mp *metricspusher) Push(cred credential.Credential) error {
})
}

storageMetrics, err := mp.storagecollector.Collect(ctx)
if err != nil {
collectionErrors = append(collectionErrors, fmt.Errorf("storage metrics: %w", err))
} else {
for _, sm := range storageMetrics {
metricSets = append(metricSets, domainmetrics.MetricSet{
Type: domainmetrics.MetricTypeStorage,
Attributes: map[string]any{
"mount_point": sm.Attributes.MountPoint,
"device": sm.Attributes.Device,
"filesystem_type": sm.Attributes.FilesystemType,
"is_read_only": sm.Attributes.IsReadOnly,
},
Metrics: sm.Metrics,
})
}
}

if len(metricSets) == 0 {
return fmt.Errorf("all metrics collection failed: %v", collectionErrors)
}
Expand Down
Loading