github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,282 Commits 85 Branches 64 Tags
aaa767ccccce2e2573d018c05de045efb72b23ee
Commit Graph

1282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Bellamy
aaa767cccc Merge pull request #834 from weaveworks/k8s-text-change 
General k8s fixups
 2016-01-18 14:42:19 +00:00
Tom Wilkie
23fd123370 Merge pull request #824 from weaveworks/820-custom-image-port 
Correctly extract image name when using custom hub.
 2016-01-18 05:39:09 -08:00
Paul Bellamy
a84da6cf1c nil selector for a k8s service means nothing, not everything 2016-01-18 10:27:56 +00:00
Paul Bellamy
a972e883e0 Reword filter text on kubernetes views 2016-01-18 10:26:11 +00:00
Tom Wilkie
f4f10fd58e Merge pull request #831 from weaveworks/build-example-in-container 
Build example app in container.
 2016-01-16 12:49:26 -08:00
Tom Wilkie
98d7887ba0 Condense some more steps in circle, this seems to speed things up. 2016-01-16 12:23:45 -08:00
Tom Wilkie
e01f7741bc Merge commit '0441e70ba033aa5417122d474bd6461fd3d538e6' into build-example-in-container 2016-01-16 12:11:34 -08:00
Tom Wilkie
0441e70ba0 Squashed 'tools/' changes from fb5985b..c7d833c 
c7d833c Allow vendor dirs in sub directories.

git-subtree-dir: tools
git-subtree-split: c7d833c2b1
 2016-01-16 12:11:34 -08:00
Tom Wilkie
0565479e8c Build example app in container. 2016-01-16 11:56:34 -08:00
Tom Wilkie
984fd528c0 Correctly extract image name when using custom hub. 2016-01-15 12:41:29 -08:00
Tom Wilkie
21a8928e47 Merge pull request #829 from weaveworks/fix-test-wait 
Various improvements to build & test
 2016-01-15 10:31:05 -08:00
Tom Wilkie
baec4688cb Various improvements to build & tests 
- Fix broken wait in tests.
- Run lint in the build container.
- Merge two quick steps in the circle plan.
- Increase number of test VMs to 3 (again).
 2016-01-15 10:00:41 -08:00
Tom Wilkie
7d340269a3 Merge pull request #823 from weaveworks/733-k8s-pause-filter 
k8s: Filter out pause as a system container
 2016-01-15 08:35:49 -08:00
Alfonso Acosta
1133daa243 k8s: Filter out pause as a system container 2016-01-15 15:34:04 +00:00
Simon
d3ffd85af5 Merge pull request #817 from weaveworks/748-fix-term-arrow-keys 
Fixes ctrl-arrow keys in terminal
 2016-01-14 17:33:11 +01:00
Simon Howe
18d31a0d08 Send xterm equivilant codes for ctrl-arrow keys 
Docker sets $TERM=xterm.
 2016-01-14 17:30:24 +01:00
Paul Bellamy
43b430ff9c Merge pull request #806 from weaveworks/804-f-star-cking-slashes 
Less hacky fix for /%2F bug
 2016-01-14 15:45:39 +00:00
Tom Wilkie
123c40028f Less hacky fix for /%2F bug 2016-01-14 07:10:31 -08:00
Alfonso Acosta
ada38a35b0 Merge pull request #808 from weaveworks/717-k8s-service-account-auth 
k8s: Use service account token by default and improve error logging
 2016-01-14 13:01:40 +00:00
Alfonso Acosta
e0dfeb18b7 Leave Helm out of the k8s install instructions for now 2016-01-14 12:57:27 +00:00
Tom Wilkie
3f6e9a337d Merge pull request #816 from weaveworks/tools 
Update to latest tools.git
 2016-01-13 16:27:13 -08:00
Tom Wilkie
e5541b965b Update to go1.5.3 2016-01-13 16:21:51 -08:00
Tom Wilkie
795436ef81 Squashed 'tools/' changes from f7f1370..fb5985b 
fb5985b Merge pull request #14 from weaveworks/increase-image-timeout
b42e792 Merge pull request #13 from weaveworks/move-gce-scripts
c5800d0 Increase rebuild-image image lifetime to 3 days.

git-subtree-dir: tools
git-subtree-split: fb5985b6c3
 2016-01-13 15:58:47 -08:00
Tom Wilkie
e5d58ac48d Merge commit '795436ef81231002c10e1dfbc415260016e7245b' into tools 2016-01-13 15:58:47 -08:00
Alfonso Acosta
312b9ac370 k8s: Add documentation about deploying Scope 2016-01-13 18:34:02 +00:00
Simon
bb3ad56410 Merge pull request #790 from weaveworks/787-fix-hover-single-node 
Highlight a single unconnected node on hover.
 2016-01-13 17:02:03 +01:00
Simon Howe
3c5e357150 Highlight a single unconnected node on hover. 
Wasn't happening before.
 2016-01-13 17:01:37 +01:00
Paul Bellamy
14899adb95 Merge pull request #807 from weaveworks/increase-test-replicas 
Speed up integration tests
 2016-01-13 14:32:09 +00:00
Tom Wilkie
98bca0b552 Squashed 'tools/' changes from 0c4636a..f7f1370 
f7f1370 Use CIRCLE_PROJECT_REPONAME to distinguih schedules for different repos.
a4c7222 More gce scripts from weave into tools.

git-subtree-dir: tools
git-subtree-split: f7f1370372
 2016-01-12 21:55:12 +00:00
Tom Wilkie
e952301980 Merge commit '98bca0b55277bae736a99f1861217fa843418328' into increase-test-replicas 2016-01-12 21:55:12 +00:00
Tom Wilkie
8e4d3a4e8b Enable sharding for integration tests. 2016-01-12 21:54:49 +00:00
Tom Wilkie
bf91d5b8ba Use gce.sh, config.sh etc from tools. 2016-01-12 21:54:42 +00:00
Tom Wilkie
511daca1ca Wait for correct application. 2016-01-12 21:54:42 +00:00
Tom Wilkie
abf8accea2 Increase test replicas. 2016-01-12 21:54:42 +00:00
Tom Wilkie
cf41ec301d Merge pull request #810 from weaveworks/727-k8s-container-names 
k8s: Render container names from label "io.kubernetes.container.name"
 2016-01-12 21:00:41 +00:00
Alfonso Acosta
bd5cfd9570 k8s: Render container names from label "io.kubernetes.container.name" 2016-01-12 18:32:25 +00:00
Alfonso Acosta
fa43df2de7 k8s: Log errors when contacting the API server 2016-01-12 15:31:32 +00:00
Alfonso Acosta
e0e7644acd k8s: Use service account token when no api server url is provided 2016-01-12 15:31:19 +00:00
Paul Bellamy
398e676c2c Merge pull request #799 from weaveworks/speed-up-tests 
Speed up tests with go test -i
 2016-01-11 13:08:48 +00:00
Tom Wilkie
4ea7453008 Update Makefile inline with some comments from weave's build. 2016-01-11 11:37:23 +00:00
Tom Wilkie
718f636109 Squashed 'tools/' changes from 3ec519f..0c4636a 
0c4636a Speed up tests by doing a go test -i before hand.

git-subtree-dir: tools
git-subtree-split: 0c4636a2b3
 2016-01-08 19:31:35 +00:00
Tom Wilkie
8474279281 Merge commit '718f63610989cb2503b74dfe640d1869e97095d0' into speed-up-tests 2016-01-08 19:31:35 +00:00
Tom Wilkie
35b6a10068 Merge pull request #798 from weaveworks/fix-tests 
Fix tests.
 2016-01-07 15:23:37 +00:00
David Kaltschmidt
bd270e5ff4 Backout: Remove backend container dep for non-container builds 
Make is called recursively, once outside then inside the container
 2016-01-07 16:18:26 +01:00
Tom Wilkie
b255a39517 Fix tests. 2016-01-07 14:50:56 +00:00
Paul Bellamy
80c7436036 Merge pull request #794 from weaveworks/641-xfer-mv 
Split and move xfer package.
 2016-01-06 15:56:55 +00:00
Paul Bellamy
a4f7042f3e Merge pull request #781 from weaveworks/779-procspy-integration-test 
Add integration test for procspy edges.
 2016-01-06 14:04:04 +00:00
Tom Wilkie
ffa955a21b Split and move xfer package. 2016-01-06 14:01:39 +00:00
Tom Wilkie
16df543967 Merge pull request #796 from weaveworks/process-name 
Use argv[0] for process name, differentiate scope app and probe.
 2016-01-06 12:47:16 +00:00
Tom Wilkie
57a06cb848 Review feedback 2016-01-06 12:46:25 +00:00