Commit Graph

1412 Commits

Author SHA1 Message Date
Rohit Jnagal
a123fd72d8 Add logic to read custom metric config files from container root.
Docker does not provide the rootfs path through docker inspect or statefile
and the path is dependent on the storage driver being used.

Instead of enumerating the storage drivers, we pick a pid from the container
and get the config from /proc/pid/root. Although a bit expensive, this method
works for non-docker containers too.
2015-07-22 15:45:07 +00:00
Victor Marmol
3f2643897d Merge pull request #828 from vegasbrianc/patch-1
Update prometheus.md
2015-07-22 08:34:24 -07:00
Victor Marmol
2dcd7f089b Merge pull request #825 from piosz/max-housekeeping
Moved max_housekeeping and allow_dynamic_housekeeping flags to cadvisor.go
2015-07-22 08:16:07 -07:00
Brian Christner
751d648ec3 Update prometheus.md
Added the example of setting up Prometheus with cAdvisor.
2015-07-22 14:08:23 +02:00
Victor Marmol
b86a9d01c2 Merge pull request #819 from mvdan/percentiles
Add 50th and 95th percentiles
2015-07-21 19:00:35 -07:00
Daniel Martí
870c10c125 Export type to calculate percentiles
It will be used in heapster and kubelet too.
2015-07-21 17:52:01 -07:00
Daniel Martí
752228ef62 Add 50th and 95th percentiles 2015-07-21 17:50:37 -07:00
Piotr Szczesniak
90ca5f9286 Moved max_housekeeping and allow_dynamic_housekeeping flags to cadvisor.go 2015-07-21 20:26:57 +02:00
Rohit Jnagal
5853f97295 Merge pull request #820 from anushree-n/api
API changes for custom metrics
2015-07-20 13:05:30 -07:00
Rohit Jnagal
649fac9fc7 Merge pull request #815 from anushree-n/cache
Cache custom metrics
2015-07-20 13:04:59 -07:00
anushree-n
b197771668 API changes for custom metrics 2015-07-20 11:29:43 -07:00
anushree-n
e2e193c1fd Add metrics caching 2015-07-20 11:24:20 -07:00
Rohit Jnagal
7ec04b773e Merge pull request #823 from rjnagal/docker
Change logic for determining minimum polling frequency.
2015-07-20 11:14:27 -07:00
Rohit Jnagal
df4d8b1da8 Change logic for determining minimum polling frequency.
Since polling is tied to housekeeping, minimum supported polling
frequency is 1s.

Users can specify polling frequency higher than 1s. The polling loop
will be called at the minimum frequency specified in config as long as
its higher than the minimum supported frequency.
2015-07-20 15:57:03 +00:00
Rohit Jnagal
f6933972a5 Merge pull request #818 from anushree-n/changeCollect
Modification in Collect() method of GenericCollector
2015-07-20 07:29:55 -07:00
anushree-n
6871ed42d6 Modify Collect() method of GenericCollector 2015-07-18 09:49:52 -07:00
Rohit Jnagal
d580ecfc53 Merge pull request #802 from anushree-n/collectorCollect
Collection of custom metrics
2015-07-14 12:58:29 -07:00
anushree-n
6cc9d44264 Implement Collect method of Collector interface 2015-07-14 11:06:55 -07:00
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