SCFF-23 HTTP post part of the message logs to sumo

Author: nmillalaf

caching/caching_boltdb.go

@@ -119,7 +119,7 @@ func (c *CachingBolt) GetAllApp() []App {
 	}
 
 	for _, app := range cfApps {
-		fmt.Printf("App [%s] Found... \n", app.Name)
+		//fmt.Printf("App [%s] Found... \n", app.Name)
 		apps = append(apps, App{
 			app.Name,
 			app.Guid,
@@ -132,7 +132,7 @@ func (c *CachingBolt) GetAllApp() []App {
 	}
 
 	c.fillDatabase(apps)
-	fmt.Printf("Found [%d] Apps!", len(apps))
+	//fmt.Printf("Found [%d] Apps!", len(apps))
 
 	return apps
 }

eventRouting/eventrouting.go

@@ -74,10 +74,9 @@ func (e *EventRouting) RouteEvent(msg *events.Envelope) {
 		if ignored, hasIgnoredField := event.Fields["cf_ignored_app"]; ignored == true && hasIgnoredField {
 			e.selectedEventsCount["ignored_app_message"]++
 		} else {
-			/*fmt.Printf("I'm in eventRpouting method .. -------")
-			fmt.Println(event.Fields)
+			/*fmt.Println("This is the message field")
 			fmt.Println(event.Msg)*/
-			e.sLAppender.AppendLogs(event.Fields) //**/here we have to change the method for the one on sumoLogicAppender
+			e.sLAppender.AppendLogs(event.Fields, event.Msg) //**/here we have to change the method for the one on sumoLogicAppender
 			e.selectedEventsCount[eventType.String()]++
 
 		}
@@ -146,7 +145,7 @@ func (e *EventRouting) LogEventTotals(logTotalsTime time.Duration) {
 			event, lastCount := e.getEventTotals(totalElapsedTime, elapsedTime, count)
 			count = lastCount
 			//*e.log.ShipEvents(event.Fields, event.Msg)
-			e.sLAppender.AppendLogs(event.Fields)
+			e.sLAppender.AppendLogs(event.Fields, event.Msg)
 		}
 	}()
 }

firehoseclient/firehoseclient.go

@@ -2,11 +2,10 @@ package firehoseclient
 
 import (
 	"crypto/tls"
+	"fmt"
 	"time"
 
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
-	//*"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
-
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/cloudfoundry/noaa/consumer"
 	"github.com/cloudfoundry/sonde-go/events"
@@ -44,8 +43,11 @@ func NewFirehoseNozzle(cfClient *cfclient.Client, eventRouting *eventRouting.Eve
 }
 
 func (f *FirehoseNozzle) Start() error {
+	fmt.Printf("Started the Nozzle... \n")
 	f.consumeFirehose()
+	fmt.Printf("consume the firehose... \n")
 	err := f.routeEvent()
+	fmt.Printf("route event... \n")
 	return err
 }
 

main.go

@@ -9,7 +9,6 @@ import (
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/firehoseclient"
-	//*"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose"
 	"github.com/cloudfoundry-community/go-cfclient"
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -18,6 +17,7 @@ import (
 var (
 	debug             = true //debug", "Enable debug mode, print in console
 	apiEndpoint       = "https://api.bosh-lite.com"
+	sumoEndpoint      = kingpin.Flag("sumo-endpoint", "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
@@ -37,7 +37,9 @@ func main() {
 	kingpin.Version(version)
 	kingpin.Parse()
 
-	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender("http://httpbin.org/post", 1000)
+	fmt.Println("this is the sumo endpoint")
+	fmt.Println(sumoEndpoint)
+	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 1000)
 
 	fmt.Printf("Starting firehose-to-sumo %s \n", version)
 
@@ -91,6 +93,7 @@ func main() {
 		fmt.Printf("Connected to Server! Connecting to Firehose... \n")
 		firehoseClient := firehoseclient.NewFirehoseNozzle(cfClient, events, firehoseConfig)
 		err = firehoseClient.Start()
+		fmt.Printf("I created the Firehose... \n")
 		if err != nil {
 			fmt.Printf("Failed connecting to Firehose...Please check settings and try again! \n") //Log error
 

sumoCFFirehose/sumoCFFirehose.go

@@ -2,5 +2,5 @@ package sumoCFFirehose
 
 type SumoCFFirehose interface {
 	Connect() bool
-	AppendLogs(map[string]interface{})
+	AppendLogs(map[string]interface{}, string)
 }

sumoCFFirehose/sumoLog4gofakes/fake_SumoLog4go.go

@@ -1,11 +1,7 @@
 // This file was generated by counterfeiter
 package sumoLog4gofakes
 
-import (
-	"sync"
-
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose"
-)
+import "sync"
 
 type FakeSumoLog4go struct {
 	ConnectStub        func() bool
@@ -95,4 +91,4 @@ func (fake *FakeSumoLog4go) recordInvocation(key string, args []interface{}) {
 	fake.invocations[key] = append(fake.invocations[key], args)
 }
 
-var _ sumoCFFirehose.SumoCFFirehose = new(FakeSumoLog4go)
+//var _ sumoCFFirehose.SumoCFFirehose = new(FakeSumoLog4go)

sumoCFFirehose/sumoLogicAppender.go

@@ -39,10 +39,10 @@ func (s *SumoLogicAppender) Connect() bool {
 	return success
 }
 
-func (s *SumoLogicAppender) AppendLogs(Event map[string]interface{}) {
+func (s *SumoLogicAppender) AppendLogs(fields map[string]interface{}, message string) {
 	//adding the message to the map
 	//fmt.Printf("I'm in AppendLogs method")
-	if Event == nil {
+	/*if Event == nil {
 		return
 	}
 
@@ -52,12 +52,16 @@ func (s *SumoLogicAppender) AppendLogs(Event map[string]interface{}) {
 
 	if Event["msg"] == "" {
 		return
-	}
-
-	Message := ""
-	Message = Event["msg"].(string) + "\n"
-
+	}*/
+	//timestampToInt, err := strconv.ParseInt(fields["timestamp"].(string), 10, 64)
+	//if err == nil {
+	//date := time.Unix(timestampToInt, 0)
+	Message := /*strconv.Itoa(fields["timestamp"]) + */ "\t" + fields["message_type"].(string) + "\t" + message
+	/*fmt.Println("---------------------I'm about to do an HTTP Post with this message-------------------")
+	fmt.Println(Message)
+	fmt.Println("---------------------------------------------------------------------------------------")*/
 	s.SendToSumo(Message)
+	//}
 
 }
 
@@ -67,7 +71,7 @@ func (s *SumoLogicAppender) SendToSumo(log string) {
 		fmt.Printf("http.NewRequest() error: %v\n", err)
 		return
 	}
-	request.Header.Add("content-type", "application/json")
+	//request.Header.Add("content-type", "application/json")
 	//request.SetBasicAuth("admin", "admin")
 	response, err := s.httpClient.Do(request)