Fix graph card error when heapster not available (#1184)

src/app/backend/resource/daemonset/daemonsetlist.go

@@ -119,7 +119,12 @@ func CreateDaemonSetList(daemonSets []extensions.DaemonSet, pods []api.Pod,
 				ContainerImages: common.GetContainerImages(&daemonSet.Spec.Template.Spec),
 			})
 	}
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	daemonSetList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		daemonSetList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return daemonSetList
 }

src/app/backend/resource/deployment/deploymentlist.go

@@ -131,7 +131,12 @@ func CreateDeploymentList(deployments []extensions.Deployment, pods []api.Pod,
 				Pods:            podInfo,
 			})
 	}
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	deploymentList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		deploymentList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return deploymentList
 }

src/app/backend/resource/job/joblist.go

@@ -20,11 +20,11 @@ import (
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/event"
 
+	heapster "github.com/kubernetes/dashboard/src/app/backend/client"
 	"k8s.io/kubernetes/pkg/api"
 	k8serrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/apis/batch"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	heapster "github.com/kubernetes/dashboard/src/app/backend/client"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
@@ -35,7 +35,7 @@ type JobList struct {
 	ListMeta common.ListMeta `json:"listMeta"`
 
 	// Unordered list of Jobs.
-	Jobs []Job `json:"jobs"`
+	Jobs              []Job           `json:"jobs"`
 	CumulativeMetrics []metric.Metric `json:"cumulativeMetrics"`
 }
 
@@ -126,8 +126,13 @@ func CreateJobList(jobs []batch.Job, pods []api.Pod, events []api.Event,
 
 		jobList.Jobs = append(jobList.Jobs, ToJob(&job, &podInfo))
 	}
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	jobList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		jobList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return jobList
 }
 

src/app/backend/resource/metric/downloader.go

@@ -15,12 +15,13 @@
 package metric
 
 import (
-	"github.com/kubernetes/dashboard/src/app/backend/client"
-	heapster "k8s.io/heapster/metrics/api/v1/types"
-
 	"fmt"
 	"strings"
+
+	"github.com/kubernetes/dashboard/src/app/backend/client"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+
+	heapster "k8s.io/heapster/metrics/api/v1/types"
 )
 
 type MetricPromises []MetricPromise
@@ -28,10 +29,11 @@ type MetricPromises []MetricPromise
 // GetMetrics returns all metrics from MetricPromises.
 // In case of no metrics were downloaded it does not initialise []Metric and returns nil.
 func (self MetricPromises) GetMetrics() ([]Metric, error) {
+	result := make([]Metric, 0)
 	if len(self) == 0 {
-		return nil, nil
+		return result, nil
 	}
-	result := []Metric{}
+
 	for _, metricPromise := range self {
 		metric, err := metricPromise.GetMetric()
 		if err != nil {
@@ -39,6 +41,7 @@ func (self MetricPromises) GetMetrics() ([]Metric, error) {
 		}
 		result = append(result, *metric)
 	}
+
 	return result, nil
 }
 

src/app/backend/resource/node/nodelist.go

@@ -77,8 +77,12 @@ func toNodeList(nodes []api.Node, dsQuery *dataselect.DataSelectQuery, heapsterC
 	}
 
 	// this may be slow because heapster does not support all in one download for nodes.
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	nodeList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		nodeList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return nodeList
 }
 

src/app/backend/resource/petset/petsetlist.go

@@ -125,8 +125,13 @@ func CreatePetSetList(petSets []apps.PetSet, pods []api.Pod, events []api.Event,
 
 		petSetList.PetSets = append(petSetList.PetSets, ToPetSet(&petSet, &podInfo))
 	}
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	petSetList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		petSetList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return petSetList
 }
 

src/app/backend/resource/pod/podlist.go

@@ -107,7 +107,11 @@ func CreatePodList(pods []api.Pod, dsQuery *dataselect.DataSelectQuery,
 		podList.Pods = append(podList.Pods, podDetail)
 	}
 
-	cumulativeMetrics, _ := cumulativeMetricsPromises.GetMetrics()
+	cumulativeMetrics, err := cumulativeMetricsPromises.GetMetrics()
 	podList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		podList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return podList
 }

src/app/backend/resource/replicaset/replicasetcommon.go

@@ -54,8 +54,13 @@ func CreateReplicaSetList(replicaSets []extensions.ReplicaSet, pods []api.Pod,
 
 		replicaSetList.ReplicaSets = append(replicaSetList.ReplicaSets, ToReplicaSet(&replicaSet, &podInfo))
 	}
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	replicaSetList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		replicaSetList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return replicaSetList
 }
 

src/app/backend/resource/replicationcontroller/replicationcontrollercommon.go

@@ -132,8 +132,13 @@ func CreateReplicationControllerList(replicationControllers []api.ReplicationCon
 		replicationController := ToReplicationController(&rc, &podInfo)
 		rcList.ReplicationControllers = append(rcList.ReplicationControllers, replicationController)
 	}
-	cumulativeMetrics, _ := metricPromises.GetMetrics()
+
+	cumulativeMetrics, err := metricPromises.GetMetrics()
 	rcList.CumulativeMetrics = cumulativeMetrics
+	if err != nil {
+		rcList.CumulativeMetrics = make([]metric.Metric, 0)
+	}
+
 	return rcList
 }
 

