From 93c6843d70d27af714b33355f47e6c07a563fd11 Mon Sep 17 00:00:00 2001
From: mbonsack <mbonsack@splunk.com>
Date: Sun, 26 Jul 2020 20:22:16 -0700
Subject: [PATCH] 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
---
 package/Dockerfile                         |  2 +-
 package/goss.yaml                          | 20 --------------------
 package/{sbin/goss.yaml => goss.yaml.tmpl} |  6 +++---
 package/sbin/entrypoint.sh                 |  2 ++
 4 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 package/goss.yaml
 rename package/{sbin/goss.yaml => goss.yaml.tmpl} (76%)

diff --git a/package/Dockerfile b/package/Dockerfile
index b461c2b..33defae 100644
--- 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
deleted file mode 100644
index 83c913b..0000000
--- a/package/goss.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-#Splunk Connect for Syslog (SC4S) by Splunk, Inc.
-#
-#To the extent possible under law, the person who associated CC0 with
-#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights
-#to Splunk Connect for Syslog (SC4S).
-#
-#You should have received a copy of the CC0 legalcode along with this
-#work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-process:
-  syslog-ng:
-    running: true
-port:
-  tcp:514:
-    listening: true
-    ip:
-    - 0.0.0.0
-  udp:514:
-    listening: true
-    ip:
-    - 0.0.0.0
\ No newline at end of file
diff --git a/package/sbin/goss.yaml b/package/goss.yaml.tmpl
similarity index 76%
rename from package/sbin/goss.yaml
rename to package/goss.yaml.tmpl
index 7d1cd7d..fa08845 100644
--- a/package/sbin/goss.yaml
+++ b/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
index 9f6465f..92e68a9 100755
--- 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