diff --git a/.circleci/config.yml b/.circleci/config.yml index c95a1bd..aad5ff8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -242,22 +242,22 @@ workflows: version: 2 build_test: jobs: - - test-sc4s-3-25-1-splunk-8-0: - filters: - branches: - only: /.*/ - - test-sc4s-master-splunk-8-0: - filters: - branches: - only: /.*/ - - test-sc4s-3-25-1-splunk-7-3: - filters: - branches: - only: /.*/ - - test-sc4s-3-25-1-splunk-7-2: - filters: - branches: - only: /.*/ + - test-sc4s-3-25-1-splunk-8-0 +# filters: +# branches: +# only: /.*/ + - test-sc4s-master-splunk-8-0 +# filters: +# branches: +# only: /.*/ + - test-sc4s-3-25-1-splunk-7-3 + # filters: + # branches: + # only: /.*/ + - test-sc4s-3-25-1-splunk-7-2 + # filters: + # branches: + # only: /.*/ - approval-tag-alpha: type: approval filters: diff --git a/package/etc/conf.d/filters/cisco/cisco_syslog.conf b/package/etc/conf.d/filters/cisco/cisco_syslog.conf index bfe3e6f..d5b8aee 100644 --- a/package/etc/conf.d/filters/cisco/cisco_syslog.conf +++ b/package/etc/conf.d/filters/cisco/cisco_syslog.conf @@ -29,12 +29,12 @@ parser cisco-parser-ex{ set( "${4}", value("HOST") - condition(match('..' value('4'))) + condition(not match('^\d+$', value('4')) and match('^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$' value('4'))) ); set( "${13}", value("HOST") - condition(match('..' value('13'))) + condition(not match('^\d+$', value('13')) and match('^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$' value('13'))) ); set( "${15}",