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

Reject standalone checks in API before serving "/checks" routes #1417

Merged
merged 15 commits into from Aug 17, 2016

Conversation

Projects
None yet
4 participants
@amdprophet
Copy link
Member

commented Aug 17, 2016

Description

The /checks & /check/:check routes in Sensu API should only show subscription checks, not standalone checks.

Related Issue

#1416

Motivation and Context

Standalone checks will be picked up by Sensu API if a Sensu Client exists on the same node and they both load checks from the same configuration file and/or directories. Including standalone checks that only exist on the node running Sensu API may be misleading to users as they may expect the API to also show information on standalone checks that exist outside of the API server.

How Has This Been Tested?

Wrote test specs. Ensured they failed prior to the fix and that they passed after the fix.

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

cwjohnston and others added some commits Jul 21, 2016

[contributing] update contrib doc to indicate we prefer issues for di…
…scussion prior to submission of pull requests
[aggregates] guard against nil check executed
             - unmatched tokens check results need executed
Merge pull request #1395 from sensu/hotfix/aggregates
API aggregates need to guard against nil check executed
Ensure /health API returns 204 No Content for "OK" responses
As documented in #1405, the API is returning "204 (No Response)" instead of the
commonly accepted "204 No Content", which is also the documented behavior. This
change fixes the implementation and adds a test for the expected response
reason.

Closes #1405
Merge pull request #1406 from cwjohnston/fix/api-health-204-message
Ensure /health API returns 204 No Content for "OK" responses
Caleb Hailey
Merge pull request #1386 from cwjohnston/contrib-updates
Add Github Issue and Pull Request templates, update contributing doc
@@ -7,14 +7,14 @@ module Checks

# GET /checks
def get_checks
@response_content = @settings.checks
@response_content = @settings.checks.reject { |c| c[:standalone] }

This comment has been minimized.

Copy link
@portertech

portertech Aug 17, 2016

Member

c -> check

@portertech

This comment has been minimized.

Copy link
Member

commented Aug 17, 2016

@amdprophet looks good, please target release/0.26

@amdprophet amdprophet changed the base branch from master to release/0.26 Aug 17, 2016

@amdprophet amdprophet merged commit c1ce8b7 into sensu:release/0.26 Aug 17, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@amdprophet amdprophet deleted the amdprophet:reject_standalones branch Aug 17, 2016

@portertech portertech removed the in progress label Aug 17, 2016

@fessyfoo

This comment has been minimized.

Copy link

commented Aug 17, 2016

tx for this. 😄

@cwjohnston

This comment has been minimized.

Copy link
Member

commented Oct 12, 2016

Closes #1416

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.