From 8d5d85e12607076d3b11c65b640acbc92f7c78a4 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Fri, 23 Jun 2017 21:43:17 +0200 Subject: [PATCH] Fixed Monitoring e2e test --- test/e2e/monitoring.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index e08974fa961..18128f09205 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() { const ( influxdbService = "monitoring-influxdb" influxdbDatabaseName = "k8s" - podlistQuery = "show tag values from \"cpu/usage\" with key = pod_id" - nodelistQuery = "show tag values from \"cpu/usage\" with key = hostname" + podlistQuery = "show tag values from \"cpu/usage\" with key = pod_name" + nodelistQuery = "show tag values from \"cpu/usage\" with key = nodename" sleepBetweenAttempts = 5 * time.Second testTimeout = 5 * time.Minute initializationTimeout = 5 * time.Minute @@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if pod.DeletionTimestamp != nil { continue } - expectedPods = append(expectedPods, string(pod.UID)) + expectedPods = append(expectedPods, pod.Name) } } // Do the same for all deployments. @@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if pod.DeletionTimestamp != nil { continue } - expectedPods = append(expectedPods, string(pod.UID)) + expectedPods = append(expectedPods, pod.Name) } } // And for pet sets. @@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if pod.DeletionTimestamp != nil { continue } - expectedPods = append(expectedPods, string(pod.UID)) + expectedPods = append(expectedPods, pod.Name) } } }