More realistic PostgreSQL setup with dedicated users, database, and monitoring

- Replace the generic `root`/`otelu` users and `otel` database with a
  dedicated `astronomy_db` owned by `astronomy_user`, keeping the default
  `postgres` database untouched
- Add `monitoring_user` with `pg_monitor` role for read-only observability
  access across all databases and schemas
- Switch OTel Collector postgresql receiver to `monitoring_user` instead
  of the superuser
- Enable `pg_stat_statements` on all databases via
  `shared_preload_libraries` and `CREATE EXTENSION`
- Rename the Compose service and container from `postgresql` to
  `astronomy-db` for clarity; update `POSTGRES_HOST` accordingly
- Set `POSTGRES_PASSWORD` to `changeit` for the default superuser

Author: cyrille-leclerc

.env

@@ -170,10 +170,9 @@ VALKEY_PORT=6379
 VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
 
 # Postgres
-POSTGRES_HOST=postgresql
+POSTGRES_HOST=astronomy-db
 POSTGRES_PORT=5432
-POSTGRES_DB=otel
-POSTGRES_PASSWORD=otel
+POSTGRES_PASSWORD=changeit
 POSTGRES_DOCKERFILE=./src/postgresql/Dockerfile
 
 # ********************

docker-compose-tests.yml

@@ -127,7 +127,7 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
     healthcheck:
-      test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
+      test: pg_isready -U "postgres" -d "$$POSTGRES_DB"
       interval: 1s
       timeout: 5s
       retries: 60

docker-compose.minimal.yml

@@ -425,11 +425,11 @@ services:
       - OTEL_SERVICE_NAME=product-catalog
       - OTEL_CONFIG_FILE=/otel-config.yml
       - OTEL_SEMCONV_STABILITY_OPT_IN=database
-      - DB_CONNECTION_STRING=postgres://otelu:otelp@${POSTGRES_HOST}/${POSTGRES_DB}?sslmode=disable
+      - DB_CONNECTION_STRING=postgres://astronomy_user:astronomy_password@${POSTGRES_HOST}/astronomy_db?sslmode=disable
     depends_on:
       otel-collector:
         condition: service_started
-      postgresql:
+      astronomy-db:
         condition: service_started
     volumes:
       - ./otel-config.yml:/otel-config.yml
@@ -460,7 +460,7 @@ services:
       - OTEL_SERVICE_NAME=product-reviews
       - OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
-      - DB_CONNECTION_STRING=host=${POSTGRES_HOST} user=otelu password=otelp dbname=${POSTGRES_DB}
+      - DB_CONNECTION_STRING=host=${POSTGRES_HOST} user=astronomy_user password=astronomy_password dbname=astronomy_db
       - LLM_BASE_URL
       - OPENAI_API_KEY
       - LLM_MODEL
@@ -472,7 +472,7 @@ services:
         condition: service_started
       llm:
         condition: service_started
-      postgresql:
+      astronomy-db:
         condition: service_started
       otel-collector:
         condition: service_started
@@ -607,21 +607,20 @@ services:
     logging:
       *logging
 
-  # Postgresql used by Product Reviews service
-  postgresql:
+  # PostgreSQL database for the astronomy demo
+  astronomy-db:
     image: ${POSTGRES_IMAGE}
-    container_name: postgresql
+    container_name: astronomy-db
     deploy:
       resources:
         limits:
           memory: 80M
     restart: unless-stopped
     ports:
       - ${POSTGRES_PORT}
+    command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
-      - POSTGRES_USER=root
       - POSTGRES_PASSWORD
-      - POSTGRES_DB
     volumes:
       - ./src/postgresql/init.sql:/docker-entrypoint-initdb.d/init.sql
     logging: *logging

docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=accounting
-      - DB_CONNECTION_STRING=Host=${POSTGRES_HOST};Username=otelu;Password=otelp;Database=${POSTGRES_DB}
+      - DB_CONNECTION_STRING=Host=${POSTGRES_HOST};Username=astronomy_user;Password=astronomy_password;Database=astronomy_db
       - OTEL_DOTNET_AUTO_TRACES_ENTITYFRAMEWORKCORE_INSTRUMENTATION_ENABLED=false
     depends_on:
       otel-collector:
