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.

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

Fix: bad substitution of API key #24036

Merged
merged 2 commits into from
Feb 15, 2021
Merged

Fix: bad substitution of API key #24036

merged 2 commits into from
Feb 15, 2021

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Feb 15, 2021

What does this PR do?

This PR fixes the bad substitution (typo), spotted in https://beats-ci.elastic.co/job/Ingest-manager/job/elastic-package/job/PR-246/45/artifact/build/elastic-stack-dump/stack/logs/elastic-agent.log .

Why is it important?

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.

How to test this PR locally

  1. Create new custom policy in the Kibana UI.
  2. Start new Docker container with Elastic Agent, don't provide the enrollment token.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 15, 2021
@mtojek mtojek added the Team:Elastic-Agent Label for the Agent team label Feb 15, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 15, 2021
@mtojek mtojek added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 15, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 15, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 15, 2021

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24036 updated

  • Start Time: 2021-02-15T13:18:08.240+0000

  • Duration: 80 min 18 sec

  • Commit: cf6c44d

Test stats 🧪

Test Results
Failed 0
Passed 45845
Skipped 4762
Total 50607

Trends 🧪

Image of Build Times

Image of Tests

Log output

Expand to view the last 100 lines of log output

[2021-02-15T14:12:52.913Z] d84b76ead6f9: Layer already exists
[2021-02-15T14:12:52.913Z] 00af10937683: Layer already exists
[2021-02-15T14:12:52.913Z] 213e8e71b191: Layer already exists
[2021-02-15T14:12:52.913Z] af2511d16095: Layer already exists
[2021-02-15T14:12:52.913Z] f5738d47af70: Layer already exists
[2021-02-15T14:12:52.913Z] 3aa55ff7bca1: Layer already exists
[2021-02-15T14:12:52.913Z] e5610243e308: Layer already exists
[2021-02-15T14:12:54.304Z] cf6c44d34874575a34111dfe1561b0d552555be4: digest: sha256:11203ce337120442e4f2402d481822ef885189fa2aea0265d3e56e489c130ac5 size: 3033
[2021-02-15T14:12:54.690Z] Client: Docker Engine - Community
[2021-02-15T14:12:54.690Z]  Version:           20.10.3
[2021-02-15T14:12:54.690Z]  API version:       1.41
[2021-02-15T14:12:54.690Z]  Go version:        go1.13.15
[2021-02-15T14:12:54.690Z]  Git commit:        48d30b5
[2021-02-15T14:12:54.690Z]  Built:             Fri Jan 29 14:33:13 2021
[2021-02-15T14:12:54.690Z]  OS/Arch:           linux/amd64
[2021-02-15T14:12:54.690Z]  Context:           default
[2021-02-15T14:12:54.690Z]  Experimental:      true
[2021-02-15T14:12:54.690Z] 
[2021-02-15T14:12:54.690Z] Server: Docker Engine - Community
[2021-02-15T14:12:54.690Z]  Engine:
[2021-02-15T14:12:54.690Z]   Version:          20.10.3
[2021-02-15T14:12:54.690Z]   API version:      1.41 (minimum version 1.12)
[2021-02-15T14:12:54.690Z]   Go version:       go1.13.15
[2021-02-15T14:12:54.690Z]   Git commit:       46229ca
[2021-02-15T14:12:54.690Z]   Built:            Fri Jan 29 14:31:25 2021
[2021-02-15T14:12:54.690Z]   OS/Arch:          linux/amd64
[2021-02-15T14:12:54.690Z]   Experimental:     false
[2021-02-15T14:12:54.690Z]  containerd:
[2021-02-15T14:12:54.690Z]   Version:          1.4.3
[2021-02-15T14:12:54.690Z]   GitCommit:        269548fa27e0089a8b8278fc4fc781d7f65a939b
[2021-02-15T14:12:54.690Z]  runc:
[2021-02-15T14:12:54.690Z]   Version:          1.0.0-rc92
[2021-02-15T14:12:54.690Z]   GitCommit:        ff819c7e9184c13b7c2607fe6c30ae19403a7aff
[2021-02-15T14:12:54.690Z]  docker-init:
[2021-02-15T14:12:54.690Z]   Version:          0.19.0
[2021-02-15T14:12:54.691Z]   GitCommit:        de40ad0
[2021-02-15T14:12:54.691Z] Unable to find image 'alpine:3.4' locally
[2021-02-15T14:12:55.259Z] 3.4: Pulling from library/alpine
[2021-02-15T14:12:55.518Z] c1e54eec4b57: Pulling fs layer
[2021-02-15T14:12:55.777Z] c1e54eec4b57: Verifying Checksum
[2021-02-15T14:12:55.777Z] c1e54eec4b57: Download complete
[2021-02-15T14:12:56.039Z] c1e54eec4b57: Pull complete
[2021-02-15T14:12:56.039Z] Digest: sha256:b733d4a32c4da6a00a84df2ca32791bb03df95400243648d8c539e7b4cce329c
[2021-02-15T14:12:56.039Z] Status: Downloaded newer image for alpine:3.4
[2021-02-15T14:12:58.253Z] + python .ci/scripts/pre_archive_test.py
[2021-02-15T14:13:10.472Z] Copy ./x-pack/metricbeat/build into build/x-pack/metricbeat/build
[2021-02-15T14:13:10.472Z] Copy ./x-pack/metricbeat/build/golang-crossbuild into build/x-pack/metricbeat/build/golang-crossbuild
[2021-02-15T14:13:10.472Z] Copy ./x-pack/elastic-agent/build into build/x-pack/elastic-agent/build
[2021-02-15T14:13:10.472Z] Copy ./x-pack/elastic-agent/build/golang-crossbuild into build/x-pack/elastic-agent/build/golang-crossbuild
[2021-02-15T14:13:10.472Z] Copy ./x-pack/elastic-agent/build/package/elastic-agent/elastic-agent-linux-amd64.docker/docker-build into build/x-pack/elastic-agent/build/package/elastic-agent/elastic-agent-linux-amd64.docker/docker-build
[2021-02-15T14:13:10.472Z] Copy ./x-pack/elastic-agent/build/package/elastic-agent-ubi8/elastic-agent-linux-amd64.docker/docker-build into build/x-pack/elastic-agent/build/package/elastic-agent-ubi8/elastic-agent-linux-amd64.docker/docker-build
[2021-02-15T14:13:10.472Z] Copy ./x-pack/filebeat/build into build/x-pack/filebeat/build
[2021-02-15T14:13:10.472Z] Copy ./x-pack/filebeat/build/golang-crossbuild into build/x-pack/filebeat/build/golang-crossbuild
[2021-02-15T14:13:10.472Z] Copy ./x-pack/heartbeat/build into build/x-pack/heartbeat/build
[2021-02-15T14:13:10.472Z] Copy ./x-pack/heartbeat/build/golang-crossbuild into build/x-pack/heartbeat/build/golang-crossbuild
[2021-02-15T14:13:10.489Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-24036/src/github.com/elastic/beats/build
[2021-02-15T14:13:10.801Z] + rm -rf ve
[2021-02-15T14:13:10.801Z] + find . -type d -name vendor -exec rm -r {} ;
[2021-02-15T14:13:10.814Z] Recording test results
[2021-02-15T14:13:13.393Z] None of the test reports contained any result
[2021-02-15T14:13:13.403Z] [Checks API] No suitable checks publisher found.
[2021-02-15T14:13:13.791Z] Client: Docker Engine - Community
[2021-02-15T14:13:13.791Z]  Version:           20.10.3
[2021-02-15T14:13:13.791Z]  API version:       1.41
[2021-02-15T14:13:13.791Z]  Go version:        go1.13.15
[2021-02-15T14:13:13.791Z]  Git commit:        48d30b5
[2021-02-15T14:13:13.791Z]  Built:             Fri Jan 29 14:33:13 2021
[2021-02-15T14:13:13.791Z]  OS/Arch:           linux/amd64
[2021-02-15T14:13:13.791Z]  Context:           default
[2021-02-15T14:13:13.791Z]  Experimental:      true
[2021-02-15T14:13:13.791Z] 
[2021-02-15T14:13:13.791Z] Server: Docker Engine - Community
[2021-02-15T14:13:13.791Z]  Engine:
[2021-02-15T14:13:13.791Z]   Version:          20.10.3
[2021-02-15T14:13:13.791Z]   API version:      1.41 (minimum version 1.12)
[2021-02-15T14:13:13.791Z]   Go version:       go1.13.15
[2021-02-15T14:13:13.791Z]   Git commit:       46229ca
[2021-02-15T14:13:13.791Z]   Built:            Fri Jan 29 14:31:25 2021
[2021-02-15T14:13:13.791Z]   OS/Arch:          linux/amd64
[2021-02-15T14:13:13.791Z]   Experimental:     false
[2021-02-15T14:13:13.791Z]  containerd:
[2021-02-15T14:13:13.792Z]   Version:          1.4.3
[2021-02-15T14:13:13.792Z]   GitCommit:        269548fa27e0089a8b8278fc4fc781d7f65a939b
[2021-02-15T14:13:13.792Z]  runc:
[2021-02-15T14:13:13.792Z]   Version:          1.0.0-rc92
[2021-02-15T14:13:13.792Z]   GitCommit:        ff819c7e9184c13b7c2607fe6c30ae19403a7aff
[2021-02-15T14:13:13.792Z]  docker-init:
[2021-02-15T14:13:13.792Z]   Version:          0.19.0
[2021-02-15T14:13:13.792Z]   GitCommit:        de40ad0
[2021-02-15T14:14:16.006Z] Scheduling project: Beats » Beats Packaging » PR-24036
[2021-02-15T14:14:17.159Z] Starting building: Beats » Beats Packaging » PR-24036 #3
[2021-02-15T14:38:23.721Z] [INFO] For detailed information see: https://beats-ci.elastic.co/job/Beats/job/packaging/job/PR-24036/3/display/redirect
[2021-02-15T14:38:24.847Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-24036/src/github.com/elastic/beats
[2021-02-15T14:38:25.133Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-24036
[2021-02-15T14:38:25.187Z] [INFO] getVaultSecret: Getting secrets
[2021-02-15T14:38:25.305Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-02-15T14:38:26.044Z] + chmod 755 generate-build-data.sh
[2021-02-15T14:38:26.044Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24036/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24036/runs/2 FAILURE 4817541
[2021-02-15T14:38:26.388Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24036/runs/2/steps/?limit=10000 -o steps-info.json
[2021-02-15T14:38:31.587Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24036/runs/2/tests/?status=FAILED -o tests-errors.json

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 45845
Skipped 4762
Total 50607

Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

👍

@@ -39,6 +39,7 @@
- Increase checkin grace period to 30 seconds {pull}23568[23568]
- Fix libbeat from reporting back degraded on config update {pull}23537[23537]
- Fix issues with dynamic inputs and conditions {pull}23886[23886]
- Fix bad substitution of API key. {pull}24036[24036]
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this required? I assume the fix goes into the same version (7.12) as the changes that broke the setup.

Copy link
Contributor Author

@mtojek mtojek Feb 15, 2021

Choose a reason for hiding this comment

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

I don't have a strong opinion about it. This is a change (bugfix) hence the CHANGELOG entry. I will backport it to 7.x once this is merged.

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe I am not up-to-date with how this works in the beats repo, but since Changelog entries are usually user facing, I am used to only include bugfixes that are user facing (which is not the case if introduced & fixed in the same version). Up to you though whether or not to keep it.

@mtojek
Copy link
Contributor Author

mtojek commented Feb 15, 2021

/packaging

@mtojek
Copy link
Contributor Author

mtojek commented Feb 15, 2021

Errors unrelated.

@mtojek mtojek merged commit 8ea9a95 into elastic:master Feb 15, 2021
mtojek added a commit to mtojek/beats that referenced this pull request Feb 15, 2021
* Fix: bad substitution of API key

* Update changelog

(cherry picked from commit 8ea9a95)
@mtojek mtojek added the v7.12.0 label Feb 15, 2021
v1v added a commit to v1v/beats that referenced this pull request Feb 16, 2021
…-arm

* upstream/master:
  [Metricbeat][Kubernetes] Extend state_node with more conditions (elastic#23905)
  [CI] googleStorageUploadExt step (elastic#24048)
  Check fields are documented for aws metricsets (elastic#23887)
  Update go-concert to 0.1.0 (elastic#23770)
  [Libbeat][New Processor] XML Decode (elastic#23678)
  Fix: bad substitution of API key (elastic#24036)
  [Filebeat] Add Pensando DFW Module (elastic#21063)
  [Filebeat] Check if processor is supported by ES version (elastic#23763)
  Syslog system tests: be more forgiving (elastic#24021)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Elastic-Agent Label for the Agent team v7.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants