Avoid unitialized environment variables

Author: konradkonrad

docker-compose.yml

@@ -22,10 +22,9 @@ services:
       - SHUTTER_PUSH_METRICS_ENABLED=false
       - KEYPER_NAME=""
       - ETHEREUM_WS=""
-      - SHUTTER_PUSH_LOGS_ENABLED
-      - PUSHGATEWAY_USERNAME
-      - PUSHGATEWAY_PASSWORD
-      - HOSTNAME
+      - SHUTTER_PUSH_LOGS_ENABLED=false
+      - PUSHGATEWAY_USERNAME=""
+      - PUSHGATEWAY_PASSWORD=""
     volumes:
       - chain:/chain
       - keyper-config:/keyper/config

setup-wizard.yml

@@ -73,7 +73,7 @@ fields:
     target:
       type: environment
       name: PUSHGATEWAY_USERNAME
-      service: metrics
+      service: [metrics, shutter]
     required: false
     if: { enable_push_metrics: { "enum": ["true"] } }
 
@@ -84,7 +84,7 @@ fields:
     target:
       type: environment
       name: PUSHGATEWAY_PASSWORD
-      service: metrics
+      service: [metrics, shutter]
     required: false
     secret: true
     if: { enable_push_metrics: { "enum": ["true"] } }

shutter/promtail_config.yaml

@@ -20,7 +20,7 @@ scrape_configs:
       - localhost
      labels:
       job: configure
-      host: ${HOSTNAME}
+      host: ${KEYPER_NAME}
       __path__: /tmp/configure.log
 
  - job_name: keyper
@@ -31,7 +31,7 @@ scrape_configs:
       - localhost
      labels:
       job: keyper
-      host: ${HOSTNAME}
+      host: ${KEYPER_NAME}
       __path__: /tmp/keyper.log
 
  - job_name: chain
@@ -42,5 +42,5 @@ scrape_configs:
       - localhost
      labels:
       job: chain
-      host: ${HOSTNAME}
+      host: ${KEYPER_NAME}
       __path__: /tmp/chain.log

shutter/supervisord.conf

@@ -55,7 +55,7 @@ priority = 4
 autostart = %(ENV_SHUTTER_PUSH_LOGS_ENABLED)s
 startretries = 9999  ; A large number enough to cover node updates
 autorestart = %(ENV_SHUTTER_PUSH_LOGS_ENABLED)s
-environment = HOSTNAME="%(ENV_HOSTNAME)s",PUSHGATEWAY_USERNAME="%(ENV_PUSHGATEWAY_USERNAME)s",PUSHGATEWAY_PASSWORD="%(ENV_PUSHGATEWAY_PASSWORD)s",SHUTTER_PUSH_LOGS_ENABLED="%(ENV_SHUTTER_PUSH_LOGS_ENABLED)s"
+environment = KEYPER_NAME="%(ENV_KEYPER_NAME)s",PUSHGATEWAY_USERNAME="%(ENV_PUSHGATEWAY_USERNAME)s",PUSHGATEWAY_PASSWORD="%(ENV_PUSHGATEWAY_PASSWORD)s",SHUTTER_PUSH_LOGS_ENABLED="%(ENV_SHUTTER_PUSH_LOGS_ENABLED)s"
 stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 stderr_logfile = /dev/stderr