Skip to content

Commit

Permalink
Fix field alias for nginx.access.remote_ip (#11512) (#11531)
Browse files Browse the repository at this point in the history
- It was missing in the breaking changes doc (generated from ecs-migration.yml)
- The actual field alias was incorrectly pointing to source.ip, this has been
  adjusted to source.address
- Re-generating the documentation file also updated the breaking changes to
  include a change introduced in #11334

This should be backported to 7.0.

Closes #11510

(cherry picked from commit 692ef9e)
  • Loading branch information
ruflin authored Mar 29, 2019
1 parent 32e6378 commit 3c59cc8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions dev-tools/ecs-migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,11 @@

## NGINX module

- from: nginx.access.remote_ip
to: source.address
alias: true
beat: filebeat

- from: nginx.access.user_name
to: user.name
alias: true
Expand Down
2 changes: 1 addition & 1 deletion filebeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -10786,7 +10786,7 @@ alias to: http.response.body.bytes
--
type: alias
alias to: source.ip
alias to: source.address
--
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/nginx/access/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
migration: true
- name: remote_ip
type: alias
path: source.ip
path: source.address
migration: true
- name: user_name
type: alias
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/nginx/fields.go

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

2 changes: 1 addition & 1 deletion libbeat/docs/field-name-changes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
|`nginx.access.http_version` |`http.version`
|`nginx.access.method` |`http.request.method`
|`nginx.access.referrer` |`http.request.referrer`
|`nginx.access.remote_ip` |`source.address`
|`nginx.access.response_code` |`http.response.status_code`
|`nginx.access.url` |`url.original`
|`nginx.access.user_agent.device` |`user_agent.device.name`
Expand Down Expand Up @@ -295,7 +296,6 @@
|`system.auth.hostname` |`host.hostname`
|`system.auth.pid` |`process.pid`
|`system.auth.program` |`process.name`
|`system.auth.ssh.event` |`event.action`
|`system.auth.ssh.geoip.city_name` |`source.geo.city_name`
|`system.auth.ssh.geoip.continent_name` |`source.geo.continent_name`
|`system.auth.ssh.geoip.country_iso_code` |`source.geo.country_iso_code`
Expand Down

0 comments on commit 3c59cc8

Please sign in to comment.