@@ -504,13 +504,13 @@ services:
       - OTEL_SERVICE_NAME=product-catalog
       - OTEL_CONFIG_FILE=/otel-config.yml
       - OTEL_SEMCONV_STABILITY_OPT_IN=database
-      - DB_CONNECTION_STRING=postgres://otelu:otelp@${POSTGRES_HOST}/${POSTGRES_DB}?sslmode=disable
+      - DB_CONNECTION_STRING=postgres://astronomy_user:astronomy_password@${POSTGRES_HOST}/astronomy_db?sslmode=disable
     depends_on:
       otel-collector:
         condition: service_started
       flagd:
         condition: service_started
-      postgresql:
+      astronomy-db:
         condition: service_started
     volumes:
       - ./otel-config.yml:/otel-config.yml
@@ -541,7 +541,7 @@ services:
       - OTEL_SERVICE_NAME=product-reviews
       - OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
-      - DB_CONNECTION_STRING=host=${POSTGRES_HOST} user=otelu password=otelp dbname=${POSTGRES_DB}
+      - DB_CONNECTION_STRING=host=${POSTGRES_HOST} user=astronomy_user password=astronomy_password dbname=astronomy_db
       - LLM_BASE_URL
       - OPENAI_API_KEY
       - LLM_MODEL
@@ -555,7 +555,7 @@ services:
         condition: service_started
       llm:
         condition: service_started
-      postgresql:
+      astronomy-db:
         condition: service_started
       otel-collector:
         condition: service_started
@@ -778,21 +778,20 @@ services:
         condition: service_started
     logging: *logging
 
-  # Postgresql used by Accounting service
-  postgresql:
+  # PostgreSQL database for the astronomy demo
+  astronomy-db:
     image: ${POSTGRES_IMAGE}
-    container_name: postgresql
+    container_name: astronomy-db
     deploy:
       resources:
         limits:
           memory: 80M
     restart: unless-stopped
     ports:
       - ${POSTGRES_PORT}
+    command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
-      - POSTGRES_USER=root
       - POSTGRES_PASSWORD
-      - POSTGRES_DB
     volumes:
       - ./src/postgresql/init.sql:/docker-entrypoint-initdb.d/init.sql
     logging: *logging

src/otel-collector/otelcol-config.yml

@@ -24,8 +24,8 @@ receivers:
     api_version: "1.44"
   postgresql:
     endpoint: ${POSTGRES_HOST}:${POSTGRES_PORT}
-    username: root
-    password: ${POSTGRES_PASSWORD}
+    username: monitoring_user
+    password: monitoring_password
     metrics:
       postgresql.blks_hit:
         enabled: true

src/postgresql/init.sql

@@ -1,11 +1,28 @@
 -- Copyright The OpenTelemetry Authors
 -- SPDX-License-Identifier: Apache-2.0
 
-CREATE USER otelu WITH PASSWORD 'otelp';
+-- Enable pg_stat_statements in the default postgres database
+CREATE EXTENSION IF NOT EXISTS pg_stat_statements;
+
+-- Create application user
+CREATE USER astronomy_user WITH PASSWORD 'astronomy_password';
+
+-- Create application database
+CREATE DATABASE astronomy_db OWNER astronomy_user;
+
+-- Create monitoring user with pg_monitor role (visibility on all databases and schemas)
+CREATE USER monitoring_user WITH PASSWORD 'monitoring_password';
+GRANT pg_monitor TO monitoring_user;
+
+-- Switch to the application database
+\connect astronomy_db
+
+-- Enable pg_stat_statements in the application database
+CREATE EXTENSION IF NOT EXISTS pg_stat_statements;
 
 -- Accounting Service: create a schema
 CREATE SCHEMA accounting;
