IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: change reducer mapping for distribution metrics

Browse Source 
- 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.
This commit is contained in:
Daniel Lee 2019-02-23 15:52:40 +01:00
parent e6830b0681
commit 35fc0c5329
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/stackdriver/components/Aggregations.test.tsx
View File

@ -49,7 +49,8 @@ describe('Aggregations', () => {
}); });
it('', () => { it('', () => {
const options = wrapper.state().aggOptions[0].options; 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'])); expect(options.map(o => o.value)).toEqual(expect.arrayContaining(['REDUCE_NONE']));
}); });
}); });

2
public/app/plugins/datasource/stackdriver/components/Aggregations.tsx
View File

@ -73,7 +73,7 @@ export class Aggregations extends React.Component<Props, State> {
value={crossSeriesReducer} value={crossSeriesReducer}
variables={templateSrv.variables} variables={templateSrv.variables}
options={aggOptions} options={aggOptions}
placeholder="Select Aggregation" placeholder="Select Reducer"
className="width-15" className="width-15"
/> />
</div> </div>

2
public/app/plugins/datasource/stackdriver/components/Metrics.tsx
View File

@ -185,7 +185,7 @@ export class Metrics extends React.Component<Props, State> {
}, },
]} ]}
placeholder="Select Metric" placeholder="Select Metric"
className="width-15" className="width-26"
/> />
</div> </div>
<div className="gf-form gf-form--grow"> <div className="gf-form gf-form--grow">

2
public/app/plugins/datasource/stackdriver/components/__snapshots__/Aggregations.test.tsx.snap
View File

@ -28,7 +28,7 @@ Array [
<div <div
className="css-0 gf-form-select-box__placeholder" className="css-0 gf-form-select-box__placeholder"
> >
Select Aggregation Select Reducer
</div> </div>
<div <div
className="css-0" className="css-0"

4
public/app/plugins/datasource/stackdriver/components/__snapshots__/QueryEditor.test.tsx.snap
View File

@ -72,7 +72,7 @@ Array [
Metric Metric
</span> </span>
<div <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]} onKeyDown={[Function]}
> >
<div <div
@ -196,7 +196,7 @@ Array [
<div <div
className="css-0 gf-form-select-box__placeholder" className="css-0 gf-form-select-box__placeholder"
> >
Select Aggregation Select Reducer
</div> </div>
<div <div
className="css-0" className="css-0"

10
public/app/plugins/datasource/stackdriver/constants.ts
View File

@ -189,7 +189,7 @@ export const aggOptions = [
ValueTypes.BOOL, ValueTypes.BOOL,
ValueTypes.STRING, ValueTypes.STRING,
], ],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
}, },
{ {
text: 'count true', text: 'count true',
@ -207,25 +207,25 @@ export const aggOptions = [
text: '99th percentile', text: '99th percentile',
value: 'REDUCE_PERCENTILE_99', value: 'REDUCE_PERCENTILE_99',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
}, },
{ {
text: '95th percentile', text: '95th percentile',
value: 'REDUCE_PERCENTILE_95', value: 'REDUCE_PERCENTILE_95',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
}, },
{ {
text: '50th percentile', text: '50th percentile',
value: 'REDUCE_PERCENTILE_50', value: 'REDUCE_PERCENTILE_50',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
}, },
{ {
text: '5th percentile', text: '5th percentile',
value: 'REDUCE_PERCENTILE_05', value: 'REDUCE_PERCENTILE_05',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE],
}, },
]; ];