Skip to content

Commit

Permalink
Fix query dashboards when frontend is deployed (thanos-io#4113)
Browse files Browse the repository at this point in the history 
* use regexp operator insted of equal to handle query and query-frontend

Signed-off-by: yogeek <gdupin@gmail.com>

* generate dashboard examples

Signed-off-by: yogeek <gdupin@gmail.com>
  • Loading branch information
@yogeek
yogeek committed Apr 30, 2021
1 parent a993bb0 commit 116c4bd
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
60 changes: 30 additions & 30 deletions examples/dashboards/query.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job, handler, code) (rate(http_requests_total{job=\"$job\", handler=\"query\"}[$interval]))",
"expr": "sum by (job, handler, code) (rate(http_requests_total{job=~\"$job\", handler=\"query\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}} {{handler}} {{code}}",
Expand Down Expand Up @@ -145,7 +145,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (rate(http_requests_total{job=\"$job\", handler=\"query\",code=~\"5..\"}[$interval])) / sum by (job) (rate(http_requests_total{job=\"$job\", handler=\"query\"}[$interval]))",
"expr": "sum by (job) (rate(http_requests_total{job=~\"$job\", handler=\"query\",code=~\"5..\"}[$interval])) / sum by (job) (rate(http_requests_total{job=~\"$job\", handler=\"query\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "error",
Expand Down Expand Up @@ -240,7 +240,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=\"$job\", handler=\"query\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", handler=\"query\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p50 {{job}}",
Expand All @@ -250,7 +250,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=\"$job\", handler=\"query\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", handler=\"query\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p90 {{job}}",
Expand All @@ -260,7 +260,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=\"$job\", handler=\"query\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", handler=\"query\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p99 {{job}}",
Expand Down Expand Up @@ -372,7 +372,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job, handler, code) (rate(http_requests_total{job=\"$job\", handler=\"query_range\"}[$interval]))",
"expr": "sum by (job, handler, code) (rate(http_requests_total{job=~\"$job\", handler=\"query_range\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}} {{handler}} {{code}}",
Expand Down Expand Up @@ -450,7 +450,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (rate(http_requests_total{job=\"$job\", handler=\"query_range\",code=~\"5..\"}[$interval])) / sum by (job) (rate(http_requests_total{job=\"$job\", handler=\"query_range\"}[$interval]))",
"expr": "sum by (job) (rate(http_requests_total{job=~\"$job\", handler=\"query_range\",code=~\"5..\"}[$interval])) / sum by (job) (rate(http_requests_total{job=~\"$job\", handler=\"query_range\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "error",
Expand Down Expand Up @@ -545,7 +545,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=\"$job\", handler=\"query_range\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", handler=\"query_range\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p50 {{job}}",
Expand All @@ -555,7 +555,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=\"$job\", handler=\"query_range\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", handler=\"query_range\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p90 {{job}}",
Expand All @@ -565,7 +565,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=\"$job\", handler=\"query_range\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", handler=\"query_range\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p99 {{job}}",
Expand Down Expand Up @@ -729,7 +729,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job, grpc_method, grpc_code) (rate(grpc_client_handled_total{job=\"$job\", grpc_type=\"unary\"}[$interval]))",
"expr": "sum by (job, grpc_method, grpc_code) (rate(grpc_client_handled_total{job=~\"$job\", grpc_type=\"unary\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}} {{grpc_method}} {{grpc_code}}",
Expand Down Expand Up @@ -807,7 +807,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (rate(grpc_client_handled_total{grpc_code=~\"Unknown|ResourceExhausted|Internal|Unavailable|DataLoss\",job=\"$job\", grpc_type=\"unary\"}[$interval])) / sum by (job) (rate(grpc_client_handled_total{job=\"$job\", grpc_type=\"unary\"}[$interval]))",
"expr": "sum by (job) (rate(grpc_client_handled_total{grpc_code=~\"Unknown|ResourceExhausted|Internal|Unavailable|DataLoss\",job=~\"$job\", grpc_type=\"unary\"}[$interval])) / sum by (job) (rate(grpc_client_handled_total{job=~\"$job\", grpc_type=\"unary\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "error",
Expand Down Expand Up @@ -902,7 +902,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=\"$job\", grpc_type=\"unary\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=~\"$job\", grpc_type=\"unary\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p50 {{job}}",
Expand All @@ -912,7 +912,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=\"$job\", grpc_type=\"unary\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=~\"$job\", grpc_type=\"unary\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p90 {{job}}",
Expand All @@ -922,7 +922,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=\"$job\", grpc_type=\"unary\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=~\"$job\", grpc_type=\"unary\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p99 {{job}}",
Expand Down Expand Up @@ -1086,7 +1086,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job, grpc_method, grpc_code) (rate(grpc_client_handled_total{job=\"$job\", grpc_type=\"server_stream\"}[$interval]))",
"expr": "sum by (job, grpc_method, grpc_code) (rate(grpc_client_handled_total{job=~\"$job\", grpc_type=\"server_stream\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{job}} {{grpc_method}} {{grpc_code}}",
Expand Down Expand Up @@ -1164,7 +1164,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (rate(grpc_client_handled_total{grpc_code=~\"Unknown|ResourceExhausted|Internal|Unavailable|DataLoss\",job=\"$job\", grpc_type=\"server_stream\"}[$interval])) / sum by (job) (rate(grpc_client_handled_total{job=\"$job\", grpc_type=\"server_stream\"}[$interval]))",
"expr": "sum by (job) (rate(grpc_client_handled_total{grpc_code=~\"Unknown|ResourceExhausted|Internal|Unavailable|DataLoss\",job=~\"$job\", grpc_type=\"server_stream\"}[$interval])) / sum by (job) (rate(grpc_client_handled_total{job=~\"$job\", grpc_type=\"server_stream\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "error",
Expand Down Expand Up @@ -1259,7 +1259,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=\"$job\", grpc_type=\"server_stream\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.50, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=~\"$job\", grpc_type=\"server_stream\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p50 {{job}}",
Expand All @@ -1269,7 +1269,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=\"$job\", grpc_type=\"server_stream\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.90, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=~\"$job\", grpc_type=\"server_stream\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p90 {{job}}",
Expand All @@ -1279,7 +1279,7 @@
"step": 10
},
{
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=\"$job\", grpc_type=\"server_stream\"}[$interval]))) * 1",
"expr": "histogram_quantile(0.99, sum by (job, le) (rate(grpc_client_handling_seconds_bucket{job=~\"$job\", grpc_type=\"server_stream\"}[$interval]))) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p99 {{job}}",
Expand Down Expand Up @@ -1370,7 +1370,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (rate(thanos_query_store_apis_dns_lookups_total{job=\"$job\"}[$interval]))",
"expr": "sum by (job) (rate(thanos_query_store_apis_dns_lookups_total{job=~\"$job\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "lookups {{job}}",
Expand Down Expand Up @@ -1449,7 +1449,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (job) (rate(thanos_query_store_apis_dns_failures_total{job=\"$job\"}[$interval])) / sum by (job) (rate(thanos_query_store_apis_dns_lookups_total{job=\"$job\"}[$interval]))",
"expr": "sum by (job) (rate(thanos_query_store_apis_dns_failures_total{job=~\"$job\"}[$interval])) / sum by (job) (rate(thanos_query_store_apis_dns_lookups_total{job=~\"$job\"}[$interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "error",
Expand Down Expand Up @@ -1536,47 +1536,47 @@
"steppedLine": false,
"targets": [
{
"expr": "go_memstats_alloc_bytes{job=\"$job\"}",
"expr": "go_memstats_alloc_bytes{job=~\"$job\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "alloc all {{instance}}",
"legendLink": null,
"step": 10
},
{
"expr": "go_memstats_heap_alloc_bytes{job=\"$job\"}",
"expr": "go_memstats_heap_alloc_bytes{job=~\"$job\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "alloc heap {{instance}}",
"legendLink": null,
"step": 10
},
{
"expr": "rate(go_memstats_alloc_bytes_total{job=\"$job\"}[30s])",
"expr": "rate(go_memstats_alloc_bytes_total{job=~\"$job\"}[30s])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "alloc rate all {{instance}}",
"legendLink": null,
"step": 10
},
{
"expr": "rate(go_memstats_heap_alloc_bytes{job=\"$job\"}[30s])",
"expr": "rate(go_memstats_heap_alloc_bytes{job=~\"$job\"}[30s])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "alloc rate heap {{instance}}",
"legendLink": null,
"step": 10
},
{
"expr": "go_memstats_stack_inuse_bytes{job=\"$job\"}",
"expr": "go_memstats_stack_inuse_bytes{job=~\"$job\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "inuse heap {{instance}}",
"legendLink": null,
"step": 10
},
{
"expr": "go_memstats_heap_inuse_bytes{job=\"$job\"}",
"expr": "go_memstats_heap_inuse_bytes{job=~\"$job\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "inuse stack {{instance}}",
Expand Down Expand Up @@ -1652,7 +1652,7 @@
"steppedLine": false,
"targets": [
{
"expr": "go_goroutines{job=\"$job\"}",
"expr": "go_goroutines{job=~\"$job\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
Expand Down Expand Up @@ -1728,7 +1728,7 @@
"steppedLine": false,
"targets": [
{
"expr": "go_gc_duration_seconds{job=\"$job\"}",
"expr": "go_gc_duration_seconds{job=~\"$job\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{quantile}} {{instance}}",
Expand Down
2 changes: 1 addition & 1 deletion mixin/dashboards/query.libsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local utils = import '../lib/utils.libsonnet';
selector: error 'must provide selector for Thanos Query dashboard',
title: error 'must provide title for Thanos Query dashboard',
dashboard:: {
selector: std.join(', ', thanos.dashboard.selector + ['job="$job"']),
selector: std.join(', ', thanos.dashboard.selector + ['job=~"$job"']),
dimensions: std.join(', ', thanos.dashboard.dimensions + ['job']),
},
},
Expand Down

0 comments on commit 116c4bd

Please sign in to comment.