fix(prometheus): Deactivate prometheus test which is not supported wi…

…th python2
DataDog · Jan 20, 2025 · 554d11f · 554d11f
1 parent 37df4ce
commit 554d11f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 68 deletions.
diff --git a/test/new-e2e/tests/containers/ecs_test.go b/test/new-e2e/tests/containers/ecs_test.go
@@ -528,37 +528,6 @@ func (suite *ecsSuite) testDogstatsd(taskName string) {
 	})
 }
 
-func (suite *ecsSuite) TestPrometheus() {
-	// Test Prometheus check
-	suite.testMetric(&testMetricArgs{
-		Filter: testMetricFilterArgs{
-			Name: "prometheus.prom_gauge",
-		},
-		Expect: testMetricExpectArgs{
-			Tags: &[]string{
-				`^cluster_name:` + regexp.QuoteMeta(suite.ecsClusterName) + `$`,
-				`^container_id:`,
-				`^container_name:ecs-.*-prometheus-ec2-`,
-				`^docker_image:ghcr.io/datadog/apps-prometheus:main$`,
-				`^ecs_cluster_name:` + regexp.QuoteMeta(suite.ecsClusterName) + `$`,
-				`^ecs_container_name:prometheus$`,
-				`^endpoint:http://.*:8080/metrics$`,
-				`^git.commit.sha:`,                                                       // org.opencontainers.image.revision docker image label
-				`^git.repository_url:https://github.com/DataDog/test-infra-definitions$`, // org.opencontainers.image.source   docker image label
-				`^image_id:sha256:`,
-				`^image_name:ghcr.io/datadog/apps-prometheus$`,
-				`^image_tag:main$`,
-				`^series:`,
-				`^short_image:apps-prometheus$`,
-				`^task_arn:`,
-				`^task_family:.*-prometheus-ec2$`,
-				`^task_name:.*-prometheus-ec2$`,
-				`^task_version:[[:digit:]]+$`,
-			},
-		},
-	})
-}
-
 func (suite *ecsSuite) TestTraceUDS() {
 	suite.testTrace(taskNameTracegenUDS)
 }

diff --git a/test/new-e2e/tests/containers/k8s_test.go b/test/new-e2e/tests/containers/k8s_test.go
@@ -834,43 +834,6 @@ func (suite *k8sSuite) testDogstatsdContainerID(kubeNamespace, kubeDeployment st
 	})
 }
 
-func (suite *k8sSuite) TestPrometheus() {
-	// Test Prometheus check
-	suite.testMetric(&testMetricArgs{
-		Filter: testMetricFilterArgs{
-			Name: "prom_gauge",
-			Tags: []string{
-				"^kube_deployment:prometheus$",
-				"^kube_namespace:workload-prometheus$",
-			},
-		},
-		Expect: testMetricExpectArgs{
-			Tags: &[]string{
-				`^container_id:`,
-				`^container_name:prometheus$`,
-				`^display_container_name:prometheus`,
-				`^endpoint:http://.*:8080/metrics$`,
-				`^git.commit.sha:`, // org.opencontainers.image.revision docker image label
-				`^git.repository_url:https://github.com/DataDog/test-infra-definitions$`, // org.opencontainers.image.source   docker image label
-				`^image_id:ghcr.io/datadog/apps-prometheus@sha256:`,
-				`^image_name:ghcr.io/datadog/apps-prometheus$`,
-				`^image_tag:main$`,
-				`^kube_container_name:prometheus$`,
-				`^kube_deployment:prometheus$`,
-				`^kube_namespace:workload-prometheus$`,
-				`^kube_ownerref_kind:replicaset$`,
-				`^kube_ownerref_name:prometheus-[[:alnum:]]+$`,
-				`^kube_qos:Burstable$`,
-				`^kube_replica_set:prometheus-[[:alnum:]]+$`,
-				`^pod_name:prometheus-[[:alnum:]]+-[[:alnum:]]+$`,
-				`^pod_phase:running$`,
-				`^series:`,
-				`^short_image:apps-prometheus$`,
-			},
-		},
-	})
-}
-
 func (suite *k8sSuite) TestAdmissionController() {
 	ctx := context.Background()