Commit Graph

1584 Commits

Author SHA1 Message Date
Jimmi Dyson
49ee94d677 Fix up missing godeps 2016-01-07 14:32:38 +00:00
Matthias Nüßler
071e910ba2 Update InfluxDB dependency to v0.9.5.1 2016-01-07 14:32:38 +00:00
Matthias Nüßler
ada6e3d354 Upgrade InfluxDB storage to InfluxDB 0.9
- Fix #743
- Rewrite InfluxDB storage for new InfluxDB API data structures.
- Store each measurement separately instead of storing all measurements
  in a single big "table" with many columns/fields.
- Use tags add metadata to points, such as the container name. Tags are
  a new feature in InfluxDB 0.9.
2016-01-07 14:32:38 +00:00
Jimmi Dyson
38e05a6ad4 Merge pull request #1041 from jimmidyson/go-1.5
Make Go 1.5 a requirement
2016-01-07 14:10:58 +00:00
Jimmi Dyson
ee73baeef7 Make Go 1.5 a requirement 2016-01-07 10:01:29 +00:00
Tim St. Clair
3a76df3ccf Merge pull request #1009 from carmark/testcase
add unit test for 'validate' package
2016-01-05 18:46:15 -08:00
Lei Xue
29469c7806 add unit test for 'validate' package 2016-01-05 11:27:20 +08:00
Phillip Wittrock
38cf3a0972 Merge pull request #1031 from pwittrock/fix_oomparsertest
resolves #1030 oomparser_test should get the current year
2016-01-04 11:36:34 -08:00
Phillip Wittrock
dee3f07b0a resolves #1030 oomparser_test should get the current year for matching the time of death. 2016-01-04 10:50:08 -08:00
Tim St. Clair
0367672b9e Merge pull request #1013 from Snorch/fix-cgroupPathRegExp
Fix cgroupPathRegExp to match path after the first colon after devices
2015-12-15 15:05:48 -08:00
Phillip Wittrock
d7d50e5313 Merge pull request #1017 from pwittrock/retry-tests
Retry cadvisor e2e tests to compensate for test flakyness
2015-12-14 15:22:16 -08:00
Phillip Wittrock
808a917fc0 Retry cadvisor e2e tests to compensate for test flakyness 2015-12-14 13:47:07 -08:00
Pavel Tikhomirov
97257ccf61 v2: Fix cgroupPathRegExp to match path after first colon after devices
If in getCgroupPath in cgroups we have some other hierarchies after
"devices" using ".*" sometimes will cause matching wrong string as
a container path so we need negated character class here: "[^:]*".

e.g.
If cgroups string is
"153:name=systemd:/system.slice/docker-f55e7cad1fcc02f992e0c33c210ecdc6d641858a665f28370523c27c05bdde0e.scope,4:freezer,devices,name=container:/system.slice/docker-f55e7cad1fcc02f992e0c33c210ecdc6d641858a665f28370523c27c05bdde0e.scope,3:cpuacct,cpu,cpuset,name=fairsched:/system.slice/docker-f55e7cad1fcc02f992e0c33c210ecdc6d641858a665f28370523c27c05bdde0e.scope,2:memory:/system.slice/docker-f55e7cad1fcc02f992e0c33c210ecdc6d641858a665f28370523c27c05bdde0e.scope,1:blkio,name=beancounter:/system.slice/docker-f55e7cad1fcc02f992e0c33c210ecdc6d641858a665f28370523c27c05bdde0e.scope"

match[1] will be "blkio" but not:
/system.slice/docker-f55e7cad1fcc02f992e0c33c210ecdc6d641858a665f28370523c27c05bdde0e.scope

These fixes the commit:
4cbd91c761 Make getCgroupPath work in case of named or multi- hierarchies

v2: use negated character class, correct the example, remove .* on
either end as they don't do anything in FindSubmatch.
2015-12-14 10:33:26 +03:00
Jimmi Dyson
634965abc4 Version bump 2015-12-11 13:20:18 +00:00
Jimmi Dyson
5c3494704d Merge pull request #1012 from DirectXMan12/bug/fix-prometheus-metrics-filtering
Fix Prometheus Metrics Filtering
2015-12-10 12:01:49 +00:00
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