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 #20811 to 7.x: Add missing country_name geo field in add host metadata #20816

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Cherry-pick #20811 to 7.x: Add missing country_name geo field in add host metadata #20816

merged 1 commit into from
Aug 27, 2020

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Aug 27, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #20811 to 7.x branch. Original message:

What does this PR do?

Add missing country_name geo field in add_host_metadata and add_observer_metadata processors.

Why is it important?

Documentation includes this field, and it is also part of ECS.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@jsoriano
Add missing country_name geo field in add host metadata (elastic#20811)
c84ee04 
Add `country_name` to the list of geo fields that can be added with
`add_host_metadata` and `add_observer_metadata`.

(cherry picked from commit 795c86f)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 27, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 27, 2020
@elasticmachine
Copy link
Collaborator

💔 Tests Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20816 opened]

  • Start Time: 2020-08-27T10:06:42.045+0000

  • Duration: 68 min 4 sec

Test stats 🧪

Test Results
Failed 2
Passed 19452
Skipped 1851
Total 21305

Test errors

Expand to view the tests failures

  • Name: Build and Test / Libbeat / Libbeat oss / TestOutputReload – pipeline

    • Age: 1
    • Duration: 71.39
    • Error Details: Failed

  • Name: Build and Test / Libbeat / Libbeat oss / TestOutputReload/client – pipeline

    • Age: 1
    • Duration: 38.65
    • Error Details: Failed

Steps errors

Expand to view the steps failures

  • Name: Mage build test

    • Description: mage build test

    • Duration: 23 min 33 sec

    • Start Time: 2020-08-27T10:30:44.247+0000

    • log

Log output

Expand to view the last 100 lines of log output 

