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

Upgraded Docker check for Agent 5.1 #1162

Merged
merged 11 commits into from
Oct 29, 2014
Merged

Upgraded Docker check for Agent 5.1 #1162

merged 11 commits into from
Oct 29, 2014

Conversation

LotharSee
Copy link
Contributor

Many bugs and feature requests were reported for this check, this PR should address most of them.

  • Remove default limitation on the number of containers
  • Revamp events: aggregate events by image name, use the body to display more information (names, ids and states of containers). Fix Improve Docker events #1094 KeyError: 'from' #1113
  • Tag docker.containers.running by image name
  • Remove warning when there is no container running
  • Add an option to turn events off
  • Add an option to set the socket timeout (useful for users with many many containers)
  • Add an option to collect container size (instead of trying first then fallback, which trigger a Docker 1.2 bug). Fix Problem with Docker 1.2.0 and agent 5.0.0 #1104
  • Remove total_* useless metrics
  • More pertinent service check
  • Much cleaner code and configuration example

def _is_container_included(self, instance, tags):
def _is_tag_included(tag):
for exclude_rule in instance.get("exclude") or []:
if re.match(exclude_rule, tag):
Copy link
Member

Choose a reason for hiding this comment

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

I think most people would assume re.search instead of re.match here. Or maybe just specify this clearly in the documentation?

@LeoCavaille
Copy link
Member

Looks good to me! Question for you @LotharSee , how hard do you think it would be to have a docker test suite?

@LotharSee
Copy link
Contributor Author

Not that hard, but I never played with Travis. But it's definitively something that I'd like to do (and that we SHOULD do).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Problem with Docker 1.2.0 and agent 5.0.0 Improve Docker events
2 participants