github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 20:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,222 Commits 85 Branches 64 Tags
scope-cortex-singleton
Commit Graph
4222 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Wilkie c0f3a59726 Squashed 'tools/' changes from 28c6aa0..1fc4d66 
1fc4d66 Make test work on mac.
REVERT: 28c6aa0 Make prefix on runner schedule optional.

git-subtree-dir: tools
git-subtree-split: 1fc4d66fac
 2015-11-10 12:08:03 +00:00
Tom Wilkie 40135dc284 Merge commit 'c0f3a59726ecb6842632fee77c6a28858f617270' into coverage 2015-11-10 12:08:03 +00:00
Tom Wilkie 5c717978d9 Run coverage reporting in post test stage, as teardown is run after the other shard has gone away. 2015-11-10 12:06:57 +00:00
Tom Wilkie 1fc4d66fac Make test work on mac. 2015-11-10 11:57:31 +00:00
David 2dcc085dc8 Merge pull request #642 from weaveworks/controls-bar 
Control bar below node details header
 2015-11-09 18:22:20 +01:00
David Kaltschmidt 17f31cdb32 Control bar below node details header 2015-11-09 17:48:36 +01:00
Tom Wilkie 89c4eb17ae Merge pull request #633 from weaveworks/refactor-probe-main 
Refactoring of probe main
 2015-11-09 16:47:19 +00:00
Tom Wilkie a89c0b9b88 Make an empty StringSet nil. 2015-11-09 16:25:49 +00:00
Paul BellamyandTom Wilkie 92ec7d9397 Move probe main.go to prog/probe/, break out a probe struct with appropriate responsibilities. 
Also adds test for probe 'engine'
 2015-11-09 16:25:28 +00:00
Tom Wilkie 8dbc586866 Merge pull request #628 from weaveworks/latest-map 
Add 'latest' CRDT, make UI update quicker.
 2015-11-09 16:10:28 +00:00
Alvaro 4f21919858 Merge pull request #639 from weaveworks/scope-504-2 
Resolve to a group of names
 2015-11-09 15:29:28 +01:00
Alvaro Saurin 82d9e35da6 Use the "name" set for the connection details 2015-11-09 13:45:02 +01:00
Alvaro Saurin bc972a52ab Resolve to a group of names (instead of taking only the first one) 2015-11-09 13:45:02 +01:00
David Kaltschmidt 5cfa193b8d Comment out console.log 2015-11-09 13:00:44 +01:00
Tom Wilkie 5e2c165fd8 Review feedback 2015-11-09 11:38:15 +00:00
Tom Wilkie 43d0ce986f Add 'latest' CRDT; use it to store container state. 
Also use same technique to merge the controls, returning the latest
set of controls instead of the union.
 2015-11-06 18:26:38 +00:00
Tom Wilkie f7c75f9cd3 Make static 2015-11-06 18:25:41 +00:00
Tom Wilkie 39b66300a6 Merge pull request #598 from weaveworks/315-capabilities 
Add controls form container start, stop, pause, etc
 2015-11-06 18:22:05 +00:00
David KaltschmidtandTom Wilkie abcb94b1f1 UI for controls. 
- Make backend address configurable via env variable
- `BACKEND_HOST=1.2.3.4:4040 npm start` points the frontend to the app on that server. Just for development
- Render control icons
  - removed close x for details panel
  - added control icons in its space
  - closing of panel still works by clicking on same node, or background
- Dont allow control while pending
- Render and auto-dismiss control error
- Make tests pass
 2015-11-06 17:44:28 +00:00
Tom Wilkie 8f957c4f13 Add docker lifecycle controls, containers in states other that running, and a filter for those containers. 
Also add integration test for container controls.
 2015-11-06 17:39:54 +00:00
Tom Wilkie 76d34330a9 Add Control plumbing. 2015-11-06 17:39:48 +00:00
Paul Bellamy 05c11ef386 Merge pull request #631 from weaveworks/cleanup 
General Cleanup
 2015-11-06 17:04:51 +00:00
Paul Bellamy 9877a2126a removing unused /api/origin/host/{id} route 2015-11-06 16:20:00 +00:00
Paul Bellamy 4d49aaccaa add eslintignore to the dockerfile where we run eslint 2015-11-06 16:19:03 +00:00
Paul Bellamy d520662e96 Merge pull request #627 from weaveworks/511-unconnected-uncontained 
Prevent a stranded Uncontained node from appearing in container view.
 2015-11-06 14:35:41 +00:00
Tom Wilkie a99888994b Prevent a standed Uncontained node from appearing in container view. 
Do this by filtering unconnected nodes after mapping them to containers, not before.
 2015-11-06 11:25:07 +00:00
Paul Bellamy 73e05d01de Merge pull request #618 from weaveworks/587-parallelise 
Speed up build & tests on Circle
 2015-11-05 17:01:35 +00:00
Paul Bellamy cb86988275 Merge pull request #626 from weaveworks/610-semaphore 
Rename semaphore p/v to acquire/release.
 2015-11-05 16:21:18 +00:00
Tom Wilkie 9a9ef72ad6 Don't run integration test in parallel for now 2015-11-05 15:44:55 +00:00
Tom Wilkie 1429d749d9 Rename semaphore v/p to release/acquire. 2015-11-05 15:43:42 +00:00
Paul Bellamy 613c41697f Merge pull request #624 from weaveworks/621-zero-nodes 
Fix stats for sub topologies.
 2015-11-05 15:41:04 +00:00
Tom Wilkie d5922e437f Fix stats for sub topologies. 2015-11-05 15:06:29 +00:00
Paul Bellamy 16239c6ea7 Merge pull request #623 from weaveworks/move-collector 
Moving xfer.Collector into App (the only place its used)
 2015-11-05 12:12:39 +00:00
Paul Bellamy 9ea156cfef Moving xfer.Collector into App (the only place its used) 2015-11-05 11:31:48 +00:00
David fb9ed7ba12 Merge pull request #593 from weaveworks/419-dancing 
Mitigate dancing nodes
 2015-11-05 11:32:33 +01:00
David Kaltschmidt af175b62bc Review feedback 2015-11-05 11:02:18 +01:00
David Kaltschmidt f7aad21016 Use edge points to determine changed endpoints 2015-11-05 11:00:31 +01:00
David Kaltschmidt 6cf93f8e17 Prevent dangling reused edge 2015-11-05 11:00:31 +01:00
David Kaltschmidt 1831e07224 Track trivial layout runs 2015-11-05 11:00:31 +01:00
David Kaltschmidt 413220db6b Fixed bug in unseen nodes detection 2015-11-05 11:00:31 +01:00
David Kaltschmidt 1fe036ab6a Simplified dance heuristics 2015-11-05 11:00:31 +01:00
David Kaltschmidt 83d7a87d43 dont relayout when node dissappears 2015-11-05 11:00:31 +01:00
David Kaltschmidt 47ba0ff2a4 Skip layout when only edges changed 2015-11-05 11:00:31 +01:00
David Kaltschmidt 7306e8fb5f Rewrote nodes-layout to use immutablejs 2015-11-05 11:00:31 +01:00
David Kaltschmidt e4da515fa1 Refactored doLayout signature 2015-11-05 10:58:13 +01:00
David Kaltschmidt 3d08b15430 JS test framework for node layout 2015-11-05 10:58:13 +01:00
Tom Wilkie 3f0b0e1365 Squashed 'tools/' changes from d6ea3ad..28c6aa0 
28c6aa0 Make prefix on runner schedule optional.
452f2b7 Merge pull request #8 from weaveworks/7-gzip
4be5541 Add gather_coverage.sh script.
e22c576 Compress cached images.
f250a3b Add sched CLI and update readme.
6b3c735 Add scheduler from weave

git-subtree-dir: tools
git-subtree-split: 28c6aa063c1b171c3ba42d958ad640d49f8c39f2
 2015-11-04 15:36:21 +00:00
Tom Wilkie 23c253fadc Merge commit '3f0b0e13653383eb630e6482a9b3d8c29891c9bf' into 587-parallelise 2015-11-04 15:36:21 +00:00
Tom Wilkie 1ad7b4fce5 Speed up tests on circle. 
- Ensure we use up to date build container when running tests.
- Parallelise host setup for integration tests.
- Pass some more circle env vars through to ./tools/tests so the scheduler works.
- Gather coverage from multiple shards.
- Create files as the right owner inside the container.
- Parallelise the circle.yaml
- Parallelise the intergration tests using existing machinery
- Build experimental in parallel.
- Use custom scheduler prefix for integration tests, so schedules don't clash with weave.
 2015-11-04 15:35:21 +00:00
Paul Bellamy 452f2b7de1 Merge pull request #8 from weaveworks/7-gzip 
Compress cached images.
 2015-11-04 12:21:31 +00:00