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
3,331 Commits 85 Branches 64 Tags
ca97cee4ddd23481f615df41a67fb8a43b479feb
Commit Graph

3331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jpellizzari
ca97cee4dd Upgraded xterm.js to 2.2.3 2017-02-01 08:29:30 -08: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
Jordan Pellizzari
f15497cba9 Merge pull request #2144 from weaveworks/2133-scope-component 
Allow Scope UI to be installed as a Node module
 2017-01-24 15:48:19 -08:00
jpellizzari
9acca772a9 Added npm module scripts to CI 2017-01-24 13:36:39 -08:00
jpellizzari
a6412f12b2 Scoped CSS classes inside .scope-app class 2017-01-24 11:33:20 -08:00
jpellizzari
0bf7fa49dd Exported wsUrl constant from web-api-utils for the terminal component 2017-01-24 11:25:03 -08:00
jpellizzari
59ed9b8f3f Added S3 release script 2017-01-24 11:25:03 -08:00
jpellizzari
c1303e181e Added ActionTypes and styles exports 2017-01-24 11:25:03 -08:00
jpellizzari
0575e85ca1 Changed API URLs when running as dependency 2017-01-24 11:25:02 -08:00
jpellizzari
d5d853ebba Added package installation scripts 2017-01-24 11:25:02 -08:00
jpellizzari
bfefa0902b Added exports and install script 2017-01-24 11:25:02 -08:00
Mike Lang
dee274e438 Merge pull request #2065 from weaveworks/mike/ecs/caching 
ECS reporter: Minimize API calls by caching task and service data
 2017-01-24 11:03:51 -08:00
Jordan Pellizzari
c896cf9a84 Merge pull request #2141 from weaveworks/convert-to-sass 
Use Sass instead of Less
 2017-01-24 09:24:36 -08:00
jpellizzari
50b84fed64 Converted node-details table style to sass 2017-01-24 08:23:41 -08:00
Jordan Pellizzari
9c214e37d5 Merge pull request #2125 from weaveworks/2120-show-app-containers 
Change topologies option from 'notsystem' to 'application'
 2017-01-23 16:33:58 -08:00
jpellizzari
39114a8ddb Changed container-label-filters-group url param to system 2017-01-23 15:54:49 -08:00
Mike Lang
fca76d661e Merge pull request #2145 from weaveworks/mike/render/fix-ecs-detailed-parents 
render.detailed: Add ECS topologies to detailed parents conversion
 2017-01-23 13:23:45 -08:00
Mike Lang
19b6d5b1c4 Merge pull request #2146 from weaveworks/mike/render/fix-ecs-detailed-children 
render.detailed: Teach detailed node view how to display ECS topologies as children
 2017-01-23 13:23:27 -08:00
Mike Lang
c4eb0960f9 awsecs client: simplify list/describe services 
by removing ability to stream results between them, since this is such a minor optimization
and greatly complicates the code.
 2017-01-23 12:48:50 -08:00
jpellizzari
66e3e7af49 Removed URL params from integration test config 2017-01-23 12:10:58 -08:00
Alfonso Acosta
036dd072d3 Merge pull request #2148 from kinvolk/iaguis/refactor-probemain 
probe: refactor probeMain
 2017-01-23 13:13:13 +01:00
Iago López Galeiras
f0d9876258 probe: refactor probeMain 2017-01-23 12:11:35 +01:00
Tom Wilkie
fe81ef98f4 Update to go1.7.4 (#2147) 2017-01-22 19:51:38 +00:00
Alfonso Acosta
a6e6131636 Merge pull request #2143 from weaveworks/2142-wrong-compose-install-docs 
Fix Scope arguments in Docker Compose installation docs
 2017-01-21 10:13:21 +01:00