rm container name overrides

Signed-off-by: Danny Kopping <[email protected]>

Author: ericpaulsen

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": false
+}

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","exporter":{"containerName":"postgres-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 | 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,8 +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` |  |
-| runbook.containerName | string | `"madness"` |  |
-| runbook.image | string | `"dannyben/madness"` |  |
-| sqlExporter.containerName | string | `"sql-exporter"` |  |
+| runbookViewer.image | string | `"dannyben/madness"` |  |
 | sqlExporter.image | string | `"burningalchemist/sql_exporter"` |  |
 

coder-observability/Chart.lock

@@ -12,4 +12,4 @@ dependencies:
   repository: https://grafana.github.io/helm-charts
   version: 0.37.0
 digest: sha256:05e0dae0200cabf5cb9e2cfb18a4e166fcaceefaf39827addff4299b18c31d4e
-generated: "2025-01-15T20:35:57.318818175Z"
+generated: "2025-01-16T07:54:38.036598102Z"

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

@@ -19,7 +19,7 @@ spec:
         app.kubernetes.io/name: "database-stats"
     spec:
       containers:
-        - name: {{ .Values.global.postgres.exporter.containerName }}
+        - name: postgres-exporter
           image: {{ .Values.global.postgres.exporter.image }}
           args:
             - --collector.long_running_transactions

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

@@ -18,8 +18,8 @@ spec:
         app: runbook-viewer
     spec:
       containers:
-        - name: {{ .Values.runbook.containerName }}
-          image: {{ .Values.runbook.image }}
+        - name: madness
+          image: {{ .Values.runbookViewer.image }}
           ports:
             - containerPort: 3000
               name: madness

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

@@ -20,7 +20,7 @@ spec:
         app.kubernetes.io/name: "database-stats"
     spec:
       containers:
-        - name: {{ .Values.sqlExporter.containerName }}
+        - name: sql-exporter
           image: {{ .Values.sqlExporter.image }}
           args:
             - -config.file=/cfg/config.yaml

coder-observability/values.yaml

@@ -116,7 +116,6 @@ global:
     # ensure that your secret has a field named `PGPASSWORD`
     mountSecret: "secret-postgres"
     exporter:
-      containerName: "postgres-exporter"
       image: "quay.io/prometheuscommunity/postgres-exporter"
 
     # global.postgres.alerts -- alerts for postgres
@@ -149,12 +148,10 @@ global:
     # global.dashboards.queryTimeout -- how long until a query in Grafana will timeout after
     queryTimeout: 900
 
-runbook:
-  containerName: "madness"
+runbookViewer:
   image: "dannyben/madness"
 
 sqlExporter:
-  containerName: "sql-exporter"
   image: "burningalchemist/sql_exporter"
 
 grafana-agent: