Commit Graph

1480 Commits

Author SHA1 Message Date
Jimmi Dyson
ec18a5e200 Version bump 2015-10-23 13:13:16 +01:00
Jimmi Dyson
038c70344c Merge pull request #940 from jimmidyson/docker-client-update
Don't bail out if docker is unreachable - recover when back up
2015-10-23 13:11:28 +01:00
Jimmi Dyson
68db03188f Don't bail out if docker is unreachable - recover when back up 2015-10-23 12:58:44 +01:00
Jimmi Dyson
81aa0d7675 Merge pull request #939 from jimmidyson/disable-tcp-stats
Disable tcp stats collection
2015-10-22 21:35:41 +01:00
Jimmi Dyson
4a20353cb1 Merge pull request #937 from jimmidyson/makefile-release
Add make release target
2015-10-22 21:07:45 +01:00
Jimmi Dyson
8b6e002e0a Disable tcp stats collection
Fixes #938
2015-10-22 21:05:46 +01:00
Jimmi Dyson
b310a4c228 Add make release target 2015-10-22 11:53:33 +01:00
Jimmi Dyson
75401d790c Merge pull request #926 from jimmidyson/docker-fs-size
Support devicemapper storage for docker images dir
2015-10-21 15:05:23 +01:00
Jimmi Dyson
8e63ba34fe Switch to alpine for release image & add devicemapper tools to docker images 2015-10-21 09:56:33 +01:00
Jimmi Dyson
b8b6e1bac1 Support devicemapper storage for docker images dir
Fixes #920
2015-10-21 09:56:33 +01:00
Vish Kannan
ec2a73d0c0 Merge pull request #930 from jimmidyson/docker-client-update
Docker client update including reuse
2015-10-20 14:20:03 -07: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
Vish Kannan
ccd829266b Merge pull request #923 from jimmidyson/go-fs-sizes
Drop C code for FS sizes
2015-10-16 13:45:03 -07:00
Jimmi Dyson
2ec8178651 Drop C code for FS sizes 2015-10-16 13:20:55 +01:00
Vish Kannan
a667c9a4b5 Merge pull request #917 from jimmidyson/fshandler-select
Switch to select on time.After & close channel for track usage
2015-10-14 15:00:23 -07:00
Jimmi Dyson
b4a6819291 Switch to select on time.After & close channel for track usage 2015-10-14 09:58:42 +01:00
Jimmi Dyson
0d6015c741 Merge pull request #912 from jimmidyson/godep-cleanup
Godeps clean up
2015-10-12 14:12:25 +01:00
Jimmi Dyson
91749aa65f Godep clean up 2015-10-12 12:39:37 +01:00
Vish Kannan
5a0bf1df1a Merge pull request #910 from vishh/fs-fix-2
Compute fs usage for docker containers less often.
2015-10-08 16:32:08 -07:00
Vishnu kannan
dd8345ab32 Perform separate housekeeping for docker container filesystem stats. 2015-10-08 15:58:57 -07:00
Vishnu kannan
6e51487236 Compute fs usage for docker containers less often.
`du` can cause a lot of cpu usage.
2015-10-08 15:01:57 -07:00
Vish Kannan
bacd1cf72d Merge pull request #909 from vishh/fs-fix-1
Reduce cpu priority for `du`
2015-10-08 13:04:58 -07:00
Vish Kannan
a38832f31f Merge pull request #906 from jimmidyson/prometheus-container-name-to-labels
Registration of custom function to map container name to prometheus labels
2015-10-08 11:46:58 -07:00
Vish Kannan
64702e7202 Merge pull request #902 from jimmidyson/git-version
Expose git revision as well as version in version info, add Makefile
2015-10-08 11:42:12 -07:00
Vishnu kannan
53e7986bc0 Reduce cpu priority for du. 2015-10-08 11:23:45 -07:00
Jimmi Dyson
5db9f8674e Registration of custom function to map container name to prometheus labels 2015-10-07 11:30:58 +01:00
Jimmi Dyson
8dcf46b153 Merge pull request #905 from mqliang/patch-1
Fix typo in comment
2015-10-06 11:45:27 +01:00
mqliang
1678418ef4 Fix typo in comment
Fix typo in comment
2015-10-06 18:37:59 +08:00
Jimmi Dyson
dcfd367bc7 Merge pull request #904 from mqliang/patch-1
Fix typo in document
2015-10-06 10:59:06 +01:00
mqliang
36ef69d95c Fix typo in document
This PR fix typo in document
2015-10-06 17:10:27 +08:00
Jimmi Dyson
6ee904d129 Merge pull request #821 from basvdlei/ignore
Reduce the amount of bad Docker.inspects when using docker_only flag in combination with Systemd
2015-10-02 15:31:43 +01:00
Jimmi Dyson
536ffc5bdf Merge pull request #897 from kadel/failcnt
Adding memory failcnt counter
2015-10-02 15:26:15 +01:00
Tomas Kral
bd61caf0c3 add failcnt 2015-10-02 14:24:22 +02:00
Bas van der Lei
f8eb8cc982 validate name with isContainerName func 2015-10-02 13:49:27 +02:00
Bas van der Lei
9931854585 remove dead code 2015-10-02 13:42:40 +02:00
Jimmi Dyson
5d72e5ce74 Merge pull request #891 from f0/master
add tcp/tcp6 statistics
2015-10-02 10:53:04 +01:00
Jimmi Dyson
cf43fd2556 Expose git revision as well as version in version info, add Makefile 2015-10-02 10:26:33 +01:00
Jimmi Dyson
fba0608527 Merge pull request #887 from Snorch/fix-for-custom-cgroup-mounting
Make getCgroupPath work in case of named or multi- hierarchies
2015-09-30 17:31:32 +01:00
Jimmi Dyson
4cb5a7eab6 Merge pull request #895 from jimmidyson/docker-subdir
Fix docker containers relative links
2015-09-30 17:31:01 +01:00
Bas van der Lei
13674cf06c optimize dockerCgroupRegexp 2015-09-27 00:20:52 +02:00
Jimmi Dyson
7072911994 Fix docker containers relative links 2015-09-26 20:19:45 +01:00
Florian Koch
e4262b91b1 move TCP and TCP6 stats to NetworkStats 2015-09-25 09:04:53 +02:00
Florian Koch
dd041457b5 some fixes 2015-09-24 15:44:42 +02:00
Florian Koch
c331982f21 add tcp/tcp6 statistics 2015-09-24 15:44:42 +02:00
Bas van der Lei
7788c8bd27 Ignore systemd 'containers' in the docker driver 2015-09-23 23:55:35 +02:00
Vish Kannan
259ce65055 Merge pull request #893 from rjnagal/release
Make release 0.18.0
2015-09-23 14:52:01 -07:00
Rohit Jnagal
1f910b1ad5 Make release 0.18.0
Didn't notice that we already had a tag for 0.17.0 from last week.
Let's skip that and move to 0.18.
2015-09-23 20:08:28 +00:00
Rohit Jnagal
e675b00a40 Merge pull request #892 from rjnagal/release
New version 0.17.0
2015-09-23 13:05:49 -07:00
Rohit Jnagal
9e667bc6dc New version 0.17.0 2015-09-23 18:21:19 +00:00