made cleanup_chronos_jobs send OK on sensu #191
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mjksmith
force-pushed
the
master
branch
2 times, most recently
from
8bbb271 to
42ae5c2
Compare
| import service_configuration_lib | ||
|
|
||
| from paasta_tools import chronos_tools | ||
| from paasta_tools.check_chronos_jobs import send_event_to_sensu |
There was a problem hiding this comment.
Instead of doing this, can you move paasta_tools.check_chronos_jobs.send_event_to_sensu to paasta_tools.chronos_tools or even paasta_tools.utils if it is generic enough?
|
|
||
| def compose_check_name_for_job(service, instance): | ||
| """Compose a sensu check name for a given job""" | ||
| return 'check-chronos-jobs.%s%s%s' % (service, INTERNAL_SPACER, instance) |
There was a problem hiding this comment.
ah, this isn't the correct place for this.
Here's what I would do:
in chronos_tools.py and marathon_tools.py:
def compose_check_name_for_service_instance(check_name, service, instance):
return '%s.%s%s%s' % (check_name, service, INTERNAL_SPACER, instance)in check_chronos_jobs.py
def send_event(service, instance):
"""check_chronos_jobs specific wrapper for monitoring_tools.send_event_to_sensu"""
check_name = chronos_tools.compose_check_name_for_job('check_chronos_jobs', service, instance)
return monitoring_tools.send_event(check_name, service, instance....)You can then follow this pattern of copying the check_chronos_tools.send_event function in other scripts (like in #198)
|
fix+ship |
mjksmith
added a commit
that referenced
this pull request
Jan 28, 2016
made cleanup_chronos_jobs send OK on sensu
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When instances are removed from a
chronos-*.yamlcleanup_chronos_jobsnow sends an OK status to sensu.