Commit Graph

1940 Commits

Author SHA1 Message Date
Vishnu kannan
d4ce3dccdd update docker to v1.11.2
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-19 16:55:05 -07:00
Tim St. Clair
734db4c437 Merge pull request #1387 from vishh/runc-bump
Update libcontainer deps
2016-07-19 12:45:32 -07:00
Vishnu kannan
4c0d60d9de update libcontainer deps
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-19 12:35:14 -07:00
Tim St. Clair
510e6e8bfd Merge pull request #1381 from Random-Liu/fix-watch-error
Continue watching other sub directories when there is watch error.
2016-07-18 18:24:06 -07:00
Lantao Liu
41e74494b3 Continue watching other directories when there is watch error. 2016-07-18 16:49:47 -07:00
Vish Kannan
0f253fe687 Merge pull request #1380 from mtaufen/working-set-fix
Modify working set memory stats calculation
2016-07-15 11:10:07 -07:00
Michael Taufen
307d1b1cb3 Modify working set memory stats calculation
Change working set calculation to usage - total_inactive_file, rather than
usage - total_inactive_anon - total_inactive_file. Since writes to tmpfs
get tracked as total_inactive_anon when swap is disabled, the old
calculation would under-report memory pressure.

See this Kubernetes issue for context:
https://github.com/kubernetes/kubernetes/issues/28619
2016-07-15 10:58:25 -07:00
Tim St. Clair
b37f9970ef Merge pull request #1376 from mwringe/collector_endpoints
Update collectors to be able to directly use the ip address of containers
2016-07-14 18:03:59 -07:00
Matt Wringe
6ef612f21e Update collectors to be able to directly access containers by their ip address. 2016-07-14 10:36:53 -04:00
Tim St. Clair
000cedb480 Merge pull request #1349 from mwringe/docker_ip_address_files
Add support to the handler to support fetching the ip address and files
2016-07-13 13:55:27 -07:00
Matt Wringe
213c254bb7 Add in the ability to expose the ip address of a container. 2016-07-13 13:58:43 -04:00
Vish Kannan
2290707a3b Merge pull request #1369 from vishh/move-to-vendor
Switch to using vendor directory for deps.
2016-07-11 17:32:30 -07:00
Vishnu kannan
2eecea1353 Move presubmit to a make rule. Update docs to not use make all unless necessary.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-11 17:27:24 -07:00
Vishnu kannan
c1f3340830 update jenkins script to use make
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-11 13:22:18 -07:00
Vishnu kannan
d2dba37eb8 ignore vendor pkgs from tests
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-11 12:40:17 -07:00
Vishnu kannan
38ea12a533 update scripts and docs to not mention godep for builds
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-11 12:40:05 -07:00
Vishnu kannan
de4af1288b moving deps to vendor subdirectory
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-11 12:19:43 -07:00
Tim St. Clair
40fd72ef26 Merge pull request #1358 from ncdc/ignore-devicemapper-container-mounts
Exclude Docker devicemapper mounts from fs info
2016-07-07 13:17:52 -07:00
Andy Goldstein
a8c592e601 Exclude Docker devicemapper mounts from fs info
Exclude Docker devicemapper mounts from the list of filesystem partitions (e.g.
/var/lib/docker/devicemapper/mnt/*) because these are handled by the ThinPoolWatcher for
per-container filesystem information.
2016-07-07 14:35:22 -04:00
Andy Goldstein
dcf5d575eb Always set partition fsType 2016-07-07 14:35:22 -04:00
Tim St. Clair
3977cb8bd1 Merge pull request #1223 from timstclair/test-tags
Move mocks to testing package to remove +build tags
2016-07-06 14:34:31 -07:00
Tim St. Clair
35f7bc5ee7 Move mocks to testing package to remove +build tags
Some go tools (e.g. godef, gorename) don't handle +build tags well, so
I refactored some packages to remove the test tags from cAdvisor.
2016-07-06 14:15:43 -07:00
Tim St. Clair
a10ec4443f Merge pull request #1332 from waleedsamy/patch-1
fix broken link
2016-07-01 12:48:25 -07:00
waleed samy
148bc71924 fix broken link 2016-07-01 21:29:33 +02:00
Tim St. Clair
c39c3f5b38 Merge pull request #1347 from enoodle/cloudinfo_gce_id_from_file
cloudinfo: identify gce from file
2016-07-01 07:45:48 -07:00
Erez Freiberger
cf548f1b70 cloudinfo: identify gce from file 2016-07-01 11:43:09 +03:00
Vish Kannan
6abe4db6f4 Merge pull request #1362 from timstclair/remote-races
Detect race conditions in jenkins integration tests
2016-06-30 19:38:42 -07:00
Tim St. Clair
2c69c0b634 Detect race conditions in jenkins integration tests
Injected a race into cadvisor.go and verified this caught it. Also, fix
the runner to grab the logs even when the tests don't complete.
2016-06-30 19:10:08 -07:00
Tim St. Clair
e6c30f7e8d Merge pull request #1288 from timstclair/races
Run the integration tests locally with the race detector enabled
2016-06-30 17:37:34 -07:00
Tim St. Clair
42dda5ef64 Run the integration tests with the race detector enabled
The integration test script was changed so that it aborts the testing
when the cAdvisor binary exits with a non-zero error code.

Also in this PR:
- clean up makefile to print more informative output
- change make release to build the release binary
2016-06-30 17:29:24 -07:00
Tim St. Clair
5a28a0c718 Merge pull request #1357 from timstclair/jenkins
Update jenkins script to match job configs
2016-06-30 13:33:08 -07:00
Tim St. Clair
4b80217dcc Update jenkins script to match job configs
Update jenkins_e2e.sh to match the up-to-date configurations of the
cAdvisor jenkins PR-builder and CI jobs. Once this is merged, we can
update those jobs to call this script instead.
2016-06-30 13:29:41 -07:00
Vish Kannan
d07eef4456 Merge pull request #1356 from timstclair/release
Simplify cAdvisor release versioning
2016-06-30 12:17:43 -07:00
Tim St. Clair
306854a42d Also check for dirty releases 2016-06-29 18:27:07 -07:00
Tim St. Clair
151d4912dc Simplify cAdvisor release versioning
- Eliminate version/VERSION in favor of parsing git versions
- Enforce that releases are built against tagged versions
- Delete the broken release script, change `make release` to build the release
2016-06-29 18:27:07 -07:00
Tim St. Clair
51574ec04f Merge pull request #1355 from ronnielai/version
Release 0.23.6
2016-06-27 17:51:14 -07:00
Ron Lai
0522a747cc Release 0.23.6 2016-06-27 17:41:03 -07:00
Tim St. Clair
bad9237cf6 Merge pull request #1353 from ronnielai/fsinfo
Including the number of free inodes in FsInfo
2016-06-27 12:06:20 -07:00
Ron Lai
29ffb3b6b9 Adding inode info 2016-06-27 11:52:40 -07:00
Tim St. Clair
dbff294be6 Merge pull request #1323 from philips/patch-1
README: tell people where to find people in slack
2016-06-23 16:37:34 -07:00
Brandon Philips
7f2466a519 README: tell people where to find people in slack 2016-06-23 12:51:01 -07:00
Tim St. Clair
b4f1d7b82f Merge pull request #1348 from ncdc/fix-dmsetup-status-parsing-for-thin-ls
Fix detection of devmapper metadata reservation
2016-06-23 12:02:44 -07:00
Andy Goldstein
f014860332 Fix detection of devmapper metadata reservation
Because new versions of devicemapper may add additional fields to the output of 'dmsetup status',
change the check to use SplitN to get the minimum fields required, and ignore any additional fields
after the one we care about.
2016-06-23 14:54:56 -04:00
Yu-Ju Hong
6351fbfc84 Merge pull request #1346 from krousey/inotify_bump
Updating inotify to fix memory leak
2016-06-23 10:20:22 -07:00
Kris
24e872fa73 Updating inotify to fix memory leak 2016-06-22 18:38:02 -07:00
Vish Kannan
e97c522721 Merge pull request #1343 from sjenning/dm-fallback
fallback to /dev/mapper device if metadata device is not set in docker info
2016-06-22 12:43:56 -07:00
Seth Jennings
eafff745a5 only fail fs stat gather if metadata device not found 2016-06-21 16:05:37 -05:00
Seth Jennings
f3bca888f8 fallback to /dev/mapper device if metadata device is not set in docker info 2016-06-21 16:01:18 -05:00
Vish Kannan
267066c0f9 Merge pull request #1301 from timstclair/runtime
Downgrade failure to rgeister runtime factory to warning
2016-06-21 13:41:09 -07:00
Tim St. Clair
f02ec8a967 Downgrade failure to rgeister runtime factory to warning
It is not an error to fail to register the Docker factory on a system
running only rkt, and vice-versa, so these failures are downgraded from
an Error to a Warning. The raw handler should always be registered.
2016-06-21 13:21:13 -07:00