Skip to content

Commit 6b35311

Browse files
committed
SCFF-49 added the timestamp to the LogMessage no verbose case
1 parent 867245e commit 6b35311

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

sumoCFFirehose/sumoLogicAppender.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,17 @@ func StringBuilder(event *events.Event, verboseLogMessages bool) string {
136136
msg = message
137137
}
138138
case "LogMessage":
139+
timestamp := time.Unix(0, event.Fields["timestamp"].(int64)*int64(time.Nanosecond)).String()
140+
event.Fields["timestamp"] = timestamp
139141
if verboseLogMessages == true {
140-
timestamp := time.Unix(0, event.Fields["timestamp"].(int64)*int64(time.Nanosecond)).String()
141-
event.Fields["timestamp"] = timestamp
142142
message, err := json.Marshal(event)
143143
if err == nil {
144144
msg = message
145145
}
146146
} else {
147147
eventNoVerbose := events.Event{
148148
Fields: map[string]interface{}{
149+
"timestamp": event.Fields["timestamp"],
149150
"cf_app_guid": event.Fields["cf_app_id"],
150151
},
151152
Msg: event.Msg,

sumoCFFirehose/sumoLogicAppender_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func testStringBuilderVerboseLogsFalse(t *testing.T) {
7373
}
7474
finalMessage := StringBuilder(&eventVerboseLogMessage, false)
7575

76-
assert.False(t, assert.Contains(t, finalMessage, "timestamp", ""), "should be false")
76+
assert.False(t, assert.Contains(t, finalMessage, "source_type", ""), "should be false")
7777

7878
}
7979

@@ -97,6 +97,6 @@ func testStringBuilderVerboseLogsTrue(t *testing.T) {
9797
}
9898
finalMessage := StringBuilder(&eventVerboseLogMessage, true)
9999

100-
assert.True(t, assert.Contains(t, finalMessage, "timestamp", ""), "should be true")
100+
assert.True(t, assert.Contains(t, finalMessage, "source_type", ""), "should be true")
101101

102102
}

tile.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ forms:
4646
- name: sumo-endpoint
4747
type: string
4848
label: Sumo Logic Endpoint
49-
description: Sumo Logic Endpoint to send logs to
49+
description: Sumo Logic Endpoint where to send the logs
50+
- name: sumo-post-minimum-delay
51+
type: string
52+
label: Sumo Logic Post Minimum Delay
53+
description: Delay between post to Sumo Logic
54+
default: 200ms
5055
- name: sumo-category
5156
type: string
5257
label: Sumo Logic Category
@@ -60,7 +65,7 @@ forms:
6065
- name: sumo-host
6166
type: string
6267
label: Sumo Logic Host
63-
description: Sumo Logic Host
68+
description: Sumo Logic Host (this will override the default in Sumo Logic)
6469
optional: true
6570

6671
- name: cf-config
@@ -84,11 +89,6 @@ forms:
8489
label: Log Events Batch Size
8590
description: Events Batch Size to send to Sumo Logic
8691
default: 200
87-
- name: sumo-post-minimum-delay
88-
type: string
89-
label: Sumo Logic Post Minimum Delay
90-
description: Delay between post to Sumo Logic
91-
default: 200ms
9292
- name: events
9393
type: string
9494
label: Comma separated list of events you would like (Default is "LogMessage")

0 commit comments

Comments
 (0)