From e9f8dd31bb8c756818726c657b3b6061ce104408 Mon Sep 17 00:00:00 2001 From: Brent Hughes Date: Mon, 1 Aug 2016 19:01:10 -0500 Subject: [PATCH] Added CPU Usage details to statsd (#1393) * Added CPU Usage details to statsd * Fixed bad path to load average * Fixed some issues with formatting and types. This is now tested * Updated to make load average follow the same schema as other cpu metrics --- storage/statsd/statsd.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/storage/statsd/statsd.go b/storage/statsd/statsd.go index 0b571dcf..0763c7dc 100644 --- a/storage/statsd/statsd.go +++ b/storage/statsd/statsd.go @@ -31,6 +31,12 @@ type statsdStorage struct { const ( colCpuCumulativeUsage string = "cpu_cumulative_usage" + // CPU system + colCpuUsageSystem string = "cpu_usage_system" + // CPU user + colCpuUsageUser string = "cpu_usage_user" + // CPU average load + colCpuLoadAverage string = "cpu_load_average" // Memory Usage colMemoryUsage string = "memory_usage" // Working set size @@ -63,6 +69,11 @@ func (self *statsdStorage) containerStatsToValues( // Cumulative Cpu Usage series[colCpuCumulativeUsage] = stats.Cpu.Usage.Total + // Cpu usage + series[colCpuUsageSystem] = stats.Cpu.Usage.System + series[colCpuUsageUser] = stats.Cpu.Usage.User + series[colCpuLoadAverage] = uint64(stats.Cpu.LoadAverage) + // Memory Usage series[colMemoryUsage] = stats.Memory.Usage