github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +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

7
probe/kubernetes/meta.go
View File

@@ -10,7 +10,6 @@ import (
// These constants are keys used in node metadata
const (
ID = "kubernetes_id"
Name = "kubernetes_name"
Namespace = "kubernetes_namespace"
Created = "kubernetes_created"
@@ -20,7 +19,6 @@ const (
// Meta represents a metadata information about a Kubernetes object
type Meta interface {
UID() string
ID() string
Name() string
Namespace() string
Created() string
@@ -36,10 +34,6 @@ func (m meta) UID() string {
return string(m.ObjectMeta.UID)
}
func (m meta) ID() string {
return m.ObjectMeta.Namespace + "/" + m.ObjectMeta.Name
}
func (m meta) Name() string {
return m.ObjectMeta.Name
}
@@ -59,7 +53,6 @@ func (m meta) Labels() map[string]string {
// MetaNode gets the node metadata
func (m meta) MetaNode(id string) report.Node {
return report.MakeNodeWith(id, map[string]string{
ID: m.ID(),
Name: m.Name(),
Namespace: m.Namespace(),
Created: m.Created(),

4
probe/kubernetes/reporter.go
View File

@@ -27,7 +27,6 @@ const (
// Exposed for testing
var (
PodMetadataTemplates = report.MetadataTemplates{
ID: {ID: ID, Label: "ID", From: report.FromLatest, Priority: 1},
State: {ID: State, Label: "State", From: report.FromLatest, Priority: 2},
IP: {ID: IP, Label: "IP", From: report.FromLatest, Priority: 3},
report.Container: {ID: report.Container, Label: "# Containers", From: report.FromCounters, Datatype: "number", Priority: 4},
@@ -38,7 +37,6 @@ var (
PodMetricTemplates = docker.ContainerMetricTemplates
ServiceMetadataTemplates = report.MetadataTemplates{
ID: {ID: ID, Label: "ID", From: report.FromLatest, Priority: 1},
Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2},
Created: {ID: Created, Label: "Created", From: report.FromLatest, Priority: 3},
PublicIP: {ID: PublicIP, Label: "Public IP", From: report.FromLatest, Priority: 4},
@@ -49,7 +47,6 @@ var (
ServiceMetricTemplates = PodMetricTemplates
DeploymentMetadataTemplates = report.MetadataTemplates{
ID: {ID: ID, Label: "ID", From: report.FromLatest, Priority: 1},
Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2},
Created: {ID: Created, Label: "Created", From: report.FromLatest, Priority: 3},
ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Priority: 4},
@@ -61,7 +58,6 @@ var (
DeploymentMetricTemplates = ReplicaSetMetricTemplates
ReplicaSetMetadataTemplates = report.MetadataTemplates{
ID: {ID: ID, Label: "ID", From: report.FromLatest, Priority: 1},
Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2},
Created: {ID: Created, Label: "Created", From: report.FromLatest, Priority: 3},
ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Priority: 4},

3
probe/kubernetes/reporter_test.go
View File

@@ -193,13 +193,11 @@ func TestReporter(t *testing.T) {
latest map[string]string
}{
{pod1ID, serviceID, map[string]string{
kubernetes.ID: "ping/pong-a",
kubernetes.Name: "pong-a",
kubernetes.Namespace: "ping",
kubernetes.Created: pod1.Created(),
}},
{pod2ID, serviceID, map[string]string{
kubernetes.ID: "ping/pong-b",
kubernetes.Name: "pong-b",
kubernetes.Namespace: "ping",
kubernetes.Created: pod1.Created(),
@@ -229,7 +227,6 @@ func TestReporter(t *testing.T) {
}
for k, want := range map[string]string{
kubernetes.ID: "ping/pongservice",
kubernetes.Name: "pongservice",
kubernetes.Namespace: "ping",
kubernetes.Created: pod1.Created(),