diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7a73b63..4efb8fb 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.23 - name: Install Helm uses: azure/setup-helm@v4 diff --git a/README.md b/README.md index 28080d1..cdb096b 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ values which are defined [here](https://github.com/grafana/helm-charts/tree/main | global.dashboards.timerange | string | `"12h"` | how far back dashboards should look | | global.externalScheme | string | `"http"` | | | global.externalZone | string | `"svc.cluster.local"` | | -| 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 | +| 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 | | 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 | | global.telemetry | object | `{"metrics":{"scrape_interval":"15s","scrape_timeout":"12s"}}` | control telemetry collection | | 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 | prometheus.serverFiles."prometheus.yml".rule_files[0] | string | `"/etc/config/alerts/*.yaml"` | | | prometheus.serverFiles."prometheus.yml".scrape_configs | string | `nil` | | | prometheus.testFramework.enabled | bool | `false` | | +| runbookViewer.image | string | `"dannyben/madness"` | | +| sqlExporter.image | string | `"burningalchemist/sql_exporter"` | | diff --git a/coder-observability/Chart.lock b/coder-observability/Chart.lock index 45c04a9..1782a88 100644 --- a/coder-observability/Chart.lock +++ b/coder-observability/Chart.lock @@ -12,4 +12,4 @@ dependencies: repository: https://grafana.github.io/helm-charts version: 0.37.0 digest: sha256:05e0dae0200cabf5cb9e2cfb18a4e166fcaceefaf39827addff4299b18c31d4e -generated: "2024-11-04T08:35:11.202671Z" +generated: "2025-01-16T07:54:38.036598102Z" diff --git a/coder-observability/templates/statefulset-postgres-exporter.yaml b/coder-observability/templates/statefulset-postgres-exporter.yaml index bcef353..229c650 100644 --- a/coder-observability/templates/statefulset-postgres-exporter.yaml +++ b/coder-observability/templates/statefulset-postgres-exporter.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: postgres-exporter - image: quay.io/prometheuscommunity/postgres-exporter + image: {{ .Values.global.postgres.exporter.image }} args: - --collector.long_running_transactions ports: diff --git a/coder-observability/templates/statefulset-runbook-viewer.yaml b/coder-observability/templates/statefulset-runbook-viewer.yaml index 0ab2179..64f50e4 100644 --- a/coder-observability/templates/statefulset-runbook-viewer.yaml +++ b/coder-observability/templates/statefulset-runbook-viewer.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: madness - image: dannyben/madness + image: {{ .Values.runbookViewer.image }} ports: - containerPort: 3000 name: madness diff --git a/coder-observability/templates/statefulset-sql-exporter.yaml b/coder-observability/templates/statefulset-sql-exporter.yaml index 3ef64c2..628339e 100644 --- a/coder-observability/templates/statefulset-sql-exporter.yaml +++ b/coder-observability/templates/statefulset-sql-exporter.yaml @@ -21,7 +21,7 @@ spec: spec: containers: - name: sql-exporter - image: burningalchemist/sql_exporter + image: {{ .Values.sqlExporter.image }} args: - -config.file=/cfg/config.yaml ports: diff --git a/coder-observability/values.yaml b/coder-observability/values.yaml index c66a6ac..bcc35da 100644 --- a/coder-observability/values.yaml +++ b/coder-observability/values.yaml @@ -115,6 +115,8 @@ global: sslmode: disable # ensure that your secret has a field named `PGPASSWORD` mountSecret: "secret-postgres" + exporter: + image: "quay.io/prometheuscommunity/postgres-exporter" # global.postgres.alerts -- alerts for postgres alerts: @@ -146,6 +148,12 @@ global: # global.dashboards.queryTimeout -- how long until a query in Grafana will timeout after queryTimeout: 900 +runbookViewer: + image: "dannyben/madness" + +sqlExporter: + image: "burningalchemist/sql_exporter" + grafana-agent: enabled: true fullnameOverride: grafana-agent