SigNoz/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2026-02-03 08:33:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: added fix for reduce to resetting back to avg (#9947)

Browse Source 
* fix: added fix for reduce to resetting back to avg

* fix: fixed failing tsc

* fix: added fix for querybuilderoperations hook test

* fix: added pr review fixes

* fix: pr review changes

* chore: pr review changes
This commit is contained in:
Abhi kumar
2026-01-09 14:42:55 +05:30
committed by GitHub
parent f2ef42bd7f
commit 0cc1fb0edb
50 changed files with 454 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts
View File

@@ -16,7 +16,7 @@ import {
QueryRangePayloadV5,
} from 'types/api/v5/queryRange';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { prepareQueryRangePayloadV5 } from './prepareQueryRangePayloadV5';
@@ -41,7 +41,7 @@ describe('prepareQueryRangePayloadV5', () => {
temporality: '',
timeAggregation: 'sum',
spaceAggregation: 'avg',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
timeAggregation: 'sum',
@@ -62,7 +62,7 @@ describe('prepareQueryRangePayloadV5', () => {
limit: null,
stepInterval: 600,
orderBy: [],
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
legend: 'Legend A',
...overrides,
});
@@ -416,7 +416,7 @@ describe('prepareQueryRangePayloadV5', () => {
metricName: 'cpu_usage',
timeAggregation: 'sum',
spaceAggregation: 'avg',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
temporality: undefined,
}),
],
@@ -569,7 +569,7 @@ describe('prepareQueryRangePayloadV5', () => {
},
],
legend: '{{service.name}}',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
offset: 0,
pageSize: 100,
},

40
frontend/src/components/CeleryTask/CeleryTaskGraph/CeleryTaskGraphUtils.ts
View File

@@ -4,7 +4,7 @@ import { getWidgetQueryBuilder } from 'container/MetricsApplication/MetricsAppli
import { getWidgetQuery } from 'pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil';
import { Widgets } from 'types/api/dashboard/getAll';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuidv4 } from 'uuid';
// dynamic step interval
@@ -57,7 +57,7 @@ export const celeryAllStateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'rate',
@@ -121,7 +121,7 @@ export const celeryRetryStateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'count',
@@ -181,7 +181,7 @@ export const celeryFailedStateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'rate',
@@ -241,7 +241,7 @@ export const celerySuccessStateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'rate',
@@ -288,7 +288,7 @@ export const celeryTasksByWorkerWidgetData = (
limit: 10,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'rate',
@@ -351,7 +351,7 @@ export const celeryErrorByWorkerWidgetData = (
},
],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: 'traces',
@@ -385,7 +385,7 @@ export const celeryErrorByWorkerWidgetData = (
},
],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
queryName: 'F1',
@@ -436,7 +436,7 @@ export const celeryLatencyByWorkerWidgetData = (
limit: 10,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'p99',
@@ -485,7 +485,7 @@ export const celeryActiveTasksWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'latest',
@@ -539,7 +539,7 @@ export const celeryTaskLatencyWidgetData = (
},
],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: type || 'p99',
@@ -590,7 +590,7 @@ export const celerySlowestTasksTableWidgetData = getWidgetQueryBuilder(
},
],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -652,7 +652,7 @@ export const celeryRetryTasksTableWidgetData = getWidgetQueryBuilder(
},
],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -715,7 +715,7 @@ export const celeryFailedTasksTableWidgetData = getWidgetQueryBuilder(
},
],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -776,7 +776,7 @@ export const celerySuccessTasksTableWidgetData = getWidgetQueryBuilder(
},
],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -838,7 +838,7 @@ export const celeryTimeSeriesTablesWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -877,7 +877,7 @@ export const celeryAllStateCountWidgetData = getWidgetQueryBuilder(
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count_distinct',
@@ -926,7 +926,7 @@ export const celerySuccessStateCountWidgetData = getWidgetQueryBuilder(
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count_distinct',
@@ -975,7 +975,7 @@ export const celeryFailedStateCountWidgetData = getWidgetQueryBuilder(
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count_distinct',
@@ -1024,7 +1024,7 @@ export const celeryRetryStateCountWidgetData = getWidgetQueryBuilder(
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count_distinct',

4
frontend/src/components/HostMetricsDetail/HostMetricTraces/constants.ts
View File

@@ -6,7 +6,7 @@ import {
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { nanoToMilli } from 'utils/timeUtils';
export const columns = [
@@ -121,7 +121,7 @@ export const getHostTracesQueryPayload = (
],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],

4
frontend/src/components/HostMetricsDetail/HostMetricsLogs/constants.ts
View File

@@ -3,7 +3,7 @@ import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuidv4 } from 'uuid';
export const getHostLogsQueryPayload = (
@@ -45,7 +45,7 @@ export const getHostLogsQueryPayload = (
],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
offset: 0,
pageSize: 100,
},

12
frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
View File

@@ -10,7 +10,7 @@ import {
import QueryAddOns from '../QueryV2/QueryAddOns/QueryAddOns';
import { PANEL_TYPES } from 'constants/queryBuilder';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
// Mocks: only what is required for this component to render and for us to assert handler calls
const mockHandleChangeQueryData = jest.fn();
@@ -200,7 +200,7 @@ describe('QueryAddOns', () => {
it('auto-opens reduce-to content when reduceTo is set', () => {
render(
<QueryAddOns
query={baseQuery({ reduceTo: 'sum' })}
query={baseQuery({ reduceTo: ReduceOperators.SUM })}
version="v5"
isListViewPanel={false}
showReduceTo
@@ -216,8 +216,10 @@ describe('QueryAddOns', () => {
it('calls handleSetQueryData when reduce-to value changes', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const query = baseQuery({
reduceTo: 'avg',
aggregations: [{ id: 'a', operator: 'count', reduceTo: 'avg' }],
reduceTo: ReduceOperators.AVG,
aggregations: [
{ id: 'a', operator: 'count', reduceTo: ReduceOperators.AVG },
],
});
render(
<QueryAddOns
@@ -258,7 +260,7 @@ describe('QueryAddOns', () => {
aggregations: [
{
...(query.aggregations?.[0] as any),
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
},
],
});

6
frontend/src/components/QueryBuilderV2/__tests__/utils.test.ts
View File

@@ -6,7 +6,7 @@ import {
DataTypes,
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { extractQueryPairs } from 'utils/queryContextUtils';
import {
@@ -803,7 +803,7 @@ describe('convertAggregationToExpression', () => {
timeAggregation: 'avg',
spaceAggregation: 'max',
alias: 'test_alias',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
temporality: 'delta',
});
@@ -812,7 +812,7 @@ describe('convertAggregationToExpression', () => {
metricName: 'test_metric',
timeAggregation: 'avg',
spaceAggregation: 'max',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
temporality: 'delta',
},
]);

18
frontend/src/constants/queryBuilder.ts
View File

@@ -138,11 +138,11 @@ export const mapOfFormulaToFilters: Record<
};
export const REDUCE_TO_VALUES: SelectOption<ReduceOperators, string>[] = [
{ value: 'last', label: 'Latest of values in timeframe' },
{ value: 'sum', label: 'Sum of values in timeframe' },
{ value: 'avg', label: 'Average of values in timeframe' },
{ value: 'max', label: 'Max of values in timeframe' },
{ value: 'min', label: 'Min of values in timeframe' },
{ value: ReduceOperators.LAST, label: 'Latest of values in timeframe' },
{ value: ReduceOperators.SUM, label: 'Sum of values in timeframe' },
{ value: ReduceOperators.AVG, label: 'Average of values in timeframe' },
{ value: ReduceOperators.MAX, label: 'Max of values in timeframe' },
{ value: ReduceOperators.MIN, label: 'Min of values in timeframe' },
];
export const initialHavingValues: HavingForm = {
@@ -180,7 +180,7 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
temporality: '',
timeAggregation: MetricAggregateOperator.COUNT,
spaceAggregation: MetricAggregateOperator.SUM,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
functions: [],
@@ -196,7 +196,7 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
source: '',
};
@@ -228,7 +228,7 @@ export const initialQueryBuilderFormMeterValues: IBuilderQuery = {
temporality: '',
timeAggregation: MeterAggregateOperator.COUNT,
spaceAggregation: MeterAggregateOperator.SUM,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
functions: [],
@@ -244,7 +244,7 @@ export const initialQueryBuilderFormMeterValues: IBuilderQuery = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
};
export const initialQueryBuilderFormValuesMap: Record<

64
frontend/src/container/ApiMonitoring/utils.tsx
View File

@@ -37,7 +37,7 @@ import {
} from 'types/api/v5/queryRange';
import { QueryData } from 'types/api/widgets/getQuery';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
import { domainNameKey } from './constants';
@@ -401,7 +401,7 @@ export const getDomainMetricsQueryPayload = (
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: DataSource.TRACES,
@@ -429,7 +429,7 @@ export const getDomainMetricsQueryPayload = (
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: DataSource.TRACES,
@@ -457,7 +457,7 @@ export const getDomainMetricsQueryPayload = (
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: DataSource.TRACES,
@@ -485,7 +485,7 @@ export const getDomainMetricsQueryPayload = (
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [
@@ -653,7 +653,7 @@ export const getEndPointsQueryPayload = (
limit: 1000,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -700,7 +700,7 @@ export const getEndPointsQueryPayload = (
limit: 1000,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'p99',
@@ -748,7 +748,7 @@ export const getEndPointsQueryPayload = (
limit: 1000,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -805,7 +805,7 @@ export const getEndPointsQueryPayload = (
limit: 1000,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -1431,7 +1431,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1461,7 +1461,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'p99',
@@ -1491,7 +1491,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -1521,7 +1521,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1551,7 +1551,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -1629,7 +1629,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -1665,7 +1665,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'p99',
@@ -1705,7 +1705,7 @@ export const getEndPointDetailsQueryPayload = (
},
],
legend: 'rate',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],
@@ -1781,7 +1781,7 @@ export const getEndPointDetailsQueryPayload = (
type: 'attribute',
},
],
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],
@@ -1850,7 +1850,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -1887,7 +1887,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'p99',
@@ -1924,7 +1924,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1961,7 +1961,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -2039,7 +2039,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: null,
timeAggregation: 'rate',
@@ -2110,7 +2110,7 @@ export const getEndPointDetailsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: null,
timeAggregation: 'p99',
@@ -2208,7 +2208,7 @@ export const getEndPointZeroStateQueryPayload = (
type: 'tag',
},
],
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],
@@ -2787,7 +2787,7 @@ export const getStatusCodeBarChartWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2909,7 +2909,7 @@ export const getAllEndpointsWidgetData = (
limit: 1000,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -2941,7 +2941,7 @@ export const getAllEndpointsWidgetData = (
limit: 1000,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'p99',
@@ -2973,7 +2973,7 @@ export const getAllEndpointsWidgetData = (
limit: 1000,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -3005,7 +3005,7 @@ export const getAllEndpointsWidgetData = (
limit: 1000,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count',
@@ -3191,7 +3191,7 @@ export const getRateOverTimeWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: null,
timeAggregation: 'rate',
@@ -3242,7 +3242,7 @@ export const getLatencyOverTimeWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: null,
timeAggregation: 'p99',

11
frontend/src/container/FormAlertRules/__tests__/usePrefillAlertConditions.test.ts
View File

@@ -1,4 +1,5 @@
import { renderHook } from '@testing-library/react';
import { ReduceOperators } from 'types/common/queryBuilder';
import { usePrefillAlertConditions } from '../usePrefillAlertConditions';
@@ -55,7 +56,7 @@ const mockStagedQuery = {
builder: {
queryData: [
{
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
},
@@ -84,10 +85,10 @@ describe('usePrefillAlertConditions', () => {
builder: {
queryData: [
{
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
},
@@ -102,10 +103,10 @@ describe('usePrefillAlertConditions', () => {
builder: {
queryData: [
{
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
},
],
},

4
frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.test.tsx
View File

@@ -8,7 +8,7 @@ import { Provider } from 'react-redux';
import store from 'store';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import {
MENUITEM_KEYS_VS_LABELS,
@@ -68,7 +68,7 @@ const mockProps: WidgetGraphComponentProps = {
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'count_distinct',

4
frontend/src/container/GridCardLayout/__tests__/utils.test.ts
View File

@@ -1,6 +1,6 @@
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { getBarStepIntervalPoints, updateBarStepInterval } from '../utils';
@@ -126,7 +126,7 @@ describe('GridCardLayout Utils', () => {
limit: null,
offset: 0,
pageSize: 0,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
legend: '',
},
],

12
frontend/src/container/GridTableComponent/__tests__/response.ts
View File

@@ -1,3 +1,5 @@
import { ReduceOperators } from 'types/common/queryBuilder';
/* eslint-disable sonarjs/no-duplicate-string */
export const tableDataMultipleQueriesSuccessResponse = {
columns: [
@@ -131,7 +133,7 @@ export const widgetQueryWithLegend = {
},
],
legend: 'p99',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: 'metrics',
@@ -158,7 +160,7 @@ export const widgetQueryWithLegend = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],
@@ -374,7 +376,7 @@ export const widgetQueryQBv5MultiAggregations = {
},
],
legend: 'p99',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: 'metrics',
@@ -414,7 +416,7 @@ export const widgetQueryQBv5MultiAggregations = {
},
],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: 'metrics',
@@ -454,7 +456,7 @@ export const widgetQueryQBv5MultiAggregations = {
},
],
legend: 'max',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],

48
frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const clusterWidgetInfo = [
@@ -177,7 +177,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -216,7 +216,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -255,7 +255,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -294,7 +294,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -367,7 +367,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -406,7 +406,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -445,7 +445,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -484,7 +484,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -570,7 +570,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -656,7 +656,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -742,7 +742,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -794,7 +794,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -892,7 +892,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -944,7 +944,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -996,7 +996,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1048,7 +1048,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1164,7 +1164,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1210,7 +1210,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1256,7 +1256,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1366,7 +1366,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1418,7 +1418,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1470,7 +1470,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1522,7 +1522,7 @@ export const getClusterMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',

18
frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const daemonSetWidgetInfo = [
@@ -126,7 +126,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -176,7 +176,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -226,7 +226,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -310,7 +310,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -360,7 +360,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -410,7 +410,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -507,7 +507,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -604,7 +604,7 @@ export const getDaemonSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',

18
frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const deploymentWidgetInfo = [
@@ -111,7 +111,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -150,7 +150,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -189,7 +189,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -262,7 +262,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -301,7 +301,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -340,7 +340,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -426,7 +426,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -512,7 +512,7 @@ export const getDeploymentMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',

6
frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/utils.tsx
View File

@@ -12,7 +12,7 @@ import {
TagFilterItem,
} from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { nanoToMilli } from 'utils/timeUtils';
import { v4 as uuidv4 } from 'uuid';
@@ -73,7 +73,7 @@ export const getEntityEventsOrLogsQueryPayload = (
],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
offset: 0,
pageSize: 100,
},
@@ -223,7 +223,7 @@ export const getEntityTracesQueryPayload = (
],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],

10
frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const jobWidgetInfo = [
@@ -101,7 +101,7 @@ export const getJobMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -185,7 +185,7 @@ export const getJobMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -282,7 +282,7 @@ export const getJobMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -379,7 +379,7 @@ export const getJobMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',

52
frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const namespaceWidgetInfo = [
@@ -185,7 +185,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -224,7 +224,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -263,7 +263,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -302,7 +302,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -375,7 +375,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -414,7 +414,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -453,7 +453,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -492,7 +492,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -531,7 +531,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -570,7 +570,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'F',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -650,7 +650,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: 20,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -730,7 +730,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: 10,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -816,7 +816,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -902,7 +902,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -982,7 +982,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1028,7 +1028,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1074,7 +1074,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1160,7 +1160,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1212,7 +1212,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1292,7 +1292,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1338,7 +1338,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1384,7 +1384,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1430,7 +1430,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1510,7 +1510,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1556,7 +1556,7 @@ export const getNamespaceMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'last',
reduceTo: ReduceOperators.LAST,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'avg',

56
frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const nodeWidgetInfo = [
@@ -178,7 +178,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -217,7 +217,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -256,7 +256,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -295,7 +295,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -334,7 +334,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -407,7 +407,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -446,7 +446,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -485,7 +485,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -524,7 +524,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -563,7 +563,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -602,7 +602,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'F',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -641,7 +641,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'G',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -714,7 +714,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -753,7 +753,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -792,7 +792,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -878,7 +878,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -917,7 +917,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -956,7 +956,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1049,7 +1049,7 @@ export const getNodeMetricsQueryPayload = (
limit: 10,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1129,7 +1129,7 @@ export const getNodeMetricsQueryPayload = (
limit: 10,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1215,7 +1215,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -1301,7 +1301,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1374,7 +1374,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1413,7 +1413,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1452,7 +1452,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1525,7 +1525,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1564,7 +1564,7 @@ export const getNodeMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',

74
frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts generated
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const podWidgetInfo = [
@@ -228,7 +228,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -278,7 +278,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -328,7 +328,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -412,7 +412,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -462,7 +462,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -512,7 +512,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -562,7 +562,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -612,7 +612,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -662,7 +662,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'F',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -746,7 +746,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -796,7 +796,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -846,7 +846,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -930,7 +930,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -980,7 +980,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1030,7 +1030,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1080,7 +1080,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',
@@ -1130,7 +1130,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -1180,7 +1180,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'F',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'min',
@@ -1264,7 +1264,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1314,7 +1314,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1405,7 +1405,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1496,7 +1496,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1587,7 +1587,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1644,7 +1644,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1701,7 +1701,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -1805,7 +1805,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1862,7 +1862,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1919,7 +1919,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -2010,7 +2010,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -2067,7 +2067,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -2124,7 +2124,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'max',
stepInterval: 60,
timeAggregation: 'latest',
@@ -2234,7 +2234,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2331,7 +2331,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -2415,7 +2415,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -2465,7 +2465,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -2515,7 +2515,7 @@ export const getPodMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',

26
frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const statefulSetWidgetInfo = [
@@ -139,7 +139,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -189,7 +189,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -239,7 +239,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -309,7 +309,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -359,7 +359,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -429,7 +429,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -479,7 +479,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -529,7 +529,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -599,7 +599,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -649,7 +649,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -732,7 +732,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -815,7 +815,7 @@ export const getStatefulSetMetricsQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',

12
frontend/src/container/InfraMonitoringK8s/Volumes/VolumeDetails/constants.ts
View File

@@ -4,7 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 } from 'uuid';
export const volumeWidgetInfo = [
@@ -141,7 +141,7 @@ export const getVolumeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -233,7 +233,7 @@ export const getVolumeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -324,7 +324,7 @@ export const getVolumeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -416,7 +416,7 @@ export const getVolumeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -508,7 +508,7 @@ export const getVolumeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',

4
frontend/src/container/LogDetailedView/ContextView/__tests__/mockData.ts
View File

@@ -5,7 +5,7 @@ import {
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
export const mockLog: ILog = {
id: 'test-log-id',
@@ -54,7 +54,7 @@ export const mockQuery: Query = {
op: 'AND',
},
expression: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
},
],
queryFormulas: [],

70
frontend/src/container/LogDetailedView/InfraMetrics/constants.ts
View File

@@ -3,7 +3,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
export const getPodQueryPayload = (
clusterName: string,
@@ -114,7 +114,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -191,7 +191,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -268,7 +268,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -325,7 +325,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -409,7 +409,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -466,7 +466,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -553,7 +553,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -614,7 +614,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -702,7 +702,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -763,7 +763,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'latest',
@@ -851,7 +851,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -912,7 +912,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1001,7 +1001,7 @@ export const getPodQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1122,7 +1122,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1171,7 +1171,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1260,7 +1260,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1309,7 +1309,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1412,7 +1412,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1493,7 +1493,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1554,7 +1554,7 @@ export const getNodeQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1675,7 +1675,7 @@ export const getHostQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1716,7 +1716,7 @@ export const getHostQueryPayload = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -1792,7 +1792,7 @@ export const getHostQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1853,7 +1853,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1894,7 +1894,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1935,7 +1935,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -2017,7 +2017,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2093,7 +2093,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2169,7 +2169,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2245,7 +2245,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2321,7 +2321,7 @@ export const getHostQueryPayload = (
limit: 30,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'avg',
@@ -2382,7 +2382,7 @@ export const getHostQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2464,7 +2464,7 @@ export const getHostQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -2539,7 +2539,7 @@ export const getHostQueryPayload = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'max',

8
frontend/src/container/LogExplorerQuerySection/LogExplorerQuerySection.test.tsx
View File

@@ -6,7 +6,11 @@ import { cleanup, render, screen, waitFor } from 'tests/test-utils';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query, QueryState } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource, QueryBuilderContextType } from 'types/common/queryBuilder';
import {
DataSource,
QueryBuilderContextType,
ReduceOperators,
} from 'types/common/queryBuilder';
import { explorerViewToPanelType } from 'utils/explorerUtils';
import LogExplorerQuerySection from './index';
@@ -166,7 +170,7 @@ const createMockQuery = (filterExpression?: string): Query => ({
orderBy: [{ columnName: 'timestamp', order: 'desc' }],
pageSize: 0,
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
stepInterval: 60,
},
],

2
frontend/src/container/LogsExplorerContext/__tests__/useInitialQuery.test.ts
View File

@@ -66,7 +66,7 @@ describe('useInitialQuery - Priority-Based Resource Filtering', () => {
queryName: 'A',
expression: 'A',
disabled: false,
reduceTo: 'avg' as ReduceOperators,
reduceTo: ReduceOperators.AVG,
legend: '',
},
],

18
frontend/src/container/MeterExplorer/Breakdown/graphs.ts
View File

@@ -7,7 +7,7 @@ import {
IBuilderQuery,
} from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuid } from 'uuid';
interface GetWidgetQueryProps {
@@ -101,7 +101,7 @@ export const getTotalLogSizeWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -138,7 +138,7 @@ export const getTotalTraceSizeWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -175,7 +175,7 @@ export const getTotalMetricDatapointCountWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -212,7 +212,7 @@ export const getLogCountWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -249,7 +249,7 @@ export const getLogSizeWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -286,7 +286,7 @@ export const getSpanCountWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -323,7 +323,7 @@ export const getSpanSizeWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',
@@ -360,7 +360,7 @@ export const getMetricCountWidgetData = (): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'increase',

5
frontend/src/container/MetricsApplication/MetricsPageQueries/MetricsPageQueriesFactory.ts
View File

@@ -9,6 +9,7 @@ import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import {
MetricAggregateOperator,
QueryBuilderData,
ReduceOperators,
Temporality,
} from 'types/common/queryBuilder';
@@ -51,7 +52,7 @@ export const getQueryBuilderQueries = ({
items: filterItems[index],
op: 'AND',
},
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: spaceAggregateOperators[index],
timeAggregation: timeAggregateOperators[index],
dataSource,
@@ -95,7 +96,7 @@ export const getQueryBuilderQuerieswithFormula = ({
aggregateAttribute: autocompleteData[index],
queryName: alphabet[index],
expression: alphabet[index],
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
filters: {
items: additionalItems[index],
op: 'AND',

4
frontend/src/container/MetricsExplorer/MetricDetails/utils.tsx
View File

@@ -4,7 +4,7 @@ import { SpaceAggregation, TimeAggregation } from 'api/v5/v5';
import { initialQueriesMap } from 'constants/queryBuilder';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
export function formatTimestampToReadableDate(timestamp: string): string {
const date = new Date(timestamp);
@@ -114,7 +114,7 @@ export function getMetricDetailsQuery(
metricName,
timeAggregation: timeAggregation as TimeAggregation,
spaceAggregation: spaceAggregation as SpaceAggregation,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
temporality: '',
},
],

3
frontend/src/container/NewWidget/RightContainer/ColumnUnitSelector/__tests__/ColumnSelector.test.tsx
View File

@@ -3,6 +3,7 @@ import { QueryBuilderProvider } from 'providers/QueryBuilder';
import { useLocation } from 'react-router-dom';
import { render } from 'tests/test-utils';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import { ReduceOperators } from 'types/common/queryBuilder';
import { ColumnUnitSelector } from '../ColumnUnitSelector';
@@ -42,7 +43,7 @@ const compositeQueryParam = {
},
],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [

4
frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx
View File

@@ -18,7 +18,7 @@ import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
const enum ApplicationLogsType {
FROM_LOG_FILE = 'from-log-file',
@@ -68,7 +68,7 @@ export default function LogsConnectionStatus(): JSX.Element {
],
groupBy: [],
legend: '',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
offset: 0,
pageSize: 100,
timeAggregation: '',

6
frontend/src/container/PanelWrapper/__tests__/tablePanelWrapperHelper.ts
View File

@@ -1,3 +1,5 @@
import { ReduceOperators } from 'types/common/queryBuilder';
export const tablePanelWidgetQuery = {
id: '727533b0-7718-4f99-a1db-a1875649325c',
title: '',
@@ -56,7 +58,7 @@ export const tablePanelWidgetQuery = {
},
],
legend: 'latency-per-service',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],
@@ -245,7 +247,7 @@ export const tablePanelQueryResponse = {
},
],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
},
},

6
frontend/src/container/PanelWrapper/__tests__/valuePanelWrapperHelper.ts
View File

@@ -1,3 +1,5 @@
import { ReduceOperators } from 'types/common/queryBuilder';
export const valuePanelWidget = {
id: 'b8b93086-ef01-47bf-9044-1e7abd583be4',
title: 'signoz latency in ms',
@@ -49,7 +51,7 @@ export const valuePanelWidget = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
queryFormulas: [],
@@ -229,7 +231,7 @@ export const valuePanelQueryResponse = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
},
},

38
frontend/src/container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter.test.tsx
View File

@@ -1,6 +1,7 @@
import { render, screen } from '@testing-library/react';
import { MetricType } from 'api/metricsExplorer/getMetricsList';
import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { ReduceOperators } from 'types/common/queryBuilder';
import { ReduceToFilter } from './ReduceToFilter';
@@ -37,7 +38,15 @@ describe('ReduceToFilter', () => {
render(
<ReduceToFilter
query={baseQuery({
aggregations: [{ reduceTo: 'sum' } as any],
aggregations: [
{
reduceTo: ReduceOperators.SUM,
metricName: 'test',
temporality: '',
timeAggregation: 'sum',
spaceAggregation: 'sum',
},
],
aggregateAttribute: { key: 'test', type: MetricType.SUM },
})}
onChange={mockOnChange}
@@ -51,7 +60,7 @@ describe('ReduceToFilter', () => {
render(
<ReduceToFilter
query={baseQuery({
reduceTo: 'max',
reduceTo: ReduceOperators.MAX,
aggregateAttribute: { key: 'test', type: MetricType.GAUGE },
})}
onChange={mockOnChange}
@@ -60,29 +69,4 @@ describe('ReduceToFilter', () => {
expect(screen.getByText('Max of values in timeframe')).toBeInTheDocument();
});
it('updates to sum when aggregateAttribute.type is SUM', async () => {
const { rerender } = render(
<ReduceToFilter
query={baseQuery({
aggregateAttribute: { key: 'test', type: MetricType.GAUGE },
})}
onChange={mockOnChange}
/>,
);
rerender(
<ReduceToFilter
query={baseQuery({
aggregateAttribute: { key: 'test2', type: MetricType.SUM },
})}
onChange={mockOnChange}
/>,
);
const reduceToFilterText = (await screen.findByText(
'Sum of values in timeframe',
)) as HTMLElement;
expect(reduceToFilterText).toBeInTheDocument();
});
});

34
frontend/src/container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter.tsx
View File

@@ -1,7 +1,6 @@
import { Select } from 'antd';
import { MetricType } from 'api/metricsExplorer/getMetricsList';
import { REDUCE_TO_VALUES } from 'constants/queryBuilder';
import { memo, useEffect, useRef, useState } from 'react';
import { memo, useEffect, useState } from 'react';
import { MetricAggregation } from 'types/api/v5/queryRange';
// ** Types
import { ReduceOperators } from 'types/common/queryBuilder';
@@ -13,10 +12,9 @@ export const ReduceToFilter = memo(function ReduceToFilter({
query,
onChange,
}: ReduceToFilterProps): JSX.Element {
const isMounted = useRef<boolean>(false);
const [currentValue, setCurrentValue] = useState<
SelectOption<ReduceOperators, string>
>(REDUCE_TO_VALUES[2]); // default to avg
>(REDUCE_TO_VALUES[2]);
const handleChange = (
newValue: SelectOption<ReduceOperators, string>,
@@ -27,30 +25,16 @@ export const ReduceToFilter = memo(function ReduceToFilter({
useEffect(
() => {
if (!isMounted.current) {
const reduceToValue =
(query.aggregations?.[0] as MetricAggregation)?.reduceTo || query.reduceTo;
const reduceToValue =
(query.aggregations?.[0] as MetricAggregation)?.reduceTo || query.reduceTo;
setCurrentValue(
REDUCE_TO_VALUES.find((option) => option.value === reduceToValue) ||
REDUCE_TO_VALUES[2],
);
isMounted.current = true;
return;
}
const aggregationAttributeType = query.aggregateAttribute?.type as
| MetricType
| undefined;
if (aggregationAttributeType === MetricType.SUM) {
handleChange(REDUCE_TO_VALUES[1]);
} else {
handleChange(REDUCE_TO_VALUES[2]);
}
setCurrentValue(
REDUCE_TO_VALUES.find((option) => option.value === reduceToValue) ||
REDUCE_TO_VALUES[2],
);
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[query.aggregateAttribute?.key],
[(query.aggregations?.[0] as MetricAggregation)?.reduceTo, query.reduceTo],
);
return (

8
frontend/src/container/QueryTable/__test__/mocks.ts
View File

@@ -1,3 +1,5 @@
import { ReduceOperators } from 'types/common/queryBuilder';
/* eslint-disable sonarjs/no-duplicate-string */
export const QueryTableProps: any = {
props: {
@@ -130,7 +132,7 @@ export const QueryTableProps: any = {
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -284,7 +286,7 @@ export const WidgetHeaderProps: any = {
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -613,7 +615,7 @@ export const WidgetHeaderProps: any = {
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',

4
frontend/src/container/SpanDetailsDrawer/SpanLogs/constants.ts
View File

@@ -4,7 +4,7 @@ import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
import { Filter } from 'types/api/v5/queryRange';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuidv4 } from 'uuid';
/**
@@ -55,7 +55,7 @@ export const getSpanLogsQueryPayload = (
],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
offset: 0,
pageSize: 100,
},

8
frontend/src/container/TraceDetail/SelectedSpanDetails/config.ts
View File

@@ -7,7 +7,11 @@ import {
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource, LogsAggregatorOperator } from 'types/common/queryBuilder';
import {
DataSource,
LogsAggregatorOperator,
ReduceOperators,
} from 'types/common/queryBuilder';
import { v4 as uuid } from 'uuid';
export const getTraceToLogsQuery = (
@@ -58,7 +62,7 @@ export const getTraceToLogsQuery = (
legend: '',
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
stepInterval: getStep({
start: minTime,
end: maxTime,

4
frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/constants.ts
View File

@@ -1,6 +1,6 @@
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
export const BASE_FILTER_QUERY: IBuilderQuery = {
queryName: 'A',
@@ -32,7 +32,7 @@ export const BASE_FILTER_QUERY: IBuilderQuery = {
],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
offset: 0,
selectColumns: [],
};

14
frontend/src/hooks/queryBuilder/__tests__/useQueryBuilderOperations.test.ts
View File

@@ -6,7 +6,11 @@ import {
DataTypes,
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource, MetricAggregateOperator } from 'types/common/queryBuilder';
import {
DataSource,
MetricAggregateOperator,
ReduceOperators,
} from 'types/common/queryBuilder';
import { useQueryBuilder } from '../useQueryBuilder';
import { useQueryOperations } from '../useQueryBuilderOperations';
@@ -54,7 +58,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
stepInterval: 60,
expression: '',
disabled: false,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
legend: '',
};
@@ -189,6 +193,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
metricName: 'new_sum_metric',
temporality: '',
spaceAggregation: MetricAggregateOperator.SUM,
reduceTo: ReduceOperators.SUM,
},
],
}),
@@ -208,6 +213,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
metricName: 'original_sum_metric',
temporality: '',
spaceAggregation: MetricAggregateOperator.SUM,
reduceTo: ReduceOperators.SUM,
},
],
};
@@ -240,6 +246,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
metricName: 'new_sum_metric',
temporality: '',
spaceAggregation: MetricAggregateOperator.SUM,
reduceTo: ReduceOperators.SUM,
},
],
}),
@@ -261,6 +268,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
metricName: 'original_gauge',
temporality: '',
spaceAggregation: '',
reduceTo: ReduceOperators.AVG,
},
],
};
@@ -291,6 +299,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
metricName: '',
temporality: '',
spaceAggregation: MetricAggregateOperator.SUM,
reduceTo: ReduceOperators.AVG,
},
],
};
@@ -316,6 +325,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
metricName: 'new_gauge',
temporality: '',
spaceAggregation: MetricAggregateOperator.AVG,
reduceTo: ReduceOperators.AVG,
},
],
}),

10
frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
View File

@@ -43,7 +43,11 @@ import {
HandleChangeQueryDataV5,
UseQueryOperations,
} from 'types/common/operations.types';
import { DataSource, MetricAggregateOperator } from 'types/common/queryBuilder';
import {
DataSource,
MetricAggregateOperator,
ReduceOperators,
} from 'types/common/queryBuilder';
import { SelectOption } from 'types/common/select';
import { getFormatedLegend } from 'utils/getFormatedLegend';
@@ -318,6 +322,7 @@ export const useQueryOperations: UseQueryOperations = ({
metricName: newQuery.aggregateAttribute?.key || '',
temporality: '',
spaceAggregation: MetricAggregateOperator.SUM,
reduceTo: ReduceOperators.SUM,
},
];
} else if (newQuery.aggregateAttribute?.type === ATTRIBUTE_TYPES.GAUGE) {
@@ -327,6 +332,7 @@ export const useQueryOperations: UseQueryOperations = ({
metricName: newQuery.aggregateAttribute?.key || '',
temporality: '',
spaceAggregation: MetricAggregateOperator.AVG,
reduceTo: ReduceOperators.AVG,
},
];
} else if (
@@ -340,6 +346,7 @@ export const useQueryOperations: UseQueryOperations = ({
metricName: newQuery.aggregateAttribute?.key || '',
temporality: '',
spaceAggregation: MetricAggregateOperator.P90,
reduceTo: ReduceOperators.AVG,
},
];
} else {
@@ -349,6 +356,7 @@ export const useQueryOperations: UseQueryOperations = ({
metricName: newQuery.aggregateAttribute?.key || '',
temporality: '',
spaceAggregation: '',
reduceTo: ReduceOperators.AVG,
},
];
}

30
frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApiInputs.ts
View File

@@ -3,7 +3,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
import { ICompositeMetricQuery } from 'types/api/alerts/compositeQuery';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
export const compositeQueryWithoutVariables = ({
builderQueries: {
@@ -26,7 +26,7 @@ export const compositeQueryWithoutVariables = ({
limit: 0,
offset: 0,
pageSize: 0,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
timeAggregation: 'rate',
spaceAggregation: 'sum',
ShiftBy: 0,
@@ -57,7 +57,7 @@ export const stepIntervalUnchanged = {
temporality: '',
timeAggregation: 'count',
spaceAggregation: 'sum',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
functions: [],
@@ -70,7 +70,7 @@ export const stepIntervalUnchanged = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
source: '',
offset: 0,
pageSize: 0,
@@ -149,7 +149,7 @@ export const compositeQueryWithVariables = ({
limit: 0,
offset: 0,
pageSize: 0,
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
timeAggregation: 'rate',
spaceAggregation: 'sum',
ShiftBy: 0,
@@ -180,7 +180,7 @@ export const replaceVariables = {
temporality: '',
timeAggregation: 'count',
spaceAggregation: 'sum',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
functions: [],
@@ -235,7 +235,7 @@ export const replaceVariables = {
},
],
legend: '{{service_name}}-{{operation}}',
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
source: '',
offset: 0,
pageSize: 0,
@@ -265,7 +265,7 @@ export const defaultOutput = {
aggregations: [
{
metricName: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
temporality: '',
timeAggregation: 'count',
@@ -286,7 +286,7 @@ export const defaultOutput = {
orderBy: [],
pageSize: 0,
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
source: '',
spaceAggregation: 'sum',
stepInterval: 240,
@@ -324,7 +324,7 @@ export const compositeQueriesWithFunctions = ({
limit: 0,
offset: 0,
pageSize: 0,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'p90',
ShiftBy: 0,
},
@@ -347,7 +347,7 @@ export const compositeQueriesWithFunctions = ({
limit: 0,
offset: 0,
pageSize: 0,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
timeAggregation: 'rate',
spaceAggregation: 'sum',
ShiftBy: 0,
@@ -395,7 +395,7 @@ export const outputWithFunctions = {
temporality: '',
timeAggregation: 'count',
spaceAggregation: 'sum',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
functions: [],
@@ -408,7 +408,7 @@ export const outputWithFunctions = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
source: '',
offset: 0,
pageSize: 0,
@@ -432,7 +432,7 @@ export const outputWithFunctions = {
temporality: '',
timeAggregation: 'count',
spaceAggregation: 'sum',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
],
functions: [],
@@ -445,7 +445,7 @@ export const outputWithFunctions = {
orderBy: [],
groupBy: [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
source: '',
offset: 0,
pageSize: 0,

6
frontend/src/mocks-server/__mockdata__/explorer_views.ts
View File

@@ -1,3 +1,5 @@
import { ReduceOperators } from 'types/common/queryBuilder';
export const explorerView = {
status: 'success',
data: [
@@ -60,7 +62,7 @@ export const explorerView = {
order: 'desc',
},
],
reduceTo: 'sum',
reduceTo: ReduceOperators.SUM,
ShiftBy: 0,
},
},
@@ -116,7 +118,7 @@ export const explorerView = {
order: 'desc',
},
],
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
timeAggregation: 'rate',
spaceAggregation: 'sum',
ShiftBy: 0,

4
frontend/src/mocks-server/__mockdata__/publicDashboard.ts
View File

@@ -1,3 +1,5 @@
import { ReduceOperators } from 'types/common/queryBuilder';
export const publishedPublicDashboardMeta = {
status: 'success',
data: {
@@ -71,7 +73,7 @@ export const publicDashboardResponse = {
aggregations: [
{
metricName: 'container.cpu.time',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
temporality: '',
timeAggregation: 'rate',

22
frontend/src/pages/Celery/CeleryOverview/CeleryOverviewGraphUtils.ts
View File

@@ -9,7 +9,7 @@ import {
DataTypes,
} from 'types/api/queryBuilder/queryAutocompleteResponse';
import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuidv4 } from 'uuid';
export const celeryOverviewRequestRateWidgetData = (
@@ -42,7 +42,7 @@ export const celeryOverviewRequestRateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -95,7 +95,7 @@ export const celeryOverviewErrorRateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -135,7 +135,7 @@ export const celeryOverviewAvgLatencyWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'p95',
@@ -178,7 +178,7 @@ export const celeryOverviewRequestRateGraphData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'rate',
@@ -238,7 +238,7 @@ export const celeryOverviewErrorRateGraphData = (
orderBy: [],
groupBy: groupByFilter ? [groupByFilter] : [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: DataSource.TRACES,
@@ -278,7 +278,7 @@ export const celeryOverviewErrorRateGraphData = (
orderBy: [],
groupBy: groupByFilter ? [groupByFilter] : [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
dataSource: DataSource.TRACES,
@@ -305,7 +305,7 @@ export const celeryOverviewErrorRateGraphData = (
orderBy: [],
groupBy: groupByFilter ? [groupByFilter] : [],
legend: '',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
},
{
queryName: 'F1',
@@ -358,7 +358,7 @@ export const celeryOverviewAvgLatencyGraphData = (
limit: null,
orderBy: [],
queryName: 'C',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'p90',
@@ -385,7 +385,7 @@ export const celeryOverviewAvgLatencyGraphData = (
limit: null,
orderBy: [],
queryName: 'D',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'p95',
@@ -412,7 +412,7 @@ export const celeryOverviewAvgLatencyGraphData = (
limit: null,
orderBy: [],
queryName: 'E',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: getStepInterval(startTime, endTime),
timeAggregation: 'p99',

48
frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil.ts
View File

@@ -8,7 +8,7 @@ import {
IBuilderQuery,
} from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuid } from 'uuid';
interface GetWidgetQueryProps {
@@ -111,7 +111,7 @@ export const getRequestTimesWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -146,7 +146,7 @@ export const getBrokerCountWidgetData = (dotMetricsEnabled: boolean): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'sum',
@@ -185,7 +185,7 @@ export const getProducerFetchRequestPurgatoryWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -229,7 +229,7 @@ export const getBrokerNetworkThroughputWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -271,7 +271,7 @@ export const getIoWaitTimeWidgetData = (dotMetricsEnabled: boolean): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -314,7 +314,7 @@ export const getRequestResponseWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -344,7 +344,7 @@ export const getRequestResponseWidgetData = (
limit: null,
orderBy: [],
queryName: 'B',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -387,7 +387,7 @@ export const getAverageRequestLatencyWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -437,7 +437,7 @@ export const getKafkaProducerByteRateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -482,7 +482,7 @@ export const getBytesConsumedWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -545,7 +545,7 @@ export const getConsumerOffsetWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -595,7 +595,7 @@ export const getConsumerGroupMemberWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'sum',
@@ -656,7 +656,7 @@ export const getConsumerLagByGroupWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -706,7 +706,7 @@ export const getConsumerFetchRateWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -749,7 +749,7 @@ export const getMessagesConsumedWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -790,7 +790,7 @@ export const getJvmGCCountWidgetData = (dotMetricsEnabled: boolean): Widgets =>
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -833,7 +833,7 @@ export const getJvmGcCollectionsElapsedWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'rate',
@@ -878,7 +878,7 @@ export const getCpuRecentUtilizationWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -917,7 +917,7 @@ export const getJvmMemoryHeapWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -965,7 +965,7 @@ export const getPartitionCountPerTopicWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'sum',
stepInterval: 60,
timeAggregation: 'sum',
@@ -1020,7 +1020,7 @@ export const getCurrentOffsetPartitionWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1076,7 +1076,7 @@ export const getOldestOffsetWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',
@@ -1132,7 +1132,7 @@ export const getInsyncReplicasWidgetData = (
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'avg',

4
frontend/src/pages/MessagingQueues/MessagingQueuesUtils.ts
View File

@@ -15,7 +15,7 @@ import { ErrorResponse, SuccessResponse } from 'types/api';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
import { EQueryType } from 'types/common/dashboard';
import { DataSource } from 'types/common/queryBuilder';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
import { v4 as uuid } from 'uuid';
export const KAFKA_SETUP_DOC_LINK =
@@ -148,7 +148,7 @@ export function getWidgetQuery({
limit: null,
orderBy: [],
queryName: 'A',
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
spaceAggregation: 'avg',
stepInterval: 60,
timeAggregation: 'max',

3
frontend/src/providers/QueryBuilder.tsx
View File

@@ -60,6 +60,7 @@ import {
IsDefaultQueryProps,
QueryBuilderContextType,
QueryBuilderData,
ReduceOperators,
} from 'types/common/queryBuilder';
import { sanitizeOrderByForExplorer } from 'utils/sanitizeOrderBy';
import { v4 as uuid } from 'uuid';
@@ -329,7 +330,7 @@ export function QueryBuilderProvider({
// set to default values
orderBy: [],
limit: null,
reduceTo: 'avg',
reduceTo: ReduceOperators.AVG,
};
},
[],

4
frontend/src/types/api/v5/queryRange.ts
View File

@@ -1,5 +1,7 @@
// ===================== Base Types =====================
import { ReduceOperators } from 'types/common/queryBuilder';
import { Warning } from '..';
export type Step = string | number; // Duration string (e.g., "30s") or seconds as number
@@ -190,7 +192,7 @@ export interface MetricAggregation {
temporality: Temporality;
timeAggregation: TimeAggregation;
spaceAggregation: SpaceAggregation;
reduceTo?: string;
reduceTo?: ReduceOperators;
}
export interface SecondaryAggregation {

8
frontend/src/types/common/queryBuilder.ts
View File

@@ -219,7 +219,13 @@ export type PanelTypeKeys =
| 'TRACE'
| 'EMPTY_WIDGET';
export type ReduceOperators = 'last' | 'sum' | 'avg' | 'max' | 'min';
export enum ReduceOperators {
LAST = 'last',
SUM = 'sum',
AVG = 'avg',
MAX = 'max',
MIN = 'min',
}
export type QueryBuilderData = {
queryData: IBuilderQuery[];