From 3b889b30870b4abafd63e21321639fd539da9693 Mon Sep 17 00:00:00 2001 From: Jack Rubacha Date: Sat, 27 Dec 2025 15:34:21 -0500 Subject: [PATCH 1/3] initial compose --- compose/compose.fake-data.yml | 33 ++++++++++++--------- compose/compose.router.yml | 53 +++++++++++++++++++--------------- compose/compose.yml | 9 +++--- siren-base/compose.grafana.yml | 14 +++++++++ 4 files changed, 69 insertions(+), 40 deletions(-) create mode 100644 siren-base/compose.grafana.yml diff --git a/compose/compose.fake-data.yml b/compose/compose.fake-data.yml index dc82bcd5..4f34df16 100644 --- a/compose/compose.fake-data.yml +++ b/compose/compose.fake-data.yml @@ -1,15 +1,22 @@ services: - scylla-server: # do not run scylla - entrypoint: ["echo", "DISABLED"] - restart: "no" - siren: - extends: - file: ../siren-base/compose.siren.yml - service: siren + scylla-server: # do not run scylla + entrypoint: ["echo", "DISABLED"] + restart: "no" + siren: + extends: + file: ../siren-base/compose.siren.yml + service: siren - calypso: - extends: - file: ./compose.calypso.yml - service: calypso - depends_on: - - siren \ No newline at end of file + grafana: + extends: + file: ../siren-base/compose.grafana.yml + service: grafana + depends_on: + - siren + + calypso: + extends: + file: ./compose.calypso.yml + service: calypso + depends_on: + - siren diff --git a/compose/compose.router.yml b/compose/compose.router.yml index c5b231e6..3d03bb77 100644 --- a/compose/compose.router.yml +++ b/compose/compose.router.yml @@ -1,27 +1,34 @@ services: - scylla-server: - depends_on: - - siren - environment: - - SCYLLA_SIREN_HOST_URL=siren:1883 - - SCYLLA_BATCH_UPSERT_TIME=20 - init: false + scylla-server: + depends_on: + - siren + environment: + - SCYLLA_SIREN_HOST_URL=siren:1883 + - SCYLLA_BATCH_UPSERT_TIME=20 + init: false - client: - extends: - file: ../angular-client/compose.client.yml - service: client + client: + extends: + file: ../angular-client/compose.client.yml + service: client - siren: - extends: - file: ../siren-base/compose.siren.yml - service: siren + grafana: + extends: + file: ../siren-base/compose.grafana.yml + service: client + depends_on: + - siren - siren-av: - network_mode: host - image: bluenviron/mediamtx:latest-ffmpeg - volumes: - - type: bind - source: ../siren-base/mediamtx.yml - target: /mediamtx.yml - read_only: true + siren: + extends: + file: ../siren-base/compose.siren.yml + service: siren + + siren-av: + network_mode: host + image: bluenviron/mediamtx:latest-ffmpeg + volumes: + - type: bind + source: ../siren-base/mediamtx.yml + target: /mediamtx.yml + read_only: true diff --git a/compose/compose.yml b/compose/compose.yml index a5b067bd..2dd75534 100644 --- a/compose/compose.yml +++ b/compose/compose.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.8" services: odyssey-db: @@ -7,14 +7,14 @@ services: restart: unless-stopped environment: POSTGRES_HOST_AUTH_METHOD: trust - command: + command: - "postgres" - "-c" - "shared_buffers=256MB" ports: - - 5432:5432 # Exposed for external access if needed + - 5432:5432 # Exposed for external access if needed expose: - - 5432 # Allow inter-container communication + - 5432 # Allow inter-container communication volumes: - db-data:/var/lib/postgresql/data cpu_shares: 1024 @@ -40,3 +40,4 @@ services: volumes: db-data: + grafana_storage: diff --git a/siren-base/compose.grafana.yml b/siren-base/compose.grafana.yml new file mode 100644 index 00000000..2ed8895a --- /dev/null +++ b/siren-base/compose.grafana.yml @@ -0,0 +1,14 @@ +services: + grafana: + image: grafana/grafana-oss + container_name: grafana + restart: unless-stopped + environment: + # increases the log level from info to debug + - GF_LOG_LEVEL=debug + - GF_PLUGINS_PREINSTALL=grafana-mqtt-datasource@@https://github.com/Northeastern-Electric-Racing/mqtt-datasource/releases/download/v1.2.0/grafana-mqtt-datasource-1.2.0.zip + - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=grafana-mqtt-datasource + ports: + - "3000:3000" + volumes: + - "grafana_storage:/var/lib/grafana" From cbf47eb8861d1239368d7ef41da3c881b3de443c Mon Sep 17 00:00:00 2001 From: Jack Rubacha Date: Sat, 27 Dec 2025 16:36:52 -0500 Subject: [PATCH 2/3] Change Grafana port mapping from 3000 to 3002 --- siren-base/compose.grafana.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siren-base/compose.grafana.yml b/siren-base/compose.grafana.yml index 2ed8895a..5f445c35 100644 --- a/siren-base/compose.grafana.yml +++ b/siren-base/compose.grafana.yml @@ -9,6 +9,6 @@ services: - GF_PLUGINS_PREINSTALL=grafana-mqtt-datasource@@https://github.com/Northeastern-Electric-Racing/mqtt-datasource/releases/download/v1.2.0/grafana-mqtt-datasource-1.2.0.zip - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=grafana-mqtt-datasource ports: - - "3000:3000" + - "3002:3000" volumes: - "grafana_storage:/var/lib/grafana" From 3aebc6c8dab6964d2437ee9e3ff9c5af6be1d356 Mon Sep 17 00:00:00 2001 From: Jack Rubacha Date: Sun, 4 Jan 2026 20:54:28 -0500 Subject: [PATCH 3/3] Change Grafana service reference in router config --- compose/compose.router.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/compose.router.yml b/compose/compose.router.yml index 3d03bb77..9a660e06 100644 --- a/compose/compose.router.yml +++ b/compose/compose.router.yml @@ -15,7 +15,7 @@ services: grafana: extends: file: ../siren-base/compose.grafana.yml - service: client + service: grafana depends_on: - siren