github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-06 11:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
875 Commits 85 Branches 64 Tags
a3c53aadf55c43360675f77965f890cd9a6ebcdb
Commit Graph

875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Wilkie
a3c53aadf5 No more nil flow workers 2015-10-27 10:53:23 +00:00
Peter Bourgon
cb40ad3a90 Continued un-exporting of symbols; renames 
- Unexport consts, types, vars, etc.
- Rename Conntracker (interface) to FlowWalker, to match its definition.
- Rename conntracker (type) to conntrackWalker, to match the interface.
- Move conntrack_test.go to conntrack_internal_test.go and package endpoint
 2015-10-27 10:40:09 +00:00
Peter Bourgon
6ae5077515 Un-export NATMapper 
Lots of TODOs to clean up...
 2015-10-27 10:38:22 +00:00
Peter Bourgon
36ce1089f4 Don't export reverseResolver 
It's only used within package endpoint, so it shouldn't be exported.
That means resolver_test becomes resolver_internal_test, and with the
previous change to the fixture, we can avoid the dot-import.

Also, update method names to reflect it's an unexported type.
 2015-10-27 10:38:19 +00:00
Peter Bourgon
c8fbea0f15 Move fixture to its own package 
We want to be able to import test from packages like probe/endpoint, in
order to use utility functions like poll. But that causes an import
cycle with the current layout. We got around this using dot-imports so
far, but it's ugly and unnecessary: fixture can be its own package.
 2015-10-27 10:36:53 +00:00
Peter Bourgon
65a7547415 Intermediate stage fix 2015-10-27 10:36:53 +00:00
Peter Bourgon
32a57e63db probe/endpoint: NATMapper missed an edge case 
NATMapper can be created with a nil Conntracker if
ConntrackerModulePresent is false, e.g. on Darwin.
Check for that in ApplyNAT.
 2015-10-27 10:36:52 +00:00
Tom Wilkie
15371a2bba Merge pull request #584 from weaveworks/535-vendor 
Build in a container, use go1.5, vendor Dependancies, build for Darwin and Arm on Circle.
 2015-10-26 17:43:07 +00:00
Tom Wilkie
0e22171e46 Merge commit '21c126249fcb7bf8566035c43fc38f52637c17e3' into 535-vendor 2015-10-26 17:08:11 +00:00
Tom Wilkie
21c126249f Squashed 'tools/' changes from 3e16fe8..4fa0c68 
4fa0c68 Don't collect coverage metrics for vendored packages.

git-subtree-dir: tools
git-subtree-split: 4fa0c68afa
 2015-10-26 17:08:08 +00:00
Tom Wilkie
b17596111e Don't go get when running the tests. 2015-10-26 16:59:39 +00:00
Tom Wilkie
283e69decc Merge commit 'c6a083dd90ebe76e377a224dcc3e1e3c7ad95e66' into 535-vendor 2015-10-26 16:59:05 +00:00
Tom Wilkie
c6a083dd90 Squashed 'tools/' changes from 58c9a39..3e16fe8 
3e16fe8 Add -no-go-get option to test.

git-subtree-dir: tools
git-subtree-split: 3e16fe8d0a
 2015-10-26 16:59:02 +00:00
Tom Wilkie
35bfa5f751 Okay, that was a bad idea 2015-10-26 16:53:21 +00:00
Tom Wilkie
0c790b966e sudo -E so environment variables (like GOOS and CIRCLECI) are passed through to docker 2015-10-26 16:44:41 +00:00
Tom Wilkie
ba2f3cf7d9 Add experiemental/vendor directory, with gopacket in there. 2015-10-26 16:29:45 +00:00
Tom Wilkie
fb49e146ad Build experimental stuff in a container too 2015-10-26 16:11:16 +00:00
Tom Wilkie
62aed75550 Fix couple of minor typos. 2015-10-26 15:42:06 +00:00
Tom Wilkie
00ac914be9 Don't need to clone a sepatate tools repo, or install a bunch of packages now. 2015-10-26 15:28:55 +00:00
Tom Wilkie
18a1354075 Add make tests target, which runs tests inside build container. 2015-10-26 15:23:00 +00:00
Tom Wilkie
8b52b10e38 Squashed 'tools/' content from commit 58c9a39 
git-subtree-dir: tools
git-subtree-split: 58c9a390c5
 2015-10-26 15:13:15 +00:00
Tom Wilkie
011a55358f Merge commit '8b52b10e38553a35d8134b428d6118a1ac011804' as 'tools' 2015-10-26 15:13:15 +00:00
Tom Wilkie
aa55aecec5 Vendor some additional libraries for the tests. 2015-10-26 15:12:10 +00:00
Tom Wilkie
c05b76373f Review feedback 2015-10-26 14:23:30 +00:00
Tom Wilkie
147db96567 Make the build-in-container vs not clearer to make, so it doesn't always rebuild the exes. 2015-10-26 14:02:39 +00:00
Tom Wilkie
bb755979b1 Add vendored dependancies 2015-10-24 11:19:50 +01:00
Tom Wilkie
e8c96a0242 Turn on GO15VENDOREXPERIMENT in build container; don't go get. 2015-10-24 10:24:59 +01:00
Peter Bourgon
a48b6d4d1e Let's not squash. 2015-10-23 16:35:46 +00:00
Tom Wilkie
0288b3151b Use gocertifi instead of random ca-certs. 2015-10-23 16:35:41 +00:00
Tom Wilkie
f3b66428db Don't use fast datapath for our inter-container connection tests. 2015-10-23 16:35:18 +00:00
Tom Wilkie
7fd5a315e3 Build inside the build container, using go1.5, by default 
Also build for GOOS=darwin and GOARCH=arm
 2015-10-23 16:35:11 +00:00
Peter Bourgon
303bed1e2b Makefile: fix indentation 2015-10-23 14:38:17 +01:00
Tom Wilkie
780e370360 Merge pull request #581 from weaveworks/570-conntrack-loop 
Retry conntrack, after a short delay, in a loop.
 2015-10-22 10:02:20 +01:00
Tom Wilkie
492ca1692d Review feedback 2015-10-22 09:01:53 +00:00
Tom Wilkie
0cd3de5c7f Retry conntrack, after a short delay, in a loop. 2015-10-21 15:17:41 +00:00
Tom Wilkie
1e22629448 Merge pull request #577 from weaveworks/520-edge-bug 
Include host scope for container joins based on IP.
 2015-10-21 11:59:31 +01:00
Tom Wilkie
cd97708af0 Review feedback 2015-10-21 10:04:27 +00:00
Tom Wilkie
7e1a653349 Add status bar to setup.sh, compress the ssh tunnel to make it quicker. 2015-10-20 15:48:46 +00:00
Tom Wilkie
811bde4d4a Include host scope for contianer joins based on IP. 2015-10-20 14:50:40 +00:00
Paul Bellamy
d380df5dd6 Merge pull request #575 from weaveworks/559-probe-ssl-support 
Add ssl support for the probe
 2015-10-20 14:57:39 +01:00
Paul Bellamy
a1466cb3fc Review Feedback 2015-10-20 14:26:27 +01:00
Tom Wilkie
4cc9a1368d Merge pull request #574 from weaveworks/560-work-with-1.2 
Make scope work with weave master.
 2015-10-20 12:27:04 +01:00
Tom Wilkie
b06b13dccd Another typo 2015-10-20 10:43:20 +00:00
Tom Wilkie
a509c86d8b Typo 2015-10-20 10:38:10 +00:00
Tom Wilkie
b77fbcdaf1 Make scope work with weave master. 2015-10-20 09:48:12 +00:00
Paul Bellamy
659da5011e Merge pull request #565 from weaveworks/563-wss-websockets 
Support wss for secure websockets when page was loaded over ssl
 2015-10-20 10:13:54 +01:00
Alvaro
7408b1eb73 Merge pull request #562 from weaveworks/scope-504-1 
Sort DNS answers before returning a name with Get()
 2015-10-20 09:41:44 +02:00
Alvaro Saurin
a1f467f20f Sort DNS answers before returning a name with Get() 2015-10-20 09:23:19 +02:00
Tom Wilkie
d788758ca3 Merge pull request #572 from weaveworks/567-docs 
Some extended basic documentation.
 2015-10-19 17:50:53 +01:00
Paul Bellamy
d7e26228bd Support wss for secure websockets when page was loaded over ssl 2015-10-19 17:42:11 +01:00