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

[8.0](backport #29312) Add logs for ca_trusted_fingerprint workflow #29316

Merged
merged 3 commits into from
Dec 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2021

This is an automatic backport of pull request #29312 done by Mergify.
Cherry-pick of db9b410 has failed:

On branch mergify/bp/8.0/pr-29312
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit db9b4104d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/common/transport/tlscommon/tls_config.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This commit adds logs to clearly show when Beats is trusting a
self-signed certificate through the fingerprint provided by
`ssl.ca_trusted_fingerprint`.

It also cleans up some struct tags on `tlscommon.TLSConfig`.

(cherry picked from commit db9b410)

# Conflicts:
#	libbeat/common/transport/tlscommon/tls_config.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 7, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 7, 2021
@botelastic
Copy link

botelastic bot commented Dec 7, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 7, 2021

💚 Build Succeeded

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

Expand to view the summary

Build stats

  • Start Time: 2021-12-07T18:10:03.247+0000

  • Duration: 102 min 20 sec

  • Commit: f2bace0

Test stats 🧪

Test Results
Failed 0
Passed 48265
Skipped 4277
Total 52542

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Dec 7, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.0/pr-29312 upstream/mergify/bp/8.0/pr-29312
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-29312

@belimawr
Copy link
Contributor

belimawr commented Dec 8, 2021

run elasticsearch-ci/docs

@belimawr belimawr merged commit a894da5 into 8.0 Dec 8, 2021
@belimawr belimawr deleted the mergify/bp/8.0/pr-29312 branch December 8, 2021 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants