Merge pull request #2400 from weaveworks/release-1.3

Release 1.3.0

client/app/scripts/components/metric-selector.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { selectMetric } from '../actions/app-actions';
-import { availableMetricsSelector } from '../selectors/node-metric';
+import { availableMetricsSelector, pinnedMetricSelector } from '../selectors/node-metric';
 import MetricSelectorItem from './metric-selector-item';
 
 class MetricSelector extends React.Component {
@@ -38,6 +38,7 @@ class MetricSelector extends React.Component {
 function mapStateToProps(state) {
   return {
     availableMetrics: availableMetricsSelector(state),
+    pinnedMetric: pinnedMetricSelector(state),
   };
 }
 

client/app/scripts/components/troubleshooting-menu.js

@@ -20,6 +20,9 @@ class DebugMenu extends React.Component {
   }
 
   render() {
+    const reportDownloadUrl = process.env.WEAVE_CLOUD
+      ? `${window.location.origin}/api${window.location.pathname}/api/report`
+      : 'api/report';
     return (
       <div className="troubleshooting-menu-wrapper">
         <div className="troubleshooting-menu">
@@ -28,7 +31,7 @@ class DebugMenu extends React.Component {
             <div className="troubleshooting-menu-item">
               <a
                 className="footer-icon"
-                href="api/report"
+                href={reportDownloadUrl}
                 download
                 title="Save raw data as JSON"
               >

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weave-scope",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "SPA JS app for Weave Scope visualising the application network.",
   "repository": "weaveworks/scope",
   "license": "Apache-2.0",