Commit Graph
5218 Commits
Author SHA1 Message Date
Filip Barl dfe4944ec7 Fixed indentation. 2017-10-17 19:03:44 +02:00
Filip Barl 510d6447df Updated all eslint dependencies. 2017-10-17 19:03:44 +02:00
Filip Barl cf23c06bab Merge pull request #2888 from weaveworks/make-time-travel-modular-component
Make Time Travel a modular component
2017-10-17 18:36:22 +02:00
Damien Lespiau b767de8e58 terminal: Fix Caculated typo 2017-10-17 16:54:57 +01:00
Damien Lespiau 5990ad4947 docker: Close pipe when the docker API call fails
This hasn't been found in the wild but by code inspection. If we fail the
docker API call, the pipe is never closed. Close it before returning.
2017-10-16 23:30:46 +01:00
Filip Barl 760f1d919e Use more colors from the theme in TimeTravelComponent. 2017-10-16 21:25:23 +02:00
Filip Barl 0056424357 TimeTravelComponent as a fully styled component. 2017-10-16 20:01:49 +02:00
Filip Barl 8a5eb637a6 Inject ui-components Theme into App component. 2017-10-16 16:26:50 +02:00
Filip Barl 11b2e77898 Using styled components. 2017-10-16 15:58:48 +02:00
Filip Barl 6b8424305c Merged TimeTravelTimeline into TimeTravelComponent so that whole of time travel is contained in one component. 2017-10-16 15:15:30 +02:00
Filip Barl 742a8c528c Made two time travel component parts independent of global state. 2017-10-16 14:43:44 +02:00
Filip Barl ada122c192 Started making component more independent. 2017-10-16 14:43:44 +02:00
bianca cheng costanzo 6098f87a93 Merge pull request #2886 from weaveworks/background-colors
Flat background instead of gradient
2017-10-16 12:25:52 +02:00
Elena Morozova c5d38f5c46 Fix golint if/else
if block ends with a return statement, so drop this else and outdent its block
2017-10-13 16:18:17 -07:00
Elena Morozova dbc89f841e Add godoc to README 2017-10-13 16:12:59 -07:00
Bianca Cheng Costanzo 54d96040cf Change back overlays 2017-10-12 14:31:48 +02:00
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
Bianca Cheng Costanzo cc4162e55a Changes background gradient to single colour, removes text background 2017-10-11 15:02:40 +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
Bianca Cheng Costanzo 7c27a1ce6d Merge branch 'master' into background-colors 2017-10-11 13:56:02 +02: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