From 35fc0c532994159f5200e4e2a6906175c16f3a35 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Sat, 23 Feb 2019 15:52:40 +0100
Subject: [PATCH] stackdriver: change reducer mapping for distribution metrics

- Distribution metrics are now mapped to more reducers
when the metric kind is cumulative.
- The witdth of the metrics dropdown is now much wider.
- Changed the text from Select Aggregation to Select Reducer
to line up with the UI in Stackdriver.
---
 .../stackdriver/components/Aggregations.test.tsx       |  3 ++-
 .../datasource/stackdriver/components/Aggregations.tsx |  2 +-
 .../datasource/stackdriver/components/Metrics.tsx      |  2 +-
 .../__snapshots__/Aggregations.test.tsx.snap           |  2 +-
 .../components/__snapshots__/QueryEditor.test.tsx.snap |  4 ++--
 public/app/plugins/datasource/stackdriver/constants.ts | 10 +++++-----
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/public/app/plugins/datasource/stackdriver/components/Aggregations.test.tsx b/public/app/plugins/datasource/stackdriver/components/Aggregations.test.tsx
index 2402cc5da2c..5b14fa73a72 100644
--- a/public/app/plugins/datasource/stackdriver/components/Aggregations.test.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Aggregations.test.tsx
@@ -49,7 +49,8 @@ describe('Aggregations', () => {
       });
       it('', () => {
         const options = wrapper.state().aggOptions[0].options;
-        expect(options.length).toEqual(5);
+
+        expect(options.length).toEqual(10);
         expect(options.map(o => o.value)).toEqual(expect.arrayContaining(['REDUCE_NONE']));
       });
     });
diff --git a/public/app/plugins/datasource/stackdriver/components/Aggregations.tsx b/public/app/plugins/datasource/stackdriver/components/Aggregations.tsx
index c616d55ba7a..9b8dca01151 100644
--- a/public/app/plugins/datasource/stackdriver/components/Aggregations.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Aggregations.tsx
@@ -73,7 +73,7 @@ export class Aggregations extends React.Component<Props, State> {
               value={crossSeriesReducer}
               variables={templateSrv.variables}
               options={aggOptions}
-              placeholder="Select Aggregation"
+              placeholder="Select Reducer"
               className="width-15"
             />
           </div>
diff --git a/public/app/plugins/datasource/stackdriver/components/Metrics.tsx b/public/app/plugins/datasource/stackdriver/components/Metrics.tsx
index 06094d0c1e9..a09b6108370 100644
--- a/public/app/plugins/datasource/stackdriver/components/Metrics.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Metrics.tsx
@@ -185,7 +185,7 @@ export class Metrics extends React.Component<Props, State> {
                 },
               ]}
               placeholder="Select Metric"
-              className="width-15"
+              className="width-26"
             />
           </div>
           <div className="gf-form gf-form--grow">
diff --git a/public/app/plugins/datasource/stackdriver/components/__snapshots__/Aggregations.test.tsx.snap b/public/app/plugins/datasource/stackdriver/components/__snapshots__/Aggregations.test.tsx.snap
index defd8ef01a4..ed9fe98bbf8 100644
--- a/public/app/plugins/datasource/stackdriver/components/__snapshots__/Aggregations.test.tsx.snap
+++ b/public/app/plugins/datasource/stackdriver/components/__snapshots__/Aggregations.test.tsx.snap
@@ -28,7 +28,7 @@ Array [
             <div
               className="css-0 gf-form-select-box__placeholder"
             >
-              Select Aggregation
+              Select Reducer
             </div>
             <div
               className="css-0"
diff --git a/public/app/plugins/datasource/stackdriver/components/__snapshots__/QueryEditor.test.tsx.snap b/public/app/plugins/datasource/stackdriver/components/__snapshots__/QueryEditor.test.tsx.snap
index 1ae6d157bf2..8ab8bbfc83b 100644
--- a/public/app/plugins/datasource/stackdriver/components/__snapshots__/QueryEditor.test.tsx.snap
+++ b/public/app/plugins/datasource/stackdriver/components/__snapshots__/QueryEditor.test.tsx.snap
@@ -72,7 +72,7 @@ Array [
         Metric
       </span>
       <div
-        className="css-0 gf-form-input gf-form-input--form-dropdown width-15"
+        className="css-0 gf-form-input gf-form-input--form-dropdown width-26"
         onKeyDown={[Function]}
       >
         <div
@@ -196,7 +196,7 @@ Array [
             <div
               className="css-0 gf-form-select-box__placeholder"
             >
-              Select Aggregation
+              Select Reducer
             </div>
             <div
               className="css-0"
diff --git a/public/app/plugins/datasource/stackdriver/constants.ts b/public/app/plugins/datasource/stackdriver/constants.ts
index 49ac5131f0d..45afa0a7684 100644
--- a/public/app/plugins/datasource/stackdriver/constants.ts
+++ b/public/app/plugins/datasource/stackdriver/constants.ts
@@ -189,7 +189,7 @@ export const aggOptions = [
       ValueTypes.BOOL,
       ValueTypes.STRING,
     ],
-    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA],
+    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
   },
   {
     text: 'count true',
@@ -207,25 +207,25 @@ export const aggOptions = [
     text: '99th percentile',
     value: 'REDUCE_PERCENTILE_99',
     valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
-    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA],
+    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
   },
   {
     text: '95th percentile',
     value: 'REDUCE_PERCENTILE_95',
     valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
-    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA],
+    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
   },
   {
     text: '50th percentile',
     value: 'REDUCE_PERCENTILE_50',
     valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
-    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA],
+    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
   },
   {
     text: '5th percentile',
     value: 'REDUCE_PERCENTILE_05',
     valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
-    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA],
+    metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
   },
 ];