Commit Graph

1114 Commits

Author SHA1 Message Date
Tom Wilkie
c317cff86e App: Rename package main->app, put main.go in prog/app 2015-12-07 14:53:28 +00:00
Paul Bellamy
269a11759f makefile should build app/static.go when needed
- Add non-containerised build for UI.
- Update README for new build steps.
2015-12-07 14:53:28 +00:00
Tom Wilkie
9878967263 Merge commit 'a7eef92988bac018db216ba2cc0325d82b42d44f' 2015-12-07 14:53:05 +00:00
Tom Wilkie
a7eef92988 Squashed 'tools/' changes from 1fc4d66..3ec519f
3ec519f Merge pull request #12 from weaveworks/prefix-unit-test-sched
856790f Use golang package name as a prefix on unit test schedules.
7f5fa57 Merge pull request #11 from weaveworks/10-dont-delete-sshed-gce-nodes
0bff9b4 Don't delete GCE nodes for running (but failed) builds
03aed8f Merge pull request #9 from weaveworks/configure-pac-domain
c04c534 socks: Make main shExpMatch expression configurable

git-subtree-dir: tools
git-subtree-split: 3ec519f704
2015-12-07 14:53:05 +00:00
Tom Wilkie
b85746704b Merge pull request #726 from weaveworks/630-merge-appclient
Merge http publisher and app client.
2015-12-07 11:38:11 +00:00
Tom Wilkie
cb8ae536de Review feedback 2015-12-07 11:38:00 +00:00
David
72cb96b75a Merge pull request #707 from weaveworks/282-hostname-in-api
Show hostname of app you are connected to
2015-12-04 16:38:34 +01:00
David Kaltschmidt
0c5331d33c Render hostname in UI 2015-12-04 15:45:16 +01:00
Tom Wilkie
e1585e7ac1 Merge pull request #711 from weaveworks/576-host-metrics
Add host memory and CPU usage metrics
2015-12-04 14:38:48 +00:00
Tom Wilkie
4444a405e0 Fix comment 2015-12-04 15:33:12 +01:00
Tom Wilkie
f1d225c836 Add hostname to /api 2015-12-04 15:33:12 +01:00
Tom Wilkie
4a475466f6 Add host memory and CPU usage metrics 2015-12-04 13:57:32 +00:00
Tom Wilkie
2b4596ca67 Merge pull request #725 from weaveworks/654-omit-controls
Omit controls field from json if emtpy.
2015-12-04 13:15:36 +00:00
Tom Wilkie
563a6e06ba Extend the testing of the AppClient. 2015-12-04 13:03:48 +00:00
Tom Wilkie
95e58b32cb Update experimental/ 2015-12-04 13:03:30 +00:00
Tom Wilkie
490f650755 Introduce intermediate type for on-the-wire controls encoding. 2015-12-04 12:43:04 +00:00
Tom Wilkie
b1c8f9f344 Merge pull request #705 from weaveworks/664-use-labels-to-hide
Merge image metadata into container metadata so image labels can be used to hide containers.
2015-12-04 12:20:08 +00:00
Tom Wilkie
88116ca9de Merge image metadata into container metadata so image labels can be used to hid containers. 2015-12-04 12:19:44 +00:00
Tom Wilkie
4f4d986571 Merge http publish and app client. 2015-12-04 12:17:21 +00:00
Tom Wilkie
eeb1f42107 Merge pull request #723 from weaveworks/714-debugging
Use common.SignalHandlerLoop from weave, and document debug options.
2015-12-04 12:00:59 +00:00
Tom Wilkie
d747eebcb7 Omit controls field from json if emtpy. 2015-12-04 10:25:56 +00:00
Tom Wilkie
99d72cbc2b Use common.SignalHandlerLoop from weave, and document debug options. 2015-12-04 10:01:00 +00:00
Tom Wilkie
a9b868d310 Vendor in github.com/weaveworks/weave/common 2015-12-04 09:57:44 +00:00
Paul Bellamy
d921b528d8 Merge pull request #722 from weaveworks/app-json-decoder
Add json support to app POST /api/report
2015-12-03 12:20:49 +00:00
Paul Bellamy
68cff926be Add json support to app POST /api/report
This way you can save reports from /app/report, then use curl to post it
to the app later for testing.
2015-12-03 11:39:37 +00:00
Simon
16635ab1b2 Merge pull request #712 from weaveworks/es2015
JS to ES2015
2015-12-01 16:45:56 +01:00
Tom Wilkie
00e63e8b33 Merge pull request #706 from weaveworks/656-unconnected
Filter nodes that are only connected to themselves.
2015-12-01 15:45:22 +00:00
Simon Howe
4b33e32276 Fixes small ES2015 errors introduced while rebasing. 2015-12-01 14:37:14 +01:00
David Kaltschmidt
6b445466ef Move JS to ES2015
Refactored mixins into utils

