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

[Heartbeat] Fix exit on disabled monitor #22829

Merged
merged 3 commits into from
Dec 1, 2020
Merged

[Heartbeat] Fix exit on disabled monitor #22829

merged 3 commits into from
Dec 1, 2020

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Dec 1, 2020 •
edited
Loading

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
8a2c85b 
Fixes a bug where when `enabled: false` was set on a monitor heartbeat
would refuse to start.

Fixes elastic#22665
@andrewvc andrewvc added bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Dec 1, 2020
@andrewvc andrewvc requested a review from a team as a code owner December 1, 2020 17:50
@andrewvc andrewvc self-assigned this Dec 1, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@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 Dec 1, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 1, 2020 •
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 #22829 updated

  • Start Time: 2020-12-01T17:57:28.480+0000

  • Duration: 22 min 0 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

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.

lgtm

@andrewvc andrewvc merged commit 15f3514 into elastic:master Dec 1, 2020
@andrewvc andrewvc deleted the fix-enabled-false branch December 1, 2020 18:48
@andrewvc andrewvc mentioned this pull request Dec 1, 2020
Merged
6 tasks
andrewvc added a commit to andrewvc/beats that referenced this pull request Dec 1, 2020
@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 mentioned this pull request Dec 1, 2020
Merged
6 tasks
andrewvc added a commit to andrewvc/beats that referenced this pull request Dec 1, 2020
@andrewvc
[Heartbeat] Fix exit on disabled monitor (elastic#22829)
132b0c0 
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 added a commit that referenced this pull request Dec 1, 2020
@andrewvc
[Heartbeat] Fix exit on disabled monitor (#22829) (#22835)
c99e749 
Fixes a bug where when `enabled: false` was set on a monitor heartbeat
would refuse to start.

Fixes #22665

(cherry picked from commit 15f3514)
andrewvc added a commit that referenced this pull request Dec 1, 2020
@andrewvc
[Heartbeat] Fix exit on disabled monitor (#22829) (#22834)
96f49bf 
Fixes a bug where when `enabled: false` was set on a monitor heartbeat
would refuse to start.

Fixes #22665

(cherry picked from commit 15f3514)
@andrewvc andrewvc mentioned this pull request Dec 1, 2020
Closed
v1v added a commit to v1v/beats that referenced this pull request Dec 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7…
6724419 
…-issues

* upstream/master: (41 commits)
  Fix version parser regex for packaging (elastic#22581)
  Fix local_dynamic documentation and add providers inline doc. (elastic#22657)
  fix: use proper param name for e2e tests (elastic#22836)
  [Heartbeat] Fix exit on disabled monitor (elastic#22829)
  Update Golang to 1.14.12 (elastic#22790)
  docs: fix setup.template.overwrite typos (elastic#22804)
  Add docs section for ECS EC2 monitoring (elastic#22784)
  Fixing logic to keep list of unique cluster UUIDs (elastic#22808)
  Skip somewhat flaky UDP system test on Windows (elastic#22810)
  Fix polling node when it is not ready and monitor by hostname (elastic#22666)
  Skip Filebeat test_shutdown on windows 7 (elastic#22797)
  Make monitoring Namespace thread-safe (elastic#22640)
  Drop pkt_dstaddr and pkt_srcaddr when equals to "-" (elastic#22721)
  Add support for reading from UNIX datagram sockets (elastic#22699)
  Fix export dashboard command from Elastic Cloud (elastic#22746)
  Skip flaky winlogbeat test on Windows-7 (elastic#22754)
  Missing `>` (elastic#22763) (elastic#22766)
  Fix k8s watcher issue when node access to list nodes and ns (elastic#22714)
  [Metricbeat/Kibana/stats] Enforce `exclude_usage=true` (elastic#22732)
  Avoid sending non-numeric floats in cloud foundry integrations (elastic#22634)
  ...
v1v added a commit to v1v/beats that referenced this pull request Dec 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/retry-win…
29404d9 
…dows-7

* upstream/master: (41 commits)
  Fix version parser regex for packaging (elastic#22581)
  Fix local_dynamic documentation and add providers inline doc. (elastic#22657)
  fix: use proper param name for e2e tests (elastic#22836)
  [Heartbeat] Fix exit on disabled monitor (elastic#22829)
  Update Golang to 1.14.12 (elastic#22790)
  docs: fix setup.template.overwrite typos (elastic#22804)
  Add docs section for ECS EC2 monitoring (elastic#22784)
  Fixing logic to keep list of unique cluster UUIDs (elastic#22808)
  Skip somewhat flaky UDP system test on Windows (elastic#22810)
  Fix polling node when it is not ready and monitor by hostname (elastic#22666)
  Skip Filebeat test_shutdown on windows 7 (elastic#22797)
  Make monitoring Namespace thread-safe (elastic#22640)
  Drop pkt_dstaddr and pkt_srcaddr when equals to "-" (elastic#22721)
  Add support for reading from UNIX datagram sockets (elastic#22699)
  Fix export dashboard command from Elastic Cloud (elastic#22746)
  Skip flaky winlogbeat test on Windows-7 (elastic#22754)
  Missing `>` (elastic#22763) (elastic#22766)
  Fix k8s watcher issue when node access to list nodes and ns (elastic#22714)
  [Metricbeat/Kibana/stats] Enforce `exclude_usage=true` (elastic#22732)
  Avoid sending non-numeric floats in cloud foundry integrations (elastic#22634)
  ...
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

@andrewvc andrewvc

Labels
bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.10.1 v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Heartbeat] enabled: false does not seem to work
3 participants
@andrewvc @elasticmachine @blakerouse