Skip to content

fix(chart): dashboard filters on job, not the unset service=s3proxy #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ynsta merged 1 commit into from
May 20, 2026
Merged

fix(chart): dashboard filters on job, not the unset service=s3proxy #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ Two version streams move independently:

### Chart

- **`chart/1.9.2`** — Fix dashboard panels showing "No data". Every query
previously filtered on `service="s3proxy"`, but the
`ServiceMonitor`-applied label is the release-prefixed Service name
(e.g. `service="cockpit-s3proxy"`), so the filter never matched. Switch
every panel target and the `instance` variable query to `job=~"$job"`,
and add a new `Job` template variable (`label_values(http_requests_total, job)`)
so the dashboard picks up whatever `job` Prometheus actually emits.
- **`chart/1.9.1`** — Make the bundled Grafana dashboard portable. Adds a
`datasource` template variable (type `datasource`, query `prometheus`)
so the dashboard binds to whichever Prometheus data source the target
Expand Down
2 changes: 1 addition & 1 deletion charts/s3proxy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ maintainers:
annotations:
org.opencontainers.image.source: "https://github.com/intrinsec/s3proxy/"
type: application
version: 1.9.1
version: 1.9.2
appVersion: "1.8.1"
32 changes: 21 additions & 11 deletions charts/s3proxy/dashboards/s3proxy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,22 @@
"current": {},
"hide": 0
},
{
"name": "job",
"label": "Job",
"type": "query",
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"query": "label_values(http_requests_total, job)",
"includeAll": false,
"multi": false,
"refresh": 2
},
{
"name": "instance",
"label": "Instance",
"type": "query",
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"query": "label_values(http_requests_total{service=\"s3proxy\"}, instance)",
"query": "label_values(http_requests_total{job=~\"$job\"}, instance)",
"includeAll": true,
"multi": true,
"refresh": 2
Expand All @@ -39,7 +49,7 @@
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "sum by (method, path) (rate(http_requests_total{service=\"s3proxy\", instance=~\"$instance\"}[1m]))",
"expr": "sum by (method, path) (rate(http_requests_total{job=~\"$job\", instance=~\"$instance\"}[1m]))",
"legendFormat": "{{method}} {{path}}",
"refId": "A"
}
Expand All @@ -54,7 +64,7 @@
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "sum(rate(http_requests_total{service=\"s3proxy\", instance=~\"$instance\", status=~\"5..\"}[5m])) / clamp_min(sum(rate(http_requests_total{service=\"s3proxy\", instance=~\"$instance\"}[5m])), 1e-12)",
"expr": "sum(rate(http_requests_total{job=~\"$job\", instance=~\"$instance\", status=~\"5..\"}[5m])) / clamp_min(sum(rate(http_requests_total{job=~\"$job\", instance=~\"$instance\"}[5m])), 1e-12)",
"legendFormat": "error ratio",
"refId": "A"
}
Expand All @@ -69,19 +79,19 @@
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "histogram_quantile(0.50, sum by (le) (rate(http_request_duration_seconds_bucket{service=\"s3proxy\", instance=~\"$instance\"}[5m])))",
"expr": "histogram_quantile(0.50, sum by (le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", instance=~\"$instance\"}[5m])))",
"legendFormat": "p50",
"refId": "A"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "histogram_quantile(0.95, sum by (le) (rate(http_request_duration_seconds_bucket{service=\"s3proxy\", instance=~\"$instance\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by (le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", instance=~\"$instance\"}[5m])))",
"legendFormat": "p95",
"refId": "B"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "histogram_quantile(0.99, sum by (le) (rate(http_request_duration_seconds_bucket{service=\"s3proxy\", instance=~\"$instance\"}[5m])))",
"expr": "histogram_quantile(0.99, sum by (le) (rate(http_request_duration_seconds_bucket{job=~\"$job\", instance=~\"$instance\"}[5m])))",
"legendFormat": "p99",
"refId": "C"
}
Expand All @@ -96,7 +106,7 @@
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "rate(service_crashes_total{service=\"s3proxy\", instance=~\"$instance\"}[5m])",
"expr": "rate(service_crashes_total{job=~\"$job\", instance=~\"$instance\"}[5m])",
"legendFormat": "crashes/s",
"refId": "A"
}
Expand All @@ -111,13 +121,13 @@
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "histogram_quantile(0.95, sum by (le) (rate(s3proxy_encrypt_duration_seconds_bucket{instance=~\"$instance\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by (le) (rate(s3proxy_encrypt_duration_seconds_bucket{job=~\"$job\", instance=~\"$instance\"}[5m])))",
"legendFormat": "encrypt p95",
"refId": "A"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "histogram_quantile(0.95, sum by (le) (rate(s3proxy_decrypt_duration_seconds_bucket{instance=~\"$instance\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by (le) (rate(s3proxy_decrypt_duration_seconds_bucket{job=~\"$job\", instance=~\"$instance\"}[5m])))",
"legendFormat": "decrypt p95",
"refId": "B"
}
Expand All @@ -132,13 +142,13 @@
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "rate(s3proxy_throttled_total{instance=~\"$instance\"}[1m])",
"expr": "rate(s3proxy_throttled_total{job=~\"$job\", instance=~\"$instance\"}[1m])",
"legendFormat": "throttled/s",
"refId": "A"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "rate(s3proxy_upstream_errors_total{instance=~\"$instance\"}[1m])",
"expr": "rate(s3proxy_upstream_errors_total{job=~\"$job\", instance=~\"$instance\"}[1m])",
"legendFormat": "upstream errors/s",
"refId": "B"
}
Expand Down
Loading