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 #20689 to 7.x: Rename cloud.provider to azure instead of az in add_cloud_metadata processor #20824

Merged
merged 3 commits into from
Aug 31, 2020
Merged

Cherry-pick #20689 to 7.x: Rename cloud.provider to azure instead of az in add_cloud_metadata processor #20824

merged 3 commits into from
Aug 31, 2020

Conversation

narph
Copy link
Contributor

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

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

What does this PR do?

Rename cloud.provider to azure instead of az in add_cloud_metadata

Why is it important?

The cloud.provider's value is az but it is matched to azure in the azure module.
Not sure why it is shorten azure to az. Looking around I do not see the az terminology being a popular one or even used anywhere (maybe in the az client). Unlike aws or gcp, azure is does not to abbreviate to az, using azure instead seems to me to be the most reasonable solution.
Also, the elastic documentation shows that azure should be used instead.

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

@narph
Rename cloud.provider to azure instead of az in add_cloud_metadat…
59e5203 
…a processor (elastic#20689)

* mofidy doc

* rename azure provider in cloud data

* changelo

(cherry picked from commit d34d1b6)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 27, 2020
@narph narph self-assigned this Aug 27, 2020
@narph narph added [zube]: In Review backport Team:Platforms Label for the Integrations - Platforms team labels Aug 27, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 27, 2020
@narph narph added Team:Integrations Label for the Integrations team and removed Team:Platforms Label for the Integrations - Platforms team labels Aug 27, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 27, 2020 •
edited by jenkins-beats-ci bot
Loading

💔 Tests Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20824 updated]

  • Start Time: 2020-08-31T09:16:49.376+0000

  • Duration: 88 min 51 sec

Test stats 🧪

Test Results
Failed 1
Passed 19585
Skipped 1856
Total 21442

Test errors

Expand to view the tests failures

  • Name: Build and Test / Filebeat oss / test_default_settings – filebeat.tests.system.test_autodiscover.TestAutodiscover

    • Age: 1
    • Duration: 90.003
    • Error Details: Failed: Timeout >90.0s

Steps errors

Expand to view the steps failures

  • Name: Mage build test

    • Description: mage build test

    • Duration: 30 min 14 sec

    • Start Time: 2020-08-31T09:42:51.052+0000

    • log

Log output

Expand to view the last 100 lines of log output 

[2020-08-31T10:44:13.521Z] + rm source.tgz
[2020-08-31T10:44:13.534Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats
[2020-08-31T10:44:13.557Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Lint
[2020-08-31T10:44:13.650Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Winlogbeat-oss
[2020-08-31T10:44:13.737Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Elastic-Agent-x-pack
[2020-08-31T10:44:13.841Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-crosscompile
[2020-08-31T10:44:13.924Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/dockerlogbeat
[2020-08-31T10:44:14.006Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Generators-Metricbeat-Linux
[2020-08-31T10:44:14.089Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Journalbeat
[2020-08-31T10:44:14.169Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Functionbeat-x-pack
[2020-08-31T10:44:14.251Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Packetbeat-Linux
[2020-08-31T10:44:14.336Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Elastic-Agent-x-pack-Windows
[2020-08-31T10:44:14.423Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-08-31T10:44:14.501Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Heartbeat-oss
[2020-08-31T10:44:14.583Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-x-pack-Windows
[2020-08-31T10:44:14.668Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-x-pack
[2020-08-31T10:44:14.752Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-oss-Windows
[2020-08-31T10:44:14.830Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Winlogbeat-Windows-x-pack
[2020-08-31T10:44:14.910Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-oss-Linux
[2020-08-31T10:44:14.987Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-08-31T10:44:15.072Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Heartbeat-Windows
[2020-08-31T10:44:15.155Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Winlogbeat-Windows
[2020-08-31T10:44:15.237Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Filebeat-x-pack-Windows
[2020-08-31T10:44:15.319Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Packetbeat-Windows
[2020-08-31T10:44:15.403Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Functionbeat-Windows
[2020-08-31T10:44:15.486Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Filebeat-Windows
[2020-08-31T10:44:15.563Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Libbeat-x-pack
[2020-08-31T10:44:15.650Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-08-31T10:44:15.728Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Generators-Beat-Linux
[2020-08-31T10:44:15.807Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-Windows
[2020-08-31T10:44:15.893Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Filebeat-x-pack
[2020-08-31T10:44:15.977Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Libbeat-oss
[2020-08-31T10:44:16.068Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Filebeat-oss
[2020-08-31T10:44:16.147Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests
[2020-08-31T10:44:16.223Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Libbeat-crosscompile
[2020-08-31T10:44:16.303Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-OSS-Python-Integration-tests
[2020-08-31T10:44:16.385Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Libbeat-stress-tests
[2020-08-31T10:44:16.462Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Elastic-Agent-Mac-OS-X
[2020-08-31T10:44:16.539Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-08-31T10:44:16.631Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-08-31T10:44:16.729Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-oss-Mac-OS-X
[2020-08-31T10:44:16.811Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-08-31T10:44:16.897Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Heartbeat-Mac-OS-X
[2020-08-31T10:44:16.976Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Packetbeat-Mac-OS-X
[2020-08-31T10:44:17.203Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack-Mac-OS-X
[2020-08-31T10:44:17.286Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-08-31T10:44:17.370Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Generators-Metricbeat-Mac-OS-X
[2020-08-31T10:44:17.452Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Generators-Beat-Mac-OS-X
[2020-08-31T10:44:17.538Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Functionbeat-Mac-OS-X-x-pack
[2020-08-31T10:44:17.624Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Auditbeat-x-pack-Mac-OS-X
[2020-08-31T10:44:18.033Z] + cat
[2020-08-31T10:44:18.033Z] + /usr/local/bin/runbld ./runbld-script --job-name elastic+beats+pull-request
[2020-08-31T10:44:18.033Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-08-31T10:44:24.632Z] runbld>>> runbld started
[2020-08-31T10:44:24.632Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-08-31T10:44:26.018Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-08-31T10:44:26.018Z] runbld>>> Matches in the system config:
[2020-08-31T10:44:26.018Z] runbld>>> - Matched ^elastic\+beats
[2020-08-31T10:44:26.018Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-08-31T10:44:27.404Z] runbld>>> Debug logging enabled.
[2020-08-31T10:44:27.404Z] runbld>>> Storing result
[2020-08-31T10:44:27.404Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-08-31T10:44:27.404Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200831104427-F55C0415
[2020-08-31T10:44:27.404Z] runbld>>> Adding system facts.
[2020-08-31T10:44:28.349Z] runbld>>> Adding vcs info for the latest commit:  945622578c2cd907af30f3ff869e113e644cf199
[2020-08-31T10:44:28.349Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-08-31T10:44:28.349Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-08-31T10:44:28.610Z] + echo 'Processing JUnit reports with runbld...'
[2020-08-31T10:44:28.610Z] Processing JUnit reports with runbld...
[2020-08-31T10:44:28.872Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-08-31T10:44:28.872Z] runbld>>> DURATION: 34ms
[2020-08-31T10:44:28.872Z] runbld>>> STDOUT: 40 bytes
[2020-08-31T10:44:28.872Z] runbld>>> STDERR: 49 bytes
[2020-08-31T10:44:28.872Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-08-31T10:44:28.872Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-20824
[2020-08-31T10:44:29.815Z] runbld>>> Storing build metadata: 
[2020-08-31T10:44:29.815Z] runbld>>> Adding test report.
[2020-08-31T10:44:29.815Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats
[2020-08-31T10:44:30.514Z] runbld>>> Found 140 test output files
[2020-08-31T10:44:33.067Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-08-31T10:44:33.067Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-08-31T10:44:33.067Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-08-31T10:44:33.067Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-08-31T10:44:33.067Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-08-31T10:44:33.067Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests/metricbeat/build/TEST-go-integration-graphite.xml
[2020-08-31T10:44:33.068Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20824/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests/metricbeat/build/TEST-go-integration-windows.xml
[2020-08-31T10:44:33.639Z] runbld>>> Test output logs contained: Errors: 0 Failures: 1 Tests: 21291 Skipped: 1575
[2020-08-31T10:44:33.639Z] runbld>>> Storing result
[2020-08-31T10:44:33.639Z] runbld>>> FAILURES: 1
[2020-08-31T10:44:34.211Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-08-31T10:44:34.211Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200831104427-F55C0415
[2020-08-31T10:44:34.211Z] runbld>>> Email notification disabled by environment variable.
[2020-08-31T10:44:34.211Z] runbld>>> Slack notification disabled by environment variable.
[2020-08-31T10:44:39.716Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-20824
[2020-08-31T10:44:39.824Z] [INFO] getVaultSecret: Getting secrets
[2020-08-31T10:44:39.887Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-08-31T10:44:40.677Z] + chmod 755 generate-build-data.sh
[2020-08-31T10:44:40.677Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20824/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20824/runs/3 FAILURE 5271041
[2020-08-31T10:44:40.677Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20824/runs/3/steps/?limit=10000 -o steps-info.json
[2020-08-31T10:44:43.160Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20824/runs/3/tests/?status=FAILED -o tests-errors.json

@narph narph merged commit f9d1fd3 into elastic:7.x Aug 31, 2020
@narph narph deleted the backport_20689_7.x branch August 31, 2020 12:26
@zube zube bot removed the [zube]: Done label Nov 30, 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

@jsoriano jsoriano jsoriano approved these changes

Assignees

@narph narph

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.
4 participants
@narph @elasticmachine @jsoriano @kaiyan-sheng