From 79b4232b08610b9f975f9abcf632785ed7898236 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Tue, 12 Apr 2016 17:29:09 +0200 Subject: [PATCH] Remove load5 and load15 * not really useful * take up lots of real estate Fixes #1267 --- probe/host/reporter.go | 2 -- probe/host/reporter_test.go | 2 -- probe/host/system_darwin.go | 12 +----------- probe/host/system_linux.go | 12 +----------- probe/host/system_test.go | 4 ++-- render/detailed/labels.go | 2 -- render/detailed/metrics.go | 2 -- render/detailed/metrics_test.go | 12 ------------ render/detailed/node_test.go | 12 ------------ test/fixture/report_fixture.go | 8 -------- 10 files changed, 4 insertions(+), 64 deletions(-) diff --git a/probe/host/reporter.go b/probe/host/reporter.go index 04019d376..587a50ff2 100644 --- a/probe/host/reporter.go +++ b/probe/host/reporter.go @@ -19,8 +19,6 @@ const ( KernelVersion = "kernel_version" Uptime = "uptime" Load1 = "load1" - Load5 = "load5" - Load15 = "load15" CPUUsage = "host_cpu_usage_percent" MemoryUsage = "host_mem_usage_bytes" ) diff --git a/probe/host/reporter_test.go b/probe/host/reporter_test.go index 3933c1e27..5ddccf0c9 100644 --- a/probe/host/reporter_test.go +++ b/probe/host/reporter_test.go @@ -22,8 +22,6 @@ func TestReporter(t *testing.T) { timestamp = time.Now() metrics = report.Metrics{ host.Load1: report.MakeMetric().Add(timestamp, 1.0), - host.Load5: report.MakeMetric().Add(timestamp, 5.0), - host.Load15: report.MakeMetric().Add(timestamp, 15.0), host.CPUUsage: report.MakeMetric().Add(timestamp, 30.0).WithMax(100.0), host.MemoryUsage: report.MakeMetric().Add(timestamp, 60.0).WithMax(100.0), } diff --git a/probe/host/system_darwin.go b/probe/host/system_darwin.go index e90528707..ba682f1d1 100644 --- a/probe/host/system_darwin.go +++ b/probe/host/system_darwin.go @@ -44,18 +44,8 @@ var GetLoad = func(now time.Time) report.Metrics { if err != nil { return nil } - five, err := strconv.ParseFloat(matches[0][2], 64) - if err != nil { - return nil - } - fifteen, err := strconv.ParseFloat(matches[0][3], 64) - if err != nil { - return nil - } return report.Metrics{ - Load1: report.MakeMetric().Add(now, one), - Load5: report.MakeMetric().Add(now, five), - Load15: report.MakeMetric().Add(now, fifteen), + Load1: report.MakeMetric().Add(now, one), } } diff --git a/probe/host/system_linux.go b/probe/host/system_linux.go index 520b7c718..02c0a231b 100644 --- a/probe/host/system_linux.go +++ b/probe/host/system_linux.go @@ -44,18 +44,8 @@ var GetLoad = func(now time.Time) report.Metrics { if err != nil { return nil } - five, err := strconv.ParseFloat(toks[1], 64) - if err != nil { - return nil - } - fifteen, err := strconv.ParseFloat(toks[2], 64) - if err != nil { - return nil - } return report.Metrics{ - Load1: report.MakeMetric().Add(now, one), - Load5: report.MakeMetric().Add(now, five), - Load15: report.MakeMetric().Add(now, fifteen), + Load1: report.MakeMetric().Add(now, one), } } diff --git a/probe/host/system_test.go b/probe/host/system_test.go index ec17e1836..850f8281e 100644 --- a/probe/host/system_test.go +++ b/probe/host/system_test.go @@ -21,8 +21,8 @@ func TestGetKernelVersion(t *testing.T) { func TestGetLoad(t *testing.T) { have := host.GetLoad(time.Now()) - if len(have) != 3 { - t.Fatalf("Expected 3 metrics, but got: %v", have) + if len(have) != 1 { + t.Fatalf("Expected 1 metrics, but got: %v", have) } for key, metric := range have { if metric.Len() != 1 { diff --git a/render/detailed/labels.go b/render/detailed/labels.go index 421d13bd7..09f7f7d71 100644 --- a/render/detailed/labels.go +++ b/render/detailed/labels.go @@ -27,9 +27,7 @@ var labels = map[string]string{ host.CPUUsage: "CPU", host.HostName: "Hostname", host.KernelVersion: "Kernel version", - host.Load15: "Load (15m)", host.Load1: "Load (1m)", - host.Load5: "Load (5m)", host.LocalNetworks: "Local Networks", host.MemoryUsage: "Memory", host.OS: "OS", diff --git a/render/detailed/metrics.go b/render/detailed/metrics.go index 5346dada2..b44b7f3ab 100644 --- a/render/detailed/metrics.go +++ b/render/detailed/metrics.go @@ -32,8 +32,6 @@ var ( {ID: host.CPUUsage, Format: percentFormat}, {ID: host.MemoryUsage, Format: filesizeFormat}, {ID: host.Load1, Format: defaultFormat, Group: "load"}, - {ID: host.Load5, Format: defaultFormat, Group: "load"}, - {ID: host.Load15, Format: defaultFormat, Group: "load"}, } ) diff --git a/render/detailed/metrics_test.go b/render/detailed/metrics_test.go index d5085d090..94160af61 100644 --- a/render/detailed/metrics_test.go +++ b/render/detailed/metrics_test.go @@ -84,18 +84,6 @@ func TestNodeMetrics(t *testing.T) { Value: 0.09, Metric: &fixture.ClientHostLoad1Metric, }, - { - ID: host.Load5, - Group: "load", - Value: 0.10, - Metric: &fixture.ClientHostLoad5Metric, - }, - { - ID: host.Load15, - Group: "load", - Value: 0.11, - Metric: &fixture.ClientHostLoad15Metric, - }, }, }, { diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index 4abe29ae0..dd782b8de 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -77,18 +77,6 @@ func TestMakeDetailedHostNode(t *testing.T) { Value: 0.09, Metric: &fixture.ClientHostLoad1Metric, }, - { - ID: host.Load5, - Group: "load", - Value: 0.10, - Metric: &fixture.ClientHostLoad5Metric, - }, - { - ID: host.Load15, - Group: "load", - Value: 0.11, - Metric: &fixture.ClientHostLoad15Metric, - }, }, }, Controls: []detailed.ControlInstance{}, diff --git a/test/fixture/report_fixture.go b/test/fixture/report_fixture.go index ebd498c17..fa5a5bd77 100644 --- a/test/fixture/report_fixture.go +++ b/test/fixture/report_fixture.go @@ -105,14 +105,10 @@ var ( ClientHostCPUMetric = report.MakeMetric().Add(Now, 0.07).WithFirst(Now.Add(-7 * time.Second)) ClientHostMemoryMetric = report.MakeMetric().Add(Now, 0.08).WithFirst(Now.Add(-8 * time.Second)) ClientHostLoad1Metric = report.MakeMetric().Add(Now, 0.09).WithFirst(Now.Add(-9 * time.Second)) - ClientHostLoad5Metric = report.MakeMetric().Add(Now, 0.10).WithFirst(Now.Add(-10 * time.Second)) - ClientHostLoad15Metric = report.MakeMetric().Add(Now, 0.11).WithFirst(Now.Add(-11 * time.Second)) ServerHostCPUMetric = report.MakeMetric().Add(Now, 0.12).WithFirst(Now.Add(-12 * time.Second)) ServerHostMemoryMetric = report.MakeMetric().Add(Now, 0.13).WithFirst(Now.Add(-13 * time.Second)) ServerHostLoad1Metric = report.MakeMetric().Add(Now, 0.14).WithFirst(Now.Add(-14 * time.Second)) - ServerHostLoad5Metric = report.MakeMetric().Add(Now, 0.15).WithFirst(Now.Add(-15 * time.Second)) - ServerHostLoad15Metric = report.MakeMetric().Add(Now, 0.16).WithFirst(Now.Add(-16 * time.Second)) Report = report.Report{ ID: "test-report", @@ -322,8 +318,6 @@ var ( host.CPUUsage: ClientHostCPUMetric, host.MemoryUsage: ClientHostMemoryMetric, host.Load1: ClientHostLoad1Metric, - host.Load5: ClientHostLoad5Metric, - host.Load15: ClientHostLoad15Metric, }), ServerHostNodeID: report.MakeNodeWith(map[string]string{ "host_name": ServerHostName, @@ -335,8 +329,6 @@ var ( host.CPUUsage: ServerHostCPUMetric, host.MemoryUsage: ServerHostMemoryMetric, host.Load1: ServerHostLoad1Metric, - host.Load5: ServerHostLoad5Metric, - host.Load15: ServerHostLoad15Metric, }), }, },