github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 10:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,163 Commits 85 Branches 64 Tags
c149e5792aa1af45b53f166de70dcafeabf74f97
Commit Graph

36 Commits

Author SHA1 Message Date
Roland Schilter
651e52b5a5 Honor DOCKER_* env variables in probe and app 
Changed default for flag `-app.docker` to use the DOCKER_* env variables
instead of hardcoded /var/run/docker.sock; uses docker's default if
no DOCKER_HOST defined, for both probe and app.

Fixes #1975
 2017-06-27 17:14:49 +02:00
Alfonso Acosta
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 Acosta
dcc7389127 Revert "Add options to hide args and env vars (#2306)" 
This reverts commit 764afb6301.
 2017-03-07 17:51:27 +01:00
Mike Bryant
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
Alfonso Acosta
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 Acosta
2443f7a3c5 Implement resize control for docker TTYs 2016-10-31 11:04:40 +01:00
Alfonso Acosta
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
Alfonso Acosta
b3b160ceb0 Merge pull request #1791 from weaveworks/release-0.17 
Release 0.17.0
 2016-08-16 15:04:29 +01:00
Alfonso Acosta
8b97f12ab1 Make stats gathering idempotent 2016-08-16 12:50:22 +00: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
0587c6a967 Fix master after merging conflicting PRs #1531 and #1584 
They both passed tests separately and were no source-line conflicts ... but shit happens.
 2016-06-15 20:23:13 +00:00
Alfonso Acosta
5d07b99e69 Merge pull request #1584 from weaveworks/1563-read-docker-networks 
Add docker networks to the Overlay Topology
 2016-06-15 19:08:30 +01:00
Tom Wilkie
fba555c985 Use image name without version as id. (#1531) 
* Use image name without version as id.

* Review feedback
 2016-06-15 16:14:51 +01: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
Peter Bourgon
e0fab36351 Re-sync container on network dis/connect 2016-06-06 16:24:03 +02: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
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 Wilkie
65dbca997c Add control for removing stopped docker containers. 2016-04-21 16:24:41 +01:00
Tom Wilkie
cec750049f Immediately remove deleted containers from the UI. 2016-04-21 12:26:51 +01:00
Paul Bellamy
497270eff7 support docker rename events 2016-04-18 14:39:48 +01:00
Tom Wilkie
7e2e4c9c45 Fix spelling mistakes in the codebase. 2016-03-23 10:51:27 +00:00
Tom Wilkie
f6835e433c Fix bug in container image reporting, strip the prefix off when adding image to the registry 2016-03-22 17:21:49 +00:00
Tom Wilkie
bd760f6e76 Update demo for tracer 2016-03-10 13:25:19 +00:00
Alfonso Acosta
2982166e03 Handle closing of docker events channel gracefully 2016-02-23 16:35:58 +00:00
Alfonso Acosta
3d94082b07 Add debug logging 2016-02-05 16:58:40 +00: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
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 Wilkie
78c86372c8 Maintain container-by-pid index correctly. 2015-11-16 10:44:30 +00:00
Tom Wilkie
92b24793f1 Push mini-reports when container's state changes. 2015-11-10 13:46:57 +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
314af5ca89 Improve probe docker code quality & test coverage. 
- Move docker probe code into it's own module
- Put PIDTree behind and interface for mocking
- Disaggregate dockerTagger into a registry, tagger and reporter
- Similarly disaggregate tests
- Add mocks for docker container and registry
- Add test for docker events & stats
 2015-06-18 17:09:33 +00:00