From 674c79da9425f0b63b4bd05af71f1931a4488ddf Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Tue, 14 May 2019 12:14:47 +0300 Subject: [PATCH] Fix Linkerd promql queries - include all inbound traffic stats --- pkg/metrics/linkerd.go | 11 +++++++---- pkg/metrics/linkerd_test.go | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/metrics/linkerd.go b/pkg/metrics/linkerd.go index 50bcd00f..4a9ee294 100644 --- a/pkg/metrics/linkerd.go +++ b/pkg/metrics/linkerd.go @@ -10,8 +10,9 @@ var linkerdQueries = map[string]string{ rate( response_total{ namespace="{{ .Namespace }}", - dst_deployment=~"{{ .Name }}", - classification="failure" + deployment=~"{{ .Name }}", + classification="failure", + direction="inbound" }[{{ .Interval }}] ) ) @@ -20,7 +21,8 @@ var linkerdQueries = map[string]string{ rate( response_total{ namespace="{{ .Namespace }}", - dst_deployment=~"{{ .Name }}" + deployment=~"{{ .Name }}", + direction="inbound" }[{{ .Interval }}] ) ) @@ -32,7 +34,8 @@ var linkerdQueries = map[string]string{ rate( response_latency_ms_bucket{ namespace="{{ .Namespace }}", - dst_deployment=~"{{ .Name }}" + deployment=~"{{ .Name }}", + direction="inbound" }[{{ .Interval }}] ) ) by (le) diff --git a/pkg/metrics/linkerd_test.go b/pkg/metrics/linkerd_test.go index 502109a1..6dbfef5c 100644 --- a/pkg/metrics/linkerd_test.go +++ b/pkg/metrics/linkerd_test.go @@ -8,7 +8,7 @@ import ( ) func TestLinkerdObserver_GetRequestSuccessRate(t *testing.T) { - expected := `sum(rate(response_total{namespace="default",dst_deployment=~"podinfo",classification="failure"}[1m]))/sum(rate(response_total{namespace="default",dst_deployment=~"podinfo"}[1m]))*100` + expected := `sum(rate(response_total{namespace="default",deployment=~"podinfo",classification="failure",direction="inbound"}[1m]))/sum(rate(response_total{namespace="default",deployment=~"podinfo",direction="inbound"}[1m]))*100` ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { promql := r.URL.Query()["query"][0] @@ -41,7 +41,7 @@ func TestLinkerdObserver_GetRequestSuccessRate(t *testing.T) { } func TestLinkerdObserver_GetRequestDuration(t *testing.T) { - expected := `histogram_quantile(0.99,sum(rate(response_latency_ms_bucket{namespace="default",dst_deployment=~"podinfo"}[1m]))by(le))` + expected := `histogram_quantile(0.99,sum(rate(response_latency_ms_bucket{namespace="default",deployment=~"podinfo",direction="inbound"}[1m]))by(le))` ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { promql := r.URL.Query()["query"][0]