From 1f6251461543b09684841515f16cd1d3aa5c8623 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Tue, 7 Apr 2020 20:39:00 -0400 Subject: [PATCH 1/4] Update vendor_product_by_source.csv.example --- .../etc/context_templates/vendor_product_by_source.csv.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/etc/context_templates/vendor_product_by_source.csv.example b/package/etc/context_templates/vendor_product_by_source.csv.example index 0ea93b5..86ece07 100644 --- a/package/etc/context_templates/vendor_product_by_source.csv.example +++ b/package/etc/context_templates/vendor_product_by_source.csv.example @@ -1,6 +1,6 @@ f_test_test,sc4s_vendor_product,"test_test" f_brocade_syslog,sc4s_vendor_product,"brocade_syslog" -f_null_queue,sc4s_vendor_product,"catch_first" +f_null_queue,sc4s_vendor_product,"null_queue" f_cisco_meraki,sc4s_vendor_product,"cisco_meraki" f_citrix_netscaler,sc4s_vendor_product,"citrix_netscaler" f_dell_rsa_secureid,sc4s_vendor_product,"dell_rsa_secureid" From af13c5351e88787df9c94b28d453df6d34b7c26e Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Tue, 7 Apr 2020 20:41:11 -0400 Subject: [PATCH 2/4] Resolve double -F --- package/sbin/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh index c3bfa26..5381f3d 100755 --- a/package/sbin/entrypoint.sh +++ b/package/sbin/entrypoint.sh @@ -54,7 +54,7 @@ echo sc4s version=$(cat /VERSION) >/opt/syslog-ng/var/log/syslog-ng.out echo syslog-ng starting /opt/syslog-ng/bin/persist-tool add /opt/syslog-ng/etc/reset_persist -o /opt/syslog-ng/var -/opt/syslog-ng/sbin/syslog-ng -F $@ & +/opt/syslog-ng/sbin/syslog-ng $@ & pid="$!" # wait forever while true From c836d0685759a22fd25acb5c1b09f645df7bc797 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Tue, 7 Apr 2020 20:48:39 -0400 Subject: [PATCH 3/4] Update source_network.t --- package/etc/go_templates/source_network.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/etc/go_templates/source_network.t b/package/etc/go_templates/source_network.t index 6d7a6d3..63ec329 100644 --- a/package/etc/go_templates/source_network.t +++ b/package/etc/go_templates/source_network.t @@ -24,7 +24,7 @@ source s_{{ .port_id }} { source { {{- if or (getenv (print "SC4S_LISTEN_" .port_id "_UDP_PORT")) (eq .port_id "DEFAULT") }} {{- $port_id := .port_id }} -{{- range (math.Seq (getenv "SC4S_SOURCE_LISTEN_UDP_SOCKETS" "5"))}} +{{- range (math.Seq (getenv "SC4S_SOURCE_LISTEN_UDP_SOCKETS" "1"))}} {{- $context := dict "instance" . "port_id" $port_id }} {{- template "UDP" $context }} {{- end}} From 24170b9466b39fb164192fec10ef95d59e97930a Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Fri, 10 Apr 2020 11:10:46 -0400 Subject: [PATCH 4/4] Update entrypoint.sh --- package/sbin/entrypoint.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh index 5381f3d..f2cedb0 100755 --- a/package/sbin/entrypoint.sh +++ b/package/sbin/entrypoint.sh @@ -57,7 +57,9 @@ echo syslog-ng starting /opt/syslog-ng/sbin/syslog-ng $@ & pid="$!" # wait forever -while true -do - tail -f /dev/null & wait ${!} -done \ No newline at end of file +if [[ $@ != *"-s"* ]]; then + while true + do + tail -f /dev/null & wait ${!} + done +fi