-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport of hoststats: add package for collecting host statistics inc…
…luding cpu memory and disk usage into release/1.15.x (#17532) * backport of commit fafb68b * backport of commit baffef4 * backport of commit 369619b * backport of commit b7f5032 * backport of commit ac60717 * backport of commit 2a3dd50 * backport of commit 50621fa * backport of commit 6e3ceb0 * backport of commit bf69a82 --------- Co-authored-by: Nick Ethier <nethier@hashicorp.com>
- Loading branch information
1 parent
d991db5
commit f9d3f8a
Showing
17 changed files
with
599 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:improvement | ||
| agent: add new metrics to track cpu disk and memory usage for server hosts (defaults to: enabled) | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| package hoststats | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "math" | ||
| "runtime" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/armon/go-metrics" | ||
| "github.com/hashicorp/go-hclog" | ||
| "github.com/shirou/gopsutil/v3/disk" | ||
| "github.com/shirou/gopsutil/v3/host" | ||
| "github.com/shirou/gopsutil/v3/mem" | ||
| ) | ||
|
|
||
| // Collector collects host resource usage stats | ||
| type Collector struct { | ||
| numCores int | ||
| cpuCalculator map[string]*cpuStatsCalculator | ||
| hostStats *HostStats | ||
| hostStatsLock sync.RWMutex | ||
| dataDir string | ||
|
|
||
| metrics Metrics | ||
| baseLabels []metrics.Label | ||
|
|
||
| logger hclog.Logger | ||
| } | ||
|
|
||
| // NewCollector returns a Collector. The dataDir is passed in | ||
| // so that we can present the disk related statistics for the mountpoint where the dataDir exists | ||
| func NewCollector(ctx context.Context, logger hclog.Logger, dataDir string, opts ...CollectorOption) *Collector { | ||
| logger = logger.Named("host_stats") | ||
| collector := initCollector(logger, dataDir) | ||
| go collector.loop(ctx) | ||
| return collector | ||
| } | ||
|
|
||
| // initCollector initializes the Collector but does not start the collection loop | ||
| func initCollector(logger hclog.Logger, dataDir string, opts ...CollectorOption) *Collector { | ||
| numCores := runtime.NumCPU() | ||
| statsCalculator := make(map[string]*cpuStatsCalculator) | ||
| collector := &Collector{ | ||
| cpuCalculator: statsCalculator, | ||
| numCores: numCores, | ||
| logger: logger, | ||
| dataDir: dataDir, | ||
| } | ||
|
|
||
| for _, opt := range opts { | ||
| opt(collector) | ||
| } | ||
|
|
||
| if collector.metrics == nil { | ||
| collector.metrics = metrics.Default() | ||
| } | ||
| return collector | ||
| } | ||
|
|
||
| func (c *Collector) loop(ctx context.Context) { | ||
| // Start collecting host stats right away and then keep collecting every | ||
| // collection interval | ||
| next := time.NewTimer(0) | ||
| defer next.Stop() | ||
| for { | ||
| select { | ||
| case <-next.C: | ||
| c.collect() | ||
| next.Reset(hostStatsCollectionInterval) | ||
| c.Stats().Emit(c.metrics, c.baseLabels) | ||
|
|
||
| case <-ctx.Done(): | ||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // collect will collect stats related to resource usage of the host | ||
| func (c *Collector) collect() { | ||
| hs := &HostStats{Timestamp: time.Now().UTC().UnixNano()} | ||
|
|
||
| // Determine up-time | ||
| uptime, err := host.Uptime() | ||
| if err != nil { | ||
| c.logger.Error("failed to collect uptime stats", "error", err) | ||
| uptime = 0 | ||
| } | ||
| hs.Uptime = uptime | ||
|
|
||
| // Collect memory stats | ||
| mstats, err := c.collectMemoryStats() | ||
| if err != nil { | ||
| c.logger.Error("failed to collect memory stats", "error", err) | ||
| mstats = &MemoryStats{} | ||
| } | ||
| hs.Memory = mstats | ||
|
|
||
| // Collect cpu stats | ||
| cpus, err := c.collectCPUStats() | ||
| if err != nil { | ||
| c.logger.Error("failed to collect cpu stats", "error", err) | ||
| cpus = []*CPUStats{} | ||
| } | ||
| hs.CPU = cpus | ||
|
|
||
| // Collect disk stats | ||
| diskStats, err := c.collectDiskStats(c.dataDir) | ||
| if err != nil { | ||
| c.logger.Error("failed to collect dataDir disk stats", "error", err) | ||
| } | ||
| hs.DataDirStats = diskStats | ||
|
|
||
| // Update the collected status object. | ||
| c.hostStatsLock.Lock() | ||
| c.hostStats = hs | ||
| c.hostStatsLock.Unlock() | ||
| } | ||
|
|
||
| func (c *Collector) collectDiskStats(dir string) (*DiskStats, error) { | ||
| usage, err := disk.Usage(dir) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to collect disk usage stats: %w", err) | ||
| } | ||
| return c.toDiskStats(usage), nil | ||
| } | ||
|
|
||
| func (c *Collector) collectMemoryStats() (*MemoryStats, error) { | ||
| memStats, err := mem.VirtualMemory() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| mem := &MemoryStats{ | ||
| Total: memStats.Total, | ||
| Available: memStats.Available, | ||
| Used: memStats.Used, | ||
| UsedPercent: memStats.UsedPercent, | ||
| Free: memStats.Free, | ||
| } | ||
|
|
||
| return mem, nil | ||
| } | ||
|
|
||
| // Stats returns the host stats that has been collected | ||
| func (c *Collector) Stats() *HostStats { | ||
| c.hostStatsLock.RLock() | ||
| defer c.hostStatsLock.RUnlock() | ||
|
|
||
| if c.hostStats == nil { | ||
| return &HostStats{} | ||
| } | ||
|
|
||
| return c.hostStats.Clone() | ||
| } | ||
|
|
||
| // toDiskStats merges UsageStat and PartitionStat to create a DiskStat | ||
| func (c *Collector) toDiskStats(usage *disk.UsageStat) *DiskStats { | ||
| ds := DiskStats{ | ||
| Size: usage.Total, | ||
| Used: usage.Used, | ||
| Available: usage.Free, | ||
| UsedPercent: usage.UsedPercent, | ||
| InodesUsedPercent: usage.InodesUsedPercent, | ||
| Path: usage.Path, | ||
| } | ||
| if math.IsNaN(ds.UsedPercent) { | ||
| ds.UsedPercent = 0.0 | ||
| } | ||
| if math.IsNaN(ds.InodesUsedPercent) { | ||
| ds.InodesUsedPercent = 0.0 | ||
| } | ||
|
|
||
| return &ds | ||
| } | ||
|
|
||
| type CollectorOption func(c *Collector) | ||
|
|
||
| func WithMetrics(m *metrics.Metrics) CollectorOption { | ||
| return func(c *Collector) { | ||
| c.metrics = m | ||
| } | ||
| } | ||
|
|
||
| func WithBaseLabels(labels []metrics.Label) CollectorOption { | ||
| return func(c *Collector) { | ||
| c.baseLabels = labels | ||
| } | ||
| } |
Oops, something went wrong.