Merge 8fbd6c3 into 2a353a1

ExpediaDotCom · Mar 12, 2019 · d557cbe · d557cbe
2 parents 2a353a1 + 8fbd6c3
commit d557cbe
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 20 deletions.
diff --git a/src/components/alerts/details/alertDetails.jsx b/src/components/alerts/details/alertDetails.jsx
@@ -69,6 +69,7 @@ export default class AlertDetails extends React.Component {
                                     type={this.props.type}
                                     alertDetailsStore={this.props.alertDetailsStore}
                                     historyWindow={AlertDetails.historyWindow}
+                                    interval={this.props.interval}
                                 />)
                             })
                         }

diff --git a/src/components/alerts/details/alertDetailsToolbar.jsx b/src/components/alerts/details/alertDetailsToolbar.jsx
@@ -29,7 +29,8 @@ const tracesEnabled = window.haystackUiConfig.subsystems.includes('traces');
 export default class AlertDetailsToolbar extends React.Component {
     static propTypes = {
         serviceName: PropTypes.string.isRequired,
-        operationName: PropTypes.string.isRequired
+        operationName: PropTypes.string.isRequired,
+        interval: PropTypes.string.isRequired
     };
 
     constructor(props) {
@@ -47,16 +48,17 @@ export default class AlertDetailsToolbar extends React.Component {
     }
 
     render() {
-        const serviceOperation = {
+        const searchConstructor = {
             serviceName: this.props.serviceName,
-            operationName: this.props.operationName
+            operationName: this.props.operationName,
+            interval: this.props.interval
         };
 
-        const trendsLink = linkBuilder.universalSearchTrendsLink(serviceOperation);
+        const trendsLink = linkBuilder.universalSearchTrendsLink(searchConstructor);
 
-        const tracesLink = linkBuilder.universalSearchTracesLink(serviceOperation);
+        const tracesLink = linkBuilder.universalSearchTracesLink(searchConstructor);
 
-        const alertsLink = linkBuilder.withAbsoluteUrl(linkBuilder.universalSearchAlertsLink(serviceOperation));
+        const alertsLink = linkBuilder.withAbsoluteUrl(linkBuilder.universalSearchAlertsLink(searchConstructor));
 
         return (
             <div>

diff --git a/src/components/alerts/details/alertHistory.jsx b/src/components/alerts/details/alertHistory.jsx
@@ -33,7 +33,8 @@ export default class AlertHistory extends React.Component {
         operationName: PropTypes.string.isRequired,
         serviceName: PropTypes.string.isRequired,
         type: PropTypes.string.isRequired,
-        historyWindow: PropTypes.number.isRequired
+        historyWindow: PropTypes.number.isRequired,
+        interval: PropTypes.string.isRequired
     };
 
     static timeAgoFormatter(cell) {
@@ -55,7 +56,12 @@ export default class AlertHistory extends React.Component {
         return value.toFixed();
     }
 
-    static timeBufferAroundAlert = 10 * 60 * 1000; // 10 mins
+    static timeBufferAroundAlert = {
+        OneMinute: 10 * 60 * 1000, // 10 minutes
+        FiveMinute: 30 * 60 * 1000, // 30 minutes
+        FifteenMinute: 2 * 60 * 60 * 1000, // 2 hours
+        OneHour: 12 * 60 * 60 * 1000 // 12 hours
+    };
 
     constructor(props) {
         super(props);
@@ -65,22 +71,25 @@ export default class AlertHistory extends React.Component {
     }
 
     trendLinkCreator(timestamp) {
-        const from = (timestamp) - AlertHistory.timeBufferAroundAlert;
-        const to = (timestamp) + AlertHistory.timeBufferAroundAlert;
+        const buffer = AlertHistory.timeBufferAroundAlert[this.props.interval];
+        const from = (timestamp) - buffer;
+        const to = (timestamp) + buffer;
 
         return linkBuilder.universalSearchTrendsLink({
             serviceName: this.props.serviceName,
             operationName: this.props.operationName,
             time: {
                 from,
                 to
-            }
+            },
+            interval: this.props.interval
         });
     }
 
     traceLinkCreator(timestamp) {
-        const from = (timestamp) - AlertHistory.timeBufferAroundAlert;
-        const to = (timestamp) + AlertHistory.timeBufferAroundAlert;
+        const buffer = AlertHistory.timeBufferAroundAlert[this.props.interval];
+        const from = (timestamp) - buffer;
+        const to = (timestamp) + buffer;
 
         return linkBuilder.universalSearchTracesLink({
             serviceName: this.props.serviceName,

diff --git a/src/components/trends/details/trendDetails.jsx b/src/components/trends/details/trendDetails.jsx
@@ -31,7 +31,8 @@ export default class TrendDetails extends React.Component {
         serviceName: PropTypes.string.isRequired,
         serviceSummary: PropTypes.bool,
         opName: PropTypes.string,
-        statsType: PropTypes.string
+        statsType: PropTypes.string,
+        interval: PropTypes.oneOfType([null, PropTypes.string]).isRequired
     };
 
     static defaultProps = {
@@ -49,6 +50,7 @@ export default class TrendDetails extends React.Component {
                     serviceName={this.props.serviceName}
                     opName={this.props.opName}
                     statsType={this.props.statsType}
+                    interval={this.props.interval}
                 />
                 { this.props.store.trendsPromiseState && this.props.store.trendsPromiseState.case({
                     empty: () => <Loading />,

diff --git a/src/components/trends/details/trendDetailsToolbar.jsx b/src/components/trends/details/trendDetailsToolbar.jsx
@@ -34,7 +34,8 @@ export default class TrendDetailsToolbar extends React.Component {
         trendsStore: PropTypes.object.isRequired,
         opName: PropTypes.string,
         statsType: PropTypes.string,
-        serviceSummary: PropTypes.bool.isRequired
+        serviceSummary: PropTypes.bool.isRequired,
+        interval: PropTypes.oneOfType([null, PropTypes.string]).isRequired
     };
 
     static defaultProps = {
@@ -80,13 +81,14 @@ export default class TrendDetailsToolbar extends React.Component {
         } = props.trendsStore.statsQuery;
 
         const activeWindow = TrendDetailsToolbar.getActiveTimeWindow(from, until, isCustomTimeRange);
+        const granularityFromSearch = metricGranularity.options.find(option => option.longName === this.props.interval);
 
         this.state = {
             activeWindow,
-            activeGranularity: timeWindow.getLowerGranularity(activeWindow.value),
+            activeGranularity: granularityFromSearch || timeWindow.getLowerGranularity(activeWindow.value),
             granularityDropdownOpen: false,
-            showCustomTimeRangePicker: false,
             clipboardText: this.setClipboardText(activeWindow),
+            showCustomTimeRangePicker: false,
             autoRefreshEnabled: false,
             autoRefreshTimer: null,
             countdownTimer: null
@@ -109,6 +111,7 @@ export default class TrendDetailsToolbar extends React.Component {
         return linkBuilder.withAbsoluteUrl(linkBuilder.universalSearchTrendsLink({
             serviceName: this.props.serviceName,
             operationName: this.props.opName,
+            interval: this.props.interval,
             time: {
                 from: activeWindow.from || timeWindow.toTimeRange(activeWindow.value).from,
                 to: activeWindow.until || timeWindow.toTimeRange(activeWindow.value).until

diff --git a/src/components/trends/operation/operationResults.jsx b/src/components/trends/operation/operationResults.jsx
@@ -28,7 +28,8 @@ import Error from '../../common/error';
 export default class operationResults extends React.Component {
     static propTypes = {
         operationStore: PropTypes.object.isRequired,
-        serviceName: PropTypes.string.isRequired
+        serviceName: PropTypes.string.isRequired,
+        interval: PropTypes.oneOfType([null, PropTypes.string]).isRequired
     };
 
     render() {
@@ -42,6 +43,7 @@ export default class operationResults extends React.Component {
                         ? <OperationResultsTable
                             operationStore={this.props.operationStore}
                             serviceName={this.props.serviceName}
+                            interval={this.props.interval}
                         />
                         : <Error errorMessage="There was a problem displaying operation results. Please try again later." />)
                 })

diff --git a/src/components/trends/operation/operationResultsTable.jsx b/src/components/trends/operation/operationResultsTable.jsx
@@ -26,7 +26,8 @@ import './operationResultsTable.less';
 export default class OperationResultsTable extends React.Component {
     static propTypes = {
         serviceName: PropTypes.string.isRequired,
-        operationStore: PropTypes.object.isRequired
+        operationStore: PropTypes.object.isRequired,
+        interval: PropTypes.oneOfType([null, PropTypes.string]).isRequired
     };
 
     static Header({name}) {
@@ -81,6 +82,7 @@ export default class OperationResultsTable extends React.Component {
                         store={this.props.operationStore}
                         serviceName={this.props.serviceName}
                         opName={row.operationName}
+                        interval={this.props.interval}
             />);
         }
         return null;

diff --git a/src/components/universalSearch/tabs/tabs.jsx b/src/components/universalSearch/tabs/tabs.jsx
@@ -101,7 +101,7 @@ export default class Tabs extends React.Component {
             case 'traces':
                 return <TraceResults tracesSearchStore={store} history={history} />;
             case 'trends':
-                return <OperationResults operationStore={store} history={history} serviceName={this.props.search.serviceName} />;
+                return <OperationResults operationStore={store} history={history} serviceName={this.props.search.serviceName} interval={this.props.search.interval || null} />;
             case 'alerts':
                 return <Alerts alertsStore={store} history={history} location={location} defaultPreset={timeWindow.presets[5]} serviceName={this.props.search.serviceName} interval={this.props.search.interval}/>;
             case 'serviceGraph':