github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-09-06 10:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,370 Commits 85 Branches 64 Tags
f86d0d89ac15fd5d7f6ebb6a542e7f85cb005cf6
Commit Graph
3370 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alfonso Acosta f86d0d89ac Merge pull request #2223 from kinvolk/alban/integration 
bin/setup-circleci-secrets: possibly use generic credentials
 2017-02-09 21:50:17 +01:00
Alban Crequy d0a5315c5c bin/setup-circleci-secrets: possibly use generic credentials 
If the $SECRET_SCRIPT environment variable is defined in CircleCI, this
can override the GCE credentials.

I now use "base64" instead of "openssl base64" in order to support long
lines in base64 text. It's useful when the text comes from a long
environment variable like $SECRET_SCRIPT defined in CircleCI.

Also, the $PROJECT environment variable can now override the GCE project
name. Before, it needed to be named scope-integration-tests.
 2017-02-09 17:42:36 +01:00
Alfonso Acosta 35182c8cb7 Merge pull request #2203 from weaveworks/release-1.2 
Release 1.2
 2017-02-09 00:33:31 +01:00
Alfonso Acosta 86528281e7 Fix release shell script bug 
Introduced by 43d9f38c5e and found during release
 2017-02-08 23:07:20 +00:00
Alfonso Acosta 7d5ef4bccb Minor CHANGELOG update v1.2.0 2017-02-08 18:18:14 +00:00
Alfonso Acosta 3f41f4559a Update CHANGELOG 2017-02-08 18:15:46 +00:00
Filip Barl 64fe7560b6 Merge pull request #2214 from weaveworks/fix-rounded-square-node-shadow-radius 
Fix rounded square node shadow radius
 2017-02-08 18:44:24 +01:00
Filip Barl df2193cd95 Fix rounded square node shadow radius 2017-02-08 18:41:46 +01:00
Filip Barl 0bd24c596a Merge pull request #2210 from weaveworks/fixed-node-stack-display 
Fix for node stack display bug
 2017-02-08 18:39:51 +01:00
Simon ddd5a25a98 Merge pull request #2217 from weaveworks/2209-fixes-popped-out-terminal-styles 
Fixes base font-size of popped out terminal.
 2017-02-08 18:38:48 +01:00
