From 670edb4fcf75ef752987296bae336d71065e0632 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Mar 2025 08:21:04 -0700 Subject: [PATCH 1/2] build(deps): bump github.com/golang-jwt/jwt/v5 from 5.2.1 to 5.2.2 (#21055) Bumps [github.com/golang-jwt/jwt/v5](https://github.com/golang-jwt/jwt) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/golang-jwt/jwt/releases) - [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md) - [Commits](https://github.com/golang-jwt/jwt/compare/v5.2.1...v5.2.2) --- updated-dependencies: - dependency-name: github.com/golang-jwt/jwt/v5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d37424f5b9529..ebec24f91d874 100644 --- a/go.mod +++ b/go.mod @@ -161,7 +161,7 @@ require ( github.com/gobwas/pool v0.2.1 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v5 v5.2.1 // indirect + github.com/golang-jwt/jwt/v5 v5.2.2 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect diff --git a/go.sum b/go.sum index 2e2b060f64a88..bc98f49fe4799 100644 --- a/go.sum +++ b/go.sum @@ -228,8 +228,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= -github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= From 46922c71b7bcbc1ce8a6412c90f1ed1cefc6885c Mon Sep 17 00:00:00 2001 From: Alexander Kalaj <[email protected]> Date: Sat, 22 Mar 2025 08:22:29 -0700 Subject: [PATCH 2/2] Updating Prom queries to include tilde needed to work (#21054) --- .../grafana/bucket/minio-bucket.json | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/metrics/prometheus/grafana/bucket/minio-bucket.json b/docs/metrics/prometheus/grafana/bucket/minio-bucket.json index d4b317b4f8325..8bb49c09dbb4c 100644 --- a/docs/metrics/prometheus/grafana/bucket/minio-bucket.json +++ b/docs/metrics/prometheus/grafana/bucket/minio-bucket.json @@ -103,7 +103,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum by (bucket,range) (minio_bucket_objects_size_distribution{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket,range) (minio_bucket_objects_size_distribution{job=~\"$scrape_jobs\"})", "format": "time_series", "instant": false, "interval": "", @@ -175,7 +175,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum by (bucket,range) (minio_bucket_objects_version_distribution{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket,range) (minio_bucket_objects_version_distribution{job=~\"$scrape_jobs\"})", "format": "time_series", "instant": false, "interval": "", @@ -247,7 +247,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum by (bucket,le,api) (minio_bucket_requests_ttfb_seconds_distribution{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket,le,api) (minio_bucket_requests_ttfb_seconds_distribution{job=~\"$scrape_jobs\"})", "format": "time_series", "instant": false, "interval": "", @@ -378,7 +378,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket,api) (increase(minio_bucket_requests_4xx_errors_total{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket,api) (increase(minio_bucket_requests_4xx_errors_total{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket,api}}", @@ -506,7 +506,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket,api) (minio_bucket_requests_inflight_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket,api) (minio_bucket_requests_inflight_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket,api}}", @@ -634,7 +634,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket,api) (increase(minio_bucket_requests_total{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket,api) (increase(minio_bucket_requests_total{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket,api}}", @@ -762,7 +762,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (rate(minio_bucket_traffic_sent_bytes{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket) (rate(minio_bucket_traffic_sent_bytes{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "Data Sent [{{bucket}}]", @@ -890,7 +890,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (rate(minio_bucket_usage_total_bytes{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket) (rate(minio_bucket_usage_total_bytes{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "Usage [{{bucket}}]", @@ -1018,7 +1018,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_usage_object_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_usage_object_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -1146,7 +1146,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_usage_version_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_usage_version_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -1274,7 +1274,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_usage_deletemarker_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_usage_deletemarker_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -1372,7 +1372,7 @@ "uid": "Prometheus" }, "exemplar": true, - "expr": "minio_usage_last_activity_nano_seconds{job=\"$scrape_jobs\"}", + "expr": "minio_usage_last_activity_nano_seconds{job=~\"$scrape_jobs\"}", "interval": "1m", "legendFormat": "{{server}}", "refId": "A" @@ -1499,7 +1499,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (rate(minio_bucket_traffic_received_bytes{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket) (rate(minio_bucket_traffic_received_bytes{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "Data Received [{{bucket}}]", @@ -1627,7 +1627,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_received_bytes{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_received_bytes{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Data Received [{{bucket}}]", @@ -1755,7 +1755,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_sent_bytes{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_sent_bytes{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Replication Data Sent [{{bucket}}]", @@ -1883,7 +1883,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_total_failed_bytes{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_total_failed_bytes{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Replication Failed [{{bucket}}]", @@ -2011,7 +2011,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_total_failed_count{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_total_failed_count{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Replication Failed Objects [{{bucket}}]", @@ -2139,7 +2139,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_received_count{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_received_count{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Replicated In Objects [{{bucket}}]", @@ -2267,7 +2267,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_sent_count{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_sent_count{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Replicated Out Objects [{{bucket}}]", @@ -2395,7 +2395,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (rate(minio_bucket_replication_last_hour_failed_bytes{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket) (rate(minio_bucket_replication_last_hour_failed_bytes{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "Last Hour Failed Size [{{bucket}}]", @@ -2523,7 +2523,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_last_hour_failed_count{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_last_hour_failed_count{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Last Hour Failed Objects [{{bucket}}]", @@ -2651,7 +2651,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (rate(minio_bucket_replication_last_minute_failed_bytes{job=\"$scrape_jobs\"}[$__rate_interval]))", + "expr": "sum by (bucket) (rate(minio_bucket_replication_last_minute_failed_bytes{job=~\"$scrape_jobs\"}[$__rate_interval]))", "interval": "1m", "intervalFactor": 2, "legendFormat": "Last Minute Failed Size [{{bucket}}]", @@ -2779,7 +2779,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_last_minute_failed_count{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_last_minute_failed_count{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "Last Minute Failed Objects [{{bucket}}]", @@ -2848,7 +2848,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum by (bucket,range,operation) (minio_bucket_replication_latency_ms{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket,range,operation) (minio_bucket_replication_latency_ms{job=~\"$scrape_jobs\"})", "format": "time_series", "instant": false, "interval": "", @@ -2979,7 +2979,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_proxied_head_requests_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_proxied_head_requests_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -3107,7 +3107,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "minio_bucket_replication_proxied_head_requests_failures{job=\"$scrape_jobs\"}", + "expr": "minio_bucket_replication_proxied_head_requests_failures{job=~\"$scrape_jobs\"}", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -3235,7 +3235,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_proxied_put_tagging_requests_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_proxied_put_tagging_requests_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -3363,7 +3363,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "minio_bucket_replication_proxied_put_tagging_requests_failures{job=\"$scrape_jobs\"}", + "expr": "minio_bucket_replication_proxied_put_tagging_requests_failures{job=~\"$scrape_jobs\"}", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -3491,7 +3491,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_proxied_get_tagging_requests_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_proxied_get_tagging_requests_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -3619,7 +3619,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "minio_bucket_replication_proxied_get_tagging_requests_failures{job=\"$scrape_jobs\"}", + "expr": "minio_bucket_replication_proxied_get_tagging_requests_failures{job=~\"$scrape_jobs\"}", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -3747,7 +3747,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_proxied_delete_tagging_requests_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_proxied_delete_tagging_requests_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -3875,7 +3875,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "minio_bucket_replication_proxied_delete_tagging_requests_failures{job=\"$scrape_jobs\"}", + "expr": "minio_bucket_replication_proxied_delete_tagging_requests_failures{job=~\"$scrape_jobs\"}", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -4003,7 +4003,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "sum by (bucket) (minio_bucket_replication_proxied_get_requests_total{job=\"$scrape_jobs\"})", + "expr": "sum by (bucket) (minio_bucket_replication_proxied_get_requests_total{job=~\"$scrape_jobs\"})", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{bucket}}", @@ -4131,7 +4131,7 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "minio_bucket_replication_proxied_get_requests_failures{job=\"$scrape_jobs\"}", + "expr": "minio_bucket_replication_proxied_get_requests_failures{job=~\"$scrape_jobs\"}", "interval": "1m", "intervalFactor": 2, "legendFormat": "{{instance}}",