Merge pull request project-sunbird#1721 from keshavprasadms/statsd-fi…

…xes-loadtest

fix: updating queries and histogram

kubernetes/helm_charts/monitoring/dashboards/dashboards/api-manager-aggregated-beta.json

@@ -15,8 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 92,
-  "iteration": 1594740559332,
+  "id": 55,
+  "iteration": 1594796692017,
   "links": [],
   "panels": [
     {
@@ -73,7 +73,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\",status_code=~\"2..|3..\", status_code!= \"total\"}[1m])) by (api, status_code, sb_cluster) / sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m])) by (api, status_code, sb_cluster)",
+          "expr": "sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\",status_code=~\"2..|3..\", status_code!= \"total\"}[1m])) by (api, status_code, sb_cluster) / ignoring(api, status_code) group_left sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m]))",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -83,7 +83,7 @@
           "step": 4
         },
         {
-          "expr": "sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\",status_code=~\"2..|3..\", status_code!= \"total\"}[1m])) by (api, status_code) / sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m])) by (api, status_code)",
+          "expr": "sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\",status_code=~\"2..|3..\", status_code!= \"total\"}[1m])) by (api, status_code) / ignoring(api, status_code) group_left sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m]))",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -190,7 +190,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\",status_code!~\"2..|3..|total\"}[1m])) by (api, status_code,sb_cluster) / sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m])) by (api, status_code,sb_cluster)",
+          "expr": "sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\",status_code!~\"2..|3..|total\"}[1m])) by (api, status_code,sb_cluster) / ignoring(api, status_code) group_left sum(increase(kong_request_status_count{sb_cluster=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -199,7 +199,7 @@
           "step": 4
         },
         {
-          "expr": "sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\",status_code!~\"2..|3..|total\"}[1m])) by (api, status_code) / sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m])) by (api, status_code)",
+          "expr": "sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\",status_code!~\"2..|3..|total\"}[1m])) by (api, status_code) / ignoring(api, status_code) group_left sum(increase(kong_request_status_count{sb_cluster=~\"$cluster\",sb_cluster!=\"$cluster\",api=~\"${api}\", status_code!= \"total\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1310,7 +1310,7 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "All",
           "value": "$__all"
         },
@@ -1469,5 +1469,5 @@
   "timezone": "",
   "title": "API Manager Aggregated Beta",
   "uid": "yL-8rNnMk",
-  "version": 11
+  "version": 1
 }

kubernetes/helm_charts/monitoring/dashboards/dashboards/api-manager-beta.json

