Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #8585 to 6.x: Fix metricbeat http module not parsing headers correctly #8564 #8692

Merged
merged 1 commit into from
Oct 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
5 changes: 4 additions & 1 deletion libbeat/tests/system/beat/beat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6933,7 +6933,7 @@ HTTP request information



*`http.request.header`*::
*`http.request.headers`*::
+
--
type: object
Expand Down Expand Up @@ -6970,7 +6970,7 @@ HTTP response information



*`http.response.header`*::
*`http.response.headers`*::
+
--
type: object
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/http/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
description: >
HTTP request information
fields:
- name: header
- name: headers
type: object
description: >
The HTTP headers sent
Expand All @@ -31,7 +31,7 @@
description: >
HTTP response information
fields:
- name: header
- name: headers
type: object
description: >
The HTTP headers received
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.