github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Monitoring e2e test

Browse Source
This commit is contained in:
Piotr Szczesniak
2017-06-23 21:43:17 +02:00
parent 98e599b40d
commit 8d5d85e126
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/monitoring.go
View File

@@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() {
const ( const (
influxdbService = "monitoring-influxdb" influxdbService = "monitoring-influxdb"
influxdbDatabaseName = "k8s" influxdbDatabaseName = "k8s"
podlistQuery = "show tag values from \"cpu/usage\" with key = pod_id" podlistQuery = "show tag values from \"cpu/usage\" with key = pod_name"
nodelistQuery = "show tag values from \"cpu/usage\" with key = hostname" nodelistQuery = "show tag values from \"cpu/usage\" with key = nodename"
sleepBetweenAttempts = 5 * time.Second sleepBetweenAttempts = 5 * time.Second
testTimeout = 5 * time.Minute testTimeout = 5 * time.Minute
initializationTimeout = 5 * time.Minute initializationTimeout = 5 * time.Minute
@@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
continue continue
} }
expectedPods = append(expectedPods, string(pod.UID)) expectedPods = append(expectedPods, pod.Name)
} }
} }
// Do the same for all deployments. // Do the same for all deployments.
@@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
continue continue
} }
expectedPods = append(expectedPods, string(pod.UID)) expectedPods = append(expectedPods, pod.Name)
} }
} }
// And for pet sets. // And for pet sets.
@@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
continue continue
} }
expectedPods = append(expectedPods, string(pod.UID)) expectedPods = append(expectedPods, pod.Name)
} }
} }
} }