changes regading Header X-Sumo-Host and tile configurations

Author: nmillalaf

.gitignore

@@ -1,5 +1,5 @@
 product/
 release/
 firehose-to-sumologic.zip
-my.db
+event.db
 

caching/caching_boltdb.go

@@ -89,6 +89,7 @@ func (c *CachingBolt) GetAppByGuid(appGuid string) []App {
 	if err != nil {
 		return apps
 	}
+
 	apps = append(apps, App{
 		app.Name,
 		app.Guid,
@@ -98,27 +99,24 @@ func (c *CachingBolt) GetAppByGuid(appGuid string) []App {
 		app.SpaceData.Entity.OrgData.Entity.Guid,
 		c.isOptOut(app.Environment),
 	})
-	//commented for not filling the db
-	//	c.fillDatabase(apps)
+
+	c.fillDatabase(apps)
 	return apps
 
 }
 
 func (c *CachingBolt) GetAllApp() []App {
-
 	var apps []App
 
 	defer func() {
 		if r := recover(); r != nil {
 			//logging.LogError("Recovered in caching.GetAllApp()", r)
 		}
 	}()
-
 	cfApps, err := c.GcfClient.ListApps()
 	if err != nil {
 		return apps
 	}
-
 	for _, app := range cfApps {
 		//fmt.Printf("App [%s] Found... \n", app.Name)
 		apps = append(apps, App{
@@ -131,15 +129,13 @@ func (c *CachingBolt) GetAllApp() []App {
 			c.isOptOut(app.Environment),
 		})
 	}
-	//commented for not filling the db
-	//c.fillDatabase(apps)
+	c.fillDatabase(apps)
 	//fmt.Printf("Found [%d] Apps!", len(apps))
 
 	return apps
 }
 
 func (c *CachingBolt) GetAppInfo(appGuid string) App {
-
 	var d []byte
 	var app App
 	c.Appdb.View(func(tx *bolt.Tx) error {

events/events_suite_test.go

@@ -25,15 +25,15 @@ var (
 	subscriptionId       = kingpin.Flag("subscription-id", "Cloud Foundry ID for the subscription.").Default("firehose").OverrideDefaultFromEnvar("FIREHOSE_SUBSCRIPTION_ID").String()
 	user                 = kingpin.Flag("cloudfoundry-user", "Cloud Foundry User").OverrideDefaultFromEnvar("CLOUDFOUNDRY_USER").String()             //user created in CF, authorized to connect the firehose
 	password             = kingpin.Flag("cloudfoundry-password", "Cloud Foundry 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
+	keepAlive, errK      = time.ParseDuration("25s")                                                                                                  //default Error, ContainerMetric, HttpStart, HttpStop, HttpStartStop, LogMessage, ValueMetric, CounterEvent
 	wantedEvents         = kingpin.Flag("events", fmt.Sprintf("Comma separated list of events you would like. Valid options are %s", eventRouting.GetListAuthorizedEventEvents())).Default("Error, ContainerMetric, HttpStart, HttpStop, HttpStartStop, LogMessage, ValueMetric, CounterEvent").OverrideDefaultFromEnvar("EVENTS").String()
-	boltDatabasePath     = "my.db" //TODO remove once database code is removed
+	boltDatabasePath     = "event.db"
 	tickerTime           = kingpin.Flag("nozzle-polling-period", "Nozzle Polling Period").Default("15s").OverrideDefaultFromEnvar("NOZZLE_POLLING_PERIOD").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 Logic HTTP Post Minimum Delay").OverrideDefaultFromEnvar("SUMO_POST_MINIMUM_DELAY").Duration()
 	sumoCategory         = kingpin.Flag("sumo-category", "Sumo Logic Category").Default("").OverrideDefaultFromEnvar("SUMO_CATEGORY").String()
 	sumoName             = kingpin.Flag("sumo-name", "Sumo Logic Name").Default("").OverrideDefaultFromEnvar("SUMO_NAME").String()
-	sumoClient           = kingpin.Flag("sumo-client", "Sumo Logic Client").Default("").OverrideDefaultFromEnvar("SUMO_CLIENT").String()
+	sumoHost             = kingpin.Flag("sumo-host", "Sumo Logic Host").Default("").OverrideDefaultFromEnvar("SUMO_HOST").String()
 )
 
 var (
@@ -50,13 +50,24 @@ func main() {
 	runtime.GOMAXPROCS(1)
 
 	logging.Info.Println("Set Configurations:")
-	logging.Info.Println("CF API Endpoint: " + *apiEndpoint)
+	logging.Info.Println("CF API Endpoint: t" + *apiEndpoint)
 	logging.Info.Println("Sumo Logic Endpoint: " + *sumoEndpoint)
 	//logging.Info.Println("Cloud foundry Doppler Endpoint: " + *dopplerEndpoint) //TODO
 	logging.Info.Println("Cloud Foundry Nozzle Subscription ID: " + *subscriptionId)
 	logging.Info.Println("Cloud Foundry User: " + *user)
-
+	logging.Info.Println("Events Selected: " + *wantedEvents)
+	logging.Info.Printf("Nozzle Polling Period: %v\n", *tickerTime)
 	logging.Info.Printf("Log Events Batch Size: [%d]\n", *eventsBatchSize)
+	logging.Info.Printf("Sumo Logic HTTP Post Minimum Delay: %v\n", *sumoPostMinimumDelay)
+	if *sumoName != "" {
+		logging.Info.Println("Sumo Logic Name: " + *sumoName)
+	}
+	if *sumoHost != "" {
+		logging.Info.Println("Sumo Logic Host: " + *sumoHost)
+	}
+	if *sumoCategory != "" {
+		logging.Info.Println("Sumo Logic Category: " + *sumoCategory)
+	}
 	logging.Info.Println("Starting Sumo Logic Nozzle " + version)
 
 	c := cfclient.Config{
@@ -81,7 +92,7 @@ func main() {
 
 	logging.Info.Println("Creating queue")
 	queue := eventQueue.NewQueue(make([]*events.Event, 100))
-	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 5000, &queue, *eventsBatchSize, *sumoPostMinimumDelay, *sumoCategory, *sumoName, *sumoClient)
+	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 5000, &queue, *eventsBatchSize, *sumoPostMinimumDelay, *sumoCategory, *sumoName, *sumoHost)
 	go loggingClientSumo.Start() //multi
 
 	logging.Info.Println("Creating Events")
@@ -99,10 +110,10 @@ func main() {
 	logging.Info.Printf("Start filling app/space/org cache.\n")
 	apps := cachingClient.GetAllApp()
 	logging.Info.Printf("Done filling cache! Found [%d] Apps \n", len(apps))
-	//TODO log out each apps name
-	logging.Info.Println("Apps founded: ")
+
+	logging.Info.Println("Apps found: ")
 	for i := 0; i < len(apps); i++ {
-		logging.Info.Printf("[%d] "+apps[i].Name, i+1)
+		logging.Info.Printf("[%d] "+apps[i].Name+" GUID: "+apps[i].Guid, i+1)
 	}
 	//Let's start the goRoutine
 	cachingClient.PerformPoollingCaching(*tickerTime)

events/events_test.go

@@ -4,3 +4,5 @@ env:
   FIREHOSE_SUBSCRIPTION_ID: firehose-to-sumologic
   LOG_EVENTS_BATCHSIZE: 200
   SUMO_POST_MINIMUM_DELAY: 200ms
+  F2S_DISABLE_LOGGING: true
+