github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-19 04:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the various metric keys so they don't accidentally overlap

Browse Source
This commit is contained in:
Paul Bellamy
2016-01-20 16:14:32 +00:00
parent 0190c15145
commit bf57aeb8d9
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render/detailed/metrics.go
+1 -1
View File
@@ -27,7 +27,7 @@ var (
)
hostNodeMetrics = renderMetrics(
MetricRow{ID: host.CPUUsage, Label: "CPU", Format: percentFormat},
MetricRow{ID: host.MemUsage, Label: "Memory", Format: filesizeFormat},
MetricRow{ID: host.MemoryUsage, Label: "Memory", Format: filesizeFormat},
MetricRow{ID: host.Load1, Label: "Load (1m)", Format: defaultFormat, Group: "load"},
MetricRow{ID: host.Load5, Label: "Load (5m)", Format: defaultFormat, Group: "load"},
MetricRow{ID: host.Load15, Label: "Load (15m)", Format: defaultFormat, Group: "load"},
render/detailed/metrics_test.go
+1 -1
View File
@@ -76,7 +76,7 @@ func TestNodeMetrics(t *testing.T) {
Metric: &fixture.ClientHostCPUMetric,
},
{
ID: host.MemUsage,
ID: host.MemoryUsage,
Label: "Memory",
Format: "filesize",
Group: "",
render/detailed/node.go
+1 -1
View File
@@ -90,7 +90,7 @@ var (
topologyID string
NodeSummaryGroup
}{
{report.Host, NodeSummaryGroup{TopologyID: "hosts", Label: "Hosts", Columns: []string{host.CPUUsage, host.MemUsage}}},
{report.Host, NodeSummaryGroup{TopologyID: "hosts", Label: "Hosts", Columns: []string{host.CPUUsage, host.MemoryUsage}}},
{report.Pod, NodeSummaryGroup{TopologyID: "pods", Label: "Pods", Columns: []string{}}},
{report.ContainerImage, NodeSummaryGroup{TopologyID: "containers-by-image", Label: "Container Images", Columns: []string{}}},
{report.Container, NodeSummaryGroup{TopologyID: "containers", Label: "Containers", Columns: []string{docker.CPUTotalUsage, docker.MemoryUsage}}},
render/detailed/node_test.go
+1 -1
View File
@@ -55,7 +55,7 @@ func TestMakeDetailedHostNode(t *testing.T) {
Metric: &fixture.ClientHostCPUMetric,
},
{
ID: host.MemUsage,
ID: host.MemoryUsage,
Format: "filesize",
Label: "Memory",
Value: 0.08,