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

[Heartbeat] Fix bug where enabled: false is ignored. #27615

Merged
merged 1 commit into from
Aug 26, 2021

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Aug 26, 2021

Fixes #27599

This properly handles skipped monitors, and also fixes the broken test for this.

Additionally, this switches to the go1.3+ way of handling error hierarchies in heartbeat.go using errors.Is. It also cleans up the code by no longer making a disabled config an error when parsing stdfields. It's now only an error when detected in monitor.go which is cleaner.

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.

How to test this PR locally

Run the default heartbeat.yml, it should no longer crash. Switching enabled: true should cause the monitor to run.

Fixes elastic#27599

This properly handles skipped monitors, and also fixes the broken test
for this.

Additionally, this switches to the go1.3+ way of handling error
hierarchies in `heartbeat.go` using `errors.Is`. It also cleans up the code by no longer
making a disabled config an `error` when parsing stdfields. It's now
only an error when detected in `monitor.go` which is cleaner.
@andrewvc andrewvc added bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.15.0 labels Aug 26, 2021
@andrewvc andrewvc self-assigned this Aug 26, 2021
@andrewvc andrewvc requested a review from a team as a code owner August 26, 2021 15:47
@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 Aug 26, 2021
Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏽

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

Expand to view the summary

Build stats

  • Start Time: 2021-08-26T15:47:52.058+0000

  • Duration: 65 min 50 sec

  • Commit: d8119f0

Test stats 🧪

Test Results
Failed 0
Passed 3489
Skipped 80
Total 3569

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 3489
Skipped 80
Total 3569

@andrewvc andrewvc merged commit 9a517a7 into elastic:master Aug 26, 2021
@andrewvc andrewvc deleted the fix-disabled branch August 26, 2021 16:55
@andrewvc
Copy link
Contributor Author

@Mergifyio backport 7.x

@andrewvc
Copy link
Contributor Author

@Mergifyio backport 7.15

mergify bot pushed a commit that referenced this pull request Aug 26, 2021
Fixes #27599

This properly handles skipped monitors, and also fixes the broken test
for this.

Additionally, this switches to the go1.3+ way of handling error
hierarchies in `heartbeat.go` using `errors.Is`. It also cleans up the code by no longer
making a disabled config an `error` when parsing stdfields. It's now
only an error when detected in `monitor.go` which is cleaner.

(cherry picked from commit 9a517a7)
@mergify
Copy link
Contributor

mergify bot commented Aug 26, 2021

Command backport 7.x: success

Backports have been created

mergify bot pushed a commit that referenced this pull request Aug 26, 2021
Fixes #27599

This properly handles skipped monitors, and also fixes the broken test
for this.

Additionally, this switches to the go1.3+ way of handling error
hierarchies in `heartbeat.go` using `errors.Is`. It also cleans up the code by no longer
making a disabled config an `error` when parsing stdfields. It's now
only an error when detected in `monitor.go` which is cleaner.

(cherry picked from commit 9a517a7)
@mergify
Copy link
Contributor

mergify bot commented Aug 26, 2021

Command backport 7.15: success

Backports have been created

andrewvc added a commit that referenced this pull request Aug 26, 2021
Fixes #27599

This properly handles skipped monitors, and also fixes the broken test
for this.

Additionally, this switches to the go1.3+ way of handling error
hierarchies in `heartbeat.go` using `errors.Is`. It also cleans up the code by no longer
making a disabled config an `error` when parsing stdfields. It's now
only an error when detected in `monitor.go` which is cleaner.

(cherry picked from commit 9a517a7)

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
andrewvc added a commit that referenced this pull request Aug 26, 2021
Fixes #27599

This properly handles skipped monitors, and also fixes the broken test
for this.

Additionally, this switches to the go1.3+ way of handling error
hierarchies in `heartbeat.go` using `errors.Is`. It also cleans up the code by no longer
making a disabled config an `error` when parsing stdfields. It's now
only an error when detected in `monitor.go` which is cleaner.

(cherry picked from commit 9a517a7)

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Sep 1, 2021
* master:
  Forward port 7.14.1 changelog to master  (elastic#27687)
  Addressing multiple dashboard issues: deps loading once, field conversion, etc. (elastic#27669)
  Remove adaptive queue sizes from agent's spec files (elastic#27653)
  Osquerybeat: Improve testability and unit test coverage (elastic#27591)
  Osquerybeat: lockdown flagsfile, prevent global defaults (elastic#27611)
  Import the references of dashboard assets using the Saved Objects API (elastic#27647)
  Fix bug with override path in cgroups (elastic#27620)
  Allow Kibana client to authorize with Elasticsearch API key (elastic#27540)
  Filebeat auditd: Fix Top Exec Commands dashboard visualization (elastic#27638)
  [elastic-agent] Fix docker tar.gz generation for complete image (elastic#27621)
  Follow up changes in dashboards in mage check && fix minor issue (elastic#27553)
  [Heartbeat] Fix bug where `enabled: false` is ignored. (elastic#27615)
  Support kube_state_metrics v2.0.0 (elastic#27552)
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
Fixes elastic#27599

This properly handles skipped monitors, and also fixes the broken test
for this.

Additionally, this switches to the go1.3+ way of handling error
hierarchies in `heartbeat.go` using `errors.Is`. It also cleans up the code by no longer
making a disabled config an `error` when parsing stdfields. It's now
only an error when detected in `monitor.go` which is cleaner.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Heartbeat] Disabled monitors in static monitor list cause crash
3 participants