github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 10:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

move counting sublabel definition to the topologies

Browse Source
This commit is contained in:
Paul Bellamy
2016-04-20 10:56:57 +01:00
parent 4ad1ae80df
commit 4bd3832219
6 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
render/detailed/summary.go
View File

@@ -124,9 +124,10 @@ func (n NodeSummary) Copy() NodeSummary {
}
func baseNodeSummary(r report.Report, n report.Node) NodeSummary {
t, _ := r.Topology(n.Topology)
return NodeSummary{
ID: n.ID,
Shape: topologyShape(r, n.Topology),
Shape: t.GetShape(),
Linkable: true,
Metadata: NodeMetadata(r, n),
Metrics: NodeMetrics(r, n),
@@ -298,18 +299,18 @@ func groupNodeSummary(base NodeSummary, r report.Report, n report.Node) (NodeSum
}
base.Label, base.Rank = label, label
if count, ok := n.Counters.Lookup(parts[1]); ok {
base.LabelMinor = fmt.Sprintf("%d %s", count, parts[1])
if count != 1 {
if strings.HasSuffix(parts[1], "s") {
base.LabelMinor += "es"
t, ok := r.Topology(parts[1])
if ok && t.Label != "" {
if count, ok := n.Counters.Lookup(parts[1]); ok {
if count == 1 {
base.LabelMinor = fmt.Sprintf("%d %s", count, t.Label)
} else {
base.LabelMinor += "s"
base.LabelMinor = fmt.Sprintf("%d %s", count, t.LabelPlural)
}
}
}
base.Shape = topologyShape(r, parts[1])
base.Shape = t.GetShape()
base.Stack = true
return base, true
}
@@ -373,10 +374,3 @@ func getRenderableContainerName(nmd report.Node) string {
}
return ""
}
func topologyShape(r report.Report, topology string) string {
if t, ok := r.Topology(topology); ok && t.Shape != "" {
return t.Shape
}
return report.Circle
}