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

Cherry-pick #23619 to 7.11: Fix refresh of monitoring configuration #23635

Merged
merged 1 commit into from
Jan 26, 2021

Conversation

michalpristas
Copy link
Contributor

Cherry-pick of PR #23619 to 7.11 branch. Original message:

What does this PR do?

This PR fixes few things

  1. tests for decorator were out of date

  2. More sensitive monitoring change detection.
    We were only regenerating on program list change now we regenerate even on internal config change

  3. Generate monitoring steps for operator not only when switch is changed but also when config is changed for agent and monitoring is running. New config will be generated and picked up by monitoring beats.

Why is it important?

Fixes: #23599

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.

* fix refresh of monitoring beats

* more descriptive comment

* changelog

* newline
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 22, 2021
@michalpristas michalpristas changed the title Cherry-pick #23619 to 7.x: Fix refresh of monitoring configuration Cherry-pick #23619 to 7.11: Fix refresh of monitoring configuration Jan 22, 2021
@elasticmachine
Copy link
Collaborator

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #23635 opened

    • Start Time: 2021-01-22T09:59:23.561+0000
  • Duration: 21 min 34 sec

  • Commit: 8760522

Test stats 🧪

Test Results
Failed 0
Passed 1412
Skipped 6
Total 1418

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1412
Skipped 6
Total 1418

Copy link
Contributor

@EricDavisX EricDavisX left a comment

Choose a reason for hiding this comment

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

most of this is identical to the master branch pr which i tested as ok - only the polcy relating section looks to have any deviation for review, and at a glance it looks ok.

@michalpristas michalpristas merged commit 74f205b into elastic:7.11 Jan 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants