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.2](backport #1299) Always add api_key to Elasticsearch output #1306

Merged
merged 5 commits into from
Apr 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 4, 2022

This is an automatic backport of pull request #1299 done by Mergify.


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

ph added 5 commits April 4, 2022 20:32
This fixes a few issues:

- When the hash on the permission and the hash on the agent were the
same the key were not added to the output. This was causing the agent to
not be able to connect to Elasticsearch. If you changes an integration
policy field, like the host,  and the data stream are the same the permission hash will
stay the same.

- Fix a possible issue when the new key was not saved on the Agent model, the
key was only saved when we were targetting a default agent policy.
Currently we only support a single ES output so this should always be saved.

- Reorganize the test to ensure that all the scenario from the case
statement are tested.

Fix: elastic/elastic-agent#285
(cherry picked from commit 372e598)
(cherry picked from commit 681be39)
(cherry picked from commit 8436923)
(cherry picked from commit 96ccfaa)
(cherry picked from commit 6b7f21f)
@mergify mergify bot requested a review from a team as a code owner April 4, 2022 20:32
@mergify mergify bot requested a review from lykkin April 4, 2022 20:32
@mergify mergify bot added the backport label Apr 4, 2022
@mergify mergify bot assigned ph Apr 4, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Apr 4, 2022

💔 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-04-04T20:42:09.270+0000

  • Duration: 7 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 172
Skipped 0
Total 172

Steps errors 1

Expand to view the steps failures

test
  • Took 2 min 28 sec . View more details here
  • Description: make test-int

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@ph
Copy link
Contributor

ph commented Apr 4, 2022

/test

@ph
Copy link
Contributor

ph commented Apr 4, 2022

Merging this same flaky test as #1289

@ph ph merged commit 246bc34 into 8.2 Apr 4, 2022
@mergify mergify bot deleted the mergify/bp/8.2/pr-1299 branch April 4, 2022 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants