Commit Graph

1344 Commits

Author SHA1 Message Date
Rohit Jnagal
9e1101f020 Merge pull request #810 from anushree-n/modifyConfig
Modify Collector structure
2015-07-14 09:57:18 -07:00
Rohit Jnagal
87dcb70fff Merge pull request #817 from vmarmol/travis
Make Travis use their new infra.
2015-07-14 09:32:55 -07:00
Victor Marmol
8c88e57813 Make Travis use their new infra. 2015-07-14 08:47:09 -07:00
Victor Marmol
d85d832a8a Merge pull request #816 from anushree-n/cacheAlternative
Include custom metrics in ContainerStats structure
2015-07-14 08:13:27 -07:00
anushree-n
4f83aae835 Include custom metrics in ContainerStats structure 2015-07-13 21:15:40 -07:00
Victor Marmol
4a9a57cdd0 Merge pull request #814 from anushree-n/typo
Fix typo
2015-07-13 10:41:01 -07:00
anushree-n
fff8880a8d Typo in helpers.go 2015-07-13 10:30:46 -07:00
anushree-n
ddfe10af54 Rename compatability.go to compatibility.go 2015-07-13 10:29:36 -07:00
anushree-n
e9cc52f5a2 Typo in redis.go 2015-07-13 10:28:55 -07:00
anushree-n
1083213d22 Modify Collector structure 2015-07-10 14:55:55 -07:00
Victor Marmol
b53b5107ef Merge pull request #812 from afein/godep-mock-fix
Removed the gomock files from the old location
2015-07-09 17:48:34 -07:00
Alex Mavrogiannis
f996b186ff removed the gomock files from the old location 2015-07-09 17:36:39 -07:00
Rohit Jnagal
0ac2401b36 Merge pull request #811 from afein/godep-mock-fix
Update gomock dependency
2015-07-09 17:30:18 -07:00
Alex Mavrogiannis
8d50a8da8f updated mock godep to use github instead of code.google.com 2015-07-09 17:22:38 -07:00
Victor Marmol
80b7e772cb Merge pull request #804 from afein/memlimit
Memory and swap limits for the / container spec
2015-07-07 23:13:33 -07:00
Alex Mavrogiannis
9666c8b38f population of memory limit for the machine container 2015-07-07 14:15:38 -07:00
Rohit Jnagal
44f86044e1 Merge pull request #803 from vmarmol/mem-limit
Lower threshold for "unlimited".
2015-07-07 08:52:52 -07:00
Victor Marmol
e646878695 Merge pull request #787 from anushree-n/collectorConfig
Collector Config
2015-07-07 08:10:47 -07:00
anushree-n
b4dcc3772a Add a generic config and collector for custom metrics 2015-07-06 19:07:39 -07:00
Victor Marmol
03059960e2 Lower threshold for "unlimited".
Seems like some kernels report a value a bit lower than MaxInt64.

Fixes #796
2015-07-06 18:26:31 -07:00
Victor Marmol
d93f16c442 Merge pull request #801 from AnanyaKumar/cloud-provider-fix
Fix incorrect use of metadata library, correct typo
2015-07-06 13:36:46 -07:00
Ananya Kumar
0a84ac1cda Fix incorrect use of metadata library, correct typo 2015-07-06 13:13:10 -07:00
Victor Marmol
ec240b60c5 Merge pull request #789 from vmarmol/release
cAdvisor 0.16.0
2015-07-01 17:05:25 -07:00
Victor Marmol
068c6e0289 cAdvisor 0.16.0 2015-07-01 16:57:50 -07:00
anushree-n
9196a8563c Merge pull request #793 from vmarmol/test-fix
Use watch instead of sh.
2015-07-01 16:18:41 -07:00
Victor Marmol
651ee5648f Use watch instead of sh.
Use of sh was making the test flaky and harder to read.
2015-07-01 14:54:35 -07:00
Victor Marmol
2e893b1e7c Merge pull request #769 from AnanyaKumar/cloud-provider-info
Create package cloudinfo
2015-07-01 13:30:05 -07:00
Victor Marmol
95666812c4 Merge pull request #790 from vmarmol/docs
Add cAdvisor canary image to running docs
2015-07-01 08:46:51 -07:00
AnanyaKumar
ee16d6e7da Victor code review 2015-06-30 15:48:56 -07:00
Victor Marmol
7bfe81c0c2 Add cAdvisor canary image to running docs 2015-06-26 19:25:29 -07:00
Rohit Jnagal
26a9112341 Merge pull request #788 from vmarmol/canary
Add a self-built canary cAdvisor.
2015-06-26 17:08:28 -07:00
Victor Marmol
4b94169003 Add a self-built canary cAdvisor. 2015-06-26 14:47:21 -07:00
Rohit Jnagal
571b2baedb Merge pull request #786 from vmarmol/fix
Escape container names.
2015-06-26 09:52:29 -07:00
Victor Marmol
39b29da609 Escape container names.
Fixes #781
2015-06-26 09:28:49 -07:00
Rohit Jnagal
0918a70c49 Merge pull request #783 from vmarmol/fix
Fix mirrored network stats
2015-06-25 12:21:34 -07:00
Victor Marmol
ee119e26f1 Add a test for differing network stats. 2015-06-25 12:00:11 -07:00
Victor Marmol
fc62b8c384 Copy stats before we convert them.
Fix # 782
2015-06-25 11:30:36 -07:00
Rohit Jnagal
afc21887db Merge pull request #772 from AnanyaKumar/build-doc-deps
Build doc deps
2015-06-18 23:44:00 -07:00
Ananya Kumar
1abd853d6b Create package cloudinfo 2015-06-19 02:35:08 -04:00
Ananya Kumar
2caa4bae20 Update build.md 2015-06-19 02:22:21 -04:00
Rohit Jnagal
c19a3b076c Merge pull request #764 from AnanyaKumar/net-host-bug
Only show network statistics for containers with bridge network
2015-06-17 09:51:31 -07:00
Ananya Kumar
aaad776d5d 1 line fix for net host bug 2015-06-10 11:00:49 -07:00
Rohit Jnagal
ec588def40 Merge pull request #768 from vmarmol/release
cAdvisor 0.15.1
2015-06-10 09:51:34 -07:00
Victor Marmol
eeffacb464 cAdvisor 0.15.1 2015-06-10 09:42:02 -07:00
Rohit Jnagal
a36554fc80 Merge pull request #767 from vmarmol/fix-leak
Remove stats from cache when container is destroyed
2015-06-10 08:20:44 -07:00
Victor Marmol
675c09e296 Remove stats from cache when container is destroyed 2015-06-10 07:53:46 -07:00
Rohit Jnagal
b0753a6d69 Merge pull request #765 from vmarmol/content-type
Set Content-Type on static files.
2015-06-09 19:41:28 -07:00
Victor Marmol
04293b1595 Set Content-Type on static files.
Fixes #763
2015-06-09 18:34:04 -07:00
Victor Marmol
c2f60493a6 Merge pull request #762 from rjnagal/docker
Make graceful degradation of OOM events clearer.
2015-06-09 10:13:17 -07:00
Rohit Jnagal
a4499777c4 Make graceful degradation of OOM events clearer. 2015-06-09 16:45:14 +00:00