Merge branch 'master' into newDevelop

Arquisoft · Apr 30, 2024 · 88eb1a9 · 88eb1a9
2 parents 0361187 + 725d7b4
commit 88eb1a9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1,659 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -94,7 +94,6 @@ services:
       - "9090:9090"
     depends_on: 
       - gatewayservice
-
 
   grafana:
     image: ghcr.io/arquisoft/wiq_es05a/grafana:latest
@@ -105,7 +104,6 @@ services:
       - mynetwork
     volumes:
       - grafana_data:/var/lib/grafana
-      - ./gatewayservice/monitoring/grafana/provisioning:/etc/grafana/provisioning
     environment:
       - GF_SERVER_HTTP_PORT=9091
       - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER:-admin}

diff --git a/monitoring/grafana/Dockerfile b/monitoring/grafana/Dockerfile
@@ -1,6 +1,5 @@
 FROM grafana/grafana
 
 COPY provisioning/ /etc/grafana/provisioning/
-COPY grafana.ini /etc/grafana/grafana.ini
 
 CMD ["./bin/grafana"]