apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14735 from challengerdeep/14581_fix-stackdriver-series-aggregation-merge

Browse Source 
Fix stackdriver aggregation series merge
pull/14767/head
Daniel Lee 6 years ago committed by GitHub
parent 56edba5a63 9759ee53ca
commit f95b4b3882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      public/app/plugins/datasource/stackdriver/constants.ts

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

@ -151,32 +151,32 @@ export const aggOptions = [
{ {
text: 'mean', text: 'mean',
value: 'REDUCE_MEAN', value: 'REDUCE_MEAN',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA],
}, },
{ {
text: 'min', text: 'min',
value: 'REDUCE_MIN', value: 'REDUCE_MIN',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE, MetricKind.METRIC_KIND_UNSPECIFIED],
}, },
{ {
text: 'max', text: 'max',
value: 'REDUCE_MAX', value: 'REDUCE_MAX',
valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY], valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY],
metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE, MetricKind.METRIC_KIND_UNSPECIFIED],
}, },
{ {
text: 'sum', text: 'sum',
value: 'REDUCE_SUM', value: 'REDUCE_SUM',
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, MetricKind.METRIC_KIND_UNSPECIFIED],
}, },
{ {
text: 'std. dev.', text: 'std. dev.',
value: 'REDUCE_STDDEV', value: 'REDUCE_STDDEV',
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, MetricKind.METRIC_KIND_UNSPECIFIED],
}, },
{ {
text: 'count', text: 'count',

Write Preview
Loading…
Cancel
Save