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

Show Pod IP and # container in the children table in details panel.

Browse Source
This commit is contained in:
Tom Wilkie
2016-05-05 13:15:15 +01:00
parent c671c58d93
commit 55069609e1
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
probe/kubernetes/reporter.go
View File

@@ -18,11 +18,12 @@ import (
// Exposed for testing
var (
PodMetadataTemplates = report.MetadataTemplates{
PodID: {ID: PodID, Label: "ID", From: report.FromLatest, Priority: 1},
PodState: {ID: PodState, Label: "State", From: report.FromLatest, Priority: 2},
PodIP: {ID: PodIP, Label: "IP", From: report.FromLatest, Priority: 3},
Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 5},
PodCreated: {ID: PodCreated, Label: "Created", From: report.FromLatest, Priority: 6},
PodID: {ID: PodID, Label: "ID", From: report.FromLatest, Priority: 1},
PodState: {ID: PodState, Label: "State", From: report.FromLatest, Priority: 2},
PodIP: {ID: PodIP, Label: "IP", From: report.FromLatest, Priority: 3},
report.Container: {ID: report.Container, Label: "# Containers", From: report.FromCounters, Datatype: "number", Priority: 4},
Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 5},
PodCreated: {ID: PodCreated, Label: "Created", From: report.FromLatest, Priority: 6},
}
ServiceMetadataTemplates = report.MetadataTemplates{
@@ -31,6 +32,7 @@ var (
ServiceCreated: {ID: ServiceCreated, Label: "Created", From: report.FromLatest, Priority: 3},
ServicePublicIP: {ID: ServicePublicIP, Label: "Public IP", From: report.FromLatest, Priority: 4},
ServiceIP: {ID: ServiceIP, Label: "Internal IP", From: report.FromLatest, Priority: 5},
report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 6},
}
PodTableTemplates = report.TableTemplates{

17
render/detailed/node.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/probe/host"
"github.com/weaveworks/scope/probe/kubernetes"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/report"
)
@@ -144,6 +145,22 @@ var (
NodeSummaryGroup: NodeSummaryGroup{
TopologyID: "pods",
Label: "Pods",
Columns: []Column{
{ID: report.Container, Label: "# Containers"},
{ID: kubernetes.PodIP, Label: "IP"},
},
},
},
{
topologyID: report.Service,
NodeSummaryGroup: NodeSummaryGroup{
TopologyID: "pods-by-service",
Label: "Services",
Columns: []Column{
{ID: report.Pod, Label: "# Pods"},
{ID: kubernetes.ServiceIP, Label: "IP"},
},
},
},
{

9
render/detailed/node_test.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/probe/host"
"github.com/weaveworks/scope/probe/kubernetes"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/render"
"github.com/weaveworks/scope/render/detailed"
@@ -97,8 +98,11 @@ func TestMakeDetailedHostNode(t *testing.T) {
{
Label: "Pods",
TopologyID: "pods",
Columns: nil,
Nodes: []detailed.NodeSummary{podNodeSummary},
Columns: []detailed.Column{
{ID: report.Container, Label: "# Containers"},
{ID: kubernetes.PodIP, Label: "IP"},
},
Nodes: []detailed.NodeSummary{podNodeSummary},
},
{
Label: "Containers",
@@ -325,6 +329,7 @@ func TestMakeDetailedPodNode(t *testing.T) {
Metadata: []report.MetadataRow{
{ID: "kubernetes_pod_id", Label: "ID", Value: "ping/pong-b", Priority: 1},
{ID: "kubernetes_pod_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},
},
},