Commit Graph
52 Commits
Author SHA1 Message Date
Bryan Boreham ec71876879 Sleep to stop TestRegistryDelete() failing 2018-08-26 21:33:26 +00:00
Filip Barl bfb20a8f40 Addressed @LiliC's feedback. 2018-05-17 11:43:54 +02:00
Matthias Radestock 9dc50b5202 refactor: hide "empty set" constants
They are an implementation detail.
2017-07-03 01:26:22 +01:00
Alfonso AcostaandGitHub 8bf753a51b Revert "Revert "Add options to hide args and env vars (#2306)"" (#2311)
* Revert "Revert "Add options to hide args and env vars (#2306)""

* Make linter happy
2017-03-08 02:16:42 -08:00
Alfonso AcostaandGitHub dcc7389127 Revert "Add options to hide args and env vars (#2306)"
This reverts commit 764afb6301.
2017-03-07 17:51:27 +01:00
Mike BryantandAlfonso Acosta 764afb6301 Add options to hide args and env vars (#2306)
* Add options to hide args and env vars

To allow for use of weave-scope in an unauthenticated environment,
add options to the probe to hide comand line arguments and
environment variables, which might contain secret data.

Fixes #2222

* Change docker.NewRegistry arguments to be a struct

* Remove redundant declarations of default values

* Move registry options outside to improve readability
2017-03-07 08:51:18 -08:00
Jonathan Lange 1020fc5f85 Use test.Diff from common 2016-12-07 11:22:40 +00:00
Jonathan Lange e8085b01b6 Use 'common' library 2016-12-07 11:22:38 +00:00
Alfonso AcostaandGitHub 3ba83ddd53 Merge pull request #1973 from weaveworks/1938-enrich-weave-details-panel
Extend metadata in details panel for Weave Net nodes
2016-11-04 09:44:27 +01:00
Alfonso Acosta 0884955c95 Extend metadata in details panel for Weave Net nodes 2016-11-03 15:57:23 +00:00
Alfonso AcostaandSimon Howe c2f2a90b61 Implement App endpoint /pipe/{id}/resize_tty/{height}/{width} to resize ttys 2016-10-31 11:04:39 +01:00
Matthias Radestock 3c4833fe97 use go-dockerclient's Client.Stats
...instead of rolling our own.

This also fixes #1799 - a race condition that could result in multiple
stats gatherers for a container.
2016-08-26 12:43:30 +01:00
Krzesimir Nowak 41193b428e Make control handlers registry an object and extend its functionality
It is not a singleton anymore. Instead it is an object with a registry
backend. The default registry backend is provided, which is equivalent
to what used to be before. Custom backend can be provided for testing
purposes.

The registry also supports batch operations to remove and add handlers
as an atomic step.
2016-08-12 17:03:42 +02:00
Alfonso Acosta 7fb40c802a Review feedback 2016-06-14 16:53:23 +00:00
Alfonso Acosta 6f0a31d1cd Add docker networks to the Overlay Topology 2016-06-14 14:58:43 +00:00
Alfonso Acosta 47c5754923 Add test 2016-06-13 11:47:19 +00:00
Tom Wilkie 1c5f0ac041 Don't attribute conntracked connections to k8s pause containers. 2016-05-03 12:04:08 +01:00
Tom Wilkie 02554b1dcd Propagate network info for containers sharing network namespaces (#1401)
- Add armon/go-radix library, use this to find containers by prefix
- Deal with host net namespace in the same way
2016-04-29 18:13:55 +01:00
Paul Bellamy a374ad334a Don't show container labels on container images
Images have their own labels. We can still use the container labels for
filtering, as the filters are "System Containers", not "System Images".
2016-04-25 10:32:33 +01:00
Paul Bellamy 1539e668e7 Merge pull request #1290 from weaveworks/remove-container-control
Add control for removing stopped docker containers.
2016-04-22 14:13:40 +01:00
Tom WilkieandTom Wilkie 65dbca997c Add control for removing stopped docker containers. 2016-04-21 16:24:41 +01:00
Tom Wilkie 66868eb946 Add test for rm'd containers 2016-04-21 13:51:20 +01:00
Tom Wilkie cec750049f Immediately remove deleted containers from the UI. 2016-04-21 12:26:51 +01:00
Paul Bellamy 5cedfad29a Merge pull request #1332 from weaveworks/1091-docker-rename
Support docker rename events
2016-04-20 09:45:40 +01:00
Paul BellamyandTom Wilkie 1edeb8d190 Removing report.Node.WithID (#1315)
* removing usage of report.Node.WithID

* report.Topology.AddNode can use the node's ID field
2016-04-19 16:48:03 +01:00
Paul Bellamy 497270eff7 support docker rename events 2016-04-18 14:39:48 +01:00
Paul Bellamy f3adefa454 Update docker client, to get better state strings in the UI 2016-04-06 16:39:45 +01:00
Tom Wilkie bd760f6e76 Update demo for tracer 2016-03-10 13:25:19 +00:00
Tom Wilkie 638c5676cb Add container uptime and restart count to details panel. 2016-01-29 14:31:40 -08:00
Tom Wilkie 6b56475766 Use ps.Map for Counters and Sets, remove Metadata in favour of Latest.
Also
- Add more complicated report.json for benchmark
- Break up report/topology.go
- Implement our own DeepEqual for ps.Map
2016-01-22 15:10:32 -08:00
Tom Wilkie 1ef6006c55 Make tests pass. 2015-12-17 11:18:57 +00:00
Tom Wilkie 6259307491 Don't use a global variable to store the pipe client. 2015-12-10 15:44:25 +00:00
Tom Wilkie b77cd3f300 Add pipe controls for Docker attach & exec. 2015-12-10 12:51:17 +00:00
Tom WilkieandPaul Bellamy ab3927617d Update tests 2015-11-16 10:44:30 +00:00
Tom Wilkie 8f957c4f13 Add docker lifecycle controls, containers in states other that running, and a filter for those containers.
Also add integration test for container controls.
2015-11-06 17:39:54 +00:00
Tom Wilkie 811bde4d4a Include host scope for contianer joins based on IP. 2015-10-20 14:50:40 +00:00
Tom Wilkie eaf52f4769 Review feedback 2015-10-10 07:47:34 +00:00
Tom Wilkie d3aa975eb9 In containers view, show short lived connections to/from the internet by including port mappings in the join. 2015-10-01 16:31:38 +00:00
Tom Wilkie 92b5b639dd Extend docker module testing. 2015-09-24 05:30:40 +00:00
Tom Wilkie 2fdfa1cbf5 Fix flaky docker tests. 2015-09-14 05:09:33 +00:00
Tom Wilkie c9f39d4129 Address one intermittent failure in registry_test.go 2015-09-14 04:57:56 +00:00
Tom Wilkie 57f7b4f2e6 Rename NodeMetadata -> Node 2015-09-03 16:18:54 +00:00
Alfonso Acosta 4db80108bf Merge pull request #400 from weaveworks/docker-labels
Report docker container labels and render them in the details pane
2015-08-27 14:11:35 +01:00
Tom Wilkie 7c1ca152fa Fail if want != have! 2015-08-26 16:24:42 +00:00
Alfonso Acosta e1c05012ca Report docker container labels and render them in the details pane 2015-08-26 13:38:53 +00:00
Tom Wilkie d8ac16d3f3 Gather container IP addresses from Docker and Weave, and apply them to nodes in the container topology. 2015-08-26 10:19:08 +00:00
Peter Bourgon 3dd59c8b9b Fixes to NodeMetadata
NewNodeMetadata -> MakeNodeMetadata. It doesn't return a pointer, so
Make is more idiomatic.

Invoke MakeNodeMetadata when necessary. The zero value for a
NodeMetadata is no longer valid.

Split MakeNodeMetadata to two constructors. MakeNodeMetadata when you
don't have anything to prepopulate; MakeNodeMetadataWith when you do.

Also, a fix to the tests in app. We unmarshal a RenderableNode struct,
which has a JSON-ignored NodeMetadata field. The zero value is invalid,
so we need to fix that before performing comparisons.
2015-07-30 17:20:44 +02:00
Tom Wilkie f85195308c report.Metadata -> map[string]string 2015-07-16 12:06:05 +00:00
Tom Wilkie c2065836e2 Make NodeMetadata a struct, move existing map[string]string to NodeMetadata.Metadata 2015-07-15 10:06:36 +00:00
Tom Wilkie 9fc02d941e Fix flaky tests
- Make poll take interfaces, do diff on error
- Use poll in TestRegistryEvents
- Improve the locking to prevent deadlocks and data races in registry_test.go
2015-07-08 13:54:09 +00:00