Vishnu kannan
dabec0a6b2
Fix fs stats handling for non-aufs storage drivers.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-05 16:32:07 -08:00
Jimmi Dyson
a8946729de
Merge pull request #969 from f0/master
...
add support for cgroup CPUQuota and CPUPeriod prometheus limit
2016-02-04 16:51:38 +00:00
Vishnu kannan
3f75344053
Fallback to flag defined value for storage dir in case docker info
...
doesn't provide the storage dir.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-03 18:00:59 -08:00
Vishnu kannan
f5829b4744
Rework the v2.1 API to expose container Info.
...
Added a test for filesystem stats. Devicemapper backend is ignored
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-03 17:02:49 -08:00
Florian Koch
669bc4abfa
add cgroup quota and period support / add missing tests
2016-02-02 20:33:11 +01:00
Vishnu kannan
59c03672d0
Handle fs metrics for docker version >= 1.10.0
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-02 10:20:20 -08:00
Vishnu kannan
5ab2f45fc6
Use storage dir from docker info for filesystem usage tracking.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-01 18:20:00 -08:00
Tim St. Clair
f5bceae3a2
Merge pull request #1033 from asteris-llc/master
...
Add the support for kafka in cAdvisor's storage, including output of container id and labels
2016-01-29 17:17:06 -05:00
Allison Richardet
80ba7e7db7
Add the support for kafka in cAdvisor's storage, including output of container id and labels
...
Addressing PR Feedback
Addressing PR Feedback
2016-01-27 21:33:57 -06:00
Jimmi Dyson
4c345b1989
Merge pull request #1063 from dqminh/fix-envs-handler
...
Initialize env mapping for labels when creating docker container
2016-01-27 10:46:24 +00:00
Vish Kannan
bef8522964
Merge pull request #1046 from jimmidyson/libcontainer-bump
...
bump(github.com/opencontainers/runc/libcontainer)
2016-01-26 14:35:46 -08:00
Jimmi Dyson
336821d28e
Fix up networking stats for new docker network functionality
2016-01-26 11:32:39 +00:00
Jimmi Dyson
33386f899b
bump(github.com/opencontainers/runc/libcontainer)
...
Fixes issues with breaking changes to ``GetPids` which is affecting
downstream consumers of cadvisor (e.g. Kubernetes).
2016-01-26 09:46:59 +00:00
Daniel Dao
127b09f5ae
initialize env mapping
...
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-01-18 15:58:45 +00:00
Vishnu Kannan
944201c86b
Refactor api conversion methods.
2016-01-15 15:40:15 -08:00
Vishnu kannan
6dfdd8eca1
1. Update filesystem stats APIs.
...
2. Add BaseUsage to containers which includes only the rootfs usage, if available.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-01-15 15:39:17 -08:00
Shimin Guo
a26b58ec8e
expose page cache size
2016-01-15 08:45:51 -08:00
Shimin Guo
1a867bdadd
expose RSS
2016-01-15 08:45:51 -08:00
Jimmi Dyson
4e9d29a408
Fix FS usage goroutine leaks
2016-01-14 19:30:48 +00:00
Vish Kannan
01434a1c54
Merge pull request #1020 from miguel250/zfs-support
...
Add support ZFS filesystem
2016-01-13 11:52:37 -08:00
Daniel Dao
e5b6bfa94f
add whitelisted env as container metadata
...
This add Envs to container spec as a metadata source. When using prometheus
exposition format, they will be merged into the list of metrics' labels.
Also changed the cli flag to docker_env_metadata_whitelist, and add refenrences
of whitelist envs to API
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-01-13 11:22:13 +00:00
Florian Pfitzer
009761cb53
Export image name and env variables as prometheus labels
2016-01-05 10:49:20 +00:00
Miguel Perez
e0fef76668
Add support ZFS filesystem
...
- fix container usage stat not loading on first load
2015-12-15 15:41:19 -05:00
Vishnu kannan
a6daa760c8
Fix goroutine leak in docker fs handler logic.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2015-12-04 11:19:49 -08:00
Jonathan Boulle
4965f069b7
Fix case statements dealing with storageDriver
...
cf0adcc817
introduced two switch
statements to facilitate the addition of the `overlayStorageDriver`;
unfortunately neither of them conform to the Go switch semantic, which
does not fallthrough unless explicitly requested. In one case this was
innocuous (because a `break` was effectively the same as a no-op) but in
the other it would cause the `HasFilesystem` bool to not be set
appropriately in the case of `aufsStorageDriver` being used.
IMHO it's also more idiomatic to perform the default behaviour in the
default case rather than pre-setting and overriding it.
2015-12-02 16:04:01 -08:00
Vishnu Kannan
cf0adcc817
Add support for Overlayfs.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2015-12-02 15:43:34 -08:00
Lei Xue
15b34b0131
add test case for compatibility.go
2015-12-02 11:01:50 +08:00
Lei Xue
7343ae4583
fix unmarshal container config failure with Docker 1.8.3
2015-12-02 11:01:12 +08:00
Lei Xue
dbbe38dfed
re-order the import package
2015-11-30 16:43:22 +08:00
Jimmi Dyson
1f679cee70
Clean up unused struct fields (via structcheck linter)
2015-11-27 22:06:16 +00:00
Jimmi Dyson
82810f13cd
Remove unused code (via deadcode linter)
2015-11-27 21:48:33 +00:00
Jimmi Dyson
360c73c6fd
Improve perf of interface stats parsing
2015-11-27 14:12:41 +00:00
Jimmi Dyson
f9eb56e800
Merge pull request #966 from afein/godep_update_runc
...
[Godeps] changed docker/libcontainer dependency to runc/libcontainer
2015-11-26 15:19:28 +00:00
Jimmi Dyson
cec96eb68b
Merge pull request #978 from jimmidyson/regexp-perf
...
Regexp tidy up
2015-11-26 09:45:27 +00:00
Jimmi Dyson
d1fce20304
Regexp tidy up
2015-11-26 09:14:26 +00:00
Jimmi Dyson
17622ecba1
Rename readInt64 -> readUInt64 for clarity
2015-11-25 16:42:33 +00:00
Alex Mavrogiannis
4533dd7d18
changed libcontainer dependency to runc
2015-11-21 14:04:01 -08:00
Vishnu kannan
401cbbc48f
Add a --nosystemd
flag to avoid assuming systemd to be the cgroups
...
owner for docker containers.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2015-11-16 10:37:54 -08:00
Vishnu Kannan
419dd8a778
Include log usage for aufs driver.
...
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2015-11-10 14:16:20 -08:00
Vish Kannan
47a1fa4fff
Merge pull request #936 from mqliang/master
...
Fix imported package names to not use mixedCaps or under_scores
2015-11-04 10:47:48 -08:00
Jimmi Dyson
561cc1da4f
Use file reader directly for net stats
2015-10-28 12:51:19 +00:00
Jimmi Dyson
c72e0c23a5
Add test for net dev stats
2015-10-28 12:51:13 +00:00
Jimmi Dyson
da771a0977
Drop regexp for net stats parsing
...
Reported in kubernetes/kubernetes#16296
2015-10-27 20:16:49 +00:00
Jimmi Dyson
8b6e002e0a
Disable tcp stats collection
...
Fixes #938
2015-10-22 21:05:46 +01:00
mqliang
ce001dcd4e
Fix imported package names to not use mixedCaps or under_scores
2015-10-22 12:10:57 +08:00
Jimmi Dyson
b8b6e1bac1
Support devicemapper storage for docker images dir
...
Fixes #920
2015-10-21 09:56:33 +01:00
Jimmi Dyson
357e6a0f23
Reuse cached docker client
...
Fixes #925
2015-10-20 20:15:54 +01:00
Jimmi Dyson
5a5d0575f5
Docker, libcontainer, docker client bumps
2015-10-20 09:22:12 +01:00
Jimmi Dyson
b4a6819291
Switch to select on time.After & close channel for track usage
2015-10-14 09:58:42 +01:00
Vishnu kannan
dd8345ab32
Perform separate housekeeping for docker container filesystem stats.
2015-10-08 15:58:57 -07:00