github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-21 06:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,877 Commits 85 Branches 64 Tags
prometheus-plugin
Commit Graph

2877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Bourgon
303bed1e2b Makefile: fix indentation 2015-10-23 14:38:17 +01:00
Tom Wilkie
58c9a390c5 Merge pull request #6 from weaveworks/add-runner 
Copy test runner from weave repo, add some more details to README.
 2015-10-23 11:04:21 +01:00
Tom Wilkie
beb4494499 Review feedback 2015-10-23 10:00:45 +00:00
Paul Bellamy
23e4459d56 fixing up typos 2015-10-23 10:50:01 +01:00
Tom Wilkie
f53a68b1b7 Copy test runner from weave repo, add some more details to README. 2015-10-23 09:48:04 +00:00
Tom Wilkie
785f9ebe7d Don't run tests in ./vendor 2015-10-23 08:54:11 +00:00
Tom Wilkie
8262e7e18e Don't lint vendor/ 2015-10-22 18:02:37 +00: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
Paul Bellamy
986abd24cd Add ssl support for the probe 
Hosts ending in :443 are treated as SSL. There is also a
--probe.insecure flag, for using it in development environments where
SSL cannot be verified.
 2015-10-19 17:32:32 +01:00
Peter Bourgon
5ac8ce5622 Move scope.md to main README. Updates, also. 2015-10-19 18:26:56 +02:00
Tom Wilkie
f87e51f849 Remove cloud. 2015-10-19 16:23:00 +00:00
Tom Wilkie
520365ac4e Merge pull request #557 from weaveworks/548-docker-version-check 
Introduce docker version check into scope script, error on <1.5.0
 2015-10-19 17:11:51 +01:00
Tom Wilkie
16d59d183c Merge pull request #571 from weaveworks/561-sort-topologies 
Sort the structs returned by /api/topology
 2015-10-19 15:55:20 +01:00
Tom Wilkie
9d754ba5f4 Typo 2015-10-19 14:47:33 +00:00
Tom Wilkie
8783fc4974 Review feedback 2015-10-19 14:41:26 +00:00
Tom Wilkie
163af5e681 Review feedback 2015-10-19 14:33:42 +00:00
Tom Wilkie
7f21622d37 Introduce docker version check into scope script, error on <1.5.0 2015-10-19 14:33:41 +00:00
Tom Wilkie
c9d0418c9f Review feedback 2015-10-19 14:09:53 +00:00
Tom Wilkie
e99c111413 Merge pull request #553 from weaveworks/329-print-command 
Make getting the docker run command easier.
 2015-10-19 14:50:48 +01:00
Paul Bellamy
745c94f07f Make getting the docker run command easier. 2015-10-19 12:24:10 +01:00
Paul Bellamy
6c336bdfc0 Merge pull request #547 from weaveworks/arm-build 
Make Scope build on arm
 2015-10-19 11:45:31 +01:00
Tom Wilkie
48f41adde7 Merge pull request #564 from weaveworks/send-service-credentials-to-api 
Send the service credentials to initial /api request
 2015-10-19 11:40:02 +01:00
Tom Wilkie
305e1f482c Refactor topology registry etc; merge a bunch of redundant types. 2015-10-19 10:33:39 +00:00
Tom Wilkie
258e2c153d Sort the structs returned by /api/topology 2015-10-19 10:33:35 +00:00
Tom Wilkie
f4192c1adb Some extended basic documentation. 2015-10-19 10:23:35 +00:00
Tom Wilkie
f26f998b09 Fix lint. 2015-10-19 10:17:46 +00:00
Paul Bellamy
637cb23ba8 Send the service credentials to initial /api request 2015-10-19 10:29:05 +01:00
Paul Bellamy
5ed324071c Merge pull request #570 from weaveworks/testing 
Rejig setup.sh to ensure we use the right version of weave.
 2015-10-19 10:26:42 +01:00
Tom Wilkie
a61800be0f Rejig setup.sh to ensure we use the right version of weave. 2015-10-17 14:04:39 +00:00
Paul Bellamy
22dea31874 Merge pull request #5 from weaveworks/socks-readme 
added README for the socks proxy
 2015-10-15 10:42:45 +01:00
Paul Bellamy
5e42a1d0aa added README for the socks proxy 
Based on unpublished blogpost.
 2015-10-15 10:40:06 +01:00
Matthias Radestock
a286ddade0 only produce coverage for the module in the current dir 
and its sub-modules

...rather than all modules containing `weaveworks`.
 2015-10-12 17:35:00 +01:00
Tom Wilkie
5e817e477e Merge pull request #542 from weaveworks/testing 
Add tests for short-lived connection between hosts and containers.
 2015-10-12 12:51:35 +01:00