Add more observability toolings

Makefile

@@ -108,12 +108,15 @@ postgres-%: postgres-configure-% \
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_buffercache install
 	+@echo "Compiling pageinspect $*"
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pageinspect install
+	+@echo "Compiling pg_stat_statements $*"
+	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_stat_statements install
 
 .PHONY: postgres-clean-%
 postgres-clean-%:
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$* MAKELEVEL=0 clean
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_buffercache clean
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pageinspect clean
+	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_stat_statements clean
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/src/interfaces/libpq clean
 
 .PHONY: neon-pg-ext-%

docker-compose/docker-compose-multi-region.yml

@@ -90,6 +90,12 @@ services:
       - source: prometheus
         target: /etc/prometheus/prometheus.yml
 
+  grafana:
+    restart: always
+    image: grafana/grafana-oss:latest
+    ports:
+      - 3000:3000
+
   #############################################
   #                 REGION 0                  #
   #############################################
@@ -266,6 +272,19 @@ services:
           - node.labels.has_compute==true
           - node.labels.region==0
 
+  compute-metrics-exporter-r0: &compute-metrics-exporter
+    restart: always
+    image: quay.io/prometheuscommunity/postgres-exporter:master
+    environment:
+      - DATA_SOURCE_NAME=postgresql://cloud_admin@compute-r0:55432/postgres?sslmode=disable
+    depends_on:
+      - compute-r0
+    deploy:
+      placement:
+        constraints:
+          - node.labels.has_compute==true
+          - node.labels.region==0
+
   #############################################
   #                 REGION 1                  #
   #############################################
@@ -377,6 +396,18 @@ services:
           - node.labels.has_compute==true
           - node.labels.region==1
 
+  compute-metrics-exporter-r1:
+    <<: *compute-metrics-exporter
+    environment:
+      - DATA_SOURCE_NAME=postgresql://cloud_admin@compute-r1:55432/postgres?sslmode=disable
+    depends_on:
+      - compute-r1
+    deploy:
+      placement:
+        constraints:
+          - node.labels.has_compute==true
+          - node.labels.region==1
+
   #############################################
   #                 REGION 2                  #
   #############################################
@@ -488,6 +519,18 @@ services:
           - node.labels.has_compute==true
           - node.labels.region==2
 
+  compute-metrics-exporter-r2:
+    <<: *compute-metrics-exporter
+    environment:
+      - DATA_SOURCE_NAME=postgresql://cloud_admin@compute-r2:55432/postgres?sslmode=disable
+    depends_on:
+      - compute-r2
+    deploy:
+      placement:
+        constraints:
+          - node.labels.has_compute==true
+          - node.labels.region==2
+
   #############################################
   #                 REGION 3                  #
   #############################################
@@ -598,3 +641,15 @@ services:
         constraints:
           - node.labels.has_compute==true
           - node.labels.region==3
+
+  compute-metrics-exporter-r3:
+    <<: *compute-metrics-exporter
+    environment:
+      - DATA_SOURCE_NAME=postgresql://cloud_admin@compute-r3:55432/postgres?sslmode=disable
+    depends_on:
+      - compute-r3
+    deploy:
+      placement:
+        constraints:
+          - node.labels.has_compute==true
+          - node.labels.region==3

docker-compose/prometheus.yml

@@ -1,14 +1,33 @@
 global:
-  scrape_interval:     5s # By default, scrape targets every 5 seconds.
+  scrape_interval: 5s # By default, scrape targets every 5 seconds.
 
 # A scrape configuration containing exactly one endpoint to scrape:
 # Here it's Prometheus itself.
 scrape_configs:
   # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
   - job_name: 'xactserver'
-
     # Override the global default and scrape targets from this job every second.
     scrape_interval: 1s
+    static_configs:
+      - targets: 
+        - 'xactserver-r0:8080'
+        - 'xactserver-r1:8080'
+        - 'xactserver-r2:8080'
+        - 'xactserver-r3:8080'
+
+  - job_name: 'pageserver'
+    scrape_interval: 2s
+    static_configs:
+      - targets:
+        - 'pageserver-r0:9898'
+        - 'pageserver-r1:9898'
+        - 'pageserver-r2:9898'
+        - 'pageserver-r3:9898'
 
+  - job_name: 'compute'
     static_configs:
-      - targets: ['xactserver-r1:8080', 'xactserver-r2:8080', 'xactserver-r3:8080']
+      - targets:
+        - 'compute-metrics-exporter-r0:9187'
+        - 'compute-metrics-exporter-r1:9187'
+        - 'compute-metrics-exporter-r2:9187'
+        - 'compute-metrics-exporter-r3:9187'