Merge branch '290-add-apm-monitoring-to-signald' into 'master'

[#290] Resolve "add basic APM monitoring to signald"

Closes #290

See merge request !324

.gitignore

@@ -65,3 +65,4 @@ grafana_data
 /nginx/vhost.d/prom.signalboost.info
 /splash/.env.dev
 /signald/jmx/jmxremote.password
+/nginx/vhost.d/signald.signalboost.info

docker-compose-dev.yml

@@ -43,9 +43,11 @@ services:
     image: signald
     container_name: signalboost_signald
     environment:
-      SIGNALD_VERBOSE_LOG: "${SIGNALD_VERBOSE_LOG:-0}"
+      SIGNALD_VERBOSE_LOG: ${SIGNALD_VERBOSE_LOG:-0}
     networks:
       - default
+    expose:
+      - ${SIGNALD_PORT}
     ports:
       - 9010:9010
     volumes:
@@ -64,12 +66,12 @@ services:
     entrypoint: /signalboost/bin/entrypoint/app
     env_file: .env.dev
     environment:
-      SIGNALBOOST_VERBOSE_LOG: "${SIGNALBOOST_VERBOSE_LOG:-0}"
-      PROJECT_ROOT: "$PWD"
-      NODE_ENV: "${NODE_ENV:-development}"
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE:-EN}"
-    ports:
-      - 3000:3000
+      SIGNALBOOST_VERBOSE_LOG: ${SIGNALBOOST_VERBOSE_LOG:-0}
+      PROJECT_ROOT: ${PWD}
+      NODE_ENV: ${NODE_ENV:-development}
+      DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE:-EN}
+    expose:
+      - ${SIGNALBOOST_PORT}
     networks:
       - default
     volumes:

docker-compose.yml

@@ -35,6 +35,9 @@ services:
     image: signald
     container_name: signalboost_signald
     environment:
+      VIRTUAL_HOST: ${SIGNALD_HOST_URL}
+      VIRTUAL_PORT: ${SIGNALD_PORT}
+      LETSENCRYPT_HOST: ${SIGNALD_HOST_URL}
       SIGNALBOOST_HOST_IP: ${SIGNALBOOST_HOST_IP}
       SIGNALD_VERBOSE_LOG: ${SIGNALD_VERBOSE_LOG:-0}
     ports:
@@ -59,12 +62,15 @@ services:
     entrypoint: /signalboost/bin/entrypoint/app
     env_file: .env
     environment:
-      SIGNALBOOST_VERBOSE_LOG: "${SIGNALBOOST_VERBOSE_LOG:-1}"
-      PROJECT_ROOT: "$PWD"
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE:-EN}"
+      VIRTUAL_HOST: ${SIGNALBOOST_HOST_URL}
+      VIRTUAL_PORT: ${SIGNALBOOST_PORT}
+      LETSENCRYPT_HOST: ${SIGNALBOOST_HOST_URL}
+      SIGNALBOOST_VERBOSE_LOG: ${SIGNALBOOST_VERBOSE_LOG:-1}
+      PROJECT_ROOT: $PWD
+      DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE:-EN}
       NODE_ENV: production
-    ports:
-      - 3000:3000
+    expose:
+      - ${SIGNALBOOST_PORT}
     networks:
       - proxy-tier
       - default

docker/signald.dockerfile

@@ -83,7 +83,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo
 # fork currently running on prod ---v
 ENV REPO_URL "https://0xacab.org/team-friendo/signald-fork.git"
 ENV BRANCH "master"
-ENV COMMIT_HASH "02d1e75b0053dd9ec021759cc5e458bd5c1112e5"
+ENV COMMIT_HASH "0ece4970980a5f4d768339fbe067baa6cc6f62a0"
 
 # fetch repo at desired commit
 RUN git init && \

keyrings/live/blackbox-files.txt

@@ -13,6 +13,7 @@ grafana/config/grafana.ini
 nginx/vhost.d/loki.signalboost.info
 nginx/vhost.d/metrics.signalboost.info
 nginx/vhost.d/prom.signalboost.info
+nginx/vhost.d/signald.signalboost.info
 prometheus/prometheus_dev.yml
 prometheus/prometheus_prod.yml
 signald/jmx/jmxremote.password