-GRANT USAGE ON SCHEMA accounting TO otelu;
+GRANT USAGE ON SCHEMA accounting TO astronomy_user;
 
 -- Accounting Service: create tables
 CREATE TABLE accounting."order" (
@@ -38,11 +55,11 @@ CREATE TABLE accounting.orderitem (
 );
 
 -- Accounting Service: grant permission to schema
-GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA accounting TO otelu;
+GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA accounting TO astronomy_user;
 
 -- Product Review Service: create a schema
 CREATE SCHEMA reviews;
-GRANT USAGE ON SCHEMA reviews TO otelu;
+GRANT USAGE ON SCHEMA reviews TO astronomy_user;
 
 -- Product Review Service: create tables
 CREATE TABLE reviews.productreviews (
@@ -57,7 +74,7 @@ CREATE TABLE reviews.productreviews (
 CREATE INDEX product_id_index ON reviews.productreviews (product_id);
 
 -- Product Review Service: grant permission to schema
-GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA reviews TO otelu;
+GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA reviews TO astronomy_user;
 
 -- Product Review Service:  add product review data
 INSERT INTO reviews.productreviews (product_id, username, description, score)
@@ -124,7 +141,7 @@ VALUES
 
 -- Product Catalog Service: create a schema
 CREATE SCHEMA catalog;
-GRANT USAGE ON SCHEMA catalog TO otelu;
+GRANT USAGE ON SCHEMA catalog TO astronomy_user;
 
 -- Product Catalog Service: create tables
 CREATE TABLE catalog.products (
@@ -139,7 +156,7 @@ CREATE TABLE catalog.products (
 );
 
 -- Product Catalog Service: grant permission to schema
-GRANT SELECT ON ALL TABLES IN SCHEMA catalog TO otelu;
+GRANT SELECT ON ALL TABLES IN SCHEMA catalog TO astronomy_user;
 
 -- Product Catalog Service: add product data
 INSERT INTO catalog.products (id, name, description, picture, price_currency_code, price_units, price_nanos, categories)
@@ -153,4 +170,4 @@ VALUES
     ('LS4PSXUNUM', 'Red Flashlight', 'This 3-in-1 device features a 3-mode red flashlight, a hand warmer, and a portable power bank for recharging your personal electronics on the go. Whether you use it to light the way at an astronomy star party, a night walk, or wildlife research, ThermoTorch 3 Astro Red''s rugged, IPX4-rated design will withstand your everyday activities.', 'RedFlashlight.jpg', 'USD', 57, 80000000, 'accessories,flashlights'),
     ('9SIQT8TOJO', 'Optical Tube Assembly', 'Capturing impressive deep-sky astroimages is easier than ever with Rowe-Ackermann Schmidt Astrograph (RASA) V2, the perfect companion to today''s top DSLR or astronomical CCD cameras. This fast, wide-field f/2.2 system allows for shorter exposure times compared to traditional f/10 astroimaging, without sacrificing resolution. Because shorter sub-exposure times are possible, your equatorial mount won''t need to accurately track over extended periods. The short focal length also lessens equatorial tracking demands. In many cases, autoguiding will not be required.', 'OpticalTubeAssembly.jpg', 'USD', 3599, 0, 'accessories,telescopes,assembly'),
     ('6E92ZMYYFZ', 'Solar Filter', 'Enhance your viewing experience with EclipSmart Solar Filter for 8" telescopes. With two Velcro straps and four self-adhesive Velcro pads for added safety, you can be assured that the solar filter cannot be accidentally knocked off and will provide Solar Safe, ISO compliant viewing.', 'SolarFilter.jpg', 'USD', 69, 950000000, 'accessories,telescopes'),
-    ('HQTGWGPNH4', 'The Comet Book', 'A 16th-century treatise on comets, created anonymously in Flanders (now northern France) and now held at the Universitätsbibliothek Kassel. Commonly known as The Comet Book (or Kometenbuch in German), its full title translates as "Comets and their General and Particular Meanings, According to Ptolomeé, Albumasar, Haly, Aliquind and other Astrologers". The image is from https://publicdomainreview.org/collection/the-comet-book, made available by the Universitätsbibliothek Kassel under a CC-BY SA 4.0 license (https://creativecommons.org/licenses/by-sa/4.0/)', 'TheCometBook.jpg', 'USD', 0, 990000000, 'books');
+    ('HQTGWGPNH4', 'The Comet Book', 'A 16th-century treatise on comets, created anonymously in Flanders (now northern France) and now held at the Universitätsbibliothek Kassel. Commonly known as The Comet Book (or Kometenbuch in German), its full title translates as "Comets and their General and Particular Meanings, According to Ptolomeé, Albumasar, Haly, Aliquind and other Astrologers". The image is from https://publicdomainreview.org/collection/the-comet-book, made available by the Universitätsbibliothek Kassel under a CC-BY SA 4.0 license (https://creativecommons.org/licenses/by-sa/4.0/)', 'TheCometBook.jpg', 'USD', 0, 990000000, 'books');