Fix metricbeat http module not parsing headers correctly (#8692)

elastic · Oct 23, 2018 · 63a3c74 · 63a3c74
1 parent 59a8551
commit 63a3c74
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -80,6 +80,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
 - Fix dropwizard module parsing of metric names. {issue}8365[8365] {pull}6385[8385]
 - Fix issue that would prevent kafka module to find a proper broker when port is not set {pull}8613[8613]
 - Fix range colors in multiple visualizations. {issue}8633[8633] {pull}8634[8634]
+- Fix incorrect header parsing on http metricbeat module {issue}8564[8564] {pull}8585[8585]
 
 *Packetbeat*
 

diff --git a/libbeat/tests/system/beat/beat.py b/libbeat/tests/system/beat/beat.py
@@ -61,6 +61,8 @@ def start(self):
                 stderr=subprocess.STDOUT,
                 bufsize=0,
             )
+            # If a "No such file or directory" error points you here, run
+            # "make metricbeat.test" on metricbeat folder
         return self.proc
 
     def kill(self):
@@ -501,7 +503,8 @@ def extract_fields(doc_list, name):
 
         global yaml_cache
 
-        # TODO: Make fields_doc path more generic to work with beat-generator
+        # TODO: Make fields_doc path more generic to work with beat-generator. If it can't find file
+        # "fields.yml" you should run "make update" on metricbeat folder
         with open(fields_doc, "r") as f:
             path = os.path.abspath(os.path.dirname(__file__) + "../../../../fields.yml")
             if not os.path.isfile(path):

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -6933,7 +6933,7 @@ HTTP request information
 
 
 
-*`http.request.header`*::
+*`http.request.headers`*::
 +
 --
 type: object
@@ -6970,7 +6970,7 @@ HTTP response information
 
 
 
-*`http.response.header`*::
+*`http.response.headers`*::
 +
 --
 type: object

diff --git a/metricbeat/module/http/_meta/fields.yml b/metricbeat/module/http/_meta/fields.yml
@@ -14,7 +14,7 @@
           description: >
               HTTP request information
           fields:
-            - name: header
+            - name: headers
               type: object
               description: >
                 The HTTP headers sent
@@ -31,7 +31,7 @@
           description: >
               HTTP response information
           fields:
-            - name: header
+            - name: headers
               type: object
               description: >
                 The HTTP headers received

diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go