Add e2e tests for network name metrics.

Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
openshift · May 15, 2020 · 5926461 · 5926461
1 parent 3954344
commit 5926461
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go
@@ -420,10 +420,19 @@ var _ = g.Describe("[sig-instrumentation] Prometheus", func() {
 				return true, nil
 			})).NotTo(o.HaveOccurred(), "ingress router cannot report metrics to monitoring system")
 
-			g.By("verifying standard metrics keys")
+		})
+		g.It("should provide named network metrics", func() {
+			oc.SetupProject()
+			ns := oc.Namespace()
+
+			execPod := exutil.CreateCentosExecPodOrFail(oc.AdminKubeClient(), ns, "execpod", nil)
+			defer func() {
+				oc.AdminKubeClient().CoreV1().Pods(ns).Delete(context.Background(), execPod.Name, *metav1.NewDeleteOptions(1))
+			}()
+
+			g.By("verifying named metrics keys")
 			queries := map[string]bool{
-				`template_router_reload_seconds_count{job="router-internal-default"} >= 1`: true,
-				`haproxy_server_up{job="router-internal-default"} >= 1`:                    true,
+				fmt.Sprintf(`pod_network_name_info{pod="%s",namespace="%s",interface="eth0"} == 0`, execPod.Name, execPod.Namespace): true,
 			}
 			helper.RunQueries(queries, oc, ns, execPod.Name, url, bearerToken)
 		})

diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go