[+] improve docker compose files (#642)

* [+] add `postgresql-17-pg-qualstats` and `python3-psutil` to Postgres image
* [+] use `pgwatch metric print-init` to add test monitoring source
* [*] make Grafana use standard storage instead of Postgres

Author: pashagolub

docker/Dockerfile.postgres-plpython3u

@@ -2,7 +2,8 @@ FROM postgres:17
 
 # Install the necessary packages for plpython3u
 RUN apt-get update && apt-get install -y \
-    postgresql-plpython3-17 pg-activity
+    postgresql-plpython3-17 postgresql-17-pg-qualstats python3-psutil \
+    pg-activity
 
 # Clean up
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*

docker/bootstrap/create_role_db.sql

@@ -4,6 +4,4 @@ CREATE ROLE pgwatch WITH
 
 CREATE DATABASE pgwatch OWNER pgwatch;
 
-CREATE DATABASE pgwatch_grafana OWNER pgwatch;
-
 CREATE DATABASE pgwatch_metrics OWNER pgwatch;

docker/compose.add-test-db.sh

@@ -2,17 +2,13 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-docker compose exec postgres psql -d pgwatch -v ON_ERROR_STOP=1 -c \
-"CREATE EXTENSION IF NOT EXISTS pg_stat_statements; 
-CREATE EXTENSION IF NOT EXISTS plpython3u; 
-CREATE FUNCTION get_load_average(OUT load_1min float, OUT load_5min float, OUT load_15min float) AS ' 
-  from os import getloadavg 
-  la = getloadavg() 
-  return [la[0], la[1], la[2]]' 
-LANGUAGE plpython3u VOLATILE; 
-GRANT EXECUTE ON FUNCTION get_load_average() TO pgwatch; 
-GRANT EXECUTE ON FUNCTION pg_stat_file(text) TO pgwatch; 
-GRANT EXECUTE ON FUNCTION pg_stat_file(text, boolean) TO pgwatch; 
-INSERT INTO pgwatch.source (name, preset_config, connstr) 
-  SELECT 'demo', 'exhaustive', 'postgresql://pgwatch:pgwatchadmin@postgres/pgwatch' 
+export MSYS_NO_PATHCONV=1
+
+# We want to pipe the output of the `pgwatch metric print-init` command to the `psql` command
+docker compose exec -T pgwatch /pgwatch/pgwatch metric print-init full | \
+docker compose exec -T -i postgres psql -d pgwatch -v ON_ERROR_STOP=1
+
+docker compose exec -T postgres psql -d pgwatch -v ON_ERROR_STOP=1 -c \
+"INSERT INTO pgwatch.source (name, preset_config, connstr) 
+  SELECT 'demo', 'full', 'postgresql://pgwatch:pgwatchadmin@postgres/pgwatch' 
   WHERE NOT EXISTS (SELECT * FROM pgwatch.source WHERE name = 'demo')"

docker/compose.grafana.yml

@@ -4,12 +4,6 @@ services:
     image: grafana/grafana:10.4.7
     user: "0:0"
     environment:
-      GF_DATABASE_TYPE: postgres
-      GF_DATABASE_HOST: postgres:5432
-      GF_DATABASE_NAME: pgwatch_grafana
-      GF_DATABASE_USER: pgwatch
-      GF_DATABASE_PASSWORD: pgwatchadmin
-      GF_DATABASE_SSL_MODE: disable
       GF_AUTH_ANONYMOUS_ENABLED: true
       GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH: /var/lib/grafana/dashboards/1-global-db-overview.json
       GF_INSTALL_PLUGINS: marcusolsson-treemap-panel