Skip to content

add country_name to the default properties of geoip ingest processor#62915

Merged
danhermann merged 3 commits intoelastic:masterfrom
gaobinlong:geoip_patch
Sep 30, 2020
Merged

add country_name to the default properties of geoip ingest processor#62915
danhermann merged 3 commits intoelastic:masterfrom
gaobinlong:geoip_patch

Conversation

@gaobinlong
Copy link
Copy Markdown
Contributor

Closes #61523.

The main changes are:

  1. Add coutry_name to the default properties of geoip processor.
  2. Add a yaml test for the code change.
  3. Update the geoip processor doc.

@danhermann danhermann self-requested a review September 29, 2020 11:50
@danhermann
Copy link
Copy Markdown
Contributor

@elasticmachine ok to test

@jrodewig jrodewig added :Distributed/Ingest Node Execution or management of Ingest Pipelines v8.0.0 labels Sep 29, 2020
@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-features (:Core/Features/Ingest)

@elasticmachine elasticmachine added the Team:Data Management (obsolete) DO NOT USE. This team no longer exists. label Sep 29, 2020
Copy link
Copy Markdown
Contributor

@danhermann danhermann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gaobinlong, thanks for adding this. I think the source of the current test failures is that country_name needs to be added to the results of the query in the geoip.asciidoc file around line 280. If you can add that, I think we can get this merged.

@gaobinlong
Copy link
Copy Markdown
Contributor Author

@danhermann, thanks for your review, I have done that and all checks have paased yet.

@danhermann danhermann merged commit 0c88c19 into elastic:master Sep 30, 2020
@danhermann
Copy link
Copy Markdown
Contributor

Thanks, @gaobinlong! I've merged this in.

danhermann pushed a commit to danhermann/elasticsearch that referenced this pull request Oct 1, 2020
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Oct 1, 2020
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.
andrewkroh added a commit to elastic/beats that referenced this pull request Oct 2, 2020
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Oct 7, 2020
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.

(cherry picked from commit 13a5463)
andrewkroh added a commit to elastic/beats that referenced this pull request Oct 7, 2020
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.

(cherry picked from commit 13a5463)
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Oct 7, 2020
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.

(cherry picked from commit 13a5463)
andrewkroh added a commit to elastic/beats that referenced this pull request Oct 8, 2020
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.

(cherry picked from commit 13a5463)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Distributed/Ingest Node Execution or management of Ingest Pipelines >enhancement Team:Data Management (obsolete) DO NOT USE. This team no longer exists. v7.10.0 v8.0.0-alpha1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add country_name to default properties of geoip processor

5 participants