DB o11y(fix): configure Alloy to connect DB with db-o11y user (#331)

Author: ppcano

alloy/cloud.alloy

@@ -269,7 +269,7 @@ otelcol.exporter.otlphttp "otlpEndpoint" {
 
 // DB o11y
 prometheus.exporter.postgres "postgres_quickpizza" {
-  data_source_names  = [coalesce(env("QUICKPIZZA_DB"), "postgresql://localhost:5432/notexist")]
+  data_source_names  = [coalesce(env("DB_O11Y_CONNECTION"), "postgresql://localhost:5432/notexist")]
   enabled_collectors = ["stat_statements"]
 
   autodiscovery {
@@ -278,7 +278,7 @@ prometheus.exporter.postgres "postgres_quickpizza" {
 }
 
 database_observability.postgres "postgres_quickpizza" {
-  data_source_name  = coalesce(env("QUICKPIZZA_DB"), "postgresql://localhost:5432/notexist")
+  data_source_name  = coalesce(env("DB_O11Y_CONNECTION"), "postgresql://localhost:5432/notexist")
   forward_to        = [loki.relabel.database_observability_postgres_quickpizza.receiver]
   targets           = prometheus.exporter.postgres.postgres_quickpizza.targets
   enable_collectors = ["query_details", "query_samples", "schema_details", "explain_plans"]

compose.grafana-cloud.microservices.yaml

@@ -34,8 +34,7 @@ services:
       GRAFANA_CLOUD_TOKEN: "${GRAFANA_CLOUD_TOKEN}"
       GRAFANA_CLOUD_STACK: "${GRAFANA_CLOUD_STACK}"
       DEPLOYMENT_ENVIRONMENT: ${DEPLOYMENT_ENVIRONMENT:-development}
-      # QUICKPIZZA_DB unset set to postgres. If empty, set to sqlite.
-      QUICKPIZZA_DB: "${QUICKPIZZA_DB-postgres://postgres:postgres@quickpizza-db:5432/quickpizza_db?sslmode=disable}"
+      DB_O11Y_CONNECTION: "postgres://db-o11y:db-o11y-password@quickpizza-db:5432/quickpizza_db?sslmode=disable"
       SERVICE_NAMESPACE: "${SERVICE_NAMESPACE:-quickpizza}"
       DB_SERVICE_NAME: "quickpizza-db"
     depends_on:

compose.grafana-cloud.monolithic.yaml

@@ -22,7 +22,7 @@ services:
       GRAFANA_CLOUD_TOKEN: "${GRAFANA_CLOUD_TOKEN}"
       GRAFANA_CLOUD_STACK: "${GRAFANA_CLOUD_STACK}"
       DEPLOYMENT_ENVIRONMENT: ${DEPLOYMENT_ENVIRONMENT:-development}
-      QUICKPIZZA_DB: "${QUICKPIZZA_DB-postgres://postgres:postgres@quickpizza-db:5432/quickpizza_db?sslmode=disable}"
+      DB_O11Y_CONNECTION: "postgres://db-o11y:db-o11y-password@quickpizza-db:5432/quickpizza_db?sslmode=disable"
       SERVICE_NAMESPACE: "${SERVICE_NAMESPACE:-quickpizza}"
       DB_SERVICE_NAME: "quickpizza-db"
     depends_on:

terraform/alloy.tf

@@ -99,11 +99,11 @@ resource "kubernetes_deployment" "alloy" {
             }
           }
           env {
-            name = "QUICKPIZZA_DB"
+            name = "DB_O11Y_CONNECTION"
             value_from {
               secret_key_ref {
                 name = kubernetes_secret.quickpizza_postgres_credentials.metadata[0].name
-                key  = "CONNECTION_STRING"
+                key  = "DB_O11Y_CONNECTION_STRING"
               }
             }
           }

terraform/alloy/config.alloy

@@ -345,7 +345,7 @@ otelcol.exporter.otlphttp "otlpEndpoint" {
 
 // DB o11y
 prometheus.exporter.postgres "postgres_quickpizza" {
-  data_source_names  = [env("QUICKPIZZA_DB")]
+  data_source_names  = [env("DB_O11Y_CONNECTION")]
   enabled_collectors = ["stat_statements"]
 
   autodiscovery {
@@ -354,7 +354,7 @@ prometheus.exporter.postgres "postgres_quickpizza" {
 }
 
 database_observability.postgres "postgres_quickpizza" {
-  data_source_name  = env("QUICKPIZZA_DB")
+  data_source_name  = env("DB_O11Y_CONNECTION")
   forward_to        = [loki.relabel.database_observability_postgres_quickpizza.receiver]
   targets           = prometheus.exporter.postgres.postgres_quickpizza.targets
   enable_collectors = ["query_details", "query_samples", "schema_details", "explain_plans"]

terraform/database.tf

@@ -25,6 +25,8 @@ resource "kubernetes_secret" "quickpizza_postgres_credentials" {
   data = {
     DATABASE_PASSWORD = var.quickpizza_db_password
     CONNECTION_STRING = format("postgres://%s:%s@%s/%s?sslmode=disable", var.quickpizza_db_user, var.quickpizza_db_password, kubernetes_service.postgres.metadata[0].name, var.quickpizza_db_name)
+    # see scripts/init-db-observability.sh for usage
+    DB_O11Y_CONNECTION_STRING = format("postgres://%s:%s@%s/%s?sslmode=disable", var.db_o11y_user, var.db_o11y_password, kubernetes_service.postgres.metadata[0].name, var.quickpizza_db_name)
   }
 }
 

terraform/variables.tf

@@ -126,4 +126,16 @@ variable "quickpizza_db_user" {
 variable "quickpizza_db_password" {
   default = "quickpizza"
   type    = string
+}
+
+variable "db_o11y_user" {
+  default     = "db-o11y"
+  type    = string
+  sensitive   = true
+}
+
+variable "db_o11y_password" {
+  default     = "db-o11y-password"
+  type    = string
+  sensitive   = true
 }