Commit Graph

2192 Commits

Author SHA1 Message Date
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
David Ashpole
c2bf2ada34 bump jenkins go version 2017-06-01 11:12:34 -07:00
David Ashpole
f0cc82200a Merge pull request #1664 from dashpole/v0.26.0
v0.26 release notes
2017-05-31 16:00:16 -07:00
David Ashpole
ba072cc9fb v0.26 release notes 2017-05-31 15:14:27 -07:00
David Ashpole
e5edc45865 Merge pull request #1585 from bamarni/overlay2
[docker] add overlay2 storage driver
2017-05-31 14:36:07 -07:00
David Ashpole
96b603e20a Merge branch 'master' into overlay2 2017-05-31 14:05:54 -07:00
David Ashpole
2835c35bde Merge pull request #1618 from vincentdaniel/influxdb-retention-policy
add retention policy flag to influxdb storage
2017-05-30 13:05:31 -07:00
David Ashpole
1b220a7ebc Merge branch 'master' into influxdb-retention-policy 2017-05-30 11:44:04 -07:00
David Ashpole
7fecf8bc2b Merge pull request #1649 from estaleiro/container-restart-count
Gather information from RestartCount counter
2017-05-30 11:43:56 -07:00
David Ashpole
de308101e4 Merge branch 'master' into container-restart-count 2017-05-30 11:33:39 -07:00
Derek Carr
28827bafad Merge pull request #1439 from ncdc/cache-devmapper-pool-name
Cache the Docker thin pool name
2017-05-30 14:15:55 -04:00
David Ashpole
4c858f16aa Merge pull request #1460 from soundcloud/grobie/private-prometheus-registry
Stop using the global prometheus registry
2017-05-30 10:17:30 -07:00
Ricardo Pchevuzinske Katz
f5a896ef4c Gather information from RestartCount counter and put into labels 2017-05-30 14:05:14 -03:00
David Ashpole
2e9a89c180 Merge branch 'master' into grobie/private-prometheus-registry 2017-05-30 10:01:44 -07:00
David Ashpole
aee7735908 Merge pull request #1637 from dashpole/generic_fs
GetDirDiskUsage and GetDirInodeUsage now also exist as utility functions
2017-05-30 09:51:01 -07:00
Andy Goldstein
69c085d9fa Cache the Docker thin pool name
Cache the Docker thin pool name in the dockerFactory and pass it to each Docker container handler,
instead of calling `docker info` each time a new container handler is created, as the thin pool name
is extremely unlikely to change.
2017-05-30 11:50:58 -04:00
David Ashpole
b226f57a3b factor out GetDirDiskUsage and GetDirInodeUsage as utility functions 2017-05-25 08:21:03 -07:00
Tobias Schmidt
c5ee516e6f Stop using the global prometheus registry
Replace usage of the global Prometheus registry with a private registry
object which will be exported under the given prometheus path.
2017-05-23 17:37:52 +02:00
Tobias Schmidt
bd6ef47876 Update vendored prometheus packages 2017-05-23 17:37:52 +02:00
David Ashpole
c24039e2c7 Merge pull request #1658 from Leibniz137/fix-prom-link
fix centurylink labs link to prometheus integration
2017-05-23 08:08:00 -07:00
Nate Gentile
05197a5450 fix centurylink labs link to prometheus integration 2017-05-20 08:29:48 -07:00
David Ashpole
dd5df2c73e Merge pull request #1655 from Christopher-Bui/short-container-id
Allow finding docker containers by short name
2017-05-18 10:07:24 -07:00
Chris Bui
cdf78981fb Allow finding docker containers by short name
Allow docker containers to be found by a short prefix name to match
the behavior of the docker daemon. This change now matches the
examples on the API docs.

Return an error if the given short name of a container is not unique.
2017-05-18 11:56:48 -05:00
David Ashpole
fdb6e418c2 Merge pull request #1657 from Christopher-Bui/runtime-docs
Document runtime options
2017-05-18 09:43:48 -07:00
Chris Bui
1331547f62 Document runtime options
Many flags are missing from docs/runtime_options.md. Add all missing
flags that aren't storage driver specific.
2017-05-18 11:34:40 -05:00
Vincent Daniel
5bc8287a48 Merge branch 'master' into influxdb-retention-policy 2017-04-28 21:17:14 +02:00
Vincent Daniel
ef0f4d1c61 feat: handling retention policy in influxdb
docs: Adding storage_driver_influxdb_retention_policy flag to the influxdb documentation

fix: using rentention policy variable in test
2017-04-28 21:13:00 +02:00
David Ashpole
e14ee9be35 Merge pull request #1642 from smarterclayton/fix_fs_metrics
Report container FS metrics into prometheus /metrics
2017-04-28 09:11:49 -07:00
Clayton Coleman
4e25a7951f
Report container FS metrics into prometheus /metrics
PerDiskStats reported from cgroups were not being surfaced into
prometheus. In order to properly correlate the metrics, we need to
assign a device label to each metric (which is the FS or device path).
Since blkio cgroup tracks devices, we create a synthetic device
`/dev/NAME` for the metric.

Assign a Device label to each PerDiskStat for the handlers up front, and
then surface the PerDiskStat values into the prometheus metrics. Report
two new metrics - total bytes read and total bytes written.
2017-04-24 20:46:55 -04:00
David Ashpole
0073fcb9c7 Merge pull request #1595 from matcornic/patch-2
doc: add default value for storage_duration option
2017-04-20 09:51:11 -07:00
David Ashpole
69e0ad3806 Merge branch 'master' into patch-2 2017-04-20 09:20:13 -07:00
David Ashpole
3230b33983 Merge pull request #1629 from kitt1987/client-with-timeout
Create cadvisor client with http client timeout
2017-04-14 08:35:53 -07:00
Kitt Hsu
86f37d5e23 new client with http timeout 2017-04-14 10:20:36 +08:00
Bilal Amarni
e0c8ec569d [docker] add overlay2 storage driver
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2017-04-13 13:39:45 +02:00
David Ashpole
516c2e552a Merge pull request #1639 from derekwaynecarr/reduce-logging
Reduce cAdvisor log spam with multiple devices
2017-04-12 11:46:05 -07:00