[2020-08-27T11:14:03.500Z] + tar -xpf source.tgz
[2020-08-27T11:14:13.851Z] + rm source.tgz
[2020-08-27T11:14:13.875Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats
[2020-08-27T11:14:13.923Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Lint
[2020-08-27T11:14:14.077Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Winlogbeat-oss
[2020-08-27T11:14:14.229Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Elastic-Agent-x-pack
[2020-08-27T11:14:14.381Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-crosscompile
[2020-08-27T11:14:14.532Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/dockerlogbeat
[2020-08-27T11:14:14.685Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Generators-Metricbeat-Linux
[2020-08-27T11:14:14.838Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Journalbeat
[2020-08-27T11:14:14.991Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Functionbeat-x-pack
[2020-08-27T11:14:15.140Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Packetbeat-Linux
[2020-08-27T11:14:15.360Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Elastic-Agent-x-pack-Windows
[2020-08-27T11:14:15.516Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Elastic-Agent-Mac-OS-X
[2020-08-27T11:14:15.670Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-08-27T11:14:15.829Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-oss-Windows
[2020-08-27T11:14:15.985Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Heartbeat-oss
[2020-08-27T11:14:16.141Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Heartbeat-Windows
[2020-08-27T11:14:16.296Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-x-pack
[2020-08-27T11:14:16.451Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Heartbeat-Mac-OS-X
[2020-08-27T11:14:16.611Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-08-27T11:14:16.766Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-oss-Mac-OS-X
[2020-08-27T11:14:16.923Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Winlogbeat-Windows-x-pack
[2020-08-27T11:14:17.080Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-x-pack-Windows
[2020-08-27T11:14:17.237Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Packetbeat-Windows
[2020-08-27T11:14:17.391Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-08-27T11:14:17.545Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Filebeat-x-pack-Windows
[2020-08-27T11:14:17.698Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-oss-Linux
[2020-08-27T11:14:17.851Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Filebeat-Windows
[2020-08-27T11:14:18.005Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Libbeat-x-pack
[2020-08-27T11:14:18.161Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-08-27T11:14:18.315Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Functionbeat-Windows
[2020-08-27T11:14:18.466Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Winlogbeat-Windows
[2020-08-27T11:14:18.619Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Auditbeat-x-pack-Mac-OS-X
[2020-08-27T11:14:18.773Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-Windows
[2020-08-27T11:14:18.927Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-08-27T11:14:19.083Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack-Mac-OS-X
[2020-08-27T11:14:19.235Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Packetbeat-Mac-OS-X
[2020-08-27T11:14:19.387Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-08-27T11:14:19.538Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Generators-Beat-Linux
[2020-08-27T11:14:19.693Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Generators-Metricbeat-Mac-OS-X
[2020-08-27T11:14:19.847Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Libbeat-oss
[2020-08-27T11:14:19.999Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Generators-Beat-Mac-OS-X
[2020-08-27T11:14:20.153Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Functionbeat-Mac-OS-X-x-pack
[2020-08-27T11:14:20.306Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Filebeat-x-pack
[2020-08-27T11:14:20.464Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Filebeat-oss
[2020-08-27T11:14:20.618Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests
[2020-08-27T11:14:20.773Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-OSS-Python-Integration-tests
[2020-08-27T11:14:20.931Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-08-27T11:14:21.450Z] + cat
[2020-08-27T11:14:21.451Z] + /usr/local/bin/runbld ./runbld-script --job-name elastic+beats+pull-request
[2020-08-27T11:14:21.451Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-08-27T11:14:28.039Z] runbld>>> runbld started
[2020-08-27T11:14:28.039Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-08-27T11:14:29.958Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-08-27T11:14:29.958Z] runbld>>> Matches in the system config:
[2020-08-27T11:14:29.959Z] runbld>>> - Matched ^elastic\+beats
[2020-08-27T11:14:29.959Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-08-27T11:14:31.348Z] runbld>>> Debug logging enabled.
[2020-08-27T11:14:31.348Z] runbld>>> Storing result
[2020-08-27T11:14:31.348Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-08-27T11:14:31.348Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200827111431-40E42A58
[2020-08-27T11:14:31.348Z] runbld>>> Adding system facts.
[2020-08-27T11:14:32.294Z] runbld>>> Adding vcs info for the latest commit:  c84ee04fbffa7b780096a39a70ea8d4f3c3bbbfd
[2020-08-27T11:14:32.294Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-08-27T11:14:32.294Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-08-27T11:14:32.553Z] Processing JUnit reports with runbld...
[2020-08-27T11:14:32.554Z] + echo 'Processing JUnit reports with runbld...'
[2020-08-27T11:14:32.815Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-08-27T11:14:32.815Z] runbld>>> DURATION: 36ms
[2020-08-27T11:14:32.815Z] runbld>>> STDOUT: 40 bytes
[2020-08-27T11:14:32.815Z] runbld>>> STDERR: 49 bytes
[2020-08-27T11:14:32.815Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-08-27T11:14:32.815Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-20816
[2020-08-27T11:14:33.758Z] runbld>>> Storing build metadata: 
[2020-08-27T11:14:33.758Z] runbld>>> Adding test report.
[2020-08-27T11:14:33.758Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats
[2020-08-27T11:14:34.328Z] runbld>>> Found 139 test output files
[2020-08-27T11:14:36.878Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-08-27T11:14:36.878Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-08-27T11:14:36.878Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-08-27T11:14:36.879Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-08-27T11:14:36.879Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-08-27T11:14:37.139Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests/metricbeat/build/TEST-go-integration-graphite.xml
[2020-08-27T11:14:37.139Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20816/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests/metricbeat/build/TEST-go-integration-windows.xml
[2020-08-27T11:14:37.710Z] runbld>>> Test output logs contained: Errors: 0 Failures: 2 Tests: 21154 Skipped: 1570
[2020-08-27T11:14:37.710Z] runbld>>> Storing result
[2020-08-27T11:14:37.710Z] runbld>>> FAILURES: 2
[2020-08-27T11:14:38.280Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-08-27T11:14:38.280Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200827111431-40E42A58
[2020-08-27T11:14:38.541Z] runbld>>> Email notification disabled by environment variable.
[2020-08-27T11:14:38.541Z] runbld>>> Slack notification disabled by environment variable.
[2020-08-27T11:14:44.678Z] Running on worker-1244230 in /var/lib/jenkins/workspace/Beats_beats_PR-20816
[2020-08-27T11:14:44.810Z] [INFO] getVaultSecret: Getting secrets
[2020-08-27T11:14:44.883Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-08-27T11:14:47.288Z] + chmod 755 generate-build-data.sh
[2020-08-27T11:14:47.288Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20816/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20816/runs/1 FAILURE 4083824
[2020-08-27T11:14:47.288Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20816/runs/1/steps/?limit=10000 -o steps-info.json
[2020-08-27T11:14:49.548Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20816/runs/1/tests/?status=FAILED -o tests-errors.json
[2020-08-27T11:14:50.251Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20816/runs/1/log/ -o pipeline-log.txt

@jsoriano jsoriano merged commit 0909162 into elastic:7.x Aug 27, 2020
@jsoriano jsoriano deleted the backport_20811_7.x branch August 27, 2020 16:08
@zube zube bot removed the [zube]: Done label Nov 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

Assignees
No one assigned
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jsoriano @elasticmachine @kaiyan-sheng