From 2edef24893b6c0e1ebaa261feb1c9faec8a8ddd2 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Sat, 22 Nov 2025 13:30:13 +0000 Subject: [PATCH 1/4] Update Grafana dashboard and Docker Compose configuration - Consolidated Grafana dashboards into `EDDI_Dashboard.json` with corrected metric names (adding `eddi_` prefix). - Verified that `eddi_conversation_start_count_total` is a valid metric backed by an explicit Counter in `RestBotEngine.java`, used for "Throughput" stats. - Updated `docker-compose.yml` (formerly `monitoring.yml`) to use `labsai/eddi:latest` and `grafana/grafana:12.3.0`. - Cleaned up obsolete dashboard files. - Consolidated docker compose files to a single `docker-compose.yml` for the full stack. --- docker-compose.monitoring.yml | 51 -- docker-compose.yml | 41 +- ...arkus_Metrics.json => EDDI_Dashboard.json} | 36 +- grafana/dashboards/EDDI_Metrics.json | 513 ------------------ 4 files changed, 52 insertions(+), 589 deletions(-) delete mode 100644 docker-compose.monitoring.yml rename grafana/dashboards/{EDDI_Quarkus_Metrics.json => EDDI_Dashboard.json} (98%) delete mode 100644 grafana/dashboards/EDDI_Metrics.json diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml deleted file mode 100644 index 5bb01e4e..00000000 --- a/docker-compose.monitoring.yml +++ /dev/null @@ -1,51 +0,0 @@ -services: - eddi: - build: - context: . - dockerfile: "./src/main/docker/Dockerfile.jvm" - # image: labsai/eddi:latest - # environment: - # - "JAVA_OPTS_APPEND=-Dquarkus.http.cors.origins=http://localhost:3000" - ports: - - "7070:7070" - depends_on: - - mongodb - networks: - - monitoring - - prometheus: - image: prom/prometheus - volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml - ports: - - "9090:9090" - networks: - - monitoring - - grafana: - image: grafana/grafana - ports: - - "3000:3000" - volumes: - - ./grafana-datastore:/var/lib/grafana - - ./grafana/provisioning:/etc/grafana/provisioning - - ./grafana/dashboards:/var/lib/grafana/dashboards - environment: - - GF_SECURITY_ADMIN_PASSWORD=secret - networks: - - monitoring - - mongodb: - image: mongo:7.0 - restart: always - volumes: - - mongodb-datastore:/data/db - networks: - - monitoring - -volumes: - grafana-datastore: - mongodb-datastore: - -networks: - monitoring: diff --git a/docker-compose.yml b/docker-compose.yml index 8059f76f..96f6c5cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,46 @@ services: eddi: image: labsai/eddi:latest -# environment: -# - "JAVA_OPTS_APPEND=-Dquarkus.http.cors.origins=http://localhost:3000" ports: - "7070:7070" - - "7443:7443" -# - "5005:5005" depends_on: - mongodb + networks: + - monitoring + + prometheus: + image: prom/prometheus + volumes: + - ./prometheus.yml:/etc/prometheus/prometheus.yml + ports: + - "9090:9090" + networks: + - monitoring + + grafana: + image: grafana/grafana:12.3.0 + ports: + - "3000:3000" + volumes: + - grafana-datastore:/var/lib/grafana + - ./grafana/provisioning:/etc/grafana/provisioning + - ./grafana/dashboards:/var/lib/grafana/dashboards + environment: + - GF_SECURITY_ADMIN_PASSWORD=secret + networks: + - monitoring + mongodb: - image: mongo:5.0 + image: mongo:7.0 restart: always volumes: - - mongodb-data:/data/db + - mongodb-datastore:/data/db + networks: + - monitoring volumes: - mongodb-data: + grafana-datastore: + mongodb-datastore: + +networks: + monitoring: diff --git a/grafana/dashboards/EDDI_Quarkus_Metrics.json b/grafana/dashboards/EDDI_Dashboard.json similarity index 98% rename from grafana/dashboards/EDDI_Quarkus_Metrics.json rename to grafana/dashboards/EDDI_Dashboard.json index 9df9d3fe..5f325455 100644 --- a/grafana/dashboards/EDDI_Quarkus_Metrics.json +++ b/grafana/dashboards/EDDI_Dashboard.json @@ -84,7 +84,7 @@ "type": "timeseries", "targets": [ { - "expr": "sum(rate(conversation_processing_duration_seconds_sum[1m])) by (job) / sum(rate(conversation_processing_duration_seconds_count[1m])) by (job)", + "expr": "sum(rate(eddi_conversation_processing_duration_seconds_sum[1m])) by (job) / sum(rate(eddi_conversation_processing_duration_seconds_count[1m])) by (job)", "legendFormat": "Avg Duration", "refId": "A" } @@ -123,7 +123,7 @@ "type": "timeseries", "targets": [ { - "expr": "sum(rate(conversation_start_duration_seconds_sum[1m])) by (job) / sum(rate(conversation_start_duration_seconds_count[1m])) by (job)", + "expr": "sum(rate(eddi_conversation_start_duration_seconds_sum[1m])) by (job) / sum(rate(eddi_conversation_start_duration_seconds_count[1m])) by (job)", "legendFormat": "Avg Duration", "refId": "B" } @@ -152,7 +152,7 @@ "type": "timeseries", "targets": [ { - "expr": "sum(rate(conversation_load_duration_seconds_sum[1m])) by (job) / sum(rate(conversation_load_duration_seconds_count[1m])) by (job)", + "expr": "sum(rate(eddi_conversation_load_duration_seconds_sum[1m])) by (job) / sum(rate(eddi_conversation_load_duration_seconds_count[1m])) by (job)", "legendFormat": "Avg Duration", "refId": "C" } @@ -254,7 +254,7 @@ }, "targets": [ { - "expr": "conversation_start_duration_seconds_sum / conversation_start_duration_seconds_count", + "expr": "eddi_conversation_start_duration_seconds_sum / eddi_conversation_start_duration_seconds_count", "legendFormat": "Avg Duration", "refId": "A" } @@ -309,12 +309,12 @@ "pluginVersion": "11.0.0", "targets": [ { - "expr": "conversation_load_total", + "expr": "sum(increase(eddi_conversation_load_count_total[1m]))", "legendFormat": "Count", "refId": "E" } ], - "title": "Conversation Load Count", + "title": "Conversations Loaded (1m)", "type": "stat" }, { @@ -395,7 +395,7 @@ }, "targets": [ { - "expr": "conversation_load_duration_seconds_sum / conversation_load_duration_seconds_count", + "expr": "eddi_conversation_load_duration_seconds_sum / eddi_conversation_load_duration_seconds_count", "legendFormat": "Avg Duration", "refId": "B" } @@ -481,7 +481,7 @@ }, "targets": [ { - "expr": "conversation_processing_duration_seconds_sum / conversation_processing_duration_seconds_count", + "expr": "eddi_conversation_processing_duration_seconds_sum / eddi_conversation_processing_duration_seconds_count", "legendFormat": "Avg Duration", "refId": "C" } @@ -536,12 +536,12 @@ "pluginVersion": "11.0.0", "targets": [ { - "expr": "conversation_start_total", + "expr": "sum(increase(eddi_conversation_start_count_total[1m]))", "legendFormat": "Count", "refId": "D" } ], - "title": "Conversation Start Count", + "title": "Conversations Started (1m)", "type": "stat" }, { @@ -591,12 +591,12 @@ "pluginVersion": "11.0.0", "targets": [ { - "expr": "conversation_processing_total", + "expr": "sum(increase(eddi_conversation_processing_count_total[1m]))", "legendFormat": "Count", "refId": "F" } ], - "title": "Conversation Processing Count", + "title": "Conversations Processed (1m)", "type": "stat" }, { @@ -699,7 +699,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "conversation_start_seconds_count", + "expr": "eddi_conversation_start_duration_seconds_count", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -799,7 +799,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "conversation_processing_seconds_sum", + "expr": "eddi_conversation_processing_duration_seconds_sum", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -899,7 +899,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "conversation_load_seconds_count", + "expr": "eddi_conversation_load_duration_seconds_count", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -998,7 +998,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "conversation_processing_seconds_count", + "expr": "eddi_conversation_processing_duration_seconds_count", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -4735,8 +4735,8 @@ ] }, "timezone": "browser", - "title": "EDDI - Quarkus - Metrics", - "uid": "pmacxmnlAk__", + "title": "EDDI Consolidated Dashboard", + "uid": "eddi-dashboard", "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/grafana/dashboards/EDDI_Metrics.json b/grafana/dashboards/EDDI_Metrics.json deleted file mode 100644 index d91770ec..00000000 --- a/grafana/dashboards/EDDI_Metrics.json +++ /dev/null @@ -1,513 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "description": "Dashboard for EDDI Chatbot Platform", - "editable": true, - "gnetId": null, - "graphTooltip": 0, - "id": null, - "iteration": 1623513495842, - "links": [], - "panels": [ - { - "collapsed": false, - "datasource": "prometheus", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 1, - "panels": [], - "title": "Conversation Metrics", - "type": "row" - }, - { - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "decimals": 2, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - } - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 1 - }, - "id": 2, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "center", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "value" - }, - "pluginVersion": "7.5.6", - "targets": [ - { - "expr": "sum(increase(eddi_conversation_start_total[1m]))", - "format": "time_series", - "instant": true, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversations Started", - "refId": "A" - } - ], - "title": "Conversations Started", - "type": "stat" - }, - { - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "decimals": 2, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - } - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 1 - }, - "id": 3, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "center", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "value" - }, - "pluginVersion": "7.5.6", - "targets": [ - { - "expr": "sum(increase(eddi_conversation_start_duration_nanoseconds[1m]))", - "format": "time_series", - "instant": true, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversation Start Duration", - "refId": "A" - } - ], - "title": "Conversation Start Duration", - "type": "stat" - }, - { - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "decimals": 2, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - } - }, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 9 - }, - "id": 4, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "center", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "value" - }, - "pluginVersion": "7.5.6", - "targets": [ - { - "expr": "sum(increase(eddi_conversation_load_total[1m]))", - "format": "time_series", - "instant": true, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversations Loaded", - "refId": "A" - } - ], - "title": "Conversations Loaded", - "type": "stat" - }, - { - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "decimals": 2, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - } - }, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 17 - }, - "id": 5, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "center", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "value" - }, - "pluginVersion": "7.5.6", - "targets": [ - { - "expr": "sum(increase(eddi_conversation_load_duration_nanoseconds[1m]))", - "format": "time_series", - "instant": true, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversation Load Duration", - "refId": "A" - } - ], - "title": "Conversation Load Duration", - "type": "stat" - }, - { - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "decimals": 2, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - } - }, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 25 - }, - "id": 6, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "center", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "value" - }, - "pluginVersion": "7.5.6", - "targets": [ - { - "expr": "sum(increase(eddi_conversation_processing_total[1m]))", - "format": "time_series", - "instant": true, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversations Processed", - "refId": "A" - } - ], - "title": "Conversations Processed", - "type": "stat" - }, - { - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "decimals": 2, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - } - }, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 33 - }, - "id": 7, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "center", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "value" - }, - "pluginVersion": "7.5.6", - "targets": [ - { - "expr": "sum(increase(eddi_conversation_processing_duration_nanoseconds[1m]))", - "format": "time_series", - "instant": true, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversation Processing Duration", - "refId": "A" - } - ], - "title": "Conversation Processing Duration", - "type": "stat" - }, - { - "datasource": "prometheus", - "gridPos": { - "h": 9, - "w": 24, - "x": 0, - "y": 41 - }, - "id": 8, - "options": { - "tooltip": { - "mode": "single" - } - }, - "targets": [ - { - "expr": "sum(increase(eddi_conversation_start_total[1m]))", - "format": "time_series", - "instant": false, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversations Started", - "refId": "A" - }, - { - "expr": "sum(increase(eddi_conversation_load_total[1m]))", - "format": "time_series", - "instant": false, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversations Loaded", - "refId": "B" - }, - { - "expr": "sum(increase(eddi_conversation_processing_total[1m]))", - "format": "time_series", - "instant": false, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversations Processed", - "refId": "C" - } - ], - "title": "Conversation Counts Over Time", - "type": "timeseries" - }, - { - "datasource": "prometheus", - "gridPos": { - "h": 9, - "w": 24, - "x": 0, - "y": 50 - }, - "id": 9, - "options": { - "tooltip": { - "mode": "single" - } - }, - "targets": [ - { - "expr": "sum(increase(eddi_conversation_start_duration_nanoseconds[1m]))", - "format": "time_series", - "instant": false, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversation Start Duration", - "refId": "A" - }, - { - "expr": "sum(increase(eddi_conversation_load_duration_nanoseconds[1m]))", - "format": "time_series", - "instant": false, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversation Load Duration", - "refId": "B" - }, - { - "expr": "sum(increase(eddi_conversation_processing_duration_nanoseconds[1m]))", - "format": "time_series", - "instant": false, - "interval": "", - "intervalFactor": 2, - "legendFormat": "Conversation Processing Duration", - "refId": "C" - } - ], - "title": "Conversation Durations Over Time", - "type": "timeseries" - } - ], - "refresh": "5s", - "schemaVersion": 27, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-6h", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "30m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "", - "title": "EDDI Chatbot Platform Metrics", - "uid": "eddi-chatbot-dashboard", - "version": 1 -} \ No newline at end of file From 8be1b6c18acbd620d594fe005890349876306687 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Sat, 22 Nov 2025 14:12:34 +0000 Subject: [PATCH 2/4] Update Grafana dashboard and Docker Compose configuration - Consolidated Grafana dashboards into `EDDI_Dashboard.json` with corrected metric names (adding `eddi_` prefix). - Verified that `eddi_conversation_start_count_total` is a valid metric backed by an explicit Counter in `RestBotEngine.java`, used for "Throughput" stats. - Updated `docker-compose.yml` (formerly `monitoring.yml`) to use `labsai/eddi:latest` and `grafana/grafana:12.3.0`. - Containerized Prometheus and Grafana configuration files into custom Docker images to fix volume mount issues in CI environments. - Cleaned up obsolete dashboard files. - Consolidated docker compose files to a single `docker-compose.yml` for the full stack. --- docker-compose.yml | 12 ++++++------ docker/grafana/Dockerfile | 4 ++++ docker/prometheus/Dockerfile | 2 ++ grafana/provisioning/dashboards/dashboards.yml | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 docker/grafana/Dockerfile create mode 100644 docker/prometheus/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 96f6c5cf..cefab9ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,22 +9,22 @@ services: - monitoring prometheus: - image: prom/prometheus - volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml + build: + context: . + dockerfile: docker/prometheus/Dockerfile ports: - "9090:9090" networks: - monitoring grafana: - image: grafana/grafana:12.3.0 + build: + context: . + dockerfile: docker/grafana/Dockerfile ports: - "3000:3000" volumes: - grafana-datastore:/var/lib/grafana - - ./grafana/provisioning:/etc/grafana/provisioning - - ./grafana/dashboards:/var/lib/grafana/dashboards environment: - GF_SECURITY_ADMIN_PASSWORD=secret networks: diff --git a/docker/grafana/Dockerfile b/docker/grafana/Dockerfile new file mode 100644 index 00000000..8e06289f --- /dev/null +++ b/docker/grafana/Dockerfile @@ -0,0 +1,4 @@ +FROM grafana/grafana:12.3.0 + +COPY grafana/provisioning /etc/grafana/provisioning +COPY grafana/dashboards /etc/grafana/dashboards diff --git a/docker/prometheus/Dockerfile b/docker/prometheus/Dockerfile new file mode 100644 index 00000000..6c0cfee2 --- /dev/null +++ b/docker/prometheus/Dockerfile @@ -0,0 +1,2 @@ +FROM prom/prometheus +COPY prometheus.yml /etc/prometheus/prometheus.yml diff --git a/grafana/provisioning/dashboards/dashboards.yml b/grafana/provisioning/dashboards/dashboards.yml index e6d4aa3a..3bad7b65 100644 --- a/grafana/provisioning/dashboards/dashboards.yml +++ b/grafana/provisioning/dashboards/dashboards.yml @@ -8,4 +8,4 @@ providers: disableDeletion: false updateIntervalSeconds: 10 options: - path: /var/lib/grafana/dashboards + path: /etc/grafana/dashboards From a6d2a5bbe26563539d1e71819cf3ea9d5dbccfb2 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Sat, 22 Nov 2025 14:33:16 +0000 Subject: [PATCH 3/4] Update Grafana dashboard and Docker Compose configuration - Consolidated Grafana dashboards into `EDDI_Dashboard.json` with corrected metric names (adding `eddi_` prefix). - Updated `docker-compose.yml` (formerly `monitoring.yml`) to use `labsai/eddi:latest` and `grafana/grafana:12.3.0`. - Containerized Prometheus and Grafana configuration files into custom Docker images to fix volume mount issues in CI environments. - Updated `.dockerignore` to include necessary Grafana and Docker configuration files in the build context. - Cleaned up obsolete dashboard files. - Consolidated docker compose files to a single `docker-compose.yml` for the full stack. --- .dockerignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.dockerignore b/.dockerignore index c4be31c5..c525f14a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,3 +4,8 @@ !target/lib/* !target/quarkus-app/* !licenses/* +!grafana/* +!grafana/dashboards/* +!grafana/provisioning/* +!docker/* +!prometheus.yml From 1bd58975f7ce31e34ed9c58db223c5c45f1d3188 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Sat, 22 Nov 2025 14:56:37 +0000 Subject: [PATCH 4/4] Update Grafana dashboard and Docker Compose configuration - Consolidated Grafana dashboards into `EDDI_Dashboard.json` with corrected metric names (adding `eddi_` prefix). - Updated `docker-compose.yml` (formerly `monitoring.yml`) to use `labsai/eddi:latest` and `grafana/grafana:12.3.0`. - Containerized Prometheus and Grafana configuration files into custom Docker images to fix volume mount issues in CI environments. - Updated `.dockerignore` to include necessary Grafana and Docker configuration files in the build context. - Removed explicit `networks` configuration in `docker-compose.yml` to allow all services to run on the default network, ensuring compatibility with `docker-compose.testing.yml` and integration tests. - Cleaned up obsolete dashboard files. - Consolidated docker compose files to a single `docker-compose.yml` for the full stack. --- docker-compose.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cefab9ea..2b995a08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,6 @@ services: - "7070:7070" depends_on: - mongodb - networks: - - monitoring prometheus: build: @@ -14,8 +12,6 @@ services: dockerfile: docker/prometheus/Dockerfile ports: - "9090:9090" - networks: - - monitoring grafana: build: @@ -27,20 +23,13 @@ services: - grafana-datastore:/var/lib/grafana environment: - GF_SECURITY_ADMIN_PASSWORD=secret - networks: - - monitoring mongodb: image: mongo:7.0 restart: always volumes: - mongodb-datastore:/data/db - networks: - - monitoring volumes: grafana-datastore: mongodb-datastore: - -networks: - monitoring: