github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,300 Commits 85 Branches 64 Tags
71a18fe1901ee73e490c4dad87337063eeb7a022
Commit Graph

4300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon
71a18fe190 Merge pull request #2882 from weaveworks/use-service-ui-terminal-route 
Use a context sensitive route for the popped out terminal.html
 2017-10-12 11:12:30 +02:00
Simon
055a766433 Merge pull request #2885 from weaveworks/fixes-flux-in-details-panel 
Fixes images in details-panel after service -> resources change
 2017-10-11 18:11:50 +02:00
Bryan Boreham
7a116ebab5 Merge pull request #2870 from weaveworks/sliced-maps 
Re-implement LatestMap as a sorted slice for better performance
 2017-10-11 13:42:09 +01:00
Simon Howe
7dcdc8db12 Fixes images in details-panel after service -> resources change 2017-10-11 12:41:18 +02:00
Bryan Boreham
5acece6e58 Refactor: loop replaced with append() 2017-10-11 09:50:06 +00:00
Simon
5173b9c981 Merge pull request #2883 from weaveworks/fixes-save-as-svg 
Fixes "Save as svg" functionality.
 2017-10-10 17:51:00 +02:00
Simon Howe
bf7cde32e0 Fixes "Save as svg" functionality. 2017-10-10 16:51:06 +02:00
Simon Howe
b990473636 Use a context sensitive route for the popped out terminal.html 
- Service-ui has learned a new route which corresponds to the existing
  scope terminal.html route. Both standalone and service-ui scope can now
  respond to terminal.html:
  - If using standalone scope path/to/scope/ -> path/to/scope/terminal.html will be used.
  - If using service-ui app/instanceid -> app/instanceId/terminal.html
 2017-10-09 12:12:51 +02:00
Filip Barl
ae5d8a9fd2 Merge pull request #2871 from weaveworks/2869-get-rid-of-react-tooltip 
Get rid of react-tooltip dependency
 2017-10-04 09:38:19 +02:00
Damien Lespiau
73f9b83540 Merge pull request #2873 from weaveworks/2017-10-01-bump-copyright-year 
Bump license copyright year to 2017
 2017-10-01 18:17:16 +01:00
Bryan Boreham
a52c9df48c Added benchmarks for encode and decode of StringLatestMap 2017-10-01 16:19:00 +00:00
Bryan Boreham
736ae5e7c8 Refactor: extract fn to make map for benchmarks 2017-10-01 16:19:00 +00:00
Bryan Boreham
29f139d424 Re-implement LatestMap as a sorted slice for better performance 
both the Python generator and the Go generated code are checked in
 2017-10-01 16:18:59 +00:00
Bryan Boreham
021015431a Merge pull request #2863 from weaveworks/update-go-codec 
Update ugorji/go/codec
 2017-10-01 16:55:35 +01:00
Damien Lespiau
f88846b435 Bump license copyright year to 2017 2017-10-01 09:50:41 +01:00
Bryan Boreham
b95c498bb7 Merge pull request #2872 from weaveworks/small-mem-reductions 
Small memory-allocation reduction
 2017-09-30 18:46:00 +01:00
Bryan Boreham
9322b54b68 Stop causing errors by parsing empty strings as time.Time 
We encode the zero time as an empty string, so we should do the
reverse when decoding.

Otherwise time.Parse() returns an error, which is created on the heap,
causing extra garbage-collection load.
 2017-09-30 14:33:20 +00:00
Filip Barl
9b3b2c058e Removed react-tooltip from package.json. 2017-09-28 13:20:02 +02:00
Filip Barl
c0c04c2e2b Replaced react-tooltip with own component. 2017-09-28 13:18:20 +02:00
Damien Lespiau
46c5fca7ce Merge pull request #2867 from weaveworks/2017-09-26-mixpanel-cleanup.2 
tracking: Fix in-flight collision of two related PRs
 2017-09-26 13:36:19 +01:00
Damien Lespiau
53f1890ad7 tracking: Fix in-flight collision of two related PRs 
Unfortunately, I forgot to rebase before renaming trackMixpanelEvent() and a PR
adding a new trace point was already in-flight.

More precisely:
  - https://github.com/weaveworks/scope/pull/2861 renames trackMixpanelEvent()
    to trackAnalysticsEent()
  - https://github.com/weaveworks/scope/pull/2857 add a new
    trackMixpanelEvent() call.

Each PR is fine, but with the merge of both without rebasing any, we end up
with master having a dandling call to trackMixpanelEvent().
 2017-09-26 12:59:29 +01:00
Damien Lespiau
c74e683a26 Merge pull request #2868 from weaveworks/2017-09-26-golint-update 
lint: Fix 2 sites failing a recently introduced golint check
 2017-09-26 12:59:00 +01:00
