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,252 Commits 85 Branches 64 Tags
e952301980502540fc3eb5a7c305fff6785ffdca
Commit Graph

1252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Wilkie
e952301980 Merge commit '98bca0b55277bae736a99f1861217fa843418328' into increase-test-replicas 2016-01-12 21:55:12 +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
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
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
Tom Wilkie
d101b0fced Add integration test for procspy edges. 2016-01-06 12:46:25 +00:00
Tom Wilkie
2f03fafe13 Merge pull request #789 from weaveworks/faster-go-build 
Speed up incremental build
 2016-01-06 12:31:19 +00:00
Tom Wilkie
f8c720f266 Use exec -a to differentiate app and probe process names. 2016-01-06 11:56:09 +00:00
Tom Wilkie
e9e152b9a3 Use argv[0] for process name to be more like ps. 2016-01-06 11:55:34 +00:00
Tom Wilkie
7b28d9a84a Merge pull request #788 from weaveworks/786-dockerclient 
Update to latest go-dockerclient
 2016-01-06 11:51:46 +00:00
Tom Wilkie
5086f55357 Merge pull request #793 from weaveworks/792-control-ws-panic 
Don't panic if you don't understand the message on the control WS.
 2016-01-06 11:50:24 +00:00
Tom Wilkie
b89deb6aa9 Review feedback 2016-01-06 11:48:29 +00:00
Tom Wilkie
6850e840bd Merge pull request #785 from weaveworks/777-probes-https 
Make probes use TLS against scope.weave.works by default
 2016-01-04 18:17:05 +00:00
Tom Wilkie
d45930545e Don't panic if you don't understand the message on the control WS. 2016-01-04 17:58:42 +00:00
Tom Wilkie
696a50fd27 Don't -i for different architectures. 2016-01-04 16:48:41 +00:00
Tom Wilkie
d6052973af Pass -i to go build to speed up builds. 2016-01-04 16:48:41 +00:00
Tom Wilkie
d12cc9a5bd Don't report network stats (we don't show them in UI anyway) 2016-01-04 16:48:19 +00:00
Tom Wilkie
7df22c6f39 Update fsouza/go-dockerclient 2016-01-04 16:48:19 +00:00
Tom Wilkie
c468dd5f32 Merge pull request #791 from weaveworks/fix-tests 
Build new test VM (to pickup latest Docker version).
 2016-01-04 16:47:53 +00:00
Tom Wilkie
abebb0f197 Build new test VM (to pickup latest Docker version). 2016-01-04 16:10:27 +00:00
Simon Howe
22247130d3 Log proxy connection errors rather than killing server. 
Don't have accurate repro for when they occur.
 2016-01-04 16:40:02 +01:00
David Kaltschmidt
372c611873 Remove backend container dep for non-container builds 2015-12-30 13:45:33 +00:00
Simon
a8fc57adae Merge pull request #780 from weaveworks/748-fix-terminal-unicode-chars 
Fixes display of unicode characters in the terminal
 2015-12-29 09:34:01 +00:00
Simon Howe
a17355e667 Fixes display of unicode characters in the terminal 2015-12-29 09:33:31 +00:00
Alfonso Acosta
7e87caf3ee [probe] Share TLS configuration with websockets 2015-12-21 17:00:23 +00:00
Alfonso Acosta
840fcb2441 [probe] Make sanitize.URL work with wss 2015-12-21 17:00:23 +00:00
Alfonso Acosta
f183590cf4 [probe] Only target scope.weave.works implicitly if no app is provided 2015-12-21 17:00:23 +00:00
Alfonso Acosta
4841340b33 [probe] Use https with scope.weave.works by default 2015-12-21 14:48:27 +00:00
Tom Wilkie
2faa58aa41 Merge pull request #776 from weaveworks/tracer 
Tracer!
 2015-12-17 13:55:10 +00:00
Tom Wilkie
6dc65e2481 Update example app. 2015-12-17 13:54:42 +00:00
Tom Wilkie
1ef6006c55 Make tests pass. 2015-12-17 11:18:57 +00:00
David
4ea854519b Merge pull request #775 from weaveworks/build-performance 
Speed up npm bundle builds
 2015-12-16 18:54:35 +01:00
David Kaltschmidt
57dfe4a4e8 Dont use -p on webpack when declaring uglifyjs plugin 2015-12-16 18:53:11 +01:00
Simon
c85f0dfdf1 Merge pull request #766 from weaveworks/765-fix-terminal-wrapping 
Set correct size for terminal which fixes text wrapping.
 2015-12-16 17:33:18 +01:00
Simon Howe
a166ecc92c Tidying up a little bit. 2015-12-16 17:32:46 +01:00