prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,113 Commits 1 Branch 39 Tags 50 MiB
28827bafad
Commit Graph

2113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Derek Carr
35e1900899 Reduce cAdvisor log spam with multiple devices 2017-04-12 14:38:37 -04:00
David Ashpole
94db83f31b Merge pull request #1530 from danielkrainas/set-envs-v2-spec 
set envs when converting to v2 spec
 2017-04-10 21:31:27 -07:00
Danny Krainas
8aa7e674e5 set envs when converting to v2 spec 2017-04-11 00:21:35 -04:00
David Ashpole
359ef5b100 Merge pull request #1488 from tcolgate/master 
Add udp and udp6 network statistics
 2017-04-10 16:55:21 -07:00
Tristan Colgate
227bb3a79d Add udp and udp6 network statistics 2017-04-10 20:41:51 +01:00
David Ashpole
850f5edba8 Merge pull request #1634 from basvdlei/prometheus-ignore-unused-cpu 
Ignore unused cpus in Prometheus metrics
 2017-04-10 08:45:51 -07:00
Bas van der Lei
a3e8c73865 gnore unused cpus in Prometheus metrics 
Only include cpu's in the Prometheus metrics endpoint that were used.

In recent kernels the cpuacct.statcpus behavior has changed to include
all possible cpu's. This can results in a high number of stale metrics
in the Prometheus endpoint.
 2017-04-10 14:10:48 +02:00
David Ashpole
8a87edd987 Merge pull request #1622 from mkumatag/git_ignore 
Gitignore Files generated by JetBrains IDEs
 2017-04-06 14:30:21 -07:00
David Ashpole
357cb54f15 Merge branch 'master' into git_ignore 2017-04-06 14:21:06 -07:00
David Ashpole
2ddeb5f60e Merge pull request #1623 from mkumatag/docker_api_version 
Add Docker API version
 2017-04-04 07:41:23 -07:00
Manjunath A Kumatagi
8fb1158353 Add Docker API version 2017-04-04 10:56:11 +05:30
Mathieu Cornic
8a0fa01342 Merge branch 'master' into patch-2 2017-03-25 17:14:14 +01:00
David Ashpole
bd72ac3332 Merge pull request #1582 from sjitech/master 
doc about error `Privileged mode is incompatible with user namespaces…
 2017-03-20 09:27:58 -07:00
Manjunath A Kumatagi
838599dab4 Gitignore Files generated by JetBrains IDEs 2017-03-18 16:51:36 +05:30
jjqq
4a4471684f doc about error Privileged mode is incompatible with user namespaces and solution --userns=host 2017-03-18 19:49:30 +09:00
Tim St. Clair
88f7898516 Merge pull request #1619 from timstclair/docs 
Remove out of date support section of running doc
 2017-03-17 11:09:01 -07:00
Tim St. Clair
594dfd4ea6
Remove out of date support section of running doc 2017-03-17 10:50:07 -07:00
David Ashpole
1dfc7a17eb Merge pull request #1555 from bakins/bakins/zfs-filesystem-watcher 
Add watcher for zfs similar to devicemapper
 2017-03-15 15:37:18 -07:00
Brian Akins
feecd47daa Add watcher for zfs similar to devicemapper 
minor cleanup

ensure we look at parent dataset for limit, etc
 2017-03-15 18:31:11 -04:00
David Ashpole
86daf2b4db Merge pull request #1574 from dmrub/master 
Added fix for Kubernetes btrfs issue #38337
 2017-03-15 08:25:51 -07:00
Dmitri Rubinstein
3e43b4573d Added fix for Kubernetes btrfs issue #38337 
https://github.com/kubernetes/kubernetes/issues/38337
 2017-03-15 16:06:54 +01:00
David Ashpole
fb28b0da1b Merge pull request #1578 from NickrenREN/sysfs-new 
optimize NewRealSysFs()
 2017-03-14 21:28:05 -07:00
NickrenREN
a248c34528 optimize NewRealSysFs() 
remove second return value since it will never return err
 2017-03-15 12:11:50 +08:00
Tim St. Clair
5d3f487a1a Merge pull request #1612 from andyxning/fix_statsd_error_log 
Fix statsd error log
 2017-03-14 12:35:28 -07:00
Andy Xie
1e93f1a412 fix statsd error logging 2017-03-14 10:27:29 +08:00
Tim St. Clair
17543becf9 Merge pull request #1609 from dashpole/1_6_release 
Release v0.25.0
 2017-03-09 15:01:14 -08:00
David Ashpole
dcf4be2613 release version 0.25.0 2017-03-09 14:49:36 -08:00
Tim St. Clair
178aba245d Merge pull request #1606 from andyxning/fix_markdown_format 
fix markdown format
 2017-03-06 11:22:57 -08:00
Andy Xie
55172b9002 fix markdown format 2017-03-04 12:06:00 +08:00