Damien Lespiau
466927ce68 lint: Fix 2 sites failing a recently introduced golint check 
golint has gained a new check and we don't freeze the golint version so CI was
failing on unrelated PRs:

app/multitenant/consul_client.go:69:2: redundant if ...; err != nil check, just return error instead.
report/marshal.go:188:2: redundant if ...; err != nil check, just return error instead.

Fix those!
 2017-09-26 12:15:09 +01:00
Alfonso Acosta
a3803cb292 Merge pull request #2859 from weaveworks/release-1.6 
Release 1.6.5
 2017-09-25 15:49:40 +02:00
Damien Lespiau
03475cec83 Merge pull request #2861 from weaveworks/tracking-with-segment 
tracking: Use segment for tracking
 2017-09-25 14:36:32 +01:00
Damien Lespiau
cbfe63dc78 tracking: Fix now out of date comment 2017-09-25 14:03:09 +01:00
Damien Lespiau
a205f6ecb7 tracking: Rename trackMixpanelEvent() to trackAnalyticsEvent() 
Might as well not mention Mixpanel now that we're sending all events to
Segment.

Commit done with:

  git grep trackMixpanelEvent | cut -d : -f 1 | sort -u | \
	xargs sed -e s/trackMixpanelEvent/trackAnalyticsEvent/g
 2017-09-25 13:57:00 +01:00
Damien Lespiau
74c0c782ac Merge pull request #2857 from weaveworks/2017-09-21-control-tracking 
tracking: Add Mixpanel event on Control clicks
 2017-09-25 12:06:19 +01:00
Bryan Boreham
42bf0dedba Update ugorji/go/codec to latest commit 54210f4e076c57f351166f0ed60e67d3fca57a36 2017-09-23 21:08:33 +00:00
Damien Lespiau
3f6faa5371 tracking: Use segment for tracking 
Align scope to the rest of the platform.
 2017-09-22 16:51:37 +01:00
Damien Lespiau
802559e527 tracking: Add Mixpanel event on Control clicks 
We'd like to gain some insight on how controls are used.
 2017-09-22 16:39:37 +01:00
Jonathan Lange
75c8b6a269 Merge pull request #2860 from weaveworks/2853-billing-optional 
Continue processing reports if billing fails
 2017-09-22 12:57:32 +01:00
Jonathan Lange
f9e37a21f5 Continue processing reports if billing fails 2017-09-22 12:20:10 +01:00
Alfonso Acosta
3e92a73312 Update Scope version in docs v1.6.5 2017-09-22 08:27:45 +00:00
Alfonso Acosta
61f95f4960 Add release 1.6.5 to CHANGELOG 2017-09-22 08:27:45 +00:00
Mike Lang
2da9ec089d Merge pull request #2856 from weaveworks/mike/ecs/fix-test 
Fix test broken by #2854
 2017-09-19 06:37:41 -07:00
Mike Lang
1c6fbffc69 Fix test broken by #2854 2017-09-19 03:54:13 -07:00
Mike Lang
b7db604875 Merge pull request #2854 from galindro/ecs-region 
Adds ECS Cluster Region option
 2017-09-18 16:46:32 -07:00
Bruno Galindro da Costa
cd21bafa2e Adds ECS Cluster Region option 2017-09-18 20:14:44 -03:00
Bryan Boreham
b0cd1805ef Merge pull request #2852 from weaveworks/s3-connections 
AWS connection keep-alive
 2017-09-18 10:29:54 +01:00
Alfonso Acosta
bfd741edcb Merge pull request #2846 from weaveworks/update-ECS-AMI-docs 
Update ECS AMI docs
 2017-09-15 16:02:32 +02:00
Bryan Boreham
fd35ac055d Use the aws config routine from weaveworks/common 
so it will allow multiple keep-alive connections to the same
destination
 2017-09-15 10:47:38 +00:00
Bryan Boreham
5defa75721 Update to latest weaveworks/common 2017-09-15 10:29:55 +00:00
Filip Barl
1cb82ad401 Merge pull request #2851 from weaveworks/2850-fix-graph-edge-path-undefined 
Fix edges disappearing in graph mode
 2017-09-14 11:09:31 +02:00
Filip Barl
687d061939 Cleanup and revert to optimized waypoints recalculation. 2017-09-12 12:16:30 +02:00
Filip Barl
75e0d383fe Simplified spring usage. 2017-09-11 18:50:23 +02:00
Filip Barl
736770c978 Fix edges disappearing. 2017-09-11 18:10:42 +02:00
Alfonso Acosta
b3894327b6 Update ECS AMI docs 2017-09-07 15:41:18 +00:00
Matthias Radestock
60844e2eab Merge pull request #2843 from weaveworks/more-precise-compose-instructions 
More precise compose instructions
 2017-09-01 18:01:32 +01:00
Matthias Radestock
5ada73b843 fix typo 2017-09-01 17:06:39 +01:00