prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,569 Commits 1 Branch 39 Tags 50 MiB
89e656d2d8
Commit Graph

1569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Solly Ross
89e656d2d8 Fix Custom Metrics Documentation 
The documentation for custom metrics contained an error in the
Prometheus metrics example JSON, and was also somewhat unclear
as to how the labels worked.
 2015-12-09 19:44:41 -05:00
Solly Ross
d11dd29ecd Make Prometheus Collector Filter Custom Metrics 
Previously, the Prometheus collector ignored the
`MetricsConfig` field of the custom metrics specification,
simply storing all exposed metrics.  Now, if the `MetricsConfig`
field contains any metric names, only those metrics will be stored
and exposed.

Fixes #1005
 2015-12-09 19:44:23 -05:00
Jimmi Dyson
97ad511121 Version bump 2015-12-09 19:58:31 +00:00
Jimmi Dyson
fde344c52f Merge pull request #1010 from piosz/num-stats 
Added possibility to not ignore NumStats field in ContainerInfoRequest
 2015-12-09 19:51:03 +00:00
Piotr Szczesniak
9e739ec757 Added possibility to not ignore NumStats field in ContainerInfoRequest 2015-12-08 21:29:56 +01:00
Dawn Chen
1d2d38d164 Merge pull request #1006 from vishh/gr-leak 
Fix goroutine leak in docker fs handler logic.
 2015-12-04 11:29:56 -08:00
Vishnu kannan
a6daa760c8 Fix goroutine leak in docker fs handler logic. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2015-12-04 11:19:49 -08:00
Jimmi Dyson
1d6e0ec9bc Merge pull request #1002 from timstclair/loaddecay 
Fix usage of housekeeping_interval flag
 2015-12-04 12:55:11 +00:00
Jimmi Dyson
3b10b41c59 Merge pull request #1004 from carmark/pprof 
make profiling tunable
 2015-12-04 11:13:39 +00:00
Lei Xue
c54f9d3758 make profiling tunable 2015-12-04 18:35:05 +08:00
Tim St. Clair
33216870d8 Fix usage of housekeeping_interval flag 
Defer calculation of `loadDecay`. Flags must be parsed before they can
be read, and therefore cannot be reliably be read at package init time.
 2015-12-03 18:39:11 -08:00
Jimmi Dyson
f0ab29e1fa Merge pull request #999 from Mistermatt007/master 
Modified links to the right lines
 2015-12-03 11:03:45 +00:00
Matthieu V
b2a053d154 Modified links to the right lines 2015-12-03 11:59:02 +01:00
Jimmi Dyson
5579deaf87 Merge pull request #998 from Mistermatt007/master 
Updated links in Client README.md
 2015-12-03 10:52:52 +00:00
Matthieu V
dce42b06fc Updated links in Client README.md 2015-12-03 11:45:56 +01:00
Jimmi Dyson
f743aab0e6 Merge pull request #996 from jonboulle/master 
Fix case statements dealing with storageDriver
 2015-12-03 09:28:08 +00:00
Vish Kannan
77cc207f4b Merge pull request #984 from jimmidyson/refactor-storage 
Refactor storage plugins
 2015-12-02 16:11:56 -08:00
Jonathan Boulle
4965f069b7 Fix case statements dealing with storageDriver 
cf0adcc817 introduced two switch
statements to facilitate the addition of the `overlayStorageDriver`;
unfortunately neither of them conform to the Go switch semantic, which
does not fallthrough unless explicitly requested. In one case this was
innocuous (because a `break` was effectively the same as a no-op) but in
the other it would cause the `HasFilesystem` bool to not be set
appropriately in the case of `aufsStorageDriver` being used.

IMHO it's also more idiomatic to perform the default behaviour in the
default case rather than pre-setting and overriding it.
 2015-12-02 16:04:01 -08:00
Vish Kannan
0605dc991c Merge pull request #995 from carmark/comments1 
comment fix for function ContainerInfoRequest
 2015-12-02 15:49:53 -08:00
Lei Xue
e36fc90b3f comment fix for function ContainerInfoRequest 2015-12-03 07:44:49 +08:00
Vish Kannan
cd4d0ece99 Merge pull request #962 from vishh/overlay-support 
Add support for Overlayfs.
 2015-12-02 15:44:43 -08:00