Filip Barl c8c6dd84c2 Fixed the node stack display bug. 2017-02-08 18:25:05 +01:00
Alfonso Acosta 14a555ffab Stop using tag -f 
(It's been removed from Docker)
 2017-02-08 17:10:50 +00:00
Simon Howe 047ce43d2a Fixes base font-size of popped out terminal. 
Share the rest of the base styles too so the embedded and popped out
terminal are working from a common style base.
 2017-02-08 18:08:13 +01:00
Alfonso Acosta 7acebad756 Push latest_release tag to Docker Hub on each release 2017-02-08 17:02:14 +00:00
Alfonso Acosta c9881a764e Merge pull request #2206 from kinvolk/schu/extras-dialer-random-seed 
extras/dialer: allow to seed random
 2017-02-08 17:32:05 +01:00
Michael Schubert c349c165e5 extras/dialer: allow to seed random 
Helpful if you want to get the same random numbers in subsequent runs
(e.g. to compare results between branches).
 2017-02-08 12:42:32 +01:00
Mike Lang f8cf32c0c1 Merge pull request #2186 from weaveworks/mike/ecs/clusterise-service-ids 
Rename ECS Service node ids to be cluster;serviceName
 2017-02-07 14:56:21 -08:00
Alfonso Acosta 9e33e7e07f Release 1.2.0 2017-02-07 18:05:35 +00:00
Alfonso Acosta 0372c0b432 Update Scope version in docs 2017-02-07 15:34:01 +00:00
Jordan Pellizzari 68971447c8 Merge pull request #2194 from weaveworks/2181-closed-connections 
Change merge to re-assign when nodes are updated
 2017-02-06 09:17:55 -08:00
Filip Barl 8e183c8283 Merge pull request #2177 from weaveworks/details-spinner-display-fix 
Node details spinner Chrome display bug fix
 2017-02-06 11:38:30 +01:00
Filip Barl 2a8904e5f2 Fixed the node details spinner Chrome display bug 2017-02-06 11:16:28 +01:00
Matthias Radestock 4bc6a6c128 Merge pull request #2189 from weaveworks/2188-make-clean 
don't attempt to make 'make clean' work on old checkouts

Fixes #2188.
 2017-02-03 22:16:32 +00:00
Mike Lang 1dcfe58b3d Add test to check ECS Service node id parsing is back-compatible 2017-02-03 13:55:11 -08:00
Matthias Radestock 4aa73bf7f0 don't attempt to make 'make clean' work on old checkouts 
It's just not worth the extra complication in the Makefile, and the
code for it was actually broken.

Also, outdent comment so it doesn't get splattered onto the console.
 2017-02-03 21:52:55 +00:00
Mike Lang fad3e88269 Rename ECS Service node ids to be cluster;serviceName 
This is important for two reasons:
* It prevents nasty false-equality bugs when two different services from different ECS clusters
  are present in the same report
* It allows us to retrieve the cluster and service name - all the info we need to look up the service -
  using only the node ID. This matters, for example, when trying to handle a control request.
 2017-02-03 13:45:18 -08:00
jpellizzari f82ec445f8 Changed merge to re-assign in RECEIVE_NODES_DELTA 2017-02-03 11:26:54 -08:00
Filip Barl 43cb7548d8 Merge pull request #2180 from weaveworks/reapply-graph-layout-optimizations 
Re-applied "Graph layout optimizations"
 2017-02-03 17:40:26 +01:00
Filip Barl 2b4ba3239c Fixed the node labels bug on Firefox. 2017-02-03 17:06:53 +01:00
Filip Barl c9ff15f7f3 Re-applied PR #2128 'Graph layout optimizations' 2017-02-03 16:59:25 +01:00
Alfonso Acosta c1b485470a Merge pull request #2190 from weaveworks/min-docker-1.10 
Embed and require Docker >= 1.10
 2017-02-03 16:58:25 +01:00
Alfonso Acosta 0922253cb1 Fix typo 2017-02-03 16:13:17 +01:00
Alfonso Acosta 92c4bc968c Embed and require Docker version 1.10 2017-02-03 14:26:58 +00:00
Alfonso Acosta e5d8c8e8b6 Bump Docker in CircleCI to 1.10 2017-02-03 14:24:16 +00:00
Filip Barl 834eb6110a Merge pull request #2179 from weaveworks/revert-2128-graph-layout-optimizations 
Revert "Graph layout optimizations"
 2017-02-02 11:46:02 +01:00
Filip Barl 8eaa12e680 Revert "Graph layout optimizations" 2017-02-02 11:42:12 +01:00
Filip Barl 95c688d1b1 Merge pull request #2128 from weaveworks/graph-layout-optimizations 
Graph layout optimizations
 2017-02-02 11:01:05 +01:00
Filip Barl c802c8c6c1 Addressed @foot's UI comments 2017-02-01 16:27:23 +01:00
Filip Barl 2a6308bf6c Split the zooming and layout logic in nodes-chart.js between a bunch of selectors 2017-02-01 16:27:23 +01:00
Filip Barl 632e3756c4 Optimized rendering of graph layout and zooming events 2017-02-01 16:27:23 +01:00
Alfonso Acosta b25417ea2f Merge pull request #2176 from weaveworks/2175-initialize-userns 
Initialize USERNS_HOST variable
 2017-02-01 16:26:36 +01:00
Alfonso Acosta 36da3cd4e5 Initialize USERNS_HOST variable 2017-02-01 14:47:32 +00:00
Filip Barl ceacc27503 Merge pull request #2174 from weaveworks/2165-contrast 
Split stylesheets to fix contrast bug
 2017-02-01 12:07:35 +01:00
David Kaltschmidt 4121da1c06 Added Internet button to debug toolbar 2017-01-31 16:57:49 +01:00
Alfonso Acosta f8ca8fa203 Merge pull request #2162 from weaveworks/2155-dot1q-decoding-and-rl 
DNSSnooper: Support Dot1Q and limit decoding errors
 2017-01-31 16:54:25 +01:00
Alfonso Acosta 373d6010dc Merge pull request #2172 from weaveworks/2163-known-services-can-be-internal 
Check for known services before external IPs
 2017-01-31 16:50:28 +01:00
Alfonso Acosta 0a135e6330 Check for known services before external IPs 
Known services can be internal (e.g. same VPC in AWS)
 2017-01-31 15:37:57 +00:00
Alfonso Acosta 0367bd8b1e Merge pull request #2161 from sjitech/master 
fix error when docker daemon is running with user namespace enabled.
 2017-01-31 08:42:52 +01:00
q c9174bb159 fix error when docker DAEMON is running with user namespace enabled. 
1:"Privileged mode is incompatible with user namespaces".
2:"Cannot share the host's network namespace when user namespaces are enabled".
 2017-01-31 11:23:58 +09:00
Alfonso Acosta ac0fbc4d66 Merge pull request #2166 from kinvolk/alban/scope-url 
scope: fix URL
 2017-01-30 15:02:56 +01:00