Skip to content

Commit

Permalink
feat(metrics) add zone selector to Kuma Service dashboard (#2865) (#2878
Browse files Browse the repository at this point in the history 
)

* feat(metrics) add zone selector to Kuma Service dashboard

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>

* tests(integration) include Kuma Service zone changes in test

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
(cherry picked from commit e2ee786)

Co-authored-by: Mike Beaumont <mjboamail@gmail.com>
  • Loading branch information
@mergify @michaelbeaumont
mergify[bot] and michaelbeaumont authored Oct 4, 2021
1 parent 516a1bb commit c0b9ea1
Show file tree
Hide file tree
Showing 4 changed files with 136 additions and 44 deletions.
45 changes: 34 additions & 11 deletions app/kumactl/cmd/install/testdata/install-metrics.defaults.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10617,7 +10617,7 @@ data:
"pluginVersion": "7.4.3",
"targets": [
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\",envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\",envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "",
Expand Down Expand Up @@ -10682,7 +10682,7 @@ data:
"pluginVersion": "7.4.3",
"targets": [
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\",envoy_cluster_name!~\"localhost_.*\",envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\",envoy_cluster_name!~\"localhost_.*\",envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "",
Expand Down Expand Up @@ -10761,21 +10761,21 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "max(histogram_quantile(0.99, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"expr": "max(histogram_quantile(0.99, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",kuma_io_zone=~\"$zone\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"hide": false,
"interval": "",
"legendFormat": "p99",
"refId": "A"
},
{
"expr": "max(histogram_quantile(0.95, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"expr": "max(histogram_quantile(0.95, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",kuma_io_zone=~\"$zone\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"hide": false,
"interval": "",
"legendFormat": "p95",
"refId": "C"
},
{
"expr": "max(histogram_quantile(0.50, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"expr": "max(histogram_quantile(0.50, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",kuma_io_zone=~\"$zone\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"hide": false,
"interval": "",
"legendFormat": "p50",
Expand Down Expand Up @@ -10873,14 +10873,14 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "Incoming",
"refId": "C"
},
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "Outgoing",
Expand Down Expand Up @@ -10978,14 +10978,14 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m])) by (envoy_response_code_class)",
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m])) by (envoy_response_code_class)",
"hide": false,
"interval": "",
"legendFormat": "Incoming {{envoy_response_code_class}}xx",
"refId": "A"
},
{
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\", envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m])) by (envoy_response_code_class)",
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\", envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m])) by (envoy_response_code_class)",
"hide": false,
"interval": "",
"legendFormat": "Outgoing {{envoy_response_code_class}}xx",
Expand Down Expand Up @@ -11381,6 +11381,29 @@ data:
"type": "query",
"useTags": false
},
{
"allFormat": "wildcard",
"allValue": null,
"current": {},
"datasource": "Prometheus",
"definition": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_zone)",
"hide": 0,
"includeAll": true,
"label": "Zone",
"multi": true,
"name": "zone",
"options": [],
"query": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_zone)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
Expand All @@ -11389,7 +11412,7 @@ data:
"value": "backend_kuma-demo_svc_3001"
},
"datasource": null,
"definition": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_service)",
"definition": "label_values(envoy_server_live{mesh=\"$mesh\",kuma_io_zone=~\"$zone\"}, kuma_io_service)",
"description": null,
"error": null,
"hide": 0,
Expand All @@ -11399,7 +11422,7 @@ data:
"name": "service",
"options": [],
"query": {
"query": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_service)",
"query": "label_values(envoy_server_live{mesh=\"$mesh\",kuma_io_zone=~\"$zone\"}, kuma_io_service)",
"refId": "StandardVariableQuery"
},
"refresh": 1,
Expand Down
45 changes: 34 additions & 11 deletions app/kumactl/cmd/install/testdata/install-metrics.no-prometheus.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10240,7 +10240,7 @@ data:
"pluginVersion": "7.4.3",
"targets": [
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\",envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\",envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "",
Expand Down Expand Up @@ -10305,7 +10305,7 @@ data:
"pluginVersion": "7.4.3",
"targets": [
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\",envoy_cluster_name!~\"localhost_.*\",envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\",envoy_cluster_name!~\"localhost_.*\",envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "",
Expand Down Expand Up @@ -10384,21 +10384,21 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "max(histogram_quantile(0.99, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"expr": "max(histogram_quantile(0.99, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",kuma_io_zone=~\"$zone\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"hide": false,
"interval": "",
"legendFormat": "p99",
"refId": "A"
},
{
"expr": "max(histogram_quantile(0.95, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"expr": "max(histogram_quantile(0.95, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",kuma_io_zone=~\"$zone\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"hide": false,
"interval": "",
"legendFormat": "p95",
"refId": "C"
},
{
"expr": "max(histogram_quantile(0.50, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"expr": "max(histogram_quantile(0.50, rate(envoy_cluster_upstream_rq_time_bucket{kuma_io_services=~\".*$service.*\",kuma_io_zone=~\"$zone\",mesh=\"$mesh\",envoy_cluster_name=~\"localhost_.*\"}[1m])))",
"hide": false,
"interval": "",
"legendFormat": "p50",
Expand Down Expand Up @@ -10496,14 +10496,14 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "Incoming",
"refId": "C"
},
{
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"expr": "sum(rate(envoy_cluster_upstream_rq_total{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\",envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m]))",
"hide": false,
"interval": "",
"legendFormat": "Outgoing",
Expand Down Expand Up @@ -10601,14 +10601,14 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m])) by (envoy_response_code_class)",
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name=~\"localhost_.*\"}[1m])) by (envoy_response_code_class)",
"hide": false,
"interval": "",
"legendFormat": "Incoming {{envoy_response_code_class}}xx",
"refId": "A"
},
{
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\", envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m])) by (envoy_response_code_class)",
"expr": "sum(rate(envoy_cluster_external_upstream_rq_xx{mesh=\"$mesh\",kuma_io_zone=~\"$zone\",kuma_io_services=~\".*$service.*\", envoy_cluster_name!~\"localhost_.*\", envoy_cluster_name!=\"kuma_envoy_admin\", envoy_cluster_name!=\"kuma_metrics_hijacker\"}[1m])) by (envoy_response_code_class)",
"hide": false,
"interval": "",
"legendFormat": "Outgoing {{envoy_response_code_class}}xx",
Expand Down Expand Up @@ -11004,6 +11004,29 @@ data:
"type": "query",
"useTags": false
},
{
"allFormat": "wildcard",
"allValue": null,
"current": {},
"datasource": "Prometheus",
"definition": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_zone)",
"hide": 0,
"includeAll": true,
"label": "Zone",
"multi": true,
"name": "zone",
"options": [],
"query": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_zone)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
Expand All @@ -11012,7 +11035,7 @@ data:
"value": "backend_kuma-demo_svc_3001"
},
"datasource": null,
"definition": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_service)",
"definition": "label_values(envoy_server_live{mesh=\"$mesh\",kuma_io_zone=~\"$zone\"}, kuma_io_service)",
"description": null,
"error": null,
"hide": 0,
Expand All @@ -11022,7 +11045,7 @@ data:
"name": "service",
"options": [],
"query": {
"query": "label_values(envoy_server_live{mesh=\"$mesh\"}, kuma_io_service)",
"query": "label_values(envoy_server_live{mesh=\"$mesh\",kuma_io_zone=~\"$zone\"}, kuma_io_service)",
"refId": "StandardVariableQuery"
},
"refresh": 1,
Expand Down
Loading

0 comments on commit c0b9ea1

Please sign in to comment.