Vishnu Kannan
cf0adcc817 Add support for Overlayfs. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2015-12-02 15:43:34 -08:00
Jimmi Dyson
017b8b2b57 Merge pull request #986 from jimmidyson/machine-id-docker 
Fix machine ID file path when running in container
 2015-12-02 09:09:53 +00:00
Jimmi Dyson
40f908db04 Fix machine ID file path when running in container 
Fixes #955
 2015-12-02 08:51:48 +00:00
Jimmi Dyson
b0ce5720b0 Refactor storage plugins 2015-12-02 08:41:50 +00:00
Jimmi Dyson
8df37ece9b Merge pull request #990 from carmark/old_config 
fix unmarshal container config failure with Docker 1.8.3
 2015-12-02 08:40:55 +00:00
Lei Xue
15b34b0131 add test case for compatibility.go 2015-12-02 11:01:50 +08:00
Lei Xue
7343ae4583 fix unmarshal container config failure with Docker 1.8.3 2015-12-02 11:01:12 +08:00
Jimmi Dyson
61246bed4b Merge pull request #987 from carmark/import 
re-order the import package
 2015-11-30 09:51:43 +00:00
Lei Xue
dbbe38dfed re-order the import package 2015-11-30 16:43:22 +08:00
Jimmi Dyson
0dbcb66c07 Merge pull request #985 from jimmidyson/cleanup-unused 
Cleanup code from gometalinter output
 2015-11-27 22:16:52 +00:00
Jimmi Dyson
1f679cee70 Clean up unused struct fields (via structcheck linter) 2015-11-27 22:06:16 +00:00
Jimmi Dyson
b9ff5c098c Fix up ignored/inefficient assigns (via ineffassign linter) 2015-11-27 22:01:54 +00:00
Jimmi Dyson
b5d8d0c991 Fix imports order 2015-11-27 21:52:29 +00:00
Jimmi Dyson
82810f13cd Remove unused code (via deadcode linter) 2015-11-27 21:48:33 +00:00
Jimmi Dyson
a40b67f80f Merge pull request #981 from jimmidyson/net-stats-from-proc 
Improve perf of interface stats parsing
 2015-11-27 15:58:33 +00:00
Jimmi Dyson
360c73c6fd Improve perf of interface stats parsing 2015-11-27 14:12:41 +00:00
Jimmi Dyson
fe7e8563b7 Merge pull request #983 from jimmidyson/version-bump 
Version bump ready for next release
 2015-11-27 00:50:51 +00:00
Jimmi Dyson
47f27fe657 Version bump ready for next release 2015-11-27 00:47:11 +00:00
Jimmi Dyson
f9eb56e800 Merge pull request #966 from afein/godep_update_runc 
[Godeps] changed docker/libcontainer dependency to runc/libcontainer
 2015-11-26 15:19:28 +00:00
Jimmi Dyson
cec96eb68b Merge pull request #978 from jimmidyson/regexp-perf 
Regexp tidy up
 2015-11-26 09:45:27 +00:00
Jimmi Dyson
d1fce20304 Regexp tidy up 2015-11-26 09:14:26 +00:00
Jimmi Dyson
34036be6e0 Merge pull request #979 from jimmidyson/readint64 
Rename readInt64 -> readUInt64 for clarity
 2015-11-25 19:50:20 +00:00
Jimmi Dyson
b4547fef49 Merge pull request #974 from yifan-gu/godep_glog 
Godeps: Update glog version.
 2015-11-25 19:44:26 +00:00
Jimmi Dyson
060609f899 Merge pull request #976 from jimmidyson/net-stats-from-proc 
Fix Devicemapper output parsing
 2015-11-25 19:29:14 +00:00
Jimmi Dyson
17622ecba1 Rename readInt64 -> readUInt64 for clarity 2015-11-25 16:42:33 +00:00
Jimmi Dyson
0be7f64857 Add DM kernel docs link 2015-11-25 14:22:51 +00:00
Jimmi Dyson
0c55544a4d Add DM fs parsing tests 2015-11-25 14:22:47 +00:00
Jimmi Dyson
56e3490f3b Refactor DM fs parsing 2015-11-25 14:15:19 +00:00
Jimmi Dyson
b9aba259df Switch net stats parsing to strings.Fields - better performance 2015-11-25 13:41:28 +00:00