Update healthcheck to use configured default ports (#585)

* Update healthcheck (goss) to use default configured ports * gomplate on the `goss.yaml` file to check env vars
CSVD · Jul 27, 2020 · 93c6843 · 93c6843
1 parent 3d903c7
commit 93c6843
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -11,7 +11,7 @@ FROM splunk/scs:base-${BRANCH}
 
 COPY --from=hairyhenderson/gomplate:v3.5.0 /gomplate /usr/local/bin/gomplate
 
-COPY goss.yaml goss.yaml
+COPY goss.yaml.tmpl goss.yaml.tmpl
 
 COPY etc/syslog-ng.conf.tmpl /opt/syslog-ng/etc/syslog-ng.conf.tmpl
 COPY etc/conf.d /opt/syslog-ng/etc/conf.d

diff --git a/package/goss.yaml b/package/goss.yaml
diff --git a/package/sbin/goss.yaml → package/goss.yaml.tmpl b/package/sbin/goss.yaml → package/goss.yaml.tmpl
@@ -10,15 +10,15 @@ process:
   syslog-ng:
     running: true
 port:
-  tcp:514:
+  tcp:{{- getenv "SC4S_LISTEN_DEFAULT_TCP_PORT" "514" }}:
     listening: true
     ip:
     - 0.0.0.0
-  udp:514:
+  udp:{{- getenv "SC4S_LISTEN_DEFAULT_UDP_PORT" "514" }}:
     listening: true
     ip:
     - 0.0.0.0
-  tcp:6514:
+  tcp:{{- getenv "SC4S_LISTEN_DEFAULT_TLS_PORT" "6514" }}:
     listening: true
     ip:
     - 0.0.0.0
diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh
@@ -105,7 +105,9 @@ echo sc4s version=$(cat /VERSION)
 echo sc4s version=$(cat /VERSION) >/opt/syslog-ng/var/log/syslog-ng.out
 /opt/syslog-ng/sbin/syslog-ng -s >>/opt/syslog-ng/var/log/syslog-ng.out 2>/opt/syslog-ng/var/log/syslog-ng.err
 
+# Use gomplate to pick up default listening ports for health check
 echo starting goss
+gomplate --file /goss.yaml.tmpl --out /goss.yaml
 goss -g /goss.yaml serve --format json >/dev/null &
 
 echo syslog-ng starting