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
1,131 Commits 85 Branches 64 Tags
ed6c4088fa94eb15084689ed88cc47affee392ed
Commit Graph

1131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Wilkie
ed6c4088fa Fix up tests. 2015-12-10 14:00:43 +00:00
Tom Wilkie
e15fe2b747 Use caching proc walker in procspy. 2015-12-10 14:00:42 +00:00
Tom Wilkie
ee2efeb10f Merge pull request #737 from weaveworks/284-probe-cpu 
Move procspy out of vendor into probe/endpoint.
 2015-12-10 13:59:12 +00:00
Tom Wilkie
9c2c2b9a5b Merge pull request #743 from weaveworks/fix-build 
[WIP] Don't go get weave, git clone it.
 2015-12-10 12:50:26 +00:00
Tom Wilkie
9d91a06a75 Don't go get weave, git clone it. 2015-12-10 12:10:29 +00:00
Tom Wilkie
5cadafcda4 Extend testing of procspy. 2015-12-09 14:47:00 +00:00
Paul Bellamy
6314cefe45 Merge pull request #732 from weaveworks/569-merge-binaries 
Merge probe and app binaries, run with ./scope probe or ./scope app.
 2015-12-09 13:15:33 +00:00
Tom Wilkie
949ae6f807 Review feedback 2015-12-09 12:45:13 +00:00
Paul Bellamy
973968ea34 Merge pull request #735 from weaveworks/testing 
Add some more tests
 2015-12-09 11:10:00 +00:00
Tom Wilkie
b94751ac10 Move procspy out of vendor into probe/endpoint. 2015-12-09 11:06:04 +00:00
Tom Wilkie
c749f5aa33 Merge probe and app binaries, run with ./scope probe or ./scope app. 2015-12-09 11:00:42 +00:00
Tom Wilkie
ec9a3b135c Add a little test for collector.go 2015-12-08 17:59:24 +00:00
Paul Bellamy
8db21fbb2d Merge pull request #730 from weaveworks/301-edge-metadata-cleanup 
Cleaning up some dead code around edges and edgemetadata
 2015-12-07 16:07:07 +00:00
Paul Bellamy
9bd818174c Removing dead EdgeMetadata rendering code 2015-12-07 15:34:01 +00:00
Paul Bellamy
a13042aafe [app] remove unused edge endpoint 2015-12-07 15:33:59 +00:00
Paul Bellamy
036f786db2 Merge pull request #728 from weaveworks/make-make-build-ui 
Make make build ui
 2015-12-07 15:18:59 +00:00
Tom Wilkie
b3cc020d79 Fix up circle.yml for binary move. 2015-12-07 14:53:28 +00:00
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