GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-13 02:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: added default value to time,space aggregation to fix query_range…" (#7464)

Browse Source 
This reverts commit 8c4c3573517d97a90b53ced8261130f7d0074700.
This commit is contained in:
Srikanth Chekuri 2025-03-28 12:43:31 +05:30 committed by GitHub
parent 8c4c357351
commit 031d62ca44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
frontend/src/constants/queryBuilderOperators.ts
View File

@ -425,45 +425,3 @@ export const metricsEmptyTimeAggregateOperatorOptions: SelectOption<
string, string,
string string
>[] = []; >[] = [];
export const metricsEmptySpaceAggregateOperatorOptions: SelectOption<
string,
string
>[] = [
{
value: MetricAggregateOperator.SUM,
label: 'Sum',
},
{
value: MetricAggregateOperator.AVG,
label: 'Avg',
},
{
value: MetricAggregateOperator.MIN,
label: 'Min',
},
{
value: MetricAggregateOperator.MAX,
label: 'Max',
},
{
value: MetricAggregateOperator.P50,
label: 'P50',
},
{
value: MetricAggregateOperator.P75,
label: 'P75',
},
{
value: MetricAggregateOperator.P90,
label: 'P90',
},
{
value: MetricAggregateOperator.P95,
label: 'P95',
},
{
value: MetricAggregateOperator.P99,
label: 'P99',
},
];

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

@ -9,8 +9,6 @@ import {
PANEL_TYPES, PANEL_TYPES,
} from 'constants/queryBuilder'; } from 'constants/queryBuilder';
import { import {
metricAggregateOperatorOptions,
metricsEmptySpaceAggregateOperatorOptions,
metricsGaugeSpaceAggregateOperatorOptions, metricsGaugeSpaceAggregateOperatorOptions,
metricsHistogramSpaceAggregateOperatorOptions, metricsHistogramSpaceAggregateOperatorOptions,
metricsSumSpaceAggregateOperatorOptions, metricsSumSpaceAggregateOperatorOptions,
@ -23,7 +21,6 @@ import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { getMetricsOperatorsByAttributeType } from 'lib/newQueryBuilder/getMetricsOperatorsByAttributeType'; import { getMetricsOperatorsByAttributeType } from 'lib/newQueryBuilder/getMetricsOperatorsByAttributeType';
import { getOperatorsBySourceAndPanelType } from 'lib/newQueryBuilder/getOperatorsBySourceAndPanelType'; import { getOperatorsBySourceAndPanelType } from 'lib/newQueryBuilder/getOperatorsBySourceAndPanelType';
import { findDataTypeOfOperator } from 'lib/query/findDataTypeOfOperator'; import { findDataTypeOfOperator } from 'lib/query/findDataTypeOfOperator';
import { isEmpty } from 'lodash-es';
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse'; import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { import {
@ -148,14 +145,12 @@ export const useQueryOperations: UseQueryOperations = ({
const handleMetricAggregateAtributeTypes = useCallback( const handleMetricAggregateAtributeTypes = useCallback(
(aggregateAttribute: BaseAutocompleteData): any => { (aggregateAttribute: BaseAutocompleteData): any => {
const newOperators = !isEmpty(aggregateAttribute.type) const newOperators = getMetricsOperatorsByAttributeType({
? getMetricsOperatorsByAttributeType({ dataSource: DataSource.METRICS,
dataSource: DataSource.METRICS, panelType: panelType || PANEL_TYPES.TIME_SERIES,
panelType: panelType || PANEL_TYPES.TIME_SERIES, aggregateAttributeType:
aggregateAttributeType: (aggregateAttribute.type as ATTRIBUTE_TYPES) || ATTRIBUTE_TYPES.GAUGE,
(aggregateAttribute.type as ATTRIBUTE_TYPES) || ATTRIBUTE_TYPES.GAUGE, });
})
: metricAggregateOperatorOptions;
switch (aggregateAttribute.type) { switch (aggregateAttribute.type) {
case ATTRIBUTE_TYPES.SUM: case ATTRIBUTE_TYPES.SUM:
@ -173,7 +168,7 @@ export const useQueryOperations: UseQueryOperations = ({
setSpaceAggregationOptions(metricsHistogramSpaceAggregateOperatorOptions); setSpaceAggregationOptions(metricsHistogramSpaceAggregateOperatorOptions);
break; break;
default: default:
setSpaceAggregationOptions(metricsEmptySpaceAggregateOperatorOptions); setSpaceAggregationOptions(metricsGaugeSpaceAggregateOperatorOptions);
break; break;
} }
@ -199,12 +194,14 @@ export const useQueryOperations: UseQueryOperations = ({
if (newQuery.aggregateAttribute.type === ATTRIBUTE_TYPES.SUM) { if (newQuery.aggregateAttribute.type === ATTRIBUTE_TYPES.SUM) {
newQuery.aggregateOperator = MetricAggregateOperator.RATE; newQuery.aggregateOperator = MetricAggregateOperator.RATE;
newQuery.timeAggregation = MetricAggregateOperator.RATE; newQuery.timeAggregation = MetricAggregateOperator.RATE;
newQuery.spaceAggregation = MetricAggregateOperator.SUM; } else if (newQuery.aggregateAttribute.type === ATTRIBUTE_TYPES.GAUGE) {
} else {
newQuery.aggregateOperator = MetricAggregateOperator.AVG; newQuery.aggregateOperator = MetricAggregateOperator.AVG;
newQuery.timeAggregation = MetricAggregateOperator.AVG; newQuery.timeAggregation = MetricAggregateOperator.AVG;
newQuery.spaceAggregation = MetricAggregateOperator.AVG; } else {
newQuery.timeAggregation = '';
} }
newQuery.spaceAggregation = '';
} }
handleSetQueryData(index, newQuery); handleSetQueryData(index, newQuery);