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
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
Alban Crequy
3d2291093c
scope: fix URL
...
Symptoms: the Scope URL are printed this way:
```
Weave Scope is reachable at the following URL(s):
* http://10.2.2.1
172.16.28.1
172.16.28.1
192.168.99.1
192.168.35.117
172.16.28.1
172.16.28.1
192.168.122.1:4040/
```
Regression from https://github.com/weaveworks/scope/pull/2068
2017-01-30 14:39:31 +01:00
David Kaltschmidt
f86dd128e0
Hotfix for URL issue
...
Pertains to #2154
2017-01-30 13:05:28 +01:00
Mike Lang
9b21183a38
Merge pull request #2153 from weaveworks/mike/track-build-external
...
Fix ownership issues with client/build-external
2017-01-27 15:25:52 -08:00
Mike Lang
02a2dd9d7a
Fix ownership issues with client/build-external
...
When the directory is created during the build process, it is as root.
This prevents us deleting root-owned files inside the directory during make clean.
In client/build/, we get around this because the directory contains a tracked file,
so it's created during git checkout.
We make this the case for build-external by adding a hidden, empty file to track.
This won't fix existing checkouts though, so we also add a fix-up step to make clean.
The use of .gitignore as the empty file to track is taken from
https://git.wiki.kernel.org/index.php/GitFaq#Can_I_add_empty_directories.3F
Specifically:
"If you really need a directory to exist in checkouts you should create a file in it.
.gitignore works well for this purpose"
2017-01-27 14:57:02 -08:00
jpellizzari
3f6e68230c
Split stylesheets to fix contrast bug
2017-01-27 12:08:01 -08:00
jpellizzari
5e461cd3ba
Fix for URLs in contrast mode
2017-01-27 08:13:17 -08:00
Alfonso Acosta
6347238f10
Review feedback
2017-01-27 13:05:50 +00:00
Alfonso Acosta
7ae94a8c8a
DNSSnooper: Support Dot1Q and limit decoding errors
2017-01-27 10:59:33 +00:00
Jordan Pellizzari
58d4306d0d
Merge pull request #2159 from weaveworks/2133-scope-component
...
Fix for incorrect iFrame API URLs
2017-01-26 14:39:18 -08:00
jpellizzari
74ab685343
Added iframe and standalone logic to web-api-utils
2017-01-26 13:54:37 -08:00
jpellizzari
7fb3ad3a96
Added npm module scripts to CI
2017-01-26 13:54:37 -08:00
Mike Lang
5ba78e050c
Merge pull request #2158 from weaveworks/mike/upgrade-alpine
...
Upgrade container base image to alpine:3.5
2017-01-26 13:53:54 -08:00
Mike Lang
0629eada0c
Upgrade container base image to alpine:3.5
...
As well as upgrading to latest stable being nice in general,
this was triggered by an issue where we could no longer find the bash package in 3.3
This upgrade also lets us get rid of reliance on the edge (rolling latest) repository
for runit, since 3.5 now contains runit natively.
2017-01-26 13:27:06 -08:00
Jordan Pellizzari
29edaebba3
Removed ui-build-pkg from circle.yml
2017-01-24 23:06:45 -08:00
jpellizzari
33844ca650
npm scripts change
2017-01-24 17:41:41 -08:00
jpellizzari
b3f3dc180e
Makefile changes
2017-01-24 17:21:31 -08:00
jpellizzari
a0b1aa12c0
Changed client build-pkg directory
2017-01-24 16:15:02 -08:00
