Use SkipHostName to avoid setting host.name.

fixes elastic#1846
simitt · Feb 18, 2019 · fefbe24 · fefbe24
1 parent 521674f
commit fefbe24
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/changelogs/7.0.asciidoc b/changelogs/7.0.asciidoc
@@ -15,6 +15,7 @@
 ==== Bugfix
 
 - Ensure setup cmd uses expected configuration {pull}1934[1934]. 
+- Ensure host.name is not added {pull}1934[1934].
 
 ////
 

diff --git a/publish/pub.go b/publish/pub.go
@@ -80,6 +80,7 @@ func NewPublisher(info beat.Info, pipeline beat.Pipeline, shutdownTimeout time.D
 		},
 		SkipAgentMetadata: true,
 		SkipNormalization: true,
+		SkipHostName:      true,
 	})
 	if err != nil {
 		return nil, err

diff --git a/tests/system/test_integration.py b/tests/system/test_integration.py
@@ -122,10 +122,6 @@ def check_docs(self, approved, received, doc_type):
                 if rec_id == appr[doc_type]['id']:
                     checked = True
                     for k, v in rec.items():
-                        if k == "host":
-                            # TODO: fix https://github.com/elastic/apm-server/issues/1846
-                            #  then remove this exception handling and treat as other keys
-                            continue
                         if k == "observer":
                             expected = Set(["hostname", "version", "id", "ephemeral_id", "type", "version_major"])
                             rec_keys = Set(v.keys())
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
     ==== Bugfix
     - Ensure setup cmd uses expected configuration {pull}1934[1934].
+    - Ensure host.name is not added {pull}1934[1934].
     ////
@@ Expand Down @@