Merge pull request #107 from cloudfoundry-community/develop

Develop

Author: chenziliang

ci/perf.py

@@ -47,6 +47,7 @@ def run_nozzle_perf(config):
         for case in suite["cases"]:
             kvs = ",".join("{}:{}".format(k, v) for k, v in case.iteritems())
             extra_fields = "{},{}".format(suite["extra-fields"], kvs)
+
             cmd = [
                 "./splunk-firehose-nozzle",
                 "--api-endpoint", config["api-endpoint"],
@@ -99,13 +100,17 @@ def execute(cmd, duration):
 
 def run_trafficcontroller(duration):
     for suite in nozzle_perf_suites:
-        for _ in suite["cases"]:
+        for case in suite["cases"]:
+            ip = "pcf_{}_{}".format(
+                suite["message-type"],
+                "_".join("{}-{}".format(k, v) for k, v in case.iteritems()))
             cmd = [
                 "./trafficcontroller",
                 "--config", "loggregator_trafficcontroller.json",
                 "--disableAccessControl",
                 "--duration", str(duration),
                 "--message-type", suite["message-type"],
+                "--ip", ip,
             ]
 
             execute(cmd, duration)

splunknozzle/config.go

@@ -116,7 +116,7 @@ func NewConfigFromCmdFlags(version, branch, commit, buildos string) *Config {
 	kingpin.Flag("consumer-queue-size", "Consumer queue buffer size").
 		OverrideDefaultFromEnvar("CONSUMER_QUEUE_SIZE").Default("10000").IntVar(&c.QueueSize)
 	kingpin.Flag("hec-batch-size", "Batchsize of the events pushing to HEC").
-		OverrideDefaultFromEnvar("HEC_BATCH_SIZE").Default("1000").IntVar(&c.BatchSize)
+		OverrideDefaultFromEnvar("HEC_BATCH_SIZE").Default("100").IntVar(&c.BatchSize)
 	kingpin.Flag("hec-retries", "Number of retries before dropping events").
 		OverrideDefaultFromEnvar("HEC_RETRIES").Default("5").IntVar(&c.Retries)
 	kingpin.Flag("hec-workers", "How many workers (concurrency) when post data to HEC").