From 83a6a5144d29be77e7005a4884cb3f257d6223ce Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Mon, 12 Oct 2020 15:28:18 +0300 Subject: [PATCH] Cloud monitoring: Add REDUCE_MEAN reducer for cumulative metrics (#28192) * Cloud monitoring: Add REDUCE_MEAN reducer for cumulative metrics * Fix tests --- .../cloud-monitoring/components/Aggregations.test.tsx | 2 +- public/app/plugins/datasource/cloud-monitoring/constants.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx index 670f6baa81f..d8e2172fa23 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Aggregations.test.tsx @@ -62,7 +62,7 @@ describe('Aggregations', () => { const { options } = wrapper.find(Segment).props() as any; const [, aggGroup] = options; - expect(aggGroup.options.length).toEqual(10); + expect(aggGroup.options.length).toEqual(11); expect(aggGroup.options.map((o: any) => o.value)).toEqual(expect.arrayContaining(['REDUCE_NONE'])); }); }); diff --git a/public/app/plugins/datasource/cloud-monitoring/constants.ts b/public/app/plugins/datasource/cloud-monitoring/constants.ts index e7955da7488..40df2143587 100644 --- a/public/app/plugins/datasource/cloud-monitoring/constants.ts +++ b/public/app/plugins/datasource/cloud-monitoring/constants.ts @@ -152,7 +152,7 @@ export const aggOptions = [ text: 'mean', value: 'REDUCE_MEAN', valueTypes: [ValueTypes.INT64, ValueTypes.DOUBLE, ValueTypes.MONEY, ValueTypes.DISTRIBUTION], - metricKinds: [MetricKind.GAUGE, MetricKind.DELTA], + metricKinds: [MetricKind.GAUGE, MetricKind.DELTA, MetricKind.CUMULATIVE], }, { text: 'min',