Merge branch 'feature/SCFF-5' into develop

Author: nmillalaf

.gitignore

@@ -1,13 +1,5 @@
-# Add any directories, files, or patterns you don't want to be tracked by version control
-internal-core
-firehose-to-sumologic*
-events/events.test
-.project
-*.swp
-.#*
-\#*
+product/
+release/
+firehose-to-sumologic.zip
 my.db
-start-firehose.sh
-dist
-*pprof
 

Godeps/Godeps.json

@@ -0,0 +1,65 @@
+package: bitbucket.org/mcplusa-ondemand/firehose-to-sumologic
+import:
+- package: github.com/Sirupsen/logrus
+  version: v0.10.0
+  subpackages:
+  - hooks/syslog
+- package: github.com/alecthomas/template
+  version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0
+  subpackages:
+  - parse
+- package: github.com/alecthomas/units
+  version: 6b4e7dc5e3143b85ea77909c72caf89416fc2915
+- package: github.com/boltdb/bolt
+  version: 4d30731e9122988d2012a9574c43f80f054a0d3b
+- package: github.com/cloudfoundry-community/go-cfclient
+  version: c783aa0efe78706e9d98ffc4a84f0d42cd322ac8
+- package: github.com/cloudfoundry/noaa
+  version: 0ca0d30d65c7422750132450593d402428dd2273
+  subpackages:
+  - consumer
+  - consumer/internal
+  - errors
+- package: github.com/cloudfoundry/sonde-go
+  version: 81c3f6be579cf4337477a8b0d03852d0760b5801
+  subpackages:
+  - events
+- package: github.com/gogo/protobuf
+  version: a4cceea7a401a73fefafd1a21fedbd4694124a82
+  subpackages:
+  - gogoproto
+  - proto
+  - protoc-gen-gogo/descriptor
+- package: github.com/gorilla/websocket
+  version: a69d25be2fe2923a97c2af6849b2f52426f68fc0
+- package: github.com/mailru/easyjson
+  version: 159cdb893c982e3d1bc6450322fedd514f9c9de3
+  subpackages:
+  - buffer
+  - jlexer
+  - jwriter
+- package: github.com/pkg/profile
+  version: 8a808a6967b79da66deacfe508b26d398a69518f
+- package: golang.org/x/net
+  version: 7dbad50ab5b31073856416cdcfeb2796d682f844
+  subpackages:
+  - context
+- package: golang.org/x/oauth2
+  version: 2baa8a1b9338cf13d9eeb27696d761155fa480be
+  subpackages:
+  - internal
+- package: golang.org/x/sys
+  version: 9d4e42a20653790449273b3c85e67d6d8bae6e2e
+  subpackages:
+  - unix
+- package: gopkg.in/alecthomas/kingpin.v2
+  version: v2.1.11
+testImport:
+- package: github.com/onsi/ginkgo
+  version: v1.2.0
+- package: github.com/onsi/gomega
+  version: v1.0
+- package: github.com/stretchr/testify
+  version: v1.1.4
+  subpackages:
+  - assert

glide.lock

@@ -19,20 +19,18 @@ import (
 )
 
 var (
-	debug                = true                                                   //debug", "Enable debug mode, print in console
-	apiEndpoint          = kingpin.Flag("api-endpoint", "Sumo Endpoint").String() //"https://api.bosh-lite.com"
-	sumoEndpoint         = kingpin.Flag("sumo-endpoint", "Sumo Endpoint").String()
+	apiEndpoint          = kingpin.Flag("api-endpoint", "Api Endpoint").OverrideDefaultFromEnvar("API_ENDPOINT").String()
+	sumoEndpoint         = kingpin.Flag("sumo-endpoint", "Sumo Endpoint").OverrideDefaultFromEnvar("SUMO_ENDPOINT").String()
 	dopplerEndpoint      = kingpin.Flag("doppler-endpoint", "Overwrite default doppler endpoint return by /v2/info").OverrideDefaultFromEnvar("DOPPLER_ENDPOINT").String()
 	subscriptionId       = kingpin.Flag("subscription-id", "Id for the subscription.").Default("firehose").OverrideDefaultFromEnvar("FIREHOSE_SUBSCRIPTION_ID").String()
-	user                 = "firehose_user"     //user created in CF, authorized to connect the firehose
-	password             = "firehose_password" // password created along with the firehose_user
-	skipSSLValidation    = kingpin.Flag("skip-ssl-validation", "Please don't").Default("false").OverrideDefaultFromEnvar("SKIP_SSL_VALIDATION").Bool()
-	keepAlive, errK      = time.ParseDuration("25s") //default
+	user                 = kingpin.Flag("cloudfoundry-user", "Cloudfoundry User").OverrideDefaultFromEnvar("CLOUDFOUNDRY_USER").String()             //user created in CF, authorized to connect the firehose
+	password             = kingpin.Flag("cloudfoundry-password", "Cloudfoundry Password").OverrideDefaultFromEnvar("CLOUDFOUNDRY_PASSWORD").String() // password created along with the firehose_user                                                                                                           //kingpin.Flag("skip-ssl-validation", "Please don't").Default("false").OverrideDefaultFromEnvar("SKIP_SSL_VALIDATION").Bool()
+	keepAlive, errK      = time.ParseDuration("25s")                                                                                                 //default
 	wantedEvents         = kingpin.Flag("events", fmt.Sprintf("Comma separated list of events you would like. Valid options are %s", eventRouting.GetListAuthorizedEventEvents())).Default("LogMessage").OverrideDefaultFromEnvar("EVENTS").String()
 	boltDatabasePath     = "my.db"                   //default
 	tickerTime, errT     = time.ParseDuration("60s") //Default
-	eventsBatchSize      = kingpin.Flag("log-events-batch-size", "Log Events Batch Size").Default("10").Int()
-	sumoPostMinimumDelay = kingpin.Flag("sumo-Post-Minimum-Delay", "Sumo Post Minimum Delay").Default("500ms").Duration()
+	eventsBatchSize      = kingpin.Flag("log-events-batch-size", "Log Events Batch Size").OverrideDefaultFromEnvar("LOG_EVENTS_BATCH_SIZE").Int()
+	sumoPostMinimumDelay = kingpin.Flag("sumo-post-minimum-delay", "Sumo Post Minimum Delay").OverrideDefaultFromEnvar("SUMO_POST_MINIMUM_DELAY").Duration()
 )
 
 var (
@@ -53,17 +51,16 @@ func main() {
 	logging.Info.Println("Sumo Endpoint: " + *sumoEndpoint)
 	logging.Info.Println("Cloudfoundry Doppler Endpoint: " + *dopplerEndpoint)
 	logging.Info.Println("Cloudfoundry Nozzle Subscription ID: " + *subscriptionId)
-	logging.Info.Println("Cloudfoundry User: " + user)
-
-	logging.Info.Printf("Events Batch Size: [%d]\n", eventsBatchSize)
+	logging.Info.Println("Cloudfoundry User: " + *user)
 
+	logging.Info.Printf("Events Batch Size: [%d]\n", *eventsBatchSize)
 	logging.Info.Println("Starting firehose-to-sumo " + version)
 
 	c := cfclient.Config{
 		ApiAddress:        *apiEndpoint,
-		Username:          user,
-		Password:          password,
-		SkipSslValidation: *skipSSLValidation,
+		Username:          *user,
+		Password:          *password,
+		SkipSslValidation: true,
 	}
 	cfClient, _ := cfclient.NewClient(&c)
 
@@ -105,7 +102,7 @@ func main() {
 
 	firehoseConfig := &firehoseclient.FirehoseConfig{
 		TrafficControllerURL:   cfClient.Endpoint.DopplerEndpoint,
-		InsecureSSLSkipVerify:  *skipSSLValidation,
+		InsecureSSLSkipVerify:  true,
 		IdleTimeoutSeconds:     keepAlive,
 		FirehoseSubscriptionID: *subscriptionId,
 	}

glide.yaml

@@ -1,14 +1,6 @@
 applications:
 - name: firehose-to-sumologic
 env:
-  API_ENDPOINT: https://api.bosh-lite.com
-  DEBUG: false
-  DOPPLER_ENDPOINT: wss://doppler.bosh-lite.com:443
-  EVENTS: LogMessage,ValueMetric,Error,ContainerMetric
-  FIREHOSE_USER: firehose_user
-  FIREHOSE_PASSWORD: firehose_admin
   FIREHOSE_SUBSCRIPTION_ID: firehose-to-sumologic
-  LOG_EVENT_TOTALS: true
-  LOG_EVENT_TOTALS_TIME: 10s
-  SKIP_SSL_VALIDATION: true
-  SYSLOG_ENDPOINT: 10.0.0.218:5514
+  LOG_EVENTS_BATCHSIZE: 200
+  SUMO_POST_MINIMUM_DELAY: 200ms