From c812dcffc178820f63eb8baa956f3002289c93fa Mon Sep 17 00:00:00 2001 From: miguelvalerio Date: Tue, 27 Jun 2023 19:47:30 +0100 Subject: [PATCH 1/2] fix traefik request-duration metric Signed-off-by: miguelvalerio --- pkg/metrics/observers/traefik.go | 2 +- pkg/metrics/observers/traefik_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/metrics/observers/traefik.go b/pkg/metrics/observers/traefik.go index af4fa1cd..2bbf2982 100644 --- a/pkg/metrics/observers/traefik.go +++ b/pkg/metrics/observers/traefik.go @@ -54,7 +54,7 @@ var traefikQueries = map[string]string{ }[{{ interval }}] ) ) by (le) - )`, + ) * 1000`, } type TraefikObserver struct { diff --git a/pkg/metrics/observers/traefik_test.go b/pkg/metrics/observers/traefik_test.go index 51086bbf..63b3141f 100644 --- a/pkg/metrics/observers/traefik_test.go +++ b/pkg/metrics/observers/traefik_test.go @@ -85,7 +85,7 @@ func TestTraefikObserver_GetRequestSuccessRate(t *testing.T) { } func TestTraefikObserver_GetRequestDuration(t *testing.T) { - expected := ` histogram_quantile( 0.99, sum( rate( traefik_service_request_duration_seconds_bucket{ service=~"default-podinfo-canary-[0-9a-zA-Z-]+@kubernetescrd" }[1m] ) ) by (le) )` + expected := ` histogram_quantile( 0.99, sum( rate( traefik_service_request_duration_seconds_bucket{ service=~"default-podinfo-canary-[0-9a-zA-Z-]+@kubernetescrd" }[1m] ) ) by (le) ) * 1000` ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { promql := r.URL.Query()["query"][0] From 7a0e95b49822b2489a26c996435961a8ed1d1dbd Mon Sep 17 00:00:00 2001 From: Sanskar Jaiswal Date: Mon, 28 Aug 2023 20:21:15 +0530 Subject: [PATCH 2/2] update traefik version to 24.0.0 in e2e tests Signed-off-by: Sanskar Jaiswal --- test/traefik/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/traefik/install.sh b/test/traefik/install.sh index 86f24148..636d23fe 100755 --- a/test/traefik/install.sh +++ b/test/traefik/install.sh @@ -2,7 +2,7 @@ set -o errexit -TRAEFIK_CHART_VERSION="10.20.1" # traefik 2.7.0 +TRAEFIK_CHART_VERSION="24.0.0" # traefik 2.10.4 REPO_ROOT=$(git rev-parse --show-toplevel) mkdir -p ${REPO_ROOT}/bin