change ci prometheus path settings + scp of prometheus yml

.gitlab-ci.yml

@@ -115,6 +115,7 @@ docker-deploy-main-test:
   script:
     ## deploy the docker-compose file and use it to spin up the containers
     - scp -O -o StrictHostKeyChecking=no ldvspec/docker/docker-compose-dev-cd.yml sdc@dop814.astron.nl:/docker_compose/ldvspec/docker-compose-dev-cd.yml
+    - scp -O -o StrictHostKeyChecking=no ldvspec/docker/resources/prometheus-dev.yml sdc@dop814.astron.nl:/docker_compose/ldvspec/prometheus-dev.yml
     - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY"
     - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE:$DOCKER_IMAGE_TAG""
     - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p ldvspec -f /docker_compose/ldvspec/docker-compose-dev-cd.yml up -d --force-recreate"
@@ -158,6 +159,7 @@ docker-deploy-main-production:
   script:
     ## deploy the docker-compose file and use it to spin up the containers
     - scp -O -o StrictHostKeyChecking=no ldvspec/docker/docker-compose-production-cd.yml sdco@dop821.astron.nl:/opt/dockercompose/ldvspec/docker-compose-production-cd.yml
+    - scp -O -o StrictHostKeyChecking=no ldvspec/docker/resources/prometheus-prod.yml sdc@dop814.astron.nl:/docker_compose/ldvspec/prometheus-prod.yml
     - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY"
     - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker pull "$CI_REGISTRY_IMAGE:$DOCKER_IMAGE_TAG""
     - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p ldvspec -f /opt/dockercompose/ldvspec/docker-compose-production-cd.yml up -d --force-recreate"

ldvspec/docker/docker-compose-dev-cd.yml

@@ -63,7 +63,7 @@ services:
     image: prom/prometheus
     volumes:
       - prometheus_data:/prometheus
-      - ./resources/prometheus-dev.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus-dev.yml:/etc/prometheus/prometheus.yml
     ports:
       - "9090:9090"
     restart: unless-stopped

ldvspec/docker/docker-compose-production-cd.yml

@@ -31,7 +31,7 @@ services:
     image: prom/prometheus
     volumes:
       - prometheus_data:/prometheus
-      - ./resources/prometheus-prod.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus-prod.yml:/etc/prometheus/prometheus.yml
     ports:
       - "9090:9090"
     restart: unless-stopped