diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 2709f7d0f58..c589ecc13ee 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -336,7 +336,7 @@ "subdir": "jsonnet/kube-thanos" } }, - "version": "5c8b734dd13edb4b64c71048b74333e9ce2c19b7", + "version": "c5c9cd256cd91bede770a03fa26ac89154071217", "sum": "sFdq83b0xqzvAREQcYyLKhnd+1MPYzyCxBOfctpiTDA=" }, { @@ -346,8 +346,8 @@ "subdir": "mixin" } }, - "version": "b65cc2fba7214fbbf81dcf8754b51d32fde033bf", - "sum": "FE6a1GxXu7kzo+zD8XeyVV296Rz/OCvBUNJXJqua6D4=", + "version": "37e37cc009dcda7bd123aedc7fec69a412d8be38", + "sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=", "name": "thanos-mixin" } ], diff --git a/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-receive.configmap.yaml b/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-receive.configmap.yaml index f4956cb5197..1fc3b0c0dd7 100644 --- a/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-receive.configmap.yaml +++ b/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-receive.configmap.yaml @@ -1099,7 +1099,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(rate(thanos_receive_write_samples_bucket{namespace=\"$namespace\", job=~\"$job\", tenant=~\"$tenant\", code=~\"2..\"}[$interval])) by (namespace, job, tenant) ", + "expr": "sum(rate(thanos_receive_write_samples_sum{namespace=\"$namespace\", job=~\"$job\", tenant=~\"$tenant\", code=~\"2..\"}[$interval])) by (namespace, job, tenant) ", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{tenant}}", @@ -1185,7 +1185,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(rate(thanos_receive_write_samples_bucket{namespace=\"$namespace\", job=~\"$job\", tenant=~\"$tenant\", code!~\"2..\"}[$interval])) by (tenant, code) ", + "expr": "sum(rate(thanos_receive_write_samples_sum{namespace=\"$namespace\", job=~\"$job\", tenant=~\"$tenant\", code!~\"2..\"}[$interval])) by (tenant, code) ", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{code}} - {{tenant}}", diff --git a/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-store.configmap.yaml b/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-store.configmap.yaml index 6a795f817a3..4dc7edac30d 100644 --- a/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-store.configmap.yaml +++ b/resources/observability/grafana/observatorium/grafana-dashboard-observatorium-thanos-store.configmap.yaml @@ -1937,7 +1937,7 @@ data: ], "spaceLength": 10, - "span": 4, + "span": 3, "stack": false, "steppedLine": false, "targets": [ @@ -2040,7 +2040,7 @@ data: ], "spaceLength": 10, - "span": 4, + "span": 3, "stack": false, "steppedLine": false, "targets": [ @@ -2048,15 +2048,15 @@ data: "expr": "thanos_bucket_store_series_data_fetched{namespace=\"$namespace\", job=~\"$job\", quantile=\"0.99\"}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "P99", + "legendFormat": "P99: {{data_type}} / {{job}}", "legendLink": null, "step": 10 }, { - "expr": "sum by (namespace, job) (rate(thanos_bucket_store_series_data_fetched_sum{namespace=\"$namespace\", job=~\"$job\"}[$interval])) / sum by (namespace, job) (rate(thanos_bucket_store_series_data_fetched_count{namespace=\"$namespace\", job=~\"$job\"}[$interval]))", + "expr": "sum by (namespace, job, data_type) (rate(thanos_bucket_store_series_data_fetched_sum{namespace=\"$namespace\", job=~\"$job\"}[$interval])) / sum by (namespace, job, data_type) (rate(thanos_bucket_store_series_data_fetched_count{namespace=\"$namespace\", job=~\"$job\"}[$interval]))", "format": "time_series", "intervalFactor": 2, - "legendFormat": "mean {{job}}", + "legendFormat": "mean: {{data_type}} / {{job}}", "legendLink": null, "step": 10 }, @@ -2064,7 +2064,7 @@ data: "expr": "thanos_bucket_store_series_data_fetched{namespace=\"$namespace\", job=~\"$job\", quantile=\"0.50\"}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "P50", + "legendFormat": "P50: {{data_type}} / {{job}}", "legendLink": null, "step": 10 } @@ -2117,6 +2117,7 @@ data: "dashLength": 10, "dashes": false, "datasource": "$datasource", + "description": "Show the size of data touched", "fill": 1, "id": 21, "legend": { @@ -2142,7 +2143,109 @@ data: ], "spaceLength": 10, - "span": 4, + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "thanos_bucket_store_series_data_touched{namespace=\"$namespace\", job=~\"$job\", quantile=\"0.99\"}", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "P99: {{data_type}} / {{job}}", + "legendLink": null, + "step": 10 + }, + { + "expr": "sum by (namespace, job, data_type) (rate(thanos_bucket_store_series_data_touched_sum{namespace=\"$namespace\", job=~\"$job\"}[$interval])) / sum by (namespace, job, data_type) (rate(thanos_bucket_store_series_data_touched_count{namespace=\"$namespace\", job=~\"$job\"}[$interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "mean: {{data_type}} / {{job}}", + "legendLink": null, + "step": 10 + }, + { + "expr": "thanos_bucket_store_series_data_touched{namespace=\"$namespace\", job=~\"$job\", quantile=\"0.50\"}", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "P50: {{data_type}} / {{job}}", + "legendLink": null, + "step": 10 + } + ], + "thresholds": [ + + ], + "timeFrom": null, + "timeShift": null, + "title": "Data Touched", + "tooltip": { + "shared": false, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ + + ] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { + + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 22, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ + + ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + + ], + "spaceLength": 10, + "span": 3, "stack": false, "steppedLine": false, "targets": [ @@ -2233,7 +2336,7 @@ data: "datasource": "$datasource", "description": "Shows how long has it taken to get all series.", "fill": 1, - "id": 22, + "id": 23, "legend": { "avg": false, "current": false, @@ -2359,7 +2462,7 @@ data: "datasource": "$datasource", "description": "Shows how long has it taken to merge series.", "fill": 1, - "id": 23, + "id": 24, "legend": { "avg": false, "current": false, @@ -2485,7 +2588,7 @@ data: "datasource": "$datasource", "description": "Shows how long has it taken for a series to wait at the gate.", "fill": 1, - "id": 24, + "id": 25, "legend": { "avg": false, "current": false, @@ -2622,7 +2725,7 @@ data: "dashes": false, "datasource": "$datasource", "fill": 1, - "id": 25, + "id": 26, "legend": { "avg": false, "current": false, @@ -2748,7 +2851,7 @@ data: "dashes": false, "datasource": "$datasource", "fill": 1, - "id": 26, + "id": 27, "legend": { "avg": false, "current": false, @@ -2834,7 +2937,7 @@ data: "dashes": false, "datasource": "$datasource", "fill": 1, - "id": 27, + "id": 28, "legend": { "avg": false, "current": false,