Merge pull request #900 from andrewkroh/bugfix/filebeat-null-fields

Omit 'fields' from Filebeat events when null
elastic · Feb 2, 2016 · 307cd73 · 307cd73
2 parents 26dcaa5 + 1bbe205
commit 307cd73
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -45,6 +45,7 @@ https://github.com/elastic/beats/compare/v1.1.0...master[Check the HEAD diff]
 *Filebeat*
 - Stop filebeat if filebeat is started without any prospectors defined or empty prospectors {pull}644[644] {pull}647[647]
 - Improve shutdown of crawler and prospector to wait for clean completion {pull}720[720]
+- Omit `fields` from Filebeat events when null {issue}899[899]
 
 *Winlogbeat*
 

diff --git a/filebeat/harvester/log.go b/filebeat/harvester/log.go
@@ -170,7 +170,7 @@ func (h *Harvester) Harvest() {
 				Offset:       h.Offset,
 				Bytes:        bytesRead,
 				Text:         &text,
-				Fields:       &h.Config.Fields,
+				Fields:       h.Config.Fields,
 				Fileinfo:     &info,
 			}
 

diff --git a/filebeat/input/file.go b/filebeat/input/file.go
@@ -24,7 +24,7 @@ type FileEvent struct {
 	Offset       int64
 	Bytes        int
 	Text         *string
-	Fields       *common.MapStr
+	Fields       common.MapStr
 	Fileinfo     *os.FileInfo
 
 	fieldsUnderRoot bool
@@ -77,7 +77,7 @@ func (f *FileEvent) ToMapStr() common.MapStr {
 
 	if f.Fields != nil {
 		if f.fieldsUnderRoot {
-			for key, value := range *f.Fields {
+			for key, value := range f.Fields {
 				// in case of conflicts, overwrite
 				_, found := event[key]
 				if found {

diff --git a/filebeat/input/file_test.go b/filebeat/input/file_test.go
@@ -115,7 +115,7 @@ func TestFileEventToMapStr(t *testing.T) {
 
 func TestFieldsUnderRoot(t *testing.T) {
 	event := FileEvent{
-		Fields: &common.MapStr{
+		Fields: common.MapStr{
 			"hello": "world",
 		},
 	}

diff --git a/filebeat/tests/system/test_fields.py b/filebeat/tests/system/test_fields.py
@@ -80,3 +80,4 @@ def test_beat_fields(self):
         doc = output[0]
         assert doc["beat.name"] == "testShipperName"
         assert doc["beat.hostname"] == socket.gethostname()
+        assert "fields" not in doc