Merge branch 'feature/SCFF-37' into develop

Author: nmillalaf

main.go

@@ -31,6 +31,9 @@ var (
 	tickerTime, errT     = time.ParseDuration("60s") //Default
 	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()
+	sumoCategory         = kingpin.Flag("sumo-category", "Sumo Category").Default("").OverrideDefaultFromEnvar("SUMO_CATEGORY").String()
+	sumoName             = kingpin.Flag("sumo-name", "Sumo Name").Default("").OverrideDefaultFromEnvar("SUMO_NAME").String()
+	sumoClient           = kingpin.Flag("sumo-client", "Sumo Client").Default("").OverrideDefaultFromEnvar("SUMO_CLIENT").String()
 )
 
 var (
@@ -78,7 +81,7 @@ func main() {
 
 	logging.Info.Println("Creating queue")
 	queue := eventQueue.NewQueue(make([]*events.Event, 100))
-	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 1000, &queue, *eventsBatchSize, *sumoPostMinimumDelay)
+	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 1000, &queue, *eventsBatchSize, *sumoPostMinimumDelay, *sumoCategory, *sumoName, *sumoClient)
 	go loggingClientSumo.Start() //multi
 
 	logging.Info.Println("Creating Events")

sumoCFFirehose/sumoLogicAppender.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"compress/gzip"
 	"errors"
-	"fmt"
 	"net/http"
 	"runtime"
 	"time"
@@ -22,6 +21,9 @@ type SumoLogicAppender struct {
 	eventsBatchSize      int
 	sumoPostMinimumDelay time.Duration
 	timerBetweenPost     time.Time
+	sumoCategory         string
+	sumoName             string
+	sumoClient           string
 }
 
 type SumoBuffer struct {
@@ -30,14 +32,17 @@ type SumoBuffer struct {
 	timerIdlebuffer          time.Time
 }
 
-func NewSumoLogicAppender(urlValue string, connectionTimeoutValue int, nozzleQueue *eventQueue.Queue, eventsBatchSize int, sumoPostMinimumDelay time.Duration) *SumoLogicAppender {
+func NewSumoLogicAppender(urlValue string, connectionTimeoutValue int, nozzleQueue *eventQueue.Queue, eventsBatchSize int, sumoPostMinimumDelay time.Duration, sumoCategory string, sumoName string, sumoClient string) *SumoLogicAppender {
 	return &SumoLogicAppender{
 		url:                  urlValue,
 		connectionTimeout:    connectionTimeoutValue,
 		httpClient:           http.Client{Timeout: time.Duration(connectionTimeoutValue * int(time.Millisecond))},
 		nozzleQueue:          nozzleQueue,
 		eventsBatchSize:      eventsBatchSize,
 		sumoPostMinimumDelay: sumoPostMinimumDelay,
+		sumoCategory:         sumoCategory,
+		sumoName:             sumoName,
+		sumoClient:           sumoClient,
 	}
 }
 
@@ -115,7 +120,6 @@ func (s *SumoLogicAppender) AppendLogs(buffer *SumoBuffer) {
 }
 
 func (s *SumoLogicAppender) SendToSumo(logStringToSend string) {
-
 	var buf bytes.Buffer
 	g := gzip.NewWriter(&buf)
 	g.Write([]byte(logStringToSend))
@@ -131,8 +135,19 @@ func (s *SumoLogicAppender) SendToSumo(logStringToSend string) {
 		logging.Error.Printf("http.NewRequest() error: %v\n", err)
 		return
 	}
+
 	request.Header.Add("Content-Encoding", "gzip")
-	//request.SetBasicAuth("admin", "admin")
+
+	if s.sumoName != "" {
+		request.Header.Add("X-Sumo-Name", s.sumoName)
+	}
+	if s.sumoClient != "" {
+		request.Header.Add("X-Sumo-Client", s.sumoClient)
+	}
+	if s.sumoCategory != "" {
+		request.Header.Add("X-Sumo-Category", s.sumoCategory)
+	}
+
 	response, err := s.httpClient.Do(request)
 
 	if (err != nil) || (response.StatusCode != 200 && response.StatusCode != 302 && response.StatusCode < 500) {
@@ -148,17 +163,25 @@ func (s *SumoLogicAppender) SendToSumo(logStringToSend string) {
 				logging.Error.Printf("http.NewRequest() error: %v\n", err)
 			}
 			request.Header.Add("Content-Encoding", "gzip")
+
+			if s.sumoName != "" {
+				request.Header.Add("X-Sumo-Name", s.sumoName)
+			}
+			if s.sumoClient != "" {
+				request.Header.Add("X-Sumo-Client", s.sumoClient)
+			}
+			if s.sumoCategory != "" {
+				request.Header.Add("X-Sumo-Category", s.sumoCategory)
+			}
 			response, errRetry = s.httpClient.Do(request)
 			if errRetry != nil {
 				logging.Error.Printf("http.Do() error: %v\n", errRetry)
 				logging.Info.Println("Waiting for 300 ms to retry after error")
-				fmt.Println(attempt)
 				time.Sleep(300 * time.Millisecond)
 				return attempt < 5, errRetry
 			} else if response.StatusCode != 200 && response.StatusCode != 302 && response.StatusCode < 500 {
 				logging.Info.Println("Endpoint dropped the post send again")
 				logging.Info.Println("Waiting for 300 ms to retry after a retry ...")
-				fmt.Println(attempt)
 				statusCode = response.StatusCode
 				time.Sleep(300 * time.Millisecond)
 				return attempt < 5, errRetry

tile.yml

@@ -26,7 +26,7 @@ properties:
 
 
 packages:
-- name: my-application
+- name: sumo-logic-nozzle
   type: app
   manifest:
     # any options that you would normally specify in a cf manifest.yml, including</i>
@@ -40,17 +40,32 @@ packages:
 
 forms:
 - name: sumo-logic-config
-  label: Sumo Destination
-  description: Sumo target configuration
+  label: Sumo Logic Settings
+  description: Sumo Logic Settings details
   properties:
   - name: sumo-endpoint
     type: string
     label: Sumo Logic Endpoint
     description: Sumo Logic Endpoint to send logs to
+  - name: sumo-category
+    type: string
+    label: Sumo Logic Category
+    description: Sumo Logic Category metadata
+    optional: true
+  - name: sumo-name
+    type: string
+    label: Sumo Logic Name
+    description: Sumo Logic Name metadata
+    optional: true
+  - name: sumo-client
+    type: string
+    label: Sumo Logic Client
+    description: Sumo Logic Client metadata
+    optional: true
 
 - name: cf-config
   label: Cloud Foundry Settings
-  description: Cloud Foundry connection details
+  description: Cloud Foundry Settings details
   properties:
   - name: cloudfoundry-user
     type: string
@@ -71,6 +86,6 @@ forms:
     optional: true
   - name: sumo-post-minimum-delay
     type: string
-    label: sumo-post-minimum-delay
+    label: Sumo Logic Post Minimum Delay
     description: delay between post to Sumo Logic
     optional: true