prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,669 Commits 1 Branch 39 Tags 50 MiB
05068c196a
Commit Graph

1669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vish Kannan
05068c196a Merge pull request #1084 from vishh/docker-v1.10 
Track fs usage for docker versions >= 1.10
 2016-02-03 18:13:55 -08:00
Vishnu kannan
f0fd525a24 fix version handling in e2e tests 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-03 18:00:59 -08: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
Vishnu kannan
16abcd2cdc Updating e2e to work with docker v1.10 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-02 12:26:31 -08: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
Vish Kannan
c9248290b7 Merge pull request #1083 from vishh/docker-root 
Use storage dir from docker info for filesystem usage tracking.
 2016-02-01 19:14:47 -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
Vish Kannan
5023475716 Merge pull request #1088 from vishh/improve-e2e 
Fix integration test runner.
 2016-02-01 15:23:30 -08:00
Vishnu kannan
9389fdabe5 Fix integration test runner. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-01 15:15:13 -08:00
Vish Kannan
a7bf08bc97 Merge pull request #1087 from vishh/improve-e2e 
Make e2e tests dump attributes and logs on failure.
 2016-02-01 15:03:32 -08:00
Vishnu Kannan
5917e84a0c Make e2e tests dump attributes and logs on failure. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-01 14:36:07 -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
ea85c4009f Add Kafka storage Godeps 2016-01-27 21:37:00 -06: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
9aa348ff5e Merge pull request #1080 from jimmidyson/release-0.20.5 
0.20.5 version bump
 2016-01-27 10:52:55 +00:00
Jimmi Dyson
4f7f2ff9d2 0.20.5 version bump 2016-01-27 10:47:54 +00: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
Jimmi Dyson
1f6f660745 Merge pull request #1068 from krhubert/master 
Use uint64 for Memory Stats
 2016-01-27 10:16:18 +00:00
Jimmi Dyson
c2eaabd58b Merge pull request #1079 from jimmidyson/libcontainer-bump 
bump(github.com/opencontainers/runc/libcontainer)
 2016-01-27 10:11:08 +00:00
Jimmi Dyson
f9bd97b337 bump(github.com/opencontainers/runc/libcontainer) 
runc was retagged at 0.0.7 - this uses the correct tag.
 2016-01-27 09:38:37 +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
Vish Kannan
a12a3e4726 Merge pull request #1077 from jimmidyson/network-mode 
Fix up networking stats for new docker network functionality
 2016-01-26 10:40:10 -08:00
Jimmi Dyson
92fff91a38 Merge pull request #1070 from ncdc/fix-devicemapper-labeling 
Fixes for devicemapper partition reporting
 2016-01-26 13:12:41 +00: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
Andy Goldstein
d0b1c5e877 Refactor devicemapper logic 
Refactor devicemapper logic to be cleaner are more unit testable
 2016-01-22 14:53:47 -05:00
Vish Kannan
59488ce2c4 Merge pull request #1072 from vishh/v0.20.4 
Tag v0.20.4
 2016-01-21 15:34:39 -08:00
Vishnu kannan
fac1daa1e7 Tag v0.20.4 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-21 15:26:16 -08:00
Vish Kannan
61f916ccef Merge pull request #1071 from vishh/godeps-mayhem 
Godeps mayhem
 2016-01-21 15:23:11 -08:00
Vishnu kannan
4c43545dd5 Update golang to v1.5.3 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-21 14:57:18 -08:00
Vishnu kannan
ae38e6f460 Update docker dependency. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-21 14:57:18 -08:00
Andy Goldstein
1352d75d6d Fixes for devicemapper partition reporting 
- If the Docker storage driver is devicemapper, and the devicemapper device is *not* loopback, fix
  an issue where the device associated with the / mount point was being assigned LabelDockerImages,
  instead of the devicemapper device
- If the devicemapper device is a loopback device, don't assign it LabelDockerImages; instead,
  report the underlying partition's information
 2016-01-21 16:51:14 -05:00
Hubert Krauze
7d053578d4 Use uint64 for Memory Stats 2016-01-20 08:46:42 +01:00
Phillip Wittrock
9b26a06688 Merge pull request #1066 from vishh/v0.20.3 
Release v0.20.3
 2016-01-19 12:20:56 -08:00
Vishnu kannan
9f10f85851 Release v0.20.3 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-19 11:56:00 -08:00
Vish Kannan
d80cb88dc0 Merge pull request #1057 from timothysc/housekeeping_jitter 
Add jitter to housekeeping interval
 2016-01-19 11:04:53 -08:00
Daniel Dao
127b09f5ae initialize env mapping 
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2016-01-18 15:58:45 +00:00
Jimmi Dyson
871697fe74 Merge pull request #1061 from timstclair/npe 
Fix v2 stats conversion NPD & add test
 2016-01-17 12:49:05 +00:00
Tim St. Clair
04f3743a09 Fix v2 stats conversion NPD & add test 2016-01-16 16:22:04 -08:00
Timothy St. Clair
3256647668 Add jitter to housekeeping interval 2016-01-16 08:17:46 -06:00
Vish Kannan
5e3f23764e Merge pull request #1059 from vishh/v0.20.2 
Release v0.20.2
 2016-01-15 16:21:20 -08:00
Vishnu kannan
18a0031a59 Release v0.20.2 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-15 16:16:02 -08:00
Vish Kannan
8f1702f651 Merge pull request #1035 from vishh/log-usage 
Expose container's write layer usage separately, with API refactoring
 2016-01-15 16:12:08 -08:00
Vishnu kannan
b3f7d812b3 merge v2 conversion files 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-15 16:06:59 -08:00
Vishnu kannan
c2a30dba3e Added integration tests for the new api/v2.1/machinestats API. 
Updated the v2 client along the way.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-15 16:05:58 -08: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
Vishnu kannan
c285b726ef Adding a local integration test option in Makefile. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-01-15 15:39:17 -08:00
Vish Kannan
b0a5bfaf8c Merge pull request #1055 from guoshimin/icanhazrss 
Expose rss and cache via API and /metrics
 2016-01-15 10:35:26 -08:00