From c9ed0e6dc3016400556671c4442952bae1d94119 Mon Sep 17 00:00:00 2001
From: Miguel Varela Ramos <miguel@cortexlabs.com>
Date: Mon, 15 Feb 2021 18:02:29 +0100
Subject: [PATCH] Fix grafana latency prometheus queries

---
 charts/dashboards/realtime.json                           | 6 +++---
 manager/manifests/grafana/grafana-dashboard-realtime.yaml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/dashboards/realtime.json b/charts/dashboards/realtime.json
index 0578d8a458..d4ba134527 100644
--- a/charts/dashboards/realtime.json
+++ b/charts/dashboards/realtime.json
@@ -746,7 +746,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.99, sum without (response_code) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
+          "expr": "histogram_quantile(0.99, sum by (destination_service_name, le) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
           "interval": "",
           "legendFormat": "{{destination_service_name}}",
           "refId": "A"
@@ -859,7 +859,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.90, sum without (response_code) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
+          "expr": "histogram_quantile(0.90, sum by (destination_service_name, le) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
           "hide": false,
           "interval": "",
           "legendFormat": "{{destination_service_name}}",
@@ -973,7 +973,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "histogram_quantile(0.50, sum without (response_code) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
+          "expr": "histogram_quantile(0.50, sum by (destination_service_name, le) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
           "hide": false,
           "interval": "",
           "legendFormat": "{{destination_service_name}}",
diff --git a/manager/manifests/grafana/grafana-dashboard-realtime.yaml b/manager/manifests/grafana/grafana-dashboard-realtime.yaml
index 728ba9399e..41984d4120 100644
--- a/manager/manifests/grafana/grafana-dashboard-realtime.yaml
+++ b/manager/manifests/grafana/grafana-dashboard-realtime.yaml
@@ -767,7 +767,7 @@ data:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "histogram_quantile(0.99, sum without (response_code) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
+              "expr": "histogram_quantile(0.99, sum by (destination_service_name, le) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
               "interval": "",
               "legendFormat": "{{destination_service_name}}",
               "refId": "A"
@@ -880,7 +880,7 @@ data:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "histogram_quantile(0.90, sum without (response_code) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
+              "expr": "histogram_quantile(0.90, sum by (destination_service_name, le) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
               "hide": false,
               "interval": "",
               "legendFormat": "{{destination_service_name}}",
@@ -994,7 +994,7 @@ data:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "histogram_quantile(0.50, sum without (response_code) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
+              "expr": "histogram_quantile(0.50, sum by (destination_service_name, le) (rate(istio_request_duration_milliseconds_bucket{destination_service_name=~\"api-$api_name.+\"}[1m])))",
               "hide": false,
               "interval": "",
               "legendFormat": "{{destination_service_name}}",