Commit Graph

1647 Commits

Author SHA1 Message Date
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
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
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
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
Shimin Guo
97e71c9ac0 fixing style 2016-01-15 10:22:52 -08:00
Shimin Guo
d656ffb0db Add unit tests. 2016-01-15 08:53:30 -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
Vish Kannan
290a84417c Merge pull request #1051 from jimmidyson/fs-goroutine-leaks
Fix FS usage goroutine leaks
2016-01-14 11:36:01 -08:00
Jimmi Dyson
4e9d29a408 Fix FS usage goroutine leaks 2016-01-14 19:30:48 +00:00
Jimmi Dyson
1cdf060f3f Merge pull request #1054 from jimmidyson/version-bump
Bump dev version to 0.21.0
2016-01-14 15:37:17 +00:00
Jimmi Dyson
8bfca2b86b Bump dev version to 0.21.0 2016-01-14 15:29:30 +00:00
Vish Kannan
b47498c16e Merge pull request #1045 from timstclair/v2-info-simple
Add V2 ContainerInfo API
2016-01-13 12:04:26 -08:00
Tim St. Clair
e011781a88 Add V2 ContainerInfo API
- Add V2 ContainerInfo struct
- Move v1/v2 conversion functions to a reusable package
- Add V2 ContainerInfo accessor method to Manager
2016-01-13 11:58:09 -08:00
Vish Kannan
01434a1c54 Merge pull request #1020 from miguel250/zfs-support
Add support ZFS filesystem
2016-01-13 11:52:37 -08:00
Vish Kannan
9cfc8ce8b2 Merge pull request #1023 from dqminh/metadata_env
Carry #780: Export env variables as prometheus labels
2016-01-13 11:30:05 -08:00
Tim St. Clair
ac8e627024 Merge pull request #1047 from timstclair/boilerplate
Fix check_boilerplate.sh for 2016
2016-01-13 10:21:54 -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
Tim St. Clair
1e1736ebc9 Fix shell scripts boilerplate 2016-01-12 12:35:46 -08:00
Tim St. Clair
a352633a17 Fix check_boilerplate.sh for 2016
Copied the kubernetes boilerplate checker from
https://github.com/kubernetes/kubernetes/tree/master/hack/boilerplate,
and updated templates for cAdvisor.
2016-01-12 12:35:38 -08:00
Jimmi Dyson
185771bc34 Merge pull request #1044 from carmark/influxdb_test
fix compile issue of influxdb test
2016-01-10 07:06:47 +00:00
Lei Xue
5b7a2fbd45 refactor the function of StatsEq 2016-01-09 09:20:11 +08:00
Lei Xue
23496fdf03 fix compile issue of influxdb test 2016-01-09 09:16:31 +08:00
Vish Kannan
0800e51cbe Merge pull request #1029 from wangzhezhe/master
replace pannic with fmt.Errorf in the error handling of elasticsearch storage
2016-01-08 12:49:37 -08:00
Vish Kannan
040bdd3cb1 Merge pull request #1040 from jimmidyson/influxdb-0.9
Upgrade InfluxDB storage to InfluxDB 0.9
2016-01-08 10:27:33 -08:00
Jimmi Dyson
1b62cefe7f Merge pull request #1032 from pwittrock/retryregex
Only retry whitelisted test failure…
2016-01-08 07:43:52 +00:00