Support 2 CPS instances in Prometheus/Grafana

- Specify both cps-and-ncmp instances in Prometheus config
- Add default JVM Micrometer dashboard to Grafana, taken from
  https://grafana.com/grafana/dashboards/4701-jvm-micrometer/

Issue-ID: CPS-2314
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I24a42b8b4771a7d9341e920fbd85fa72e1a3518e

1 files changed, 8 insertions, 6 deletions

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 5af325a50b..6b372c189c 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       POSTGRES_USER: ${DB_USERNAME:-cps}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-cps}
     volumes:
-      - ./postgres-init.sql:/docker-entrypoint-initdb.d/postgres-init.sql
+      - ./config/postgres-init.sql:/docker-entrypoint-initdb.d/postgres-init.sql
     deploy:
       resources:
         reservations:
@@ -79,8 +79,8 @@ services:
     depends_on:
       - cps-and-ncmp
     volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-      - ./proxy_params:/etc/nginx/proxy_params
+      - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./config/nginx/proxy_params:/etc/nginx/proxy_params
 
   ### if kafka is not required comment out zookeeper and kafka ###
   zookeeper:
@@ -158,26 +158,28 @@ services:
       - policy-executor-stub
 
   prometheus:
-    container_name: prometheus-container
+    container_name: prometheus
     image: prom/prometheus:latest
     ports:
       - 9090:9090
     restart: always
     volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./config/prometheus.yml:/etc/prometheus/prometheus.yml
     profiles:
       - monitoring
 
   grafana:
     image: grafana/grafana-oss:latest
     user: ""
-    container_name: grafana-container
+    container_name: grafana
     depends_on:
       prometheus:
         condition: service_started
     ports:
       - 3000:3000
     volumes:
+      - ./config/grafana/provisioning/:/etc/grafana/provisioning/
+      - ./config/grafana/jvm-micrometer-dashboard.json:/var/lib/grafana/dashboards/jvm-micrometer-dashboard.json
       - grafana:/var/lib/grafana
     environment:
       - GF_SECURITY_ADMIN_PASSWORD=admin