Commit Graph

2176 Commits

Author SHA1 Message Date
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
Seth Jennings
2ab9f25f4e fixup manager after runc bump 2017-08-22 16:38:37 -05:00
Seth Jennings
749f73148b bump(github.com/opencontainers/runc/libcontainer): 4d6225ae 2017-08-22 16:38:37 -05:00
David Ashpole
a1e1ede0b2 Merge pull request #1700 from derekwaynecarr/reduce-log-spam
Reduce log spam when unable to get network stats
2017-08-18 13:18:36 -07:00
Derek Carr
d493f11f0b Reduce log spam when unable to get network stats 2017-08-18 16:11:03 -04:00
David Ashpole
27e1acbb4e Merge pull request #1722 from sjenning/skip-subcontainer-update-v2
Skip subcontainer update on v2 calls
2017-08-18 09:17:17 -07:00
Seth Jennings
9a028b6cfd Merge branch 'master' into skip-subcontainer-update-v2 2017-08-17 15:53:35 -05:00
Derek Carr
0df211fc30 Merge pull request #1723 from sjenning/fix-hugepages-disabled
make lack of hugepages support non-fatal
2017-08-17 12:34:50 -07:00
Seth Jennings
6c900995ce make lack of hugepages support non-fatal 2017-08-17 13:55:45 -05:00
Seth Jennings
3ba4699c12 skip subcontainer update on v2 calls 2017-08-17 12:36:38 -05:00
David Ashpole
764e91bf16 Merge pull request #1719 from sjenning/fix-segfault-netgo
add netgo tag to fix segfault
2017-08-15 15:28:53 -07:00
Seth Jennings
1a220a2129 add netgo tag to fix segfault 2017-08-15 17:11:43 -05:00
David Ashpole
5e06d8d27b Merge pull request #1705 from derekwaynecarr/hugepages
Machine info introspects hugepages
2017-08-14 09:41:03 -07:00
Derek Carr
556c7b125a Machine info introspects hugepages 2017-08-11 23:27:15 -04:00
David Ashpole
04437130ab Merge pull request #1713 from tallclair/content-type
Cleanup cAdvisor error responses with proper headers & response codes
2017-08-10 12:37:43 -07:00
Tim Allclair
3b3a855ba4
Cleanup cAdvisor error responses with proper headers & response codes 2017-08-10 12:32:25 -07:00
David Ashpole
d258736528 Merge pull request #1698 from lborguetti/fix-issue-with-find
Added findutils at the Dockerfile
2017-08-07 12:12:49 -07:00
Luciano Antonio Borguetti Faustino
816b8ff001 Added findutils 2017-08-07 16:00:30 -03:00
David Ashpole
83dea17ed3 Merge pull request #1706 from euank/unix-processes-are-not-words
oomparser: don't get stuck for certain processes
2017-08-01 16:34:13 -07:00
Euan Kemp
fe722c7b02 oomparser: don't get stuck for certain processes
The oomparser logic would end up stuck, unable to detect the end of a
given oom trace, for any process with a name that didn't match \w+.

This includes processes like 'python3.4' due to the '.', or
'docker-containerd' due to the '-'.

This fix was included in pr #1544 last year, but since that PR seems
dead it seems like a good idea to break this more important fix out.

I've updated the tests such that they would have caught this issue.
2017-08-01 16:21:31 -07:00
David Ashpole
ee7e1dd52b Merge pull request #1710 from dashpole/fix_build
update assets to fix cAdvisor builds
2017-08-01 12:27:43 -07:00
David Ashpole
1aa83b64c1 fix assets 2017-08-01 08:18:16 -07:00
Tim St. Clair
057293a179 Merge pull request #1682 from CaoShuFeng/glog.Warning
use glog.Warningf when a format string is passed
2017-06-23 14:27:01 -07:00
CaoShuFeng
2e45a27f87 Merge branch 'master' into glog.Warning 2017-06-23 14:11:55 +08:00
Tim St. Clair
9f10872860 Merge pull request #1687 from timstclair/tpt
thin-provisioning-tools moved to alpine main
2017-06-21 17:01:35 -07:00
Tim St. Clair
062c4b00ce
thin-provisioning-tools moved to alpine main 2017-06-21 15:54:58 -07:00
Lantao Liu
77df5f06ca Merge pull request #1685 from Random-Liu/changelog-for-v0.26.1
Add changelog for 0.26.1.
2017-06-21 11:21:15 -07:00
Random-Liu
f350e26693 Add changelog for 0.26.1. 2017-06-21 11:14:00 -07:00
Cao Shufeng
85477fe544 use glog.Warningf when a format string is passed 2017-06-21 16:22:34 +08:00
Dawn Chen
f3d900b148 Merge pull request #1679 from Random-Liu/fix-metrics
Set ContinueOnError for prometheus http handler.
2017-06-20 12:09:30 -07:00
Random-Liu
66c95c765f Set ContinueOnError for prometheus http handler. 2017-06-20 11:56:21 -07:00
David Ashpole
689b91c1f2 Merge pull request #1674 from Colstuwjx/docker/load-tcpudp-metrics4prom
Add cpu load,tcp\udp usage statistics in prom `/metrics` endpoint.
2017-06-15 09:41:07 -07:00
Jacky Wu
fe9d0d8c00 Merge branch 'master' into docker/load-tcpudp-metrics4prom 2017-06-14 07:47:10 +09:00
wujiaxing
8aed6e9cae Add cpu load,tcp\udp usage statistics in prom /metrics endpoint. 2017-06-14 00:54:17 +09:00
David Ashpole
ac9a4203b6 Merge pull request #1668 from flavio/fix-kubernetes-issue-47046
Added fix for Kubernetes btrfs issue #47046
2017-06-12 09:44:08 -07:00
Flavio Castelli
5a7481f46d
Added fix for Kubernetes btrfs issue #47046
https://github.com/kubernetes/kubernetes/issues/47046

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2017-06-12 18:14:43 +02:00
David Ashpole
541d58a30d Merge pull request #1675 from apilloud/RaceNotExist
Fix race in ignoring non-existent directories
2017-06-08 12:20:11 -07:00
Andrew Pilloud
9e40f1c837 Fix race in ignoring non-existent files 2017-06-08 11:16:31 -07:00
David Ashpole
ab04ccc0e8 Merge pull request #1667 from dims/master
Support tmpfs in processMounts
2017-06-07 17:21:09 -07:00
Davanum Srinivas
a7f98d4ea8 Support tmpfs in processMounts
Helps with the situation in kubernetes where /var/lib/kubelet is
mounted using tmpfs.
2017-06-05 23:02:41 -04:00
David Ashpole
b971fd1850 Merge pull request #1665 from dashpole/test_go_1.8
Update go version for jenkins testing from 1.7 to 1.8
2017-06-01 11:17:20 -07:00