Merge pull request #7 from NHSLeadership/develop

Change metrics port

Author: Tawmu

README.md

@@ -55,8 +55,8 @@ serving the same site and as such PHP sessions should be centralised. The defaul
 |CONTAINER_MODE | web, cron, or worker | web |
 |ATATUS_ENABLED | Boolean to enable or disable Atatus APM | false |
 |ATATUS_APM_LICENSE_KEY |Provides a licence key to enable the Atatus APM PHP module. Disabled Atatus APM if not set. | |
+|ATATUS_ENABLED | The name of the application to be passed to Atatus | "PHP App" |
 |REDIS_HOST | Provide the path to Redis for PHP session storage. | tcp://redis:6379 |
 |MAIL_RELAY | Set the SMTP mail host for the system's SSMTP mail relay service | outbound.kube-mail:25 |
-|APP_NAME | The name of the application to be passed to Atatus | "PHP App" |
 |APP_ENV | The name of the environment to be passed to Atatus | null |
-|APP_VERSION | The version of the app | null |
+|APP_VERSION | The version of the app | Set by the upstream container |

rootfs/entrypoint.sh

@@ -3,6 +3,8 @@ set -e
 
 # Startup logging
 echo "=== Container Startup ==="
+echo "App name: ${ATATUS_APP_NAME:app}"
+echo "App version: ${APP_VERSION:none}"
 echo "Container mode: ${CONTAINER_MODE:-web}"
 echo "Environment: ${APP_ENV:-production}"
 echo "Atatus: ${ATATUS_ENABLED:-false}"
@@ -26,7 +28,7 @@ cp /nhsla/ro/atatus.ini /nhsla/rw/atatus.ini
 if [ "${ATATUS_ENABLED:-false}" = "true" ] && [ ! -z "$ATATUS_APM_LICENSE_KEY" ]; then
   # If Atatus is enabled and API key set then configure Atatus
   sed -i -e "s/atatus.license_key = \"\"/atatus.license_key = \"$ATATUS_APM_LICENSE_KEY\"/g" /nhsla/rw/atatus.ini
-  sed -i -e "s/atatus.app_name = \"PHP App\"/atatus.app_name = \"$APP_NAME\"/g" /nhsla/rw/atatus.ini
+  sed -i -e "s/atatus.app_name = \"PHP App\"/atatus.app_name = \"$ATATUS_APP_NAME\"/g" /nhsla/rw/atatus.ini
   sed -i -e "s/atatus.release_stage = \"production\"/atatus.release_stage = \"$APP_ENV\"/g" /nhsla/rw/atatus.ini
   sed -i -e "s/atatus.app_version = \"\"/atatus.app_version = \"$APP_VERSION\"/g" /nhsla/rw/atatus.ini
 fi

rootfs/etc/frankenphp/Caddyfile

@@ -97,7 +97,7 @@
     php_server
 }
 
-:2019 {
+:9253 {
     handle /metrics {
         metrics
     }