Vish Kannan
47a1fa4fff
Merge pull request #936 from mqliang/master
...
Fix imported package names to not use mixedCaps or under_scores
2015-11-04 10:47:48 -08:00
Vish Kannan
8c4e29b186
Merge pull request #949 from vishh/canary
...
Fix canary docker image.
2015-11-04 10:47:37 -08:00
Vishnu kannan
d1c4a20ff7
Fix canary docker image.
2015-11-03 16:11:09 -08:00
Vish Kannan
cd7657e00a
Merge pull request #886 from linux-on-ibm-z/master
...
Code changes for zSystems (s390x)
2015-11-02 09:52:18 -08:00
Jimmi Dyson
e6a64da6a5
Version bump
2015-11-02 17:31:33 +00:00
Jimmi Dyson
c56af85fdb
Merge pull request #942 from jimmidyson/net-stats-from-proc
...
Drop regexp for net stats parsing
2015-10-28 19:02:45 +00:00
Jimmi Dyson
561cc1da4f
Use file reader directly for net stats
2015-10-28 12:51:19 +00:00
Jimmi Dyson
c72e0c23a5
Add test for net dev stats
2015-10-28 12:51:13 +00:00
Jimmi Dyson
da771a0977
Drop regexp for net stats parsing
...
Reported in kubernetes/kubernetes#16296
2015-10-27 20:16:49 +00:00
Jimmi Dyson
aa6f80814b
Fix up release process
2015-10-23 13:24:32 +01:00
Jimmi Dyson
77a118c843
Merge pull request #941 from jimmidyson/version-bump
...
Version bump
2015-10-23 13:17:20 +01:00
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
mqliang
ce001dcd4e
Fix imported package names to not use mixedCaps or under_scores
2015-10-22 12:10:57 +08: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
shahidhs-ibm
305bb279d8
gofmt changes (new)
...
Formatting in 'utils/machine/machine.go' and
'utils/sysfs/sysfs.go' was incorrect and causing ./build/presubmit.sh
script to fail in Travis giving below error:
The following files are not properly formatted:
$ ./build/presubmit.sh
+./build/check_gofmt.sh .
utils/machine/machine.go utils/sysfs/sysfs.go utils/machine/machine.go
utils/sysfs/sysfs.go
Fixed the formatting using below command:
gofmt -l -w -s utils/sysfs/sysfs.go
gofmt -l -w -s utils/machine/machine.go
2015-10-19 17:13:09 +05:30
shahidhs-ibm
be8de942e7
Revert "gofmt changes"
...
This reverts commit c4a523adb9
2015-10-19 17:01:41 +05:30
shahidhs
c4a523adb9
gofmt changes
...
Looks like formatting in 'utils/machine/machine.go' and
'utils/sysfs/sysfs.go' was incorrect and causing ./build/presubmit.sh
script to fail in Travis giving below error:
The following files are not properly formatted:
$ ./build/presubmit.sh
+./build/check_gofmt.sh .
utils/machine/machine.go utils/sysfs/sysfs.go utils/machine/machine.go
utils/sysfs/sysfs.go
Fixed the formatting using below command:
gofmt -l -w -s utils/sysfs/sysfs.go
gofmt -l -w -s utils/machine/machine.go
2015-10-19 16:07:20 +05:30
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
Shahid
259e42d118
Update sysfs.go
2015-10-05 21:10:58 +05:30
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