src/test/backend/resource/daemonset/daemonsetcommon_test.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"k8s.io/kubernetes/pkg/labels"
-
 )
 
 func TestGetServicesForDeletionforDS(t *testing.T) {

src/test/backend/resource/daemonset/daemonsetlist_test.go

@@ -19,10 +19,11 @@ import (
 	"testing"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 func TestGetDaemonSetList(t *testing.T) {
@@ -35,8 +36,10 @@ func TestGetDaemonSetList(t *testing.T) {
 		nodes      []api.Node
 		expected   *DaemonSetList
 	}{
-		{nil, nil, nil, nil, &DaemonSetList{DaemonSets: []DaemonSet{}}},
-		{
+		{nil, nil, nil, nil, &DaemonSetList{
+			DaemonSets:        []DaemonSet{},
+			CumulativeMetrics: make([]metric.Metric, 0)},
+		}, {
 			[]extensions.DaemonSet{
 				{
 					ObjectMeta: api.ObjectMeta{
@@ -160,7 +163,8 @@ func TestGetDaemonSetList(t *testing.T) {
 			},
 			},
 			&DaemonSetList{
-				ListMeta: common.ListMeta{TotalItems: 2},
+				ListMeta:          common.ListMeta{TotalItems: 2},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				DaemonSets: []DaemonSet{
 					{
 						ObjectMeta: common.ObjectMeta{

src/test/backend/resource/deployment/deploymentdetail_test.go

@@ -12,6 +12,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/intstr"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/replicaset"
 )
 
@@ -103,7 +104,10 @@ func TestGetDeploymentDetail(t *testing.T) {
 					MaxSurge:       1,
 					MaxUnavailable: 1,
 				},
-				OldReplicaSetList: replicaset.ReplicaSetList{ReplicaSets: []replicaset.ReplicaSet{}},
+				OldReplicaSetList: replicaset.ReplicaSetList{
+					ReplicaSets:       []replicaset.ReplicaSet{},
+					CumulativeMetrics: make([]metric.Metric, 0),
+				},
 				NewReplicaSet: replicaset.ReplicaSet{
 					ObjectMeta: common.NewObjectMeta(newReplicaSet.ObjectMeta),
 					TypeMeta:   common.NewTypeMeta(common.ResourceKindReplicaSet),

src/test/backend/resource/deployment/deploymentlist_test.go

@@ -15,7 +15,6 @@
 package deployment
 
 import (
-	"errors"
 	"reflect"
 	"testing"
 
@@ -24,8 +23,10 @@ import (
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 
+	"errors"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 )
 
 func TestGetDeploymentListFromChannels(t *testing.T) {
@@ -41,8 +42,9 @@ func TestGetDeploymentListFromChannels(t *testing.T) {
 			nil,
 			&api.PodList{},
 			&DeploymentList{
-				ListMeta: common.ListMeta{},
-				Deployments: []Deployment{},
+				ListMeta:          common.ListMeta{},
+				Deployments:       []Deployment{},
+				CumulativeMetrics: make([]metric.Metric, 0),
 			},
 			nil,
 		},
@@ -121,7 +123,8 @@ func TestGetDeploymentListFromChannels(t *testing.T) {
 				},
 			},
 			&DeploymentList{
-				ListMeta: common.ListMeta{TotalItems: 1},
+				ListMeta:          common.ListMeta{TotalItems: 1},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				Deployments: []Deployment{{
 					ObjectMeta: common.ObjectMeta{
 						Name:              "rs-name",

src/test/backend/resource/event/eventcommon_test.go

@@ -16,11 +16,11 @@ package event
 
 import (
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"reflect"
 	"testing"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 func TestGetEvents(t *testing.T) {

src/test/backend/resource/job/jobdetail_test.go

@@ -20,13 +20,14 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/client"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 type FakeHeapsterClient struct {
@@ -62,10 +63,13 @@ func TestGetJobDetail(t *testing.T) {
 				},
 			},
 			&JobDetail{
-				ObjectMeta:  common.ObjectMeta{Name: "test-job"},
-				TypeMeta:    common.TypeMeta{Kind: common.ResourceKindJob},
-				PodInfo:     common.PodInfo{Warnings: []common.Event{}},
-				PodList:     pod.PodList{Pods: []pod.Pod{}},
+				ObjectMeta: common.ObjectMeta{Name: "test-job"},
+				TypeMeta:   common.TypeMeta{Kind: common.ResourceKindJob},
+				PodInfo:    common.PodInfo{Warnings: []common.Event{}},
+				PodList: pod.PodList{
+					Pods:              []pod.Pod{},
+					CumulativeMetrics: make([]metric.Metric, 0),
+				},
 				EventList:   common.EventList{Events: []common.Event{}},
 				Parallelism: &jobCompletions,
 				Completions: &parallelism,

src/test/backend/resource/job/joblist_test.go

@@ -20,11 +20,12 @@ import (
 	"testing"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"k8s.io/kubernetes/pkg/api"
 	k8serrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/batch"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 func TestGetJobListFromChannels(t *testing.T) {
@@ -41,8 +42,9 @@ func TestGetJobListFromChannels(t *testing.T) {
 			nil,
 			&api.PodList{},
 			&JobList{
-				ListMeta: common.ListMeta{},
-				Jobs: []Job{}},
+				ListMeta:          common.ListMeta{},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				Jobs:              []Job{}},
 			nil,
 		},
 		{
@@ -135,7 +137,8 @@ func TestGetJobListFromChannels(t *testing.T) {
 				},
 			},
 			&JobList{
-				ListMeta: common.ListMeta{TotalItems: 2},
+				ListMeta:          common.ListMeta{TotalItems: 2},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				Jobs: []Job{{
 					ObjectMeta: common.ObjectMeta{
 						Name:              "rs-name",

src/test/backend/resource/metric/resourceselector_test.go

 package metric
 
 import (
+	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"reflect"
 	"testing"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 )
 
 func TestResourceSelector(t *testing.T) {

src/test/backend/resource/node/nodedetail_test.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/client"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/restclient"
@@ -63,7 +64,8 @@ func TestGetNodeDetail(t *testing.T) {
 				ProviderID:    "ID-1",
 				Unschedulable: true,
 				PodList: pod.PodList{
-					Pods: []pod.Pod{},
+					Pods:              []pod.Pod{},
+					CumulativeMetrics: make([]metric.Metric, 0),
 				},
 				EventList: common.EventList{
 					Events: nil,

src/test/backend/resource/persistentvolume/persistentvolume_test.go

@@ -19,8 +19,8 @@ import (
 	"testing"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
-	"k8s.io/kubernetes/pkg/api"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"k8s.io/kubernetes/pkg/api"
 )
 
 func TestGetPersistentVolumeList(t *testing.T) {

src/test/backend/resource/persistentvolumeclaim/persistentvolumeclaim_test.go

 package persistentvolumeclaim
 
-
 import (
-"reflect"
-"testing"
+	"reflect"
+	"testing"
 
-"github.com/kubernetes/dashboard/src/app/backend/resource/common"
-"k8s.io/kubernetes/pkg/api"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"k8s.io/kubernetes/pkg/api"
 )
 
 func TestGetPersistentVolumeClaimList(t *testing.T) {
 	cases := []struct {
 		persistentVolumeClaims []api.PersistentVolumeClaim
-		expected          	*PersistentVolumeClaimList
+		expected               *PersistentVolumeClaimList
 	}{
 		{nil, &PersistentVolumeClaimList{Items: []PersistentVolumeClaim{}}},
 		{
 			[]api.PersistentVolumeClaim{{
 				ObjectMeta: api.ObjectMeta{Name: "foo"},
-				Spec: api.PersistentVolumeClaimSpec{VolumeName: "my-volume"},
-				Status: api.PersistentVolumeClaimStatus{ Phase: api.ClaimBound},
-				},
+				Spec:       api.PersistentVolumeClaimSpec{VolumeName: "my-volume"},
+				Status:     api.PersistentVolumeClaimStatus{Phase: api.ClaimBound},
+			},
 			},
 			&PersistentVolumeClaimList{
 				ListMeta: common.ListMeta{TotalItems: 1},
 				Items: []PersistentVolumeClaim{{
 					TypeMeta:   common.TypeMeta{Kind: "persistentvolumeclaim"},
 					ObjectMeta: common.ObjectMeta{Name: "foo"},
-					Status: "Bound",
-					Volume: "my-volume",
+					Status:     "Bound",
+					Volume:     "my-volume",
 				}},
 			},
 		},
@@ -42,5 +41,3 @@ func TestGetPersistentVolumeClaimList(t *testing.T) {
 		}
 	}
 }
-
-

src/test/backend/resource/petset/petsetlist_test.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 )
 
 func TestGetPetSetListFromChannels(t *testing.T) {
@@ -41,8 +42,9 @@ func TestGetPetSetListFromChannels(t *testing.T) {
 			nil,
 			&api.PodList{},
 			&PetSetList{
-				ListMeta: common.ListMeta{},
-				PetSets: []PetSet{}},
+				ListMeta:          common.ListMeta{},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				PetSets:           []PetSet{}},
 			nil,
 		},
 		{
@@ -120,7 +122,8 @@ func TestGetPetSetListFromChannels(t *testing.T) {
 				},
 			},
 			&PetSetList{
-				ListMeta: common.ListMeta{TotalItems: 1},
+				ListMeta:          common.ListMeta{TotalItems: 1},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				PetSets: []PetSet{{
 					ObjectMeta: common.ObjectMeta{
 						Name:              "rs-name",

src/test/backend/resource/replicaset/replicasetcommon_test.go

@@ -22,10 +22,11 @@ import (
 	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/service"
 
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 func TestCreateReplicaSetList(t *testing.T) {
@@ -47,7 +48,8 @@ func TestCreateReplicaSetList(t *testing.T) {
 			[]api.Pod{},
 			[]api.Event{},
 			&ReplicaSetList{
-				ListMeta: common.ListMeta{TotalItems: 1},
+				ListMeta:          common.ListMeta{TotalItems: 1},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				ReplicaSets: []ReplicaSet{
 					{
 						ObjectMeta: common.ObjectMeta{Name: "replica-set", Namespace: "ns-1"},

src/test/backend/resource/replicaset/replicasetdetail_test.go

@@ -27,9 +27,10 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/client"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/service"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 type FakeHeapsterClient struct {
@@ -62,10 +63,13 @@ func TestGetReplicaSetDetail(t *testing.T) {
 					}},
 			},
 			&ReplicaSetDetail{
-				ObjectMeta:  common.ObjectMeta{Name: "test-replicaset"},
-				TypeMeta:    common.TypeMeta{Kind: common.ResourceKindReplicaSet},
-				PodInfo:     common.PodInfo{Warnings: []common.Event{}},
-				PodList:     pod.PodList{Pods: []pod.Pod{}},
+				ObjectMeta: common.ObjectMeta{Name: "test-replicaset"},
+				TypeMeta:   common.TypeMeta{Kind: common.ResourceKindReplicaSet},
+				PodInfo:    common.PodInfo{Warnings: []common.Event{}},
+				PodList: pod.PodList{
+					Pods:              []pod.Pod{},
+					CumulativeMetrics: make([]metric.Metric, 0),
+				},
 				ServiceList: service.ServiceList{Services: []service.Service{}},
 				EventList:   common.EventList{Events: []common.Event{}},
 			},

src/test/backend/resource/replicaset/replicasetlist_test.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 )
 
 func TestGetReplicaSetListFromChannels(t *testing.T) {
@@ -41,8 +42,9 @@ func TestGetReplicaSetListFromChannels(t *testing.T) {
 			nil,
 			&api.PodList{},
 			&ReplicaSetList{
-				ListMeta: common.ListMeta{},
-				ReplicaSets: []ReplicaSet{}},
+				ListMeta:          common.ListMeta{},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				ReplicaSets:       []ReplicaSet{}},
 			nil,
 		},
 		{
@@ -120,7 +122,8 @@ func TestGetReplicaSetListFromChannels(t *testing.T) {
 				},
 			},
 			&ReplicaSetList{
-				ListMeta: common.ListMeta{TotalItems: 1},
+				ListMeta:          common.ListMeta{TotalItems: 1},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				ReplicaSets: []ReplicaSet{{
 					ObjectMeta: common.ObjectMeta{
 						Name:              "rs-name",

src/test/backend/resource/replicationcontroller/replicationcontrollerlist_test.go

@@ -19,8 +19,9 @@ import (
 	"testing"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
-	"k8s.io/kubernetes/pkg/api"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
+	"k8s.io/kubernetes/pkg/api"
 )
 
 func TestGetReplicationControllerList(t *testing.T) {
@@ -33,7 +34,12 @@ func TestGetReplicationControllerList(t *testing.T) {
 		nodes                  []api.Node
 		expected               *ReplicationControllerList
 	}{
-		{nil, nil, nil, nil, &ReplicationControllerList{ReplicationControllers: []ReplicationController{}}},
+		{nil, nil, nil, nil,
+			&ReplicationControllerList{
+				ReplicationControllers: []ReplicationController{},
+				CumulativeMetrics:      make([]metric.Metric, 0),
+			},
+		},
 		{
 			[]api.ReplicationController{
 				{
@@ -154,7 +160,8 @@ func TestGetReplicationControllerList(t *testing.T) {
 			},
 			},
 			&ReplicationControllerList{
-				ListMeta: common.ListMeta{TotalItems: 2},
+				ListMeta:          common.ListMeta{TotalItems: 2},
+				CumulativeMetrics: make([]metric.Metric, 0),
 				ReplicationControllers: []ReplicationController{
 					{
 						ObjectMeta: common.ObjectMeta{

src/test/backend/resource/service/servicedetail_test.go

@@ -24,8 +24,9 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/client"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 )
 
 type FakeHeapsterClient struct {
@@ -55,7 +56,10 @@ func TestGetServiceDetail(t *testing.T) {
 			expectedActions: []string{"get", "get", "list"},
 			expected: &ServiceDetail{
 				TypeMeta: common.TypeMeta{Kind: common.ResourceKindService},
-				PodList:  pod.PodList{Pods: []pod.Pod{}},
+				PodList: pod.PodList{
+					Pods:              []pod.Pod{},
+					CumulativeMetrics: make([]metric.Metric, 0),
+				},
 			},
 		}, {
 			service: &api.Service{ObjectMeta: api.ObjectMeta{
@@ -70,7 +74,10 @@ func TestGetServiceDetail(t *testing.T) {
 				},
 				TypeMeta:         common.TypeMeta{Kind: common.ResourceKindService},
 				InternalEndpoint: common.Endpoint{Host: "test-service.test-namespace"},
-				PodList:          pod.PodList{Pods: []pod.Pod{}},
+				PodList: pod.PodList{
+					Pods:              []pod.Pod{},
+					CumulativeMetrics: make([]metric.Metric, 0),
+				},
 			},
 		},
 	}

src/test/backend/resource/service/servicelist_test.go

@@ -19,9 +19,9 @@ import (
 	"testing"
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 func TestGetServiceList(t *testing.T) {

src/test/backend/resource/workload/workloads_test.go

@@ -20,8 +20,10 @@ import (
 
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/daemonset"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/deployment"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/job"
+	"github.com/kubernetes/dashboard/src/app/backend/resource/metric"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/petset"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/pod"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/replicaset"
@@ -31,7 +33,6 @@ import (
 	"k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
 )
 
 func TestGetWorkloadsFromChannels(t *testing.T) {
@@ -164,31 +165,38 @@ func TestGetWorkloadsFromChannels(t *testing.T) {
 		expected := &Workloads{
 			ReplicationControllerList: replicationcontroller.ReplicationControllerList{
 				ListMeta:               common.ListMeta{TotalItems: len(c.rcs)},
+				CumulativeMetrics:      make([]metric.Metric, 0),
 				ReplicationControllers: c.rcs,
 			},
 			ReplicaSetList: replicaset.ReplicaSetList{
-				ListMeta:    common.ListMeta{TotalItems: len(c.rs)},
-				ReplicaSets: c.rs,
+				ListMeta:          common.ListMeta{TotalItems: len(c.rs)},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				ReplicaSets:       c.rs,
 			},
 			JobList: job.JobList{
-				ListMeta: common.ListMeta{TotalItems: len(c.jobs)},
-				Jobs:     c.jobs,
+				ListMeta:          common.ListMeta{TotalItems: len(c.jobs)},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				Jobs:              c.jobs,
 			},
 			DaemonSetList: daemonset.DaemonSetList{
-				ListMeta:   common.ListMeta{TotalItems: len(c.daemonset)},
-				DaemonSets: c.daemonset,
+				ListMeta:          common.ListMeta{TotalItems: len(c.daemonset)},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				DaemonSets:        c.daemonset,
 			},
 			DeploymentList: deployment.DeploymentList{
-				ListMeta:    common.ListMeta{TotalItems: len(c.deployment)},
-				Deployments: c.deployment,
+				ListMeta:          common.ListMeta{TotalItems: len(c.deployment)},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				Deployments:       c.deployment,
 			},
 			PodList: pod.PodList{
-				ListMeta: common.ListMeta{TotalItems: len(c.pod)},
-				Pods:     c.pod,
+				ListMeta:          common.ListMeta{TotalItems: len(c.pod)},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				Pods:              c.pod,
 			},
 			PetSetList: petset.PetSetList{
-				ListMeta: common.ListMeta{TotalItems: len(c.petSet)},
-				PetSets:  c.petSet,
+				ListMeta:          common.ListMeta{TotalItems: len(c.petSet)},
+				CumulativeMetrics: make([]metric.Metric, 0),
+				PetSets:           c.petSet,
 			},
 		}
 		var expectedErr error