github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-23 22:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,966 Commits 85 Branches 64 Tags
withlatests-slice
Commit Graph
4966 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alfonso Acosta 9ba37402cf Report/render both image and container labels 
Daemon labels will have to wait since the go client (Docker API v1.14) doesn't support
them yet (daemon labels were exposed in Docker API v1.16)

See https://godoc.org/github.com/fsouza/go-dockerclient#Client.Info for details.
 2015-08-27 09:45:30 +00:00
Tom Wilkie d5dd969a4d Merge pull request #402 from weaveworks/poll 
Fail if want != have!
 2015-08-26 17:31:20 +01:00
Tom Wilkie 7c1ca152fa Fail if want != have! 2015-08-26 16:24:42 +00:00
Alfonso Acosta 529aa3d84f Use a metadata key per docker label 2015-08-26 15:49:13 +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 d9ab9d8150 Merge pull request #396 from weaveworks/weave-docker-ips 
Tag containers with Weave and Docker IPs
 2015-08-26 14:09:26 +01:00
Tom Wilkie 1ad1197051 Review feedback 2015-08-26 13:00:33 +00:00
Peter Bourgon 6d2252f604 app: fixes for new merge semantics 2015-08-26 12:02:11 +01:00
Peter Bourgon 775f0ede90 render: fixes for new merge semantics 2015-08-26 12:02:11 +01:00
Peter Bourgon 8f55c74b27 xfer: fixes for new merge semantics 2015-08-26 12:02:11 +01:00
Peter Bourgon d5ab8177f6 probe: fixes for new merge semantics 2015-08-26 12:02:03 +01: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
Tom Wilkie 64d9a1b252 Merge pull request #384 from weaveworks/gzip_compress 
gzip compression
 2015-08-26 11:07:35 +01:00
Alvaro Saurin b60c39b7de GZip compression for app HTTP endpoints and probe -> app communication. 2015-08-26 09:56:14 +00:00
Peter Bourgon 42be036428 report: always copy 2015-08-25 17:52:20 +01:00
Tom Wilkie 7e39b92799 Merge pull request #394 from weaveworks/weave-dns-hostnames 
Tag containers with WeaveDNS hostnames.
 2015-08-25 17:49:33 +01:00
Tom Wilkie e9fad6136f Tag containers with WeaveDNS hostnames. 2015-08-25 16:41:56 +00:00
Peter Bourgon b138dda3b3 Move merge functions with their types 2015-08-25 13:31:25 +01:00
Alfonso Acosta a3ecc34d33 Merge pull request #387 from weaveworks/origin-host-labels 
Improve titles and context of tables in the details pane
 2015-08-25 12:43:32 +01:00
Alfonso Acosta 11e5135d19 Address PR comment 2015-08-25 10:31:13 +00:00
Tom Wilkie 535feac4f0 Merge pull request #393 from weaveworks/390-docker-error 
Change log message to make it clear this probably isn't an error.
 2015-08-25 11:10:01 +01:00
Tom Wilkie ac34ce8c57 Change log message to make it clear this probably isn't an error. 2015-08-25 10:03:44 +00:00
Tom Wilkie bd217b10db 'Trying to reconnect..' in UI even though its connected 2015-08-25 09:51:32 +00:00
Tom Wilkie 99e28dc052 Merge pull request #389 from weaveworks/weave-integration 
Update for new weave status interface; 'intelligently' enable by default
 2015-08-25 10:22:48 +01:00
Tom Wilkie fe809fd896 Update for new weave status interface; 'intelligently' enable by default. 2015-08-25 09:22:14 +00:00
Alfonso Acosta d1126f911b Desambiguate Container associated to processes in details pane 2015-08-24 21:13:27 +00:00
Alfonso Acosta 117b0e190b Address PR comment 2015-08-24 18:51:12 +00:00
Alfonso Acosta 807b30bfe3 Figure out whether to show host tags in details pane from context 2015-08-24 18:40:24 +00:00
David Kaltschmidt 0a9ce218c7 updated static.go 2015-08-24 18:25:29 +02:00
David a24d798b84 Merge pull request #379 from weaveworks/dancing 
Stop the rendered graph from dancing.
 2015-08-24 18:19:44 +02:00
