github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 03:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1774 from weaveworks/1759-remove-k8s-id-col

Browse Source 
Remove kubernetes_id column from the grid view.
This commit is contained in:
Alfonso Acosta
2016-08-11 17:43:21 +01:00
committed by GitHub
parent 22434616fa 77bb186039
commit cfb686b546
6 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render/detailed/node_test.go
-1
View File
@@ -330,7 +330,6 @@ func TestMakeDetailedPodNode(t *testing.T) {
Linkable: true,
Pseudo: false,
Metadata: []report.MetadataRow{
{ID: "kubernetes_id", Label: "ID", Value: "ping/pong-b", Priority: 1},
{ID: "kubernetes_state", Label: "State", Value: "running", Priority: 2},
{ID: "container", Label: "# Containers", Value: "1", Priority: 4, Datatype: "number"},
{ID: "kubernetes_namespace", Label: "Namespace", Value: "ping", Priority: 5},
render/detailed/summary.go
+10 -8
View File
@@ -241,10 +241,15 @@ func containerImageNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bo
return base, true
}
func podNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
func addKubernetesLabelAndRank(base NodeSummary, n report.Node) NodeSummary {
base.Label, _ = n.Latest.Lookup(kubernetes.Name)
base.Rank, _ = n.Latest.Lookup(kubernetes.ID)
namespace, _ := n.Latest.Lookup(kubernetes.Namespace)
base.Rank = namespace + "/" + base.Label
return base
}
func podNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
base = addKubernetesLabelAndRank(base, n)
if c, ok := n.Counters.Lookup(report.Container); ok {
if c == 1 {
base.LabelMinor = fmt.Sprintf("%d container", c)
@@ -257,8 +262,7 @@ func podNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
}
func serviceNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
base.Label, _ = n.Latest.Lookup(kubernetes.Name)
base.Rank, _ = n.Latest.Lookup(kubernetes.ID)
base = addKubernetesLabelAndRank(base, n)
base.Stack = true
// Services are always just a group of pods, so there's no counting multiple
@@ -275,8 +279,7 @@ func serviceNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
}
func deploymentNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
base.Label, _ = n.Latest.Lookup(kubernetes.Name)
base.Rank, _ = n.Latest.Lookup(kubernetes.ID)
base = addKubernetesLabelAndRank(base, n)
base.Stack = true
if p, ok := n.Counters.Lookup(report.Pod); ok {
@@ -291,8 +294,7 @@ func deploymentNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool)
}
func replicaSetNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) {
base.Label, _ = n.Latest.Lookup(kubernetes.Name)
base.Rank, _ = n.Latest.Lookup(kubernetes.ID)
base = addKubernetesLabelAndRank(base, n)
base.Stack = true
if p, ok := n.Counters.Lookup(report.Pod); ok {