Merge branch 'develop' into dev/pcf-performance-testing

Author: luckyj5

.circleci/ci_nozzle_manifest.yml

@@ -2,7 +2,7 @@
 applications:
   - name: splunk-firehose-nozzle
     memory: 256M
-    instances: 2
+    instances: 1
     buildpack: go_buildpack
     cmd: splunk-firehose-nozzle
     env:
@@ -25,11 +25,11 @@ applications:
       APP_LIMITS: 1000
       BOLTDB_PATH: cache.db
       EVENTS: ValueMetric,CounterEvent,Error,LogMessage,HttpStartStop,ContainerMetric
-      EXTRA_FIELDS: name:update-ci-test
+      EXTRA_FIELDS: name:splunk-pcf-ci
       FIREHOSE_SUBSCRIPTION_ID: splunk-ci
       FLUSH_INTERVAL: 5s
       CONSUMER_QUEUE_SIZE: 10000
-      HEC_BATCH_SIZE: 1000
+      HEC_BATCH_SIZE: 100
       HEC_RETRIES: 5
       HEC_WORKERS: 8
       DEBUG: false

.circleci/config.yml

@@ -146,12 +146,12 @@ workflows:
               only:
                 - develop
                 - master
-      - tile-builder:
-          requires:
-            - deploy-nozzle
-          filters:
-            branches:
-              only: master
+#      - tile-builder:
+#          requires:
+#            - deploy-nozzle
+#          filters:
+#            branches:
+#              only: master
       - execute_tests:
           requires:
             - deploy-nozzle

.circleci/data_gen_manifest.yml

@@ -2,10 +2,10 @@
 applications:
   - name: data_gen
     memory: 128M
-    instances: 2
+    instances: 1
     buildpack: go_buildpack
     cmd: data_gen
     env:
       GOPACKAGENAME: main
-      EPS: 500
+      EPS: 50
       TOTAL_EVENTS: 0

testing/integration/testcases/test_nozzle_configurations.py

@@ -81,7 +81,7 @@ def test_search_by_event_type(self, test_env, splunk_logger, query_input):
 
     @pytest.mark.Critical
     @pytest.mark.parametrize("query_input", [
-        "index={} name::update-ci-test"
+        "index={} name::splunk-pcf-ci"
     ])
     def test_search_by_extra_fields(self, test_env, splunk_logger, query_input):
         self.splunk_api = SplunkApi(test_env, splunk_logger)