David Kaltschmidt 9c7dea8e2f cache render engines for consistent renderings 
* one render engine per topology
* improves switching back and forth between topos
* might increase memory use
* roughly fixes #160
 2015-08-24 18:19:14 +02:00
Tom Wilkie 91627f8cc3 Stop the rendered graph from dancing. 2015-08-24 18:19:14 +02:00
Tom Wilkie 74e8f61da5 Merge pull request #391 from weaveworks/249-clickable-pseudo-nodes 
Make pseudo nodes clickable.
 2015-08-24 16:29:31 +01:00
Tom Wilkie 498bfd4b18 Make pseudo nodes clickable. 2015-08-24 14:05:01 +00:00
David bd45b264cd Merge pull request #385 from weaveworks/js-tooling 
Update the JS tooling
 2015-08-24 12:54:33 +02:00
David Kaltschmidt 392f8ce69b fix file list for circle deployment, add JS lint 
* lint will be done in build step and fail with error
 2015-08-24 12:41:17 +02:00
David Kaltschmidt e518bedecb Update the JS tooling 
* get rid of gulp
* use webpack-dev-server to serve app.js
* express serves static files
* 2 webpack configs: local and production
* for development with backend, websocket URL is injected
* remove unneeded static files
 2015-08-24 12:41:17 +02:00
Alfonso Acosta 75595a5519 Add useful information to table titles in details pane 
Title modifications:
* "Origin Process" -> "Process \"name\" (pid)"
* "Origin Container" -> "Container \"name\" (pid)"
* "Origin Host" -> "Host \"name\""
* "Origin Container Image" -> "Container Image \"name\""
 2015-08-21 16:37:12 +00:00
Alfonso Acosta a01a7069b6 Make tables and addContainerTable consistent with the rest of the code 2015-08-21 15:30:56 +00:00
Alfonso Acosta 10199737e4 Add host context in the details pane 
In situations when the details can refer to entities from multiple hosts
(e.g. container image) make explicit to what host we are referring to.
 2015-08-21 15:19:30 +00:00
Tom Wilkie 7ca9dd32e6 Revert "Also use conntrack to populate the endpoint topology." 
This reverts commit f89044a381.
 2015-08-21 14:55:39 +00:00
Tom Wilkie 3672cb3c4f Merge branch '356-ftrace' 2015-08-21 14:41:46 +00:00
Tom Wilkie f89044a381 Also use conntrack to populate the endpoint topology. 2015-08-21 13:51:00 +00:00
Tom Wilkie 0cb5502c61 Plumb in socket syscall. 2015-08-21 10:46:30 +00:00
Alfonso Acosta a8eded41ea Merge pull request #383 from weaveworks/merge-connection-tables 
Merge 'Connections' and 'Connection Details' in node details pane
 2015-08-21 11:35:16 +01:00
Alfonso Acosta 37307c26b9 Merge 'Connections' and 'Connection Details' in node details pane 
* Now the Connections table appears at the end of the pane

* Connection details are expandable (still not implemented in the UI but backwards
compatible).
 2015-08-21 10:11:39 +00:00
Tom Wilkie eaa35bd415 Merge pull request #381 from weaveworks/356-ftrace 
[WIP] First working ftrace prototype.
 2015-08-20 18:31:42 +01:00
Tom Wilkie 27c42b0191 Lookup local addr of fds we detect via ftrace. 2015-08-20 17:11:19 +00:00
Alfonso Acosta c78f9d812c Add Expandable attribute to detailed-pane rows 2015-08-20 15:26:23 +00:00
Tom Wilkie 66ffc2397b First working ftrace prototype. 2015-08-20 13:18:50 +00:00