Merge branch 'feature/SCFF-38' into develop

Author: nmillalaf

main.go

@@ -35,6 +35,7 @@ var (
 	sumoName             = kingpin.Flag("sumo-name", "Sumo Logic Name").Default("").OverrideDefaultFromEnvar("SUMO_NAME").String()
 	sumoHost             = kingpin.Flag("sumo-host", "Sumo Logic Host").Default("").OverrideDefaultFromEnvar("SUMO_HOST").String()
 	verboseLogMessages   = kingpin.Flag("verbose-log-messages", "Verbose Log Messages").Default("true").OverrideDefaultFromEnvar("VERBOSE_LOG_MESSAGES").Bool()
+	customMetadata       = kingpin.Flag("custom-metadata", "Custom Metadata").Default("").OverrideDefaultFromEnvar("CUSTOM_METADATA").String()
 )
 
 var (
@@ -90,7 +91,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, *sumoHost, *verboseLogMessages)
+	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 5000, &queue, *eventsBatchSize, *sumoPostMinimumDelay, *sumoCategory, *sumoName, *sumoHost, *verboseLogMessages, *customMetadata)
 	go loggingClientSumo.Start() //multi
 
 	logging.Info.Println("Creating Events")

sumoCFFirehose/sumoLogicAppender.go

@@ -3,13 +3,13 @@ package sumoCFFirehose
 import (
 	"bytes"
 	"compress/gzip"
+	"encoding/json"
 	"errors"
 	"net/http"
 	"runtime"
+	"strings"
 	"time"
 
-	"encoding/json"
-
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/eventQueue"
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/events"
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/logging"
@@ -27,6 +27,7 @@ type SumoLogicAppender struct {
 	sumoName             string
 	sumoHost             string
 	verboseLogMessages   bool
+	customMetadata       string
 }
 
 type SumoBuffer struct {
@@ -35,7 +36,7 @@ type SumoBuffer struct {
 	timerIdlebuffer          time.Time
 }
 
-func NewSumoLogicAppender(urlValue string, connectionTimeoutValue int, nozzleQueue *eventQueue.Queue, eventsBatchSize int, sumoPostMinimumDelay time.Duration, sumoCategory string, sumoName string, sumoHost string, verboseLogMessages bool) *SumoLogicAppender {
+func NewSumoLogicAppender(urlValue string, connectionTimeoutValue int, nozzleQueue *eventQueue.Queue, eventsBatchSize int, sumoPostMinimumDelay time.Duration, sumoCategory string, sumoName string, sumoHost string, verboseLogMessages bool, customMetadata string) *SumoLogicAppender {
 	return &SumoLogicAppender{
 		url:                  urlValue,
 		connectionTimeout:    connectionTimeoutValue,
@@ -47,6 +48,7 @@ func NewSumoLogicAppender(urlValue string, connectionTimeoutValue int, nozzleQue
 		sumoName:             sumoName,
 		sumoHost:             sumoHost,
 		verboseLogMessages:   verboseLogMessages,
+		customMetadata:       customMetadata,
 	}
 }
 
@@ -186,6 +188,14 @@ func (s *SumoLogicAppender) AppendLogs(buffer *SumoBuffer) {
 	buffer.logEventsInCurrentBuffer++
 
 }
+func ParseCustomMetadata(customMetadata string) map[string]string {
+	cMetadataArray := strings.Split(customMetadata, ",")
+	customMetadataMap := make(map[string]string)
+	for i := 0; i < len(cMetadataArray); i++ {
+		customMetadataMap[strings.Split(cMetadataArray[i], ":")[0]] = strings.Split(cMetadataArray[i], ":")[1]
+	}
+	return customMetadataMap
+}
 
 func (s *SumoLogicAppender) SendToSumo(logStringToSend string) {
 	if logStringToSend != "" {
@@ -198,7 +208,6 @@ func (s *SumoLogicAppender) SendToSumo(logStringToSend string) {
 			logging.Error.Printf("http.NewRequest() error: %v\n", err)
 			return
 		}
-
 		request.Header.Add("Content-Encoding", "gzip")
 
 		if s.sumoName != "" {
@@ -210,6 +219,13 @@ func (s *SumoLogicAppender) SendToSumo(logStringToSend string) {
 		if s.sumoCategory != "" {
 			request.Header.Add("X-Sumo-Category", s.sumoCategory)
 		}
+
+		if s.customMetadata != "" {
+			customMetadataMap := ParseCustomMetadata(s.customMetadata)
+			for key, value := range customMetadataMap {
+				request.Header.Add(key, value)
+			}
+		}
 		//checking the timer before first POST intent
 		for time.Since(s.timerBetweenPost) < s.sumoPostMinimumDelay {
 			logging.Trace.Println("Delaying Post because minimum post timer not expired")

sumoCFFirehose/sumoLogicAppender_test.go

@@ -114,6 +114,18 @@ func TestStringBuilderVerboseLogsTrue(t *testing.T) {
 	}
 	finalMessage := StringBuilder(&eventVerboseLogMessage, true)
 
-	assert.Contains(t, finalMessage, "source_type", "dsds")
+	assert.Contains(t, finalMessage, "source_type", "")
+
+}
+func TestSendParseCustomMetadata(t *testing.T) {
+	customMetadata := "Key1:Value1,Key2:Value2,Key3:Value3"
+	mapCustomMetadata := ParseCustomMetadata(customMetadata)
+	mapExpected := map[string]string{
+		"Key1": "Value1",
+		"Key2": "Value2",
+		"Key3": "Value3",
+	}
+
+	assert.Equal(t, mapExpected, mapCustomMetadata, "")
 
 }

tile.yml

@@ -67,6 +67,11 @@ forms:
     label: Sumo Logic Host
     description: Sumo Logic Host (this will override the default in Sumo Logic)
     optional: true
+  - name: custom-metadata
+    type: string
+    label: Custom Metadata
+    description: Enter your custom metatdata and values (key1:value1,key2:value2, etc...)
+    optional: true
 
 - name: cf-config
   label: Cloud Foundry Settings