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
2,065 Commits 85 Branches 64 Tags
9eaac25d692cbda0120671ae2eac2c6c8e04df5c
Commit Graph

306 Commits

Author SHA1 Message Date
Tom Wilkie
9eaac25d69 Don't merge nodes in the rendering pipeline 2016-05-03 15:18:31 +01:00
Paul Bellamy
57bc6f7c90 Merge pull request #1386 from weaveworks/1340-k8s-filter-namespace 
Filter by Kubernetes Namespaces
 2016-05-03 13:48:22 +01:00
Paul Bellamy
0456df9d0a Merge branch 'master' of github.com:weaveworks/scope 2016-05-03 13:46:14 +01:00
Paul Bellamy
c40f29caf2 cleaning up old todo 2016-05-03 13:45:54 +01:00
Paul Bellamy
0e70f70ffd Review feedback 2016-05-03 12:49:02 +01:00
Paul Bellamy
4187ea2107 fixing up tests 2016-05-03 12:49:00 +01:00
Paul Bellamy
2af2b1f15a Filter by Kubernetes Namespaces 2016-05-03 12:47:24 +01:00
Tom Wilkie
1c5f0ac041 Don't attribute conntracked connections to k8s pause containers. 2016-05-03 12:04:08 +01:00
Tom Wilkie
8395c3ca4b Index Pods by UID and join with containers based on this. 2016-05-03 11:51:51 +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
a81b116672 Merge pull request #1409 from weaveworks/1396-pod-ip 
Show Pod IP in details panel.
 2016-04-29 14:49:39 +01:00
Tom Wilkie
e917dd61a8 Show Pod IP in details panel. 2016-04-29 13:34:31 +01:00
Tom Wilkie
b4a59f6e36 Don't recursively gets stats beyond an ApplyDecorators decorator 2016-04-29 12:06:33 +01:00
Tom Wilkie
9b5ac56214 Review feedback 2016-04-29 10:31:24 +01:00
Tom Wilkie
cb52acbc46 Add pod delete control 
- Push shortcut reports when pods are created/deleted
- Buffer upto 2 reports instead of dropping them
 2016-04-28 14:48:05 +01:00
Paul Bellamy
64450a4830 Merge pull request #1371 from weaveworks/1219-grouped-node-counts-2 
Fixing grouped node count for filtered children nodes
 2016-04-28 13:30:15 +01:00
Paul Bellamy
3d3aed2bb3 Fixing grouped node count for filtered children nodes 
Squash of:

* We have to keep all the container hostnames until the end so we can
  count how many we've filtered

* Adding tests for ContainerHostnameRenderer and PodServiceRenderer with
  filters

* Because we filter on image name we need the image name before
  filtering

* Alternative approach to passing decorators.

* Refactor out some of the decorator capture

* Don't memoise decorated calls to Render

* Fixing filtered counts on containers topology

  Tricky, because we need the filters to be silent sometimes (when they're
  in the middle), but not when they're at the top, so we take the "top"
  filter's stats. However, this means we have to compose all
  user-specified filters into a single Filter layer, so we can get all
  stats.

  There are no more Silent filters, as all filters are silent (unless they
  are at the top).

  Additionally, I clarified some of the filters as their usage/terminology
  was inconsistent and confused. Now Filter(IsFoo, ...) *keeps* only nodes
  where IsFoo is true.
 2016-04-28 12:23:43 +01:00
Paul Bellamy
3bfb8c4c85 Merge pull request #1356 from pidster/1355-add-swarm-to-system-containers 
Add swarm-agent, swarm-agent master to sys container filters
 2016-04-26 11:08:38 +01:00
pidster
0c2e9347d0 remove prefix slash 2016-04-25 14:54:09 +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
fdaafd2208 Check counters on expected rendered topologies 2016-04-22 14:14:31 +01:00
Paul Bellamy
e7ebb83e23 Prune is only used in tests, so let's move it there 2016-04-22 14:14:30 +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
cfda4c8404 Review feedback 2016-04-22 11:07:07 +01:00
Tom Wilkie
22e8418e7a Reorganise the render/ package 2016-04-22 11:07:07 +01:00
Paul Bellamy
a4e68b9598 Merge pull request #1363 from weaveworks/1072-docker-rm 
Immediately remove deleted containers from the UI.
 2016-04-22 10:29:14 +01:00
