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

[Ingest Manager] Fix refresh of monitoring configuration #23619

Merged
merged 5 commits into from
Jan 21, 2021
Merged

[Ingest Manager] Fix refresh of monitoring configuration #23619

merged 5 commits into from
Jan 21, 2021

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Jan 21, 2021 •
edited
Loading

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.

@michalpristas michalpristas self-assigned this Jan 21, 2021
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Ingest Management labels Jan 21, 2021
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 21, 2021
@michalpristas michalpristas changed the title fix refresh of monitoring beats [Ingest Manager] Fix refresh of monitoring configuration Jan 21, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 21, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 #23619 updated

    • Start Time: 2021-01-21T19:12:24.479+0000

  • Duration: 28 min 11 sec

  • Commit: 841fcfc

Test stats 🧪

Test Results
Failed 0
Passed 1460
Skipped 4
Total 1464

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1460
Skipped 4
Total 1464

blakerouse
blakerouse approved these changes Jan 21, 2021
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Looks like the unit test does good coverage of if this is actually working now. Lets land it and get some real world testing on it.

@michalpristas
Copy link
Contributor Author

/package

@ph ph assigned michalpristas and unassigned michalpristas Jan 21, 2021
@EricDavisX
Copy link
Contributor

I pulled the branch gcp agent artifact for linux .tar.gz and tested it out and the logging seems to be turned off or on exactly as policy states without problem now. this is great, nice work Michal

EricDavisX
EricDavisX approved these changes Jan 21, 2021
View reviewed changes
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.

tests like it works to me.

@michalpristas michalpristas merged commit 717cb22 into elastic:master Jan 21, 2021
michalpristas added a commit to michalpristas/beats that referenced this pull request Jan 22, 2021
@michalpristas
[Ingest Manager] Fix refresh of monitoring configuration (elastic#23619)
b010b82 
* fix refresh of monitoring beats

* more descriptive comment

* changelog

* newline
michalpristas added a commit to michalpristas/beats that referenced this pull request Jan 22, 2021
@michalpristas
[Ingest Manager] Fix refresh of monitoring configuration (elastic#23619)
8760522 
* fix refresh of monitoring beats

* more descriptive comment

* changelog

* newline
This was referenced Jan 22, 2021
Merged
Merged
michalpristas added a commit that referenced this pull request Jan 26, 2021
@michalpristas
[Ingest Manager] Fix refresh of monitoring configuration (#23619) (#2…
74f205b 
…3635)

* fix refresh of monitoring beats

* more descriptive comment

* changelog

* newline
michalpristas added a commit that referenced this pull request Jan 26, 2021
@michalpristas
[Ingest Manager] Fix refresh of monitoring configuration (#23619) (#2…
3205776 
…3636)

* fix refresh of monitoring beats

* more descriptive comment

* changelog

* newline
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EricDavisX EricDavisX EricDavisX approved these changes

@blakerouse blakerouse blakerouse approved these changes

Assignees

@michalpristas michalpristas

Labels
bug Team:Elastic-Agent Label for the Agent team v7.11.0
Projects
None yet
Milestone
No milestone
4 participants
@michalpristas @elasticmachine @EricDavisX @blakerouse