github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
899 Commits 85 Branches 64 Tags
ec4425fb807bafaafb1dbf35db1ae40b40aec3a0
Commit Graph

899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Wilkie
ec4425fb80 Use Node.Sets for Host Local Networks. 2015-10-27 14:35:07 +00:00
Tom Wilkie
6e9ad995b0 Use Node.Sets for Docker/Weave IPs 2015-10-27 14:12:35 +00:00
Tom Wilkie
6913431138 Make IDList an alias for StringSet 2015-10-27 14:12:34 +00:00
Tom Wilkie
5a0e23b3ea Some additional methods for using Sets. 2015-10-27 14:12:34 +00:00
Peter Bourgon
c68516ec22 report: add StringSet (port of IDList, effectively) 2015-10-27 14:12:34 +00:00
Tom Wilkie
6a4c997048 Merge pull request #526 from weaveworks/fix-natmapper-conntracker 
Refactor probe/endpoint for export and dependency cleanliness
 2015-10-27 14:11:55 +00:00
Tom Wilkie
e3f8e142d5 Merge commit '5b32aa68b714b61558e454001e80009319005ea2' into fix-natmapper-conntracker 2015-10-27 13:17:35 +00:00
Tom Wilkie
5b32aa68b7 Squashed 'tools/' changes from 4fa0c68..d6ea3ad 
d6ea3ad Use git diff to detect changes in rebuild-image

git-subtree-dir: tools
git-subtree-split: d6ea3ad379
 2015-10-27 13:17:35 +00:00
Paul Bellamy
5ed5fd1bd0 Merge pull request #596 from weaveworks/ssl-hostname-verify 
pass the hostname through to xfer.HttpPublisher, so we can verify ssl certs
 2015-10-27 12:11:42 +00:00
Tom Wilkie
07af26e05b Review feedback 2015-10-27 11:39:38 +00:00
Paul Bellamy
650f015421 Review feedback 2015-10-27 11:36:14 +00:00
Tom Wilkie
8b03814cb7 Fixup failing tests due to fixture move. 2015-10-27 11:30:40 +00:00
Tom Wilkie
a3c53aadf5 No more nil flow workers 2015-10-27 10:53:23 +00:00
Paul Bellamy
e41352a220 pass the hostname through to xfer.HttpPublisher, so we can verify ssl certs 2015-10-27 10:51:41 +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
David
344adb449e Merge pull request #590 from weaveworks/jest 
Migrate JS testing to Jest
 2015-10-27 10:20:54 +00:00
Alfonso Acosta
fb7af97d91 Merge pull request #594 from weaveworks/scope-modes 
[docs] Refer to different Scope setups as standalone and service modes
 2015-10-27 09:29:04 +00:00
Alfonso Acosta
6a9a6a05b8 User cloud service mode instead of service mode 2015-10-27 08:10:57 +00:00
Alfonso Acosta
9f8d6801c2 Address PR comments 2015-10-26 23:24:16 +00:00
Alfonso Acosta
314245325d [docs] Refer to different Scope setups as standalone and service modes 2015-10-26 19:27:07 +00:00
Alfonso Acosta
1fe32ad334 Merge pull request #592 from weaveworks/588-improve-version-extraction 
Make Docker version extraction more robust
 2015-10-26 19:14:57 +00:00
Alfonso Acosta
543109a524 Make Docker version extraction more robust 2015-10-26 18:07:11 +00:00
David Kaltschmidt
e2d488182d JS test dirs are now inlined 2015-10-26 17:51:41 +00:00
David Kaltschmidt
92e56a492b Fix package.json syntax error 2015-10-26 17:49:21 +00:00
David Kaltschmidt
a2877102f1 remove old karma test config, make webpackdevserver optional 
`npm install` continues to install everything, but `npm install
--no-optional` wont install the dev server.
 2015-10-26 17:49:21 +00:00
David Kaltschmidt
cacc2e1bc3 Move testing to Jest 2015-10-26 17:49:21 +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