Docker support #844
Merged
Docker support #844
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
| from checks import AgentCheck | ||
|
|
||
|
|
||
| USER_HZ = 1000 |
There was a problem hiding this comment.
This doesn't seem to be used anywhere.
| "cgroup": "memory", | ||
| "file": "lxc/{0}/memory.stat", | ||
| "metrics": { | ||
| "active_anon": ("docker.memory.active_anon", "gauge"), |
There was a problem hiding this comment.
Let's rename docker.memory.* to docker.mem.* to be consistent with the system.mem.*.
…information from all the running containers. Tags the data with the ContainerId, etc...
|
Updated PR with suggested changes. |
| def check(self, instance): | ||
| tags = instance.get("tags") or [] | ||
|
|
||
| for container in self._get_containers(instance): |
There was a problem hiding this comment.
Could you log something and use the self.warning() method to display a message in the info page in case there is no containers ?
|
Updated changes |
| if key in stats: | ||
| getattr(self, metric_type)(dd_key, int(stats[key]), tags=container_tags) | ||
| else: | ||
| self.warning("No containers are running.") |
There was a problem hiding this comment.
the else statement after a loop will always be executed unless there is break in your loop
…limit the number of collected containers if no rules are supplied.
|
Thanks a lot @steeve ! As discussed I'll do a few small changes before the release. |
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.
This PR enables instrumentation on Docker (LXC/cgroups) containers for:
It uses the native Unix socket to communicate with
dockerd, and thus doesn't need any particular configuration.It supports both old-style and new-style cgroups mountpoints, so it should work out of the box for any system that has cgroups support enabled.
To enable:
dd-agentis part of thedockergroup (so it can access the socket)docker.yaml.exampletodocker.yaml.