Merge pull request #393 from splunk/feature/fix-persist-conflict-udp

Feature/fix persist conflict udp
CSVD · Apr 2, 2020 · 26ce3ae · 26ce3ae
2 parents 2487050 + ab87f12
commit 26ce3ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/package/etc/go_templates/source_network.t b/package/etc/go_templates/source_network.t
@@ -2,7 +2,7 @@
         syslog (
                 transport("udp")
                 so-reuseport(1)
-                persist-name("udp{{.instance}}")
+                persist-name("{{ .port_id }}{{ .instance }}")
                 port({{ getenv (print "SC4S_LISTEN_" .port_id "_UDP_PORT") "514" }})
                 ip-protocol(4)
                 so-rcvbuf({{getenv "SC4S_SOURCE_UDP_SO_RCVBUFF" "1703936"}})
@@ -23,8 +23,9 @@ source s_{{ .port_id }} {
     channel {
         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"))}}
-{{- $context := dict "instance" . "port_id" "DEFAULT" }}
+{{- $context := dict "instance" . "port_id" $port_id }}
 {{- template "UDP"  $context }}
 {{- end}}
 {{- end}}

diff --git a/tests/docker-compose-ci.yml b/tests/docker-compose-ci.yml
@@ -48,6 +48,12 @@ services:
       - SC4S_LISTEN_JUNIPER_IDP_TCP_PORT=5004
       - SC4S_LISTEN_PALOALTO_PANOS_TCP_PORT=5005
       - SC4S_LISTEN_PFSENSE_TCP_PORT=5006
+      - SC4S_LISTEN_CISCO_ASA_UDP_PORT=5001
+      - SC4S_LISTEN_CISCO_IOS_UDP_PORT=5002
+      - SC4S_LISTEN_CISCO_MERAKI_UDP_PORT=5003
+      - SC4S_LISTEN_JUNIPER_IDP_UDP_PORT=5004
+      - SC4S_LISTEN_PALOALTO_PANOS_UDP_PORT=5005
+      - SC4S_LISTEN_PFSENSE_UDP_PORT=5006
       - SC4S_ARCHIVE_GLOBAL=no
   splunk:
     build:

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -38,6 +38,12 @@ services:
       - SC4S_LISTEN_JUNIPER_IDP_TCP_PORT=5004
       - SC4S_LISTEN_PALOALTO_PANOS_TCP_PORT=5005
       - SC4S_LISTEN_PFSENSE_TCP_PORT=5006
+      - SC4S_LISTEN_CISCO_ASA_UDP_PORT=5001
+      - SC4S_LISTEN_CISCO_IOS_UDP_PORT=5002
+      - SC4S_LISTEN_CISCO_MERAKI_UDP_PORT=5003
+      - SC4S_LISTEN_JUNIPER_IDP_UDP_PORT=5004
+      - SC4S_LISTEN_PALOALTO_PANOS_UDP_PORT=5005
+      - SC4S_LISTEN_PFSENSE_UDP_PORT=5006
       - SC4S_ARCHIVE_GLOBAL=no
       - SC4S_SOURCE_STORE_RAWMSG=yes
   splunk: