Commit Graph

1750 Commits

Author SHA1 Message Date
Phillip Wittrock
9baa6b5def Merge pull request #1108 from pwittrock/integration-test-use-direct-ssh
Use vanilla ssh instead of gcloud ssh for e2e tests
2016-02-11 17:30:40 -08:00
Phillip Wittrock
8c70b2aed9 Merge pull request #1112 from vishh/jenkins-e2e
Fix integration test script.
2016-02-11 15:27:17 -08:00
Phillip Wittrock
84738b9226 Use vanilla ssh instead of gcloud ssh for e2e tests to work around 'gcloud compute ssh' flakes. Fixes #1056. 2016-02-11 15:23:53 -08:00
Vishnu kannan
d36991fb42 Fix integration test script.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-11 15:23:02 -08:00
Vish Kannan
94cef953b1 Merge pull request #1111 from pwittrock/pre-integration-test-use-direct-ssh
Add ssh-options flag so pr builder can test #1108
2016-02-11 14:53:54 -08:00
Phillip Wittrock
80e0c6405c Add ssh-options flag so it can be tested by the pr builder in followup #1108 2016-02-11 14:48:36 -08:00
Tim St. Clair
e726534f1f Specify to include test utilities when testing 2016-02-11 14:08:17 -08:00
Tim St. Clair
0bc286dc93 Stop leaking testing dependencies (and flags) in non-testing builds 2016-02-11 13:18:02 -08:00
Phillip Wittrock
967e6bb864 Merge pull request #1107 from pwittrock/fix-integration-test
fix integration tests always passing because of obscure golang variab…
2016-02-10 16:53:54 -08:00
Phillip Wittrock
cf8f46f58d fix integration tests always passing because of obscure golang variable shadowing rules 2016-02-10 16:34:48 -08:00
Marcin Wielgus
fb8efe0cf6 Add a flag to control the number of custom metrics scraped by collectors 2016-02-11 01:33:58 +01:00
Vish Kannan
8fbb00810c Merge pull request #1106 from timstclair/logo
Run PNG crusher on logo.png
2016-02-10 15:07:27 -08:00
Tim St. Clair
e4686f1233 Run PNG crusher on logo.png 2016-02-10 15:02:44 -08:00
Vish Kannan
52abf444f7 Merge pull request #1102 from timstclair/labels
Proposal: Clean up issue labels
2016-02-10 14:32:30 -08:00
Vish Kannan
e588696df2 Merge pull request #1100 from vishh/docker-info
Adding a script that will run e2e tests on our jenkins builder.
2016-02-10 11:00:26 -08:00
Vishnu kannan
dee717ab9d Adding a script that will run e2e tests on our jenkins builder.
The script should make updates to the test infra explicit.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-08 17:19:56 -08:00
Tim St. Clair
5a2c760306 Add issue tracking documentation, move development documents to subdir 2016-02-08 16:17:41 -08:00
Vish Kannan
8221b8cebc Merge pull request #1101 from timstclair/docs
Fix out of date client/README.md
2016-02-08 14:08:05 -08:00
Vish Kannan
20d0f9f3c9 Merge pull request #1095 from jimmidyson/docker-1.10-cgroup
Remove systemd docker container name check
2016-02-08 14:06:59 -08:00
Tim St. Clair
6e27fb58f1 Fix out of date client/README.md 2016-02-08 13:54:55 -08:00
Jimmi Dyson
31dcb5f3b7 Remove systemd docker container name check 2016-02-06 20:38:32 +00:00
Phillip Wittrock
960b4e99e3 Merge pull request #1099 from vishh/remove-unused-var
remove unused var rwLayerIDDirTemplate
2016-02-05 17:18:37 -08:00
Vishnu kannan
6a6abc19f4 remove unused var rwLayerIDDirTemplate
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-05 17:15:00 -08:00
Phillip Wittrock
1f90271f42 Merge pull request #1097 from vishh/docker-info
Fix fs stats handling for non-aufs storage drivers.
2016-02-05 16:44:06 -08:00
Vishnu kannan
6f0c6d3667 add todo to cleanup variable names in docker handler
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-05 16:32:08 -08:00
Vishnu kannan
e24ca544d4 disable fs e2e to avoid timeouts
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-05 16:32:08 -08:00
Vishnu kannan
dabec0a6b2 Fix fs stats handling for non-aufs storage drivers.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-05 16:32:07 -08:00
Jimmi Dyson
a8946729de Merge pull request #969 from f0/master
add support for cgroup  CPUQuota  and CPUPeriod prometheus limit
2016-02-04 16:51:38 +00:00
Vish Kannan
ed56482bde Merge pull request #1089 from vishh/docker-v1.10
Releasing v0.21.0 tag.
2016-02-03 18:18:32 -08:00
Vishnu kannan
fbfdbb6516 Releasing v0.21.0 tag.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-03 18:15:56 -08:00
Vish Kannan
05068c196a Merge pull request #1084 from vishh/docker-v1.10
Track fs usage for docker versions >= 1.10
2016-02-03 18:13:55 -08:00
Vishnu kannan
f0fd525a24 fix version handling in e2e tests
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-03 18:00:59 -08:00
Vishnu kannan
3f75344053 Fallback to flag defined value for storage dir in case docker info
doesn't provide the storage dir.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-03 18:00:59 -08:00
Vishnu kannan
f5829b4744 Rework the v2.1 API to expose container Info.
Added a test for filesystem stats. Devicemapper backend is ignored

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-03 17:02:49 -08:00
Vishnu kannan
16abcd2cdc Updating e2e to work with docker v1.10
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-02 12:26:31 -08:00
Florian Koch
669bc4abfa add cgroup quota and period support / add missing tests 2016-02-02 20:33:11 +01:00
Vishnu kannan
59c03672d0 Handle fs metrics for docker version >= 1.10.0
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-02 10:20:20 -08:00
Vish Kannan
c9248290b7 Merge pull request #1083 from vishh/docker-root
Use storage dir from docker info for filesystem usage tracking.
2016-02-01 19:14:47 -08:00
Vishnu kannan
5ab2f45fc6 Use storage dir from docker info for filesystem usage tracking.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-01 18:20:00 -08:00
Vish Kannan
5023475716 Merge pull request #1088 from vishh/improve-e2e
Fix integration test runner.
2016-02-01 15:23:30 -08:00
Vishnu kannan
9389fdabe5 Fix integration test runner.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-01 15:15:13 -08:00
Vish Kannan
a7bf08bc97 Merge pull request #1087 from vishh/improve-e2e
Make e2e tests dump attributes and logs on failure.
2016-02-01 15:03:32 -08:00
Vishnu Kannan
5917e84a0c Make e2e tests dump attributes and logs on failure.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-01 14:36:07 -08:00
Tim St. Clair
f5bceae3a2 Merge pull request #1033 from asteris-llc/master
Add the support for kafka in cAdvisor's storage, including output of container id and labels
2016-01-29 17:17:06 -05:00
Allison Richardet
ea85c4009f Add Kafka storage Godeps 2016-01-27 21:37:00 -06:00
Allison Richardet
80ba7e7db7 Add the support for kafka in cAdvisor's storage, including output of container id and labels
Addressing PR Feedback

Addressing PR Feedback
2016-01-27 21:33:57 -06:00
Jimmi Dyson
9aa348ff5e Merge pull request #1080 from jimmidyson/release-0.20.5
0.20.5 version bump
2016-01-27 10:52:55 +00:00
Jimmi Dyson
4f7f2ff9d2 0.20.5 version bump 2016-01-27 10:47:54 +00:00
Jimmi Dyson
4c345b1989 Merge pull request #1063 from dqminh/fix-envs-handler
Initialize env mapping for labels when creating docker container
2016-01-27 10:46:24 +00:00
Jimmi Dyson
1f6f660745 Merge pull request #1068 from krhubert/master
Use uint64 for Memory Stats
2016-01-27 10:16:18 +00:00