David Ashpole
790b787399
Merge pull request #1768 from derekwaynecarr/max_usage_in_bytes
...
Container stats expose memory max usage
2017-10-10 14:53:11 -07:00
Derek Carr
9ea61176bf
Expose memory.max_usage_in_bytes in container stats
2017-10-10 17:31:31 -04:00
Derek Carr
3e659ec0d1
Merge pull request #1766 from sjenning/adapt-long-du
...
adaptive longOp for du operation
2017-10-05 10:36:37 -04:00
Seth Jennings
fd9c6d2fde
adaptive longOp for du operation
2017-10-05 09:22:54 -05:00
David Ashpole
b9ab5d6ba9
Merge pull request #1756 from dashpole/remove_engine_api
...
Move off of docker/engine-api
2017-09-28 14:37:22 -07:00
David Ashpole
888a529088
fix #1743 ; move off of docker/engine-api
2017-09-28 11:05:13 -07:00
David Ashpole
f1c4a432ac
Merge pull request #1760 from dashpole/off_inotify
...
Move from inotify to fsnotify
2017-09-28 11:04:52 -07:00
David Ashpole
e6b6a1ac57
fix #1708 ; move from inotify to fsnotify
2017-09-28 10:57:49 -07:00
David Ashpole
8a59b6d8cf
Merge pull request #1759 from dashpole/clarify_memory_usage
...
Update memory usage helper message
2017-09-28 10:57:26 -07:00
David Ashpole
1dcd0cee2b
update description of memory usage
2017-09-28 10:48:07 -07:00
David Ashpole
ba91527651
Merge pull request #1763 from mindprince/cleanup
...
Minor cleanup.
2017-09-27 11:30:53 -07:00
Rohit Agarwal
919b369923
Minor cleanup.
...
- Remove unused travis file.
- Fix Makefile license.
- Update README with new link.
- Fix outdated comment.
2017-09-27 00:22:11 -07:00
David Ashpole
76538e77a5
Merge pull request #1754 from bsingr/master
...
Add memory reservation in prom `/metrics` endpoint.
2017-09-19 15:11:18 -07:00
Jens Bissinger
2599ea6764
Add memory reservation in prom /metrics
endpoint.
2017-09-12 19:20:49 +02:00
David Ashpole
a2d3378b8a
Merge pull request #1752 from dashpole/fix_builds
...
apt-get update, not apt-cache update
2017-09-07 11:09:24 -07:00
David Ashpole
d4a4d8c960
fix builds
2017-09-07 10:47:04 -07:00
David Ashpole
2f84d83d9c
Merge pull request #1751 from dashpole/fix_builds
...
clean after apt-get install
2017-09-07 09:20:16 -07:00
David Ashpole
08136d0a3c
clean after apt-get install
2017-09-06 16:45:35 -07:00
David Ashpole
bed4ed57dc
Merge pull request #1750 from dashpole/patch_release
...
0.27.1 changelog update
2017-09-06 16:20:25 -07:00
David Ashpole
debd14b35a
0.27.1 changelog
2017-09-06 16:09:30 -07:00
David Ashpole
32f77e9f14
Merge pull request #1749 from dashpole/fix_builds
...
Add apt-get update to dockerfile
2017-09-06 16:07:15 -07:00
David Ashpole
a996ef85a4
fix kubernetes/test-infra #4403
2017-09-06 15:47:58 -07:00
Derek Carr
e8dbd5003c
Merge pull request #1741 from runcom/crio-handler
...
*: add CRI-O handler
2017-09-06 15:48:13 -04:00
Antonio Murdaca
4b002b3bd3
*: add CRI-O handler
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-09-05 17:01:58 +02:00
David Ashpole
1df21eaa59
Merge pull request #1747 from dashpole/dockerdigest
...
update docker/distribution
2017-09-01 13:36:25 -07:00
David Ashpole
35de579b37
update distribution
2017-09-01 13:28:43 -07:00
David Ashpole
4940190f7f
Merge pull request #1746 from dashpole/release
...
Add changelog for 0.27.0 release
2017-09-01 11:44:45 -07:00
David Ashpole
7335d277d4
0.27.0 changelog
2017-09-01 11:35:39 -07:00
David Ashpole
11b8f17c15
Merge pull request #1745 from dashpole/docker_godep
...
Update docker/docker, and docker/distribution
2017-09-01 11:23:38 -07:00
David Ashpole
20bd275f77
update docker/docker, and docker/distribution
2017-09-01 11:17:14 -07:00
Vish Kannan
03d7288c83
Merge pull request #1544 from euank/kmsg-parser
...
oomparser: update to use kmsg based parser
2017-08-30 15:44:04 -07:00
Euan Kemp
95f9c8c86f
oomparser: update to use kmsg based parser
...
This provides much more robust support for kernel logs via accessing the
`/dev/kmsg` interface to them directly.
2017-08-30 15:35:40 -07:00
Euan Kemp
cfb16f102b
godeps: vendor in kmsgparser
2017-08-30 15:35:40 -07:00
David Ashpole
a2d6d33fba
Merge pull request #1711 from euank/cpuacct
...
libcontainer: use real number of CPUs for usage
2017-08-30 14:36:27 -07:00
Euan Kemp
d2e11efba2
libcontainer: use real number of CPUs for usage
...
As of the 4.7 kernel, the cpustats field returned from libcontainer
contains values for every possible cpu (including nonexistent ones).
The extra values are all 0s.
If we assume that hotplug events won't happen, we can get a more
accurage cpu count by using runtime.NumCPU and then ignoring any values
beyond that.
2017-08-30 14:26:26 -07:00
David Ashpole
4a77163406
Merge pull request #1738 from dashpole/docker_godep
...
Update docker godeps to be the same as k8s
2017-08-29 14:20:55 -07:00
David Ashpole
92cca44f5d
update docker godeps
2017-08-29 13:19:44 -07:00
David Ashpole
c2f8191ba9
Merge pull request #1732 from dashpole/godep
...
Update runc godeps
2017-08-28 09:21:28 -07:00
David Ashpole
8ba18456d5
update runc godep
2017-08-25 13:42:26 -07:00
David Ashpole
995cd0a212
Merge pull request #1678 from stelzner/tls-support
...
Add runtime options for TLS support
2017-08-24 13:22:06 -07:00
Karl
5a033c064e
Add runtime options for TLS support
2017-08-24 15:14:33 +02:00
David Ashpole
bcc6f2d23d
Merge pull request #1720 from allencloud/allencloud-patch-1
...
Improve error message
2017-08-23 18:02:06 -07:00
Allen Sun
a0c1a1c33f
Update prometheus_collector.go
...
fix incorrect comparison err message
2017-08-24 08:54:27 +08:00
David Ashpole
81635163ce
Merge pull request #1724 from yguo0905/uuid
...
Add an API to get FsStats from filesystem UUID
2017-08-23 12:43:08 -07:00
Yang Guo
a5adaad26d
Add an API to get FsStats from filesystem UUID
2017-08-23 12:33:42 -07:00
David Ashpole
a0be0ea1e5
Merge pull request #1728 from derekwaynecarr/total-rss
...
Expose total_rss when hierarchy is enabled
2017-08-23 12:28:54 -07:00
Derek Carr
6fa48d9048
Expose total_rss when hierarchy is enabled
2017-08-23 14:56:59 -04:00
David Ashpole
d937b68c57
Merge pull request #1729 from mtaufen/fix-journalctl-leak
...
Fix journalctl leak
2017-08-23 10:06:35 -07:00
Michael Taufen
3190c1c53d
Fix journalctl leak
...
This fixes the journalctl leak that occurs when a process that uses
cadvisor exits. See issues #1725 and
https://github.com/kubernetes/kubernetes/issues/34965 .
2017-08-23 09:14:54 -07:00
Derek Carr
48f6b9981a
Merge pull request #1726 from sjenning/bump-runc
...
Bump runc
2017-08-22 18:05:50 -04:00