Commit Graph

3730 Commits

Author SHA1 Message Date
Alfonso Acosta
70cd3aaba0 only lint files in git ls-files, not .git/* 2017-04-26 16:43:06 +00:00
Alfonso Acosta
7544f4bc7d Merge pull request #2449 from weaveworks/2448-dockerhub-publish
publish master to dockerhub (again)
2017-04-25 16:11:37 +02:00
Alfonso Acosta
876bb97539 Merge pull request #2452 from weaveworks/mike/docker-swarm/service-ns-selector
Add docker swarm Stack selector ala k8s namespace selector
2017-04-25 15:57:15 +02:00
Bryan Boreham
8ad2d0e42c Merge pull request #2466 from weaveworks/map-write-optimise
Msgpack perf: write psMap out directly
2017-04-25 14:55:45 +01:00
Alfonso Acosta
372d818804 Merge pull request #2453 from kinvolk/schu/proc-walker
proc_linux: don't exec `getNetNamespacePathSuffix()` on every walk
2017-04-25 15:54:26 +02:00
Bryan Boreham
6842b08eb8 Fix out-of-date error message in test 2017-04-25 12:28:14 +00:00
Bryan Boreham
f9a1ecbef0 Remove Gob from plugin spec - not used any more 2017-04-25 12:27:51 +00:00
Bryan Boreham
b49ee2ae95 Remove Gob from report package - no longer used 2017-04-25 12:26:15 +00:00
Bryan Boreham
36ff5ab71a Write psMap out directly
rather than going via intermediate data structure
2017-04-25 10:38:56 +00:00
David
64fadf3c20 Merge pull request #2457 from weaveworks/remove-double-click
Remove zoom on double-click
2017-04-24 12:52:37 +02:00
Bryan Boreham
0281d4aeef Fix typo 2017-04-23 16:58:15 +00:00
David Kaltschmidt
11d9903d8f Remove zoom on double-click
This was confusing in demos at KubeCon and DockerCon this year, as
clicking on nodes kept the UI zooming in.
Plus, when asked, users had no idea that double-click meant zoom in.

Fixes weaveworks/service-ui#453
2017-04-21 17:00:09 +02:00
Michael Schubert
1d1f7347ce proc_linux: don't exec getNetNamespacePathSuffix() on every walk 2017-04-19 12:49:04 +02:00
Mike Lang
51999529a7 Add docker swarm Stack selector ala k8s namespace selector
We have to introduce the kinda hacky concept of a 'No Stack' stack
to reconcile it with the idea of a 'default' k8s namespace. This is important
because swarm services without a stack don't have the same docker labels as ones that do.
Curiously, they still have what appears to be a stack name 'prefix' on their names,
but I can't isolate that name anywhere easily so they'll just have to make do.

I basically copy-pasted updateFilters to make this work, todo go back and refactor
to not duplicate 90% of the code.
2017-04-18 09:08:22 -07:00
Bryan Boreham
c944225475 Merge pull request #2437 from kinvolk/alban/gzip-compression-level-default
gzip: change compression level to the default
2017-04-18 10:45:38 +01:00
Mike Lang
b58832df7e Merge pull request #2450 from weaveworks/mike/docker-swarm/stack-ns
swarm service: Capture stack namespace and strip it from name
2017-04-17 18:13:53 -07:00
Mike Lang
72bcdba1c3 swarm service: Capture stack namespace and strip it from name 2017-04-17 15:13:50 -07:00
Matthias Radestock
c6e6854be9 publish master to dockerhub (again)
Fixes #2448
2017-04-17 19:06:21 +01:00
Mike Lang
e8ecfe1c76 Merge pull request #2447 from weaveworks/mike/scope-script/hotfix-image-name
scope script: Allow 'user' part of image name to be given by DOCKERHUB_USER env var
2017-04-16 20:00:23 -07:00
Mike Lang
b51385d5f1 scope script: Allow 'user' part of image name to be given by DOCKERHUB_USER env var
This allows alternate scope images to be used, and mirrors the option available for weave net.
2017-04-16 19:46:03 -07:00
Mike Lang
c07c6156c1 Merge pull request #2444 from weaveworks/mike/docker-swarm/services-topology
Add very basic Docker Swarm service topology
2017-04-14 17:55:16 -07:00
Matthias Radestock
c924e817b0 Merge pull request #2443 from weaveworks/1190-app-http-address
don't lie about reachable address

Fixes #1190.
2017-04-15 01:32:06 +01:00
Matthias Radestock
5c452d0b59 Merge pull request #2445 from weaveworks/1550-disable-weave-dns
allow disabling of weaveDNS advertising/lookup
2017-04-15 01:29:53 +01:00
Mike Lang
2b208580ab Add new topology view for Docker Swarm services 2017-04-14 17:18:06 -07:00
Matthias Radestock
413dbc7f0c allow disabling of weaveDNS advertising/lookup
...while keeping other weave integrations, by setting
--weave.hostname=

Addresses a suggestion in #1550.
2017-04-15 00:02:07 +01:00
Mike Lang
327b909956 probe/docker: Populate SwarmService topology based on docker labels
This isn't the best way to do it, but it will work well enough for an initial implementation
2017-04-14 12:51:28 -07:00
Mike Lang
6bf34ab95d Add SwarmService topology containing data on Docker Swarm services 2017-04-14 12:51:28 -07:00
Mike Lang
460352d2d7 Merge pull request #2436 from weaveworks/mike/easier-added-topologies
Reduce the number of places topologies are explicitly listed
2017-04-14 12:49:12 -07:00
Matthias Radestock
bb36067e41 don't lie about reachable address
when app.http.address is specified. Instead just tell the user that
scope is reachable where they said.

Also, complain when the address is specified on D4M since there are
a bunch of hard-coded port 4040 in place for that.

Fixes #1190.
2017-04-14 02:09:03 +01:00
Matthias Radestock
76253c3cd0 Merge pull request #2442 from weaveworks/2018-close-s3-response
close s3 response body to prevent leaks

Fixes #2018.
2017-04-14 01:12:02 +01:00
Matthias Radestock
46f288bb6d close s3 response body to prevent leaks
Fixes #2018
2017-04-14 00:27:41 +01:00
Alban Crequy
a8af81fe20 gzip: change compression level to the default
We want the middle ground between a small compression size, a fast
compression time and a fast decompression time.

Tests suggest that the default compression level is better than the
maximum compression level: although the reports are 4% bigger and
decompress slower, they compress 33% faster.

See discussion on https://github.com/weaveworks/scope/issues/1457#issuecomment-293288682
2017-04-12 17:41:43 +02:00
Mike Lang
18ba2c4e38 ecs: Also make service a parent of task 2017-04-11 10:58:33 -07:00
Filip Barl
7c22c97382 Fix node highlight for all shapes (#2430)
* Render highlight with strokes & use non-scaled highlight for stacks.

* Reverted part of the changes made to node stack highlighting.
2017-04-11 09:11:31 +02:00
Mike Lang
9f0f120bc5 Remove explicit listing of api topologies in render/detailed/node specs
Instead, we can infer them from the render topology and the primaryAPITopology map
2017-04-10 15:06:38 -07:00
Mike Lang
7ba3555fe6 report: Reintroduce explicit topology listing for Walk functions
To avoid needing to allocate a new map every time, since we're already
hitting GC-related perf issues
2017-04-10 14:30:53 -07:00
Mike Lang
3656965ae7 Refactor Map2Parent and family into one function
This greatly improves code reuse while keeping the behaviour flexible
2017-04-10 14:30:53 -07:00
Mike Lang
9c88ad85e9 render/detailed/parents: Refactor for less repeated information
We replace the existing data structure with a simpler one that
only specifies how to get the parent label, which is the only
part of the Parent struct that can't be generated from the node info alone.

Future work: Standardize this concept of a label and put it in the topology instead.
Though that already exists...so just use it?
2017-04-10 14:30:52 -07:00
Mike Lang
2a74883cce If no node summary generator exists for topology, do a sane default
The default sets the node label to the node ID.
This is likely to not look very good, but the intent is that it creates an obvious problem,
ie. that the node ID is being used as the label, rather than a silent omission or more subtle problem.

Possible future work:
* For single-component IDs, extract the component automatically and use that instead.
* Instead of functions, in simple cases just have a LUT by topology with common behaviours like
  'stack = true or false', 'label = this key in node.Latest'
The latter opens up to eventually moving this info inside the report itself ala topology templates,
or at least centralizing it in the source.
2017-04-10 14:30:52 -07:00
Mike Lang
c16becc148 render/detailed: When summarising children, add fallback for unlisted topologies
Currently, if a topology does not have any specific info in nodeSummariesByID,
any children of the node that belong to that topology will be silently omitted.

This change adds a default behaviour for such topologies, with no special columns
but at least it is displayed at all.
Unlisted topologies are displayed after all listed ones, in arbitrary order.

Note that completely bogus or other special cases (eg. topology = Pseudo) still will not
be displayed as report.Topology() will fail.
2017-04-10 14:30:52 -07:00
Mike Lang
14ab5ccceb render: Maintain a list of 'primary' api topologies for each report topology
This gives us a single source of truth in a variety of situations where we want to
know what view to direct a user to in order to 'open' a particular node.

I wanted to put this in app/api_topologies where the views are defined, but that creates
a circular import.
2017-04-10 14:30:52 -07:00
Alfonso Acosta
7b838c7d69 Merge pull request #2435 from weaveworks/ami-docs-fix-disable
Fix disabling Scope in the ECS AMI
2017-04-10 18:24:11 +02:00
Alfonso Acosta
4d092723fb Review feedback 2017-04-10 18:22:56 +02:00
Alfonso Acosta
a80fa89ba4 Fix disabling Scope in the ECS AMI 2017-04-10 14:35:58 +00:00
Mike Lang
75314cb910 Reduce manually listing all topologies in a few places
Prefer WalkTopologies to apply a uniform action to every topology,
reducing need to make multiple changes and risk of errors if you forget one.
2017-04-07 12:57:42 -07:00
Filip Barl
9c566562c9 Made view mode selector responsive. (#2421) 2017-04-07 15:04:38 +02:00
Filip Barl
d71fc313b6 Not showing metric selector when empty. (#2426) 2017-04-07 12:36:21 +02:00
Anita Buehrle
258326a16c Merge pull request #2416 from weaveworks/renameamifile
missed an anchor
2017-04-06 07:57:55 -05:00
Filip Barl
82e373777a Increase cloud node thickness in graph view (#2418)
* Unified node shapes rendering templates.

* Addressed @foot's comments (fix shadow thickness across all shapes).

* Made getClipPathDefinition slightly more readable.
2017-04-06 14:44:52 +02:00
Alfonso Acosta
a404d82a91 Merge pull request #2419 from weaveworks/name-unnamed
Make various anonymous fields named
2017-04-06 14:16:29 +02:00