Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ Two version streams move independently:

### Chart

- **`chart/1.9.3`** — Dashboard usability + Go runtime panels.
- `Job` picker now defaults to **All** (`allValue: ".*s3proxy.*"`) and
restricts its dropdown to jobs whose name contains `s3proxy` via the
template `regex: /s3proxy/`. Multi-release clusters land on a
populated dashboard out of the box.
- New **Runtime (Go)** row with six panels backed by the default
`client_golang` collectors (already registered in s3proxy):
CPU usage (`process_cpu_seconds_total`), resident memory
(`process_resident_memory_bytes`), Go heap in use
(`go_memstats_heap_inuse_bytes` / `_heap_alloc_bytes`), goroutines
(`go_goroutines`), GC pause quantiles (`go_gc_duration_seconds`),
and open file descriptors (`process_open_fds`).
- **`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
Expand Down
2 changes: 1 addition & 1 deletion charts/s3proxy/Chart.yaml
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.2
version: 1.9.3
appVersion: "1.8.1"
121 changes: 120 additions & 1 deletion charts/s3proxy/dashboards/s3proxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
"type": "query",
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"query": "label_values(http_requests_total, job)",
"includeAll": false,
"regex": "/s3proxy/",
"includeAll": true,
"allValue": ".*s3proxy.*",
"current": {"text": "All", "value": "$__all"},
"multi": false,
"refresh": 2
},
Expand Down Expand Up @@ -154,6 +157,122 @@
}
],
"fieldConfig": {"defaults": {"unit": "ops"}}
},
{
"id": 7,
"type": "row",
"title": "Runtime (Go)",
"collapsed": false,
"gridPos": {"x": 0, "y": 24, "w": 24, "h": 1},
"panels": []
},
{
"id": 8,
"type": "timeseries",
"title": "CPU usage (cores)",
"gridPos": {"x": 0, "y": 25, "w": 12, "h": 8},
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "rate(process_cpu_seconds_total{job=~\"$job\", instance=~\"$instance\"}[2m])",
"legendFormat": "{{instance}}",
"refId": "A"
}
],
"fieldConfig": {"defaults": {"unit": "none", "min": 0}}
},
{
"id": 9,
"type": "timeseries",
"title": "Resident memory (RSS)",
"gridPos": {"x": 12, "y": 25, "w": 12, "h": 8},
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "process_resident_memory_bytes{job=~\"$job\", instance=~\"$instance\"}",
"legendFormat": "{{instance}}",
"refId": "A"
}
],
"fieldConfig": {"defaults": {"unit": "bytes", "min": 0}}
},
{
"id": 10,
"type": "timeseries",
"title": "Go heap in use",
"gridPos": {"x": 0, "y": 33, "w": 12, "h": 8},
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "go_memstats_heap_inuse_bytes{job=~\"$job\", instance=~\"$instance\"}",
"legendFormat": "heap inuse {{instance}}",
"refId": "A"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "go_memstats_heap_alloc_bytes{job=~\"$job\", instance=~\"$instance\"}",
"legendFormat": "heap alloc {{instance}}",
"refId": "B"
}
],
"fieldConfig": {"defaults": {"unit": "bytes", "min": 0}}
},
{
"id": 11,
"type": "timeseries",
"title": "Goroutines",
"gridPos": {"x": 12, "y": 33, "w": 12, "h": 8},
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "go_goroutines{job=~\"$job\", instance=~\"$instance\"}",
"legendFormat": "{{instance}}",
"refId": "A"
}
],
"fieldConfig": {"defaults": {"unit": "short", "min": 0}}
},
{
"id": 12,
"type": "timeseries",
"title": "GC pause (p50 / p95 / p99)",
"gridPos": {"x": 0, "y": 41, "w": 12, "h": 8},
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "go_gc_duration_seconds{job=~\"$job\", instance=~\"$instance\", quantile=\"0.5\"}",
"legendFormat": "p50 {{instance}}",
"refId": "A"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "go_gc_duration_seconds{job=~\"$job\", instance=~\"$instance\", quantile=\"0.95\"}",
"legendFormat": "p95 {{instance}}",
"refId": "B"
},
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "go_gc_duration_seconds{job=~\"$job\", instance=~\"$instance\", quantile=\"0.99\"}",
"legendFormat": "p99 {{instance}}",
"refId": "C"
}
],
"fieldConfig": {"defaults": {"unit": "s", "min": 0}}
},
{
"id": 13,
"type": "timeseries",
"title": "Open file descriptors",
"gridPos": {"x": 12, "y": 41, "w": 12, "h": 8},
"targets": [
{
"datasource": {"type": "prometheus", "uid": "${datasource}"},
"expr": "process_open_fds{job=~\"$job\", instance=~\"$instance\"}",
"legendFormat": "{{instance}}",
"refId": "A"
}
],
"fieldConfig": {"defaults": {"unit": "short", "min": 0}}
}
]
}
Loading