ES2015 module exports

ES2015-style imports

WIP Fixing tests

Fixes tests after es2015 code migrations.

We we're require()ing an ES2015 module[1]. Have to make sure you account
for the .default in this case.

[1] We had to use ES5 `require` in Jest:
(https://github.com/babel/babel-jest/issues/16)
2015-12-01 14:35:22 +01:00
David Kaltschmidt
2ce9de62f2 add empty eslintignore, original source maps 2015-12-01 14:29:28 +01:00
Tom Wilkie
5632cd8e61 Merge pull request #709 from weaveworks/708-feedback
Add 'getting help' section and update screenshot
2015-12-01 11:58:16 +00:00
Tom Wilkie
4b67506a9d Merge pull request #703 from weaveworks/688-security-warngin
Add basic security warning.
2015-12-01 11:05:42 +00:00
Tom Wilkie
51cc333139 Review feedback 2015-12-01 10:47:34 +00:00
Tom Wilkie
173546525b Add 'getting help' section and update screenshot 2015-12-01 08:08:37 +00:00
Tom Wilkie
3262fa7a5e make static 2015-11-30 14:06:17 +00:00
Tom Wilkie
0c3802c29c Merge pull request #704 from weaveworks/693-no-filter-details
Dont send topology options when requesting node details
2015-11-30 22:55:46 +09:00
Tom Wilkie
5a1cc3fa8f Filter nodes that are only connected to themselves. 2015-11-30 12:43:02 +00:00
David Kaltschmidt
40f504022c dont send topology options when requesting node details 2015-11-30 12:59:53 +01:00
Tom Wilkie
f16db9df1a Merge pull request #701 from weaveworks/693-no-filter-details
Don't apply filters to node endpoints & update details panel logic
2015-11-30 20:59:41 +09:00
Tom Wilkie
a532c2649e Merge pull request #702 from weaveworks/700-update-docker-version
Update the docker version we embed into the scope image to 1.6.2 in sync with weave 1.3 changes.
2015-11-30 19:55:24 +09:00
Tom Wilkie
02ac1fb9cb Add basic security warning. 2015-11-30 09:51:24 +00:00
Tom Wilkie
045a1feba0 Update the docker version we embed into the scope image to 1.6.2 in sync with weave 1.3 changes. 2015-11-30 09:38:42 +00:00
Tom Wilkie
f5aafb7a05 Don't apply filters to node endpoints & update details panel logic such that node which dissappear from the topology (eg when they are stopped) don't dissapear from the details panel. 2015-11-30 09:33:41 +00:00
Tom Wilkie
a8718104de Remove probe/scope-probe .gitignore, to help #696 2015-11-30 08:40:47 +00:00
David
385ba4bf09 Merge pull request #691 from weaveworks/loading-details
Show a spinner while node details are loading
2015-11-26 19:10:29 +01:00
David Kaltschmidt
72fb2f793c Treat empty text and no text the same for color 2015-11-26 18:47:07 +01:00
David Kaltschmidt
37b71487cd Disregard node details response if node is no longer selected 2015-11-25 20:01:42 +01:00
David Kaltschmidt
b1fa8a77b5 Click on node unsets loaded node details 2015-11-24 19:31:46 +01:00
David Kaltschmidt
13a2eec05d Loading details header now has node color 2015-11-24 18:49:49 +01:00
David Kaltschmidt
e60d64da27 Show a spinner while node details are loading 2015-11-24 18:41:56 +01:00