Release/0.4.0 (#67)

v0.4.0 - Add source support for Cisco NX - Add source support for Symantec Proxy SG and ASG (Formerly bluecoat) - Add support for mapping network source IP OR parsed host to specific vendor product where MSG parsing is impossible - Code cleanup and simplification - Begin using SEMVER for releases
CSVD · Aug 27, 2019 · cb8ebde · cb8ebde
1 parent 8f38c19
commit cb8ebde
Show file tree

Hide file tree

Showing 71 changed files with 1,323 additions and 665 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -120,16 +120,21 @@ jobs:
             docker container create --name dummy \
                     -v sc4s-tests:/work/tests \
                     -v sc4s-results:/work/test-results \
+                    -v splunk-etc:/work/splunk-etc \
                     registry.access.redhat.com/ubi7/ubi
             docker cp tests/ dummy:/work/tests/
+            docker cp ./splunk/etc/* dummy:/work/splunk-etc/
             docker rm dummy
-#      - run:
-#          name: Docker Compose build
-#          command: |
-#            docker-compose build
+      - run:
+          name: Docker Compose build
+          command: |
+            docker-compose build test
       - run:
           name: Docker Compose up
-          command: docker-compose  -f ./docker-compose-ci.yml up --abort-on-container-exit
+          command: |
+            docker-compose  -f ./docker-compose-ci.yml up -d splunk
+            sleep 70
+            docker-compose  -f ./docker-compose-ci.yml up --abort-on-container-exit
       - run:
           name: Collect test results from Docker Compose
           command: |
@@ -204,6 +209,31 @@ jobs:
           name: Docker push tag
           command: docker push $IMAGE_NAME:edge
 
+  publish-version:
+    machine:
+      image: ubuntu-1604:201903-01
+      docker_layer_caching: true    # default - false
+    environment:
+      IMAGE_NAME: rfaircloth/scs
+    steps:
+      - checkout
+
+      - run:
+          name: Docker Login
+          command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - run:
+          name: Docker pull
+          command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
+      - run:
+          name: Docker tag image
+          command: |
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch)
+            docker tag $IMAGE_NAME:$CIRCLE_SHA1 splunk/scs:$SEMVER
+      - run:
+          name: Docker push tag
+          command: |
+            SEMVER=$(docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer /nofetch)
+            docker push splunk/scs:$SEMVER
   publish-latest:
     environment:
       IMAGE_NAME: rfaircloth/scs
@@ -256,6 +286,15 @@ workflows:
             branches:
               only:
                 - develop
+      - publish-version:
+          requires:
+            - dgoss
+            - test-unit
+          filters:
+            branches:
+              only:
+                - master
+                - /^release\/.*/
       - publish-latest:
           requires:
             - dgoss

diff --git a/.gitignore b/.gitignore
@@ -378,11 +378,5 @@ fabric.properties
 !/package/scripts/splunkmetrics.sh
 !/package/scripts/
 .ecs
-=======
 /test-results/
-/.idea/workspace.xml
-/.idea/tasks.xml
-!/package/scripts/switch_transport.sh
-!/package/scripts/splunkmetrics.sh
-!/package/scripts/
->>>>>>> master
+/.idea/
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/sc4s.iml b/.idea/sc4s.iml
diff --git a/.idea/splunk-connect-for-syslog.iml b/.idea/splunk-connect-for-syslog.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,6 @@
+0.4.0
+    - Add source support for Cisco NX
+    - Add source support for Symantec Proxy SG and ASG (Formerly bluecoat)
+    - Add support for mapping network source IP OR parsed host to specific vendor product where MSG parsing is impossible
+    - Code cleanup and simplification
+    - Begin using SEMVER for releases
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -39,6 +39,23 @@ services:
       - SPLUNK_CONNECT_METHOD=${SPLUNK_CONNECT_METHOD}
       - SPLUNK_DEFAULT_INDEX=${SPLUNK_DEFAULT_INDEX}
       - SPLUNK_METRICS_INDEX=${SPLUNK_DEFAULT_INDEX}
+  sc4s-juniper:
+    image: rfaircloth/scs:${CIRCLE_SHA1}
+    hostname: sc4s-juniper
+    ports:
+      - "514"
+    stdin_open: true
+    tty: true
+    links:
+      - splunk
+    environment:
+      - SPLUNK_HEC_URL=${SPLUNK_HEC_URL}
+      - SPLUNK_HEC_STATSURL=${SPLUNK_HEC_STATSURL}
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_CONNECT_METHOD=${SPLUNK_CONNECT_METHOD}
+      - SPLUNK_DEFAULT_INDEX=${SPLUNK_DEFAULT_INDEX}
+      - SPLUNK_METRICS_INDEX=${SPLUNK_DEFAULT_INDEX}
+      - SYSLOG_PRESUME_FILTER=juniper_netscreen
 #    logging:
 #      driver: splunk
 #      options:
@@ -62,7 +79,7 @@ services:
       - SPLUNKBASE_USERNAME=${SPLUNKBASE_USERNAME}
       - SPLUNKBASE_PASSWORD=${SPLUNKBASE_PASSWORD}
     volumes:
-      - ./splunk/SA-syslog-ng:/opt/splunk/etc/apps/SA-syslog-ng
+      - splunk-etc:/opt/splunk/etc
 #    logging:
 #      driver: splunk
 #      options:
@@ -76,3 +93,5 @@ volumes:
     external: true
   sc4s-results:
     external: true
+  splunk-etc:
+    external: true
diff --git a/docker-compose-debug.yml b/docker-compose-debug.yml
@@ -0,0 +1,56 @@
+#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/>.
+version: "3.2"
+services:
+
+  sc4s:
+    image: splunk/scs:latest
+    build:
+      context: ./package
+      args:
+        RH_ORG: ${RH_ORG}
+        RH_ACTIVATION: ${RH_ACTIVATION}
+    entrypoint:
+      - "tail"
+      - "-f"
+      - "/dev/null"
+    hostname: sc4s
+    ports:
+      - "514"
+      - "601"
+      - "514/udp"
+      - "5514"
+      - "5514/udp"
+    stdin_open: true
+    tty: true
+    links:
+      - splunk
+    environment:
+      - SPLUNK_HEC_URL=${SPLUNK_HEC_URL}
+      - SPLUNK_HEC_STATSURL=${SPLUNK_HEC_STATSURL}
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_CONNECT_METHOD=${SPLUNK_CONNECT_METHOD}
+      - SPLUNK_DEFAULT_INDEX=${SPLUNK_DEFAULT_INDEX}
+      - SPLUNK_METRICS_INDEX=${SPLUNK_DEFAULT_INDEX}
+  splunk:
+    image: splunk/splunk:latest
+    hostname: splunk
+    ports:
+      - "8000:8000"
+      - "8088:8088"
+      - "8089:8089"
+    environment:
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
+      - SPLUNK_START_ARGS=${SPLUNK_START_ARGS}
+      - SPLUNK_APPS_URL=${SPLUNK_APPS_URL}
+      - SPLUNKBASE_USERNAME=${SPLUNKBASE_USERNAME}
+      - SPLUNKBASE_PASSWORD=${SPLUNKBASE_PASSWORD}
+    volumes:
+      - ./splunk/SA-syslog-ng:/opt/splunk/etc/apps/SA-syslog-ng
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
     links:
       - splunk
       - sc4s
+      - sc4s-juniper
     volumes:
       - sc4s-tests:/work/tests
       - sc4s-results:/work/test-results
@@ -44,6 +45,32 @@ services:
       - SPLUNK_CONNECT_METHOD=${SPLUNK_CONNECT_METHOD}
       - SPLUNK_DEFAULT_INDEX=${SPLUNK_DEFAULT_INDEX}
       - SPLUNK_METRICS_INDEX=${SPLUNK_DEFAULT_INDEX}
+  sc4s-juniper:
+    image: splunk/scs:latest
+    build:
+      context: ./package
+#      cache_from:
+#        - registry.access.redhat.com/ubi7/ubi
+#        - registry.access.redhat.com/rhel7/rhel
+#        - rfaircloth/scs:edge
+      args:
+        RH_ORG: ${RH_ORG}
+        RH_ACTIVATION: ${RH_ACTIVATION}
+    hostname: sc4s-juniper
+    ports:
+      - "514"
+    stdin_open: true
+    tty: true
+    links:
+      - splunk
+    environment:
+      - SPLUNK_HEC_URL=${SPLUNK_HEC_URL}
+      - SPLUNK_HEC_STATSURL=${SPLUNK_HEC_STATSURL}
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_CONNECT_METHOD=${SPLUNK_CONNECT_METHOD}
+      - SPLUNK_DEFAULT_INDEX=${SPLUNK_DEFAULT_INDEX}
+      - SPLUNK_METRICS_INDEX=${SPLUNK_DEFAULT_INDEX}
+      - SYSLOG_PRESUME_FILTER=juniper_netscreen
 #    logging:
 #      driver: splunk
 #      options:
@@ -67,7 +94,7 @@ services:
       - SPLUNKBASE_USERNAME=${SPLUNKBASE_USERNAME}
       - SPLUNKBASE_PASSWORD=${SPLUNKBASE_PASSWORD}
     volumes:
-      - ./splunk/SA-syslog-ng:/opt/splunk/etc/apps/SA-syslog-ng
+      - splunk-etc:/opt/splunk/etc
 #    logging:
 #      driver: splunk
 #      options:
@@ -81,3 +108,5 @@ volumes:
     external: true
   sc4s-results:
     external: true
+  splunk-etc:
+    external: true