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

Cherry-pick #22829 to 7.x: [Heartbeat] Fix exit on disabled monitor #22834

Merged
merged 1 commit into from
Dec 1, 2020
Merged

Cherry-pick #22829 to 7.x: [Heartbeat] Fix exit on disabled monitor #22834

merged 1 commit into from
Dec 1, 2020

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Dec 1, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #22829 to 7.x branch. Original message:

Fixes a bug where when enabled: false was set on a monitor heartbeat would refuse to start.

Also fixes capitalization for those those errors.

Fixes #22665

  • 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

Simply add enabled: false to the default HTTP config in heartbeat.yml

@andrewvc
[Heartbeat] Fix exit on disabled monitor (elastic#22829)
9ef78ff 
Fixes a bug where when `enabled: false` was set on a monitor heartbeat
would refuse to start.

Fixes elastic#22665

(cherry picked from commit 15f3514)
@andrewvc andrewvc requested a review from a team as a code owner December 1, 2020 18:49
@andrewvc andrewvc added [zube]: In Review backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Dec 1, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 1, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 1, 2020
blakerouse
blakerouse approved these changes Dec 1, 2020
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.

Backport looks good.

@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 #22834 opened

  • Start Time: 2020-12-01T18:50:05.852+0000

  • Duration: 23 min 46 sec

Test stats 🧪

Test Results
Failed 0
Passed 926
Skipped 13
Total 939

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 926
Skipped 13
Total 939

@andrewvc andrewvc merged commit 96f49bf into elastic:7.x Dec 1, 2020
@andrewvc andrewvc deleted the backport_22829_7.x branch December 1, 2020 19:15
@zube zube bot removed the [zube]: Done label Mar 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blakerouse blakerouse blakerouse approved these changes

Assignees
No one assigned
Labels
backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andrewvc @elasticmachine @blakerouse