Commit Graph

528 Commits

Author SHA1 Message Date
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
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
Alfonso Acosta
0fd54e40da Merge pull request #376 from weaveworks/no-empty-proc-rows
Don't report empty fields from process
2015-08-19 18:39:05 +01:00
Alfonso Acosta
bdd886a28f Don't report empty fields from process 2015-08-19 16:50:20 +00:00
Tom Wilkie
4bcdfc507f Typo 2015-08-19 15:04:56 +00:00
Tom Wilkie
08e1090a65 Merge pull request #369 from weaveworks/336-show-counts
Show how many containers have been grouped together under an image
2015-08-19 15:42:00 +01:00
Tom Wilkie
7508df7e5b Add NodeMetadata.Counters with appropriate merge semantics 2015-08-19 14:24:21 +00:00
Tom Wilkie
336ba79f95 Merge pull request #355 from weaveworks/directionality
Make edge direction flow from client->server.
2015-08-19 14:21:13 +01:00
Tom Wilkie
2b7b0c3774 Merge pull request #366 from weaveworks/331-process-container-names
Add container names to process minor label if possible.
2015-08-19 14:19:41 +01:00
Tom Wilkie
6f1f453098 Review feedback 2015-08-19 12:22:28 +00:00
Tom Wilkie
7fb1a98eca Update detail node logic to deal with connection directionality; also correctly merge edge metadata for pseudo nodes. 2015-08-19 10:21:01 +00:00
Tom Wilkie
60d1b503c1 Deal with directed edges in the rest of the codebase. 2015-08-19 10:17:31 +00:00
Tom Wilkie
89df11bbfd Make edge direction flow from client->server. 2015-08-19 10:17:24 +00:00
Tom Wilkie
0cc3dd0eea Merge pull request #367 from weaveworks/323-origin-address
Condense origin address entries into a single table.
2015-08-19 11:16:00 +01:00
Paul Bellamy
0c9216d56e Merge pull request #362 from weaveworks/release-0.6.0
v0.6.0
2015-08-19 11:13:32 +01:00
Tom Wilkie
75369acb42 Review feedback 2015-08-19 10:06:57 +00:00
Paul Bellamy
b97590a435 Changelog for 0.6.0 v0.6.0 2015-08-19 10:37:03 +01:00
Paul Bellamy
3fa86fe6ce adding -version flag back into app and probe for the release script 2015-08-19 10:37:02 +01:00
Tom Wilkie
fbe010a15f Review feedback 2015-08-19 09:24:52 +00:00
Paul Bellamy
fc75b3dc58 fixing bin/release 2015-08-19 10:22:31 +01:00