Tom Wilkie
8b06f6c0d8 Add rank field to controls. 2016-04-21 18:05:48 +01:00
Paul Bellamy
c4d4514278 Merge pull request #1359 from weaveworks/1121-reverse-resolution 
Use reverse-resolved DNS info in the connections table.
 2016-04-21 17:53:10 +01:00
pidster
6b5e39ff02 Address feedback in PR. Move to images, etc. 
Also fixes embarrassing compilation error; reminding me not to rewrite patches *after* testing, without re-testing.
 2016-04-21 16:52:13 +01:00
Tom Wilkie
fc46301c32 Include IP address in label. 2016-04-21 16:20:39 +01:00
Tom Wilkie
99204e1ff7 Add k8s pod log control (#1298) 
* Remove individually vendored k8s.io/kubernetes/pkg/<foo>

* Vendor the whole of vendor/k8s.io/kubernetes/pkg

* Add k8s pod log control

* Tag pods with host id and include them in the host topology as children.

* adding a basic test for kubernetes.Reporter.GetLogs
 2016-04-21 13:48:50 +01:00
Tom Wilkie
cec750049f Immediately remove deleted containers from the UI. 2016-04-21 12:26:51 +01:00
Tom Wilkie
0a51064713 Use reverse-resolved DNS info in the connections table. 2016-04-20 17:18:32 +01:00
Paul Bellamy
4bd3832219 move counting sublabel definition to the topologies 2016-04-20 12:17:46 +01:00
Paul Bellamy
4ad1ae80df move shapes determination to the topology 2016-04-20 12:17:46 +01:00
pidster
9e59a3eace Add swarm-agent, swarm-agent master to sys container filters 2016-04-20 11:59:23 +01:00
Paul Bellamy
43a29db73c Add explicit group node summariser instead of doing it in the other summaires 2016-04-20 11:59:04 +01:00
Paul Bellamy
8f3402f3e6 Merge pull request #1350 from weaveworks/1246-k8s-unmanaged 
Add a 'Unmanaged' node to k8s views which included non-k8s containers.
 2016-04-20 10:26:29 +01:00
Paul Bellamy
c9b12db612 Merge pull request #1352 from weaveworks/1349-k8s-pod-count 
Show number of pods in service minor
 2016-04-20 09:59:53 +01:00
Tom Wilkie
9eda27822c Show k8s labels and container env vars in the details panel. (#1342) 
* Show k8s labels and container env vars in the details panel.

* Add show more bar to the env vars and labels

* React key was in the wrong place; empty tables render section labels.
 2016-04-20 08:18:03 +01:00
Tom Wilkie
14d35d2b96 Show number of pods in service minor 2016-04-19 17:54:27 +01:00
Tom Wilkie
6db171bc9b Add a 'Unmanaged' node to k8s views which included non-k8s containers. 2016-04-19 17:49:06 +01:00
Paul Bellamy
f8fb829848 Merge pull request #1348 from weaveworks/1196-no-image-version-in-parents 
Strip image version from parent links
 2016-04-19 17:14:26 +01:00
Paul Bellamy
7d685efe78 Strip image version from parent links 2016-04-19 16:49:37 +01:00
Paul Bellamy
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
Tom Wilkie
0396a79d7f Don't show non-internet pseudo nodes. (#1326) 2016-04-18 14:18:19 +01:00
Ilya Dmitrichenko
a49c3893de More sensible container names for Mesos/Marathon (#1316) 
* Collect container environment variales (close #1314)

* Containers managed by Marathon can have meaningful names (close #1309)

* Make linter happy and fix tests
 2016-04-18 12:10:18 +01:00
Ilya Dmitrichenko
7a6d6ea938 Merge pull request #1307 from weaveworks/fix-1306 
Add OpenShift infra container image name to the list of well-known system containers
 2016-04-15 17:15:18 +01:00
Paul Bellamy
7090855f9e Add local_networks to weave Overlay nodes, so we can track weave without an exposed weave ip (#1313) 2016-04-15 16:23:15 +01:00
Ilya Dmitrichenko
adf8e21801 Add OpenShift infra container image name to the list of well-known system containers (close #1306) 2016-04-14 17:47:44 +01:00