@@ -15,8 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 85,
-  "iteration": 1594740507617,
+  "id": 56,
+  "iteration": 1594796123029,
   "links": [],
   "panels": [
     {
@@ -69,11 +69,11 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(increase(kong_request_status_count{api=~\"${api}\",status_code=~\"2..|3..\", status_code!= \"total\"}[1m])) by (api, status_code) / sum(increase(kong_request_status_count{api=~\"${api}\", status_code!= \"total\"}[1m])) by (api, status_code)",
+          "expr": "sum(increase(kong_request_status_count{api=~\"${api}\",status_code=~\"2..|3..\", status_code!= \"total\"}[1m])) by (api, status_code) / ignoring(api, status_code) group_left sum(increase(kong_request_status_count{api=~\"${api}\", status_code!= \"total\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -175,11 +175,11 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(increase(kong_request_status_count{api=~\"${api}\",status_code!~\"2..|3..|total\"}[1m])) by (api, status_code) / sum(increase(kong_request_status_count{api=~\"${api}\", status_code!= \"total\"}[1m])) by (api, status_code)",
+          "expr": "sum(increase(kong_request_status_count{api=~\"${api}\",status_code!~\"2..|3..|total\"}[1m])) by (api, status_code) / ignoring(api, status_code) group_left  sum(increase(kong_request_status_count{api=~\"${api}\", status_code!= \"total\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -194,7 +194,7 @@
       "timeShift": null,
       "title": "Error %",
       "tooltip": {
-        "shared": false,
+        "shared": true,
         "sort": 2,
         "value_type": "individual"
       },
@@ -1162,7 +1162,21 @@
       "datasource": "$cluster",
       "fieldConfig": {
         "defaults": {
-          "custom": {}
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
         },
         "overrides": []
       },
@@ -1199,6 +1213,7 @@
         "dataLinks": []
       },
       "percentage": false,
+      "pluginVersion": "7.0.6",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -1267,7 +1282,7 @@
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "Prometheus",
           "value": "Prometheus"
         },
@@ -1420,5 +1435,5 @@
   "timezone": "",
   "title": "API Manager Beta",
   "uid": "E5PNTVnMz",
-  "version": 25
+  "version": 1
 }

kubernetes/helm_charts/monitoring/dashboards/dashboards/api-manager-req-resp-aggregated.json

@@ -15,8 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 93,
-  "iteration": 1594740676226,
+  "id": 54,
+  "iteration": 1594797404526,
   "links": [],
   "panels": [
     {
@@ -350,11 +350,11 @@
             "cardRound": null
           },
           "color": {
-            "cardColor": "#E0B400",
+            "cardColor": "#37872D",
             "colorScale": "linear",
             "colorScheme": "interpolateRdYlGn",
             "exponent": 0.5,
-            "mode": "spectrum"
+            "mode": "opacity"
           },
           "dataFormat": "tsbuckets",
           "datasource": "prom-fed",
@@ -384,7 +384,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 10
+            "y": 3
           },
           "heatmap": {},
           "hideZeroBuckets": true,
@@ -469,11 +469,11 @@
             "cardRound": null
           },
           "color": {
-            "cardColor": "#F2CC0C",
+            "cardColor": "#E0B400",
             "colorScale": "linear",
             "colorScheme": "interpolateRdYlGn",
             "exponent": 0.5,
-            "mode": "spectrum"
+            "mode": "opacity"
           },
           "dataFormat": "tsbuckets",
           "datasource": "prom-fed",
@@ -679,10 +679,9 @@
         "allValue": null,
         "current": {
           "selected": true,
-          "text": "All",
-          "value": [
-            "$__all"
-          ]
+          "tags": [],
+          "text": "",
+          "value": []
         },
         "datasource": "$cluster",
         "definition": "label_values(kong_response_size_bucket,le)",
@@ -725,5 +724,5 @@
   "timezone": "",
   "title": "API Manager Request/Response Size Aggregated",
   "uid": "CS1kzvnMk",
-  "version": 15
+  "version": 1
 }

kubernetes/helm_charts/monitoring/dashboards/dashboards/api-manager-req-resp.json

@@ -15,8 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 80,
-  "iteration": 1594740597629,
+  "id": 57,
+  "iteration": 1594796972386,
   "links": [],
   "panels": [
     {
@@ -336,11 +336,11 @@
             "cardRound": null
           },
           "color": {
-            "cardColor": "#E0B400",
+            "cardColor": "#37872D",
             "colorScale": "linear",
             "colorScheme": "interpolateRdYlGn",
             "exponent": 0.5,
-            "mode": "spectrum"
+            "mode": "opacity"
           },
           "dataFormat": "tsbuckets",
           "datasource": null,
@@ -448,11 +448,11 @@
             "cardRound": null
           },
           "color": {
-            "cardColor": "#F2CC0C",
+            "cardColor": "#E0B400",
             "colorScale": "linear",
             "colorScheme": "interpolateRdYlGn",
-            "exponent": 0.5,
-            "mode": "spectrum"
+            "exponent": 1,
+            "mode": "opacity"
           },
           "dataFormat": "tsbuckets",
           "datasource": null,
@@ -553,7 +553,7 @@
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "Prometheus",
           "value": "Prometheus"
         },
@@ -654,7 +654,7 @@
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-3h",
     "to": "now"
   },
   "timepicker": {
@@ -673,5 +673,5 @@
   "timezone": "",
   "title": "API Manager Request/Response Size",
   "uid": "VTE9NeMGk",
-  "version": 2
+  "version": 1
 }