Skip to content

Commit f5c3291

Browse files
authored
Merge pull request #28 from coder/custom-images
feat: add statefulset image overrides
2 parents b5eabba + 76a8f34 commit f5c3291

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

.github/workflows/lint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.22
20+
go-version: 1.23
2121

2222
- name: Install Helm
2323
uses: azure/setup-helm@v4

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ values which are defined [here](https://github.com/grafana/helm-charts/tree/main
242242
| global.dashboards.timerange | string | `"12h"` | how far back dashboards should look |
243243
| global.externalScheme | string | `"http"` | |
244244
| global.externalZone | string | `"svc.cluster.local"` | |
245-
| global.postgres | object | `{"alerts":{"groups":{"Basic":{"delay":"1m","enabled":true},"Connections":{"delay":"5m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}},"Notifications":{"delay":"15m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}}}},"database":"coder","hostname":"localhost","mountSecret":"secret-postgres","password":null,"port":5432,"sslmode":"disable","username":"coder"}` | postgres connection information NOTE: these settings are global so we can parameterise some values which get rendered by subcharts |
245+
| global.postgres | object | `{"alerts":{"groups":{"Basic":{"delay":"1m","enabled":true},"Connections":{"delay":"5m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}},"Notifications":{"delay":"15m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}}}},"database":"coder","exporter":{"image":"quay.io/prometheuscommunity/postgres-exporter"},"hostname":"localhost","mountSecret":"secret-postgres","password":null,"port":5432,"sslmode":"disable","username":"coder"}` | postgres connection information NOTE: these settings are global so we can parameterise some values which get rendered by subcharts |
246246
| global.postgres.alerts | object | `{"groups":{"Basic":{"delay":"1m","enabled":true},"Connections":{"delay":"5m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}},"Notifications":{"delay":"15m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}}}}` | alerts for postgres |
247247
| global.telemetry | object | `{"metrics":{"scrape_interval":"15s","scrape_timeout":"12s"}}` | control telemetry collection |
248248
| global.telemetry.metrics | object | `{"scrape_interval":"15s","scrape_timeout":"12s"}` | control metric collection |
@@ -466,4 +466,6 @@ values which are defined [here](https://github.com/grafana/helm-charts/tree/main
466466
| prometheus.serverFiles."prometheus.yml".rule_files[0] | string | `"/etc/config/alerts/*.yaml"` | |
467467
| prometheus.serverFiles."prometheus.yml".scrape_configs | string | `nil` | |
468468
| prometheus.testFramework.enabled | bool | `false` | |
469+
| runbookViewer.image | string | `"dannyben/madness"` | |
470+
| sqlExporter.image | string | `"burningalchemist/sql_exporter"` | |
469471

coder-observability/Chart.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ dependencies:
1212
repository: https://grafana.github.io/helm-charts
1313
version: 0.37.0
1414
digest: sha256:05e0dae0200cabf5cb9e2cfb18a4e166fcaceefaf39827addff4299b18c31d4e
15-
generated: "2024-11-04T08:35:11.202671Z"
15+
generated: "2025-01-16T07:54:38.036598102Z"

coder-observability/templates/statefulset-postgres-exporter.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
containers:
2222
- name: postgres-exporter
23-
image: quay.io/prometheuscommunity/postgres-exporter
23+
image: {{ .Values.global.postgres.exporter.image }}
2424
args:
2525
- --collector.long_running_transactions
2626
ports:

coder-observability/templates/statefulset-runbook-viewer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
spec:
2020
containers:
2121
- name: madness
22-
image: dannyben/madness
22+
image: {{ .Values.runbookViewer.image }}
2323
ports:
2424
- containerPort: 3000
2525
name: madness

coder-observability/templates/statefulset-sql-exporter.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
spec:
2222
containers:
2323
- name: sql-exporter
24-
image: burningalchemist/sql_exporter
24+
image: {{ .Values.sqlExporter.image }}
2525
args:
2626
- -config.file=/cfg/config.yaml
2727
ports:

coder-observability/values.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ global:
115115
sslmode: disable
116116
# ensure that your secret has a field named `PGPASSWORD`
117117
mountSecret: "secret-postgres"
118+
exporter:
119+
image: "quay.io/prometheuscommunity/postgres-exporter"
118120

119121
# global.postgres.alerts -- alerts for postgres
120122
alerts:
@@ -146,6 +148,12 @@ global:
146148
# global.dashboards.queryTimeout -- how long until a query in Grafana will timeout after
147149
queryTimeout: 900
148150

151+
runbookViewer:
152+
image: "dannyben/madness"
153+
154+
sqlExporter:
155+
image: "burningalchemist/sql_exporter"
156+
149157
grafana-agent:
150158
enabled: true
151159
fullnameOverride: grafana-agent

0 commit comments

Comments
 (0)