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

Docker check adjustment #964

Merged
merged 4 commits into from
Jun 2, 2014
Merged

Docker check adjustment #964

merged 4 commits into from
Jun 2, 2014

Conversation

LotharSee
Copy link
Contributor

This PR contains some adjustment to the Docker integration.

  • Turns cpu metrics to rates
  • Does not collect total_ metrics by default because most of the time they are redundant
  • Catch socket timeouts
  • Some cleanup

remh
remh reviewed Jun 2, 2014
View reviewed changes
checks.d/docker.py

try:
containers = self._get_containers(instance)
except:
Copy link

Choose a reason for hiding this comment

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

except Exception, you should avoid just "except"

@remh
Copy link

remh commented Jun 2, 2014

👍

remh pushed a commit that referenced this pull request Jun 2, 2014
Merge pull request #964 from DataDog/docker_check_adjustment
e67624a 
Docker check adjustment
@remh remh merged commit e67624a into master Jun 2, 2014
@LotharSee LotharSee deleted the docker_check_adjustment branch June 20, 2014 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@remh remh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LotharSee @remh