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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick #4415 to 5.x: Allow string characters in user agent patch version #4418

Merged
merged 1 commit into from
May 30, 2017
Merged

Cherry-pick #4415 to 5.x: Allow string characters in user agent patch version #4418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ https://github.com/elastic/beats/compare/v5.3.0...master[Check the HEAD diff]
- Fix issue that new prospector was not reloaded on conflict {pull}4128[4128]
- Fix grok pattern in filebeat module system/auth without hostname. {pull}4224[4224]
- Fix the Mysql slowlog parsing of IP addresses. {pull}4183[4183]
- Allow string characters in user agent patch version (NGINX and Apache) {pull}4415[4415]

*Heartbeat*

Expand Down
4 changes: 2 additions & 2 deletions filebeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ The minor version of the user agent.
[float]
=== apache2.access.user_agent.patch

type: long
type: keyword

The patch version of the user agent.

Expand Down Expand Up @@ -875,7 +875,7 @@ The minor version of the user agent.
[float]
=== nginx.access.user_agent.patch

type: long
type: keyword

The patch version of the user agent.

Expand Down
8 changes: 6 additions & 2 deletions filebeat/filebeat.template-es2x.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@
"type": "string"
},
"patch": {
"type": "long"
"ignore_above": 1024,
"index": "not_analyzed",
"type": "string"
}
}
},
Expand Down Expand Up @@ -534,7 +536,9 @@
"type": "string"
},
"patch": {
"type": "long"
"ignore_above": 1024,
"index": "not_analyzed",
"type": "string"
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions filebeat/filebeat.template-es6x.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@
"type": "keyword"
},
"patch": {
"type": "long"
"ignore_above": 1024,
"type": "keyword"
}
}
},
Expand Down Expand Up @@ -452,7 +453,8 @@
"type": "keyword"
},
"patch": {
"type": "long"
"ignore_above": 1024,
"type": "keyword"
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions filebeat/filebeat.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
"type": "keyword"
},
"patch": {
"type": "long"
"ignore_above": 1024,
"type": "keyword"
}
}
},
Expand Down Expand Up @@ -455,7 +456,8 @@
"type": "keyword"
},
"patch": {
"type": "long"
"ignore_above": 1024,
"type": "keyword"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/apache2/access/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
description: >
The minor version of the user agent.
- name: patch
type: long
type: keyword
description: >
The patch version of the user agent.
- name: name
Expand Down
1 change: 1 addition & 0 deletions filebeat/module/apache2/access/test/test.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
::1 - - [26/Dec/2016:16:16:29 +0200] "GET /favicon.ico HTTP/1.1" 404 209
192.168.33.1 - - [26/Dec/2016:16:22:13 +0000] "GET /hello HTTP/1.1" 404 499 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0"
::1 - - [26/Dec/2016:16:16:48 +0200] "-" 408 -
172.17.0.1 - - [29/May/2017:19:02:48 +0000] "GET /stringpatch HTTP/1.1" 404 612 "-" "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2" "-"
Loading