diff --git a/frontend/src/api/v5/queryRange/convertV5Response.test.ts b/frontend/src/api/v5/queryRange/convertV5Response.test.ts new file mode 100644 index 000000000000..0e2d82618730 --- /dev/null +++ b/frontend/src/api/v5/queryRange/convertV5Response.test.ts @@ -0,0 +1,284 @@ +/* eslint-disable sonarjs/no-duplicate-string */ +import { SuccessResponse } from 'types/api'; +import { + MetricRangePayloadV5, + QueryBuilderFormula, + QueryRangeRequestV5, + QueryRangeResponseV5, + RequestType, + ScalarData, + TelemetryFieldKey, + TimeSeries, + TimeSeriesData, + TimeSeriesValue, +} from 'types/api/v5/queryRange'; + +import { convertV5ResponseToLegacy } from './convertV5Response'; + +describe('convertV5ResponseToLegacy', () => { + function makeBaseSuccess( + payload: T, + params: QueryRangeRequestV5, + ): SuccessResponse { + return { + statusCode: 200, + message: 'success', + payload, + error: null, + params, + }; + } + + function makeBaseParams( + requestType: RequestType, + queries: QueryRangeRequestV5['compositeQuery']['queries'], + ): QueryRangeRequestV5 { + return { + schemaVersion: 'v1', + start: 1, + end: 2, + requestType, + compositeQuery: { queries }, + variables: {}, + formatOptions: { formatTableResultForUI: false, fillGaps: false }, + }; + } + + it('converts time_series response into legacy series structure', () => { + const timeSeries: TimeSeriesData = { + queryName: 'A', + aggregations: [ + { + index: 0, + alias: '__result_0', + meta: {}, + series: [ + ({ + labels: [ + { + key: ({ name: 'service.name' } as unknown) as TelemetryFieldKey, + value: 'adservice', + }, + ], + values: [ + ({ timestamp: 1000, value: 10 } as unknown) as TimeSeriesValue, + ({ timestamp: 2000, value: 12 } as unknown) as TimeSeriesValue, + ], + } as unknown) as TimeSeries, + ], + }, + ], + }; + + const v5Data: QueryRangeResponseV5 = { + type: 'time_series', + data: { results: [timeSeries] }, + meta: { rowsScanned: 0, bytesScanned: 0, durationMs: 0 }, + }; + + const params = makeBaseParams('time_series', [ + { + type: 'builder_query', + spec: { + name: 'A', + signal: 'traces', + stepInterval: 60, + disabled: false, + aggregations: [{ expression: 'count()' }], + }, + }, + ]); + + const input: SuccessResponse< + MetricRangePayloadV5, + QueryRangeRequestV5 + > = makeBaseSuccess({ data: v5Data }, params); + + const legendMap = { A: '{{service.name}}' }; + const result = convertV5ResponseToLegacy(input, legendMap, false); + + expect(result.payload.data.resultType).toBe('time_series'); + expect(result.payload.data.result).toHaveLength(1); + const q = result.payload.data.result[0]; + expect(q.queryName).toBe('A'); + expect(q.legend).toBe('{{service.name}}'); + expect(q.series?.[0]).toEqual( + expect.objectContaining({ + labels: { 'service.name': 'adservice' }, + values: [ + { timestamp: 1000, value: '10' }, + { timestamp: 2000, value: '12' }, + ], + metaData: expect.objectContaining({ + alias: '__result_0', + index: 0, + queryName: 'A', + }), + }), + ); + }); + + it('converts scalar to legacy table (formatForWeb=false) with names/ids resolved from aggregations', () => { + const scalar: ScalarData = { + columns: [ + // group column + ({ + name: 'service.name', + queryName: 'A', + aggregationIndex: 0, + columnType: 'group', + } as unknown) as ScalarData['columns'][number], + // aggregation 0 + ({ + name: '__result_0', + queryName: 'A', + aggregationIndex: 0, + columnType: 'aggregation', + } as unknown) as ScalarData['columns'][number], + // aggregation 1 + ({ + name: '__result_1', + queryName: 'A', + aggregationIndex: 1, + columnType: 'aggregation', + } as unknown) as ScalarData['columns'][number], + // formula F1 + ({ + name: '__result', + queryName: 'F1', + aggregationIndex: 0, + columnType: 'aggregation', + } as unknown) as ScalarData['columns'][number], + ], + data: [['adservice', 606, 1.452, 151.5]], + }; + + const v5Data: QueryRangeResponseV5 = { + type: 'scalar', + data: { results: [scalar] }, + meta: { rowsScanned: 0, bytesScanned: 0, durationMs: 0 }, + }; + + const params = makeBaseParams('scalar', [ + { + type: 'builder_query', + spec: { + name: 'A', + signal: 'traces', + stepInterval: 60, + disabled: false, + aggregations: [ + { expression: 'count()' }, + { expression: 'avg(app.ads.count)', alias: 'avg' }, + ], + }, + }, + { + type: 'builder_formula', + spec: ({ + name: 'F1', + expression: 'A * 0.25', + } as unknown) as QueryBuilderFormula, + }, + ]); + + const input: SuccessResponse< + MetricRangePayloadV5, + QueryRangeRequestV5 + > = makeBaseSuccess({ data: v5Data }, params); + const legendMap = { A: '{{service.name}}', F1: '' }; + const result = convertV5ResponseToLegacy(input, legendMap, false); + + expect(result.payload.data.resultType).toBe('scalar'); + const [tableEntry] = result.payload.data.result; + expect(tableEntry.table?.columns).toEqual([ + { + name: 'service.name', + queryName: 'A', + isValueColumn: false, + id: 'service.name', + }, + { name: 'count()', queryName: 'A', isValueColumn: true, id: 'A.count()' }, + { + name: 'avg', + queryName: 'A', + isValueColumn: true, + id: 'A.avg(app.ads.count)', + }, + { name: 'F1', queryName: 'F1', isValueColumn: true, id: 'F1' }, + ]); + expect(tableEntry.table?.rows?.[0]).toEqual({ + data: { + 'service.name': 'adservice', + 'A.count()': 606, + 'A.avg(app.ads.count)': 1.452, + F1: 151.5, + }, + }); + }); + + it('converts scalar with formatForWeb=true to UI-friendly table', () => { + const scalar: ScalarData = { + columns: [ + { + name: 'service.name', + queryName: 'A', + aggregationIndex: 0, + columnType: 'group', + } as any, + { + name: '__result_0', + queryName: 'A', + aggregationIndex: 0, + columnType: 'aggregation', + } as any, + ], + data: [['adservice', 580]], + }; + + const v5Data: QueryRangeResponseV5 = { + type: 'scalar', + data: { results: [scalar] }, + meta: { rowsScanned: 0, bytesScanned: 0, durationMs: 0 }, + }; + + const params = makeBaseParams('scalar', [ + { + type: 'builder_query', + spec: { + name: 'A', + signal: 'traces', + stepInterval: 60, + disabled: false, + aggregations: [{ expression: 'count()' }], + }, + }, + ]); + + const input: SuccessResponse< + MetricRangePayloadV5, + QueryRangeRequestV5 + > = makeBaseSuccess({ data: v5Data }, params); + const legendMap = { A: '{{service.name}}' }; + const result = convertV5ResponseToLegacy(input, legendMap, true); + + expect(result.payload.data.resultType).toBe('scalar'); + const [tableEntry] = result.payload.data.result; + expect(tableEntry.table?.columns).toEqual([ + { + name: 'service.name', + queryName: 'A', + isValueColumn: false, + id: 'service.name', + }, + // Single aggregation: name resolves to legend, id resolves to queryName + { name: '{{service.name}}', queryName: 'A', isValueColumn: true, id: 'A' }, + ]); + expect(tableEntry.table?.rows?.[0]).toEqual({ + data: { + 'service.name': 'adservice', + A: 580, + }, + }); + }); +}); diff --git a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts new file mode 100644 index 000000000000..aef670e54929 --- /dev/null +++ b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts @@ -0,0 +1,633 @@ +/* eslint-disable sonarjs/no-duplicate-string, simple-import-sort/imports, @typescript-eslint/indent, no-mixed-spaces-and-tabs */ +import { PANEL_TYPES } from 'constants/queryBuilder'; +import { + IBuilderFormula, + IBuilderQuery, +} from 'types/api/queryBuilder/queryBuilderData'; +import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults'; +import { + ClickHouseQuery, + LogAggregation, + LogBuilderQuery, + MetricBuilderQuery, + PromQuery, + QueryBuilderFormula as V5QueryBuilderFormula, + QueryEnvelope, + QueryRangePayloadV5, +} from 'types/api/v5/queryRange'; +import { EQueryType } from 'types/common/dashboard'; +import { DataSource } from 'types/common/queryBuilder'; +import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse'; + +import { prepareQueryRangePayloadV5 } from './prepareQueryRangePayloadV5'; + +jest.mock('lib/getStartEndRangeTime', () => ({ + __esModule: true, + default: jest.fn(() => ({ start: '100', end: '200' })), +})); + +describe('prepareQueryRangePayloadV5', () => { + const start = 1_710_000_000; // seconds + const end = 1_710_000_600; // seconds + + const baseBuilderQuery = ( + overrides?: Partial, + ): IBuilderQuery => ({ + queryName: 'A', + dataSource: DataSource.METRICS, + aggregations: [ + { + metricName: 'cpu_usage', + temporality: '', + timeAggregation: 'sum', + spaceAggregation: 'avg', + reduceTo: 'avg', + }, + ], + timeAggregation: 'sum', + spaceAggregation: 'avg', + temporality: '', + functions: [ + { + name: 'timeShift', + args: [{ value: '5m' }], + }, + ], + filter: { expression: '' }, + filters: { items: [], op: 'AND' }, + groupBy: [], + expression: 'A', + disabled: false, + having: [], + limit: null, + stepInterval: 600, + orderBy: [], + reduceTo: 'avg', + legend: 'Legend A', + ...overrides, + }); + + const baseFormula = ( + overrides?: Partial, + ): IBuilderFormula => ({ + expression: 'A + 1', + disabled: false, + queryName: 'F1', + legend: 'Formula Legend', + limit: undefined, + having: [], + stepInterval: undefined, + orderBy: [], + ...overrides, + }); + + it('builds payload for builder queries with formulas and variables', () => { + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.QUERY_BUILDER, + id: 'q1', + unit: undefined, + promql: [], + clickhouse_sql: [], + builder: { + queryData: [baseBuilderQuery()], + queryFormulas: [baseFormula()], + }, + }, + graphType: PANEL_TYPES.TIME_SERIES, + selectedTime: 'GLOBAL_TIME', + start, + end, + variables: { svc: 'api', count: 5, flag: true }, + fillGaps: true, + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: { A: 'Legend A', F1: 'Formula Legend' }, + queryPayload: expect.objectContaining({ + compositeQuery: expect.objectContaining({ + queries: expect.arrayContaining([ + expect.objectContaining({ + type: 'builder_query', + spec: expect.objectContaining({ + name: 'A', + signal: 'metrics', + stepInterval: 600, + functions: [{ name: 'timeShift', args: [{ value: '5m' }] }], + aggregations: [ + expect.objectContaining({ + metricName: 'cpu_usage', + timeAggregation: 'sum', + spaceAggregation: 'avg', + reduceTo: undefined, + }), + ], + }), + }), + expect.objectContaining({ + type: 'builder_formula', + spec: expect.objectContaining({ + name: 'F1', + expression: 'A + 1', + legend: 'Formula Legend', + }), + }), + ]), + }), + requestType: 'time_series', + formatOptions: expect.objectContaining({ + formatTableResultForUI: false, + fillGaps: true, + }), + start: start * 1000, + end: end * 1000, + variables: expect.objectContaining({ + svc: { value: 'api' }, + count: { value: 5 }, + flag: { value: true }, + }), + }), + }), + ); + + // Legend map combines builder and formulas + expect(result.legendMap).toEqual({ A: 'Legend A', F1: 'Formula Legend' }); + + const payload: QueryRangePayloadV5 = result.queryPayload; + + expect(payload.schemaVersion).toBe('v1'); + expect(payload.start).toBe(start * 1000); + expect(payload.end).toBe(end * 1000); + expect(payload.requestType).toBe('time_series'); + expect(payload.formatOptions?.formatTableResultForUI).toBe(false); + expect(payload.formatOptions?.fillGaps).toBe(true); + + // Variables mapped as { key: { value } } + expect(payload.variables).toEqual({ + svc: { value: 'api' }, + count: { value: 5 }, + flag: { value: true }, + }); + + // Queries include one builder_query and one builder_formula + expect(payload.compositeQuery.queries).toHaveLength(2); + + const builderQuery = payload.compositeQuery.queries.find( + (q) => q.type === 'builder_query', + ) as QueryEnvelope; + const builderSpec = builderQuery.spec as MetricBuilderQuery; + expect(builderSpec.name).toBe('A'); + expect(builderSpec.signal).toBe('metrics'); + expect(builderSpec.aggregations?.[0]).toMatchObject({ + metricName: 'cpu_usage', + timeAggregation: 'sum', + spaceAggregation: 'avg', + }); + // reduceTo should not be present for non-scalar panels + expect(builderSpec.aggregations?.[0].reduceTo).toBeUndefined(); + // functions should be preserved/normalized + expect(builderSpec.functions?.[0]?.name).toBe('timeShift'); + + const formulaQuery = payload.compositeQuery.queries.find( + (q) => q.type === 'builder_formula', + ) as QueryEnvelope; + const formulaSpec = formulaQuery.spec as V5QueryBuilderFormula; + expect(formulaSpec.name).toBe('F1'); + expect(formulaSpec.expression).toBe('A + 1'); + expect(formulaSpec.legend).toBe('Formula Legend'); + }); + + it('builds payload for PromQL queries and respects originalGraphType for formatting', () => { + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.PROM, + id: 'q2', + unit: undefined, + promql: [ + { + name: 'A', + query: 'up', + disabled: false, + legend: 'LP', + }, + ], + clickhouse_sql: [], + builder: { queryData: [], queryFormulas: [] }, + }, + graphType: PANEL_TYPES.TIME_SERIES, + originalGraphType: PANEL_TYPES.TABLE, + selectedTime: 'GLOBAL_TIME', + start, + end, + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: { A: 'LP' }, + queryPayload: expect.objectContaining({ + compositeQuery: expect.objectContaining({ + queries: [ + { + type: 'promql', + spec: expect.objectContaining({ + name: 'A', + query: 'up', + legend: 'LP', + stats: false, + }), + }, + ], + }), + requestType: 'time_series', + formatOptions: expect.objectContaining({ + formatTableResultForUI: true, + fillGaps: false, + }), + start: start * 1000, + end: end * 1000, + variables: {}, + }), + }), + ); + + expect(result.legendMap).toEqual({ A: 'LP' }); + + const payload: QueryRangePayloadV5 = result.queryPayload; + expect(payload.requestType).toBe('time_series'); + expect(payload.formatOptions?.formatTableResultForUI).toBe(true); + expect(payload.compositeQuery.queries).toHaveLength(1); + + const prom = payload.compositeQuery.queries[0]; + expect(prom.type).toBe('promql'); + const promSpec = prom.spec as PromQuery; + expect(promSpec.name).toBe('A'); + expect(promSpec.query).toBe('up'); + expect(promSpec.legend).toBe('LP'); + expect(promSpec.stats).toBe(false); + }); + + it('builds payload for ClickHouse queries and maps requestType from panel', () => { + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.CLICKHOUSE, + id: 'q3', + unit: undefined, + promql: [], + clickhouse_sql: [ + { + name: 'Q', + query: 'SELECT 1', + disabled: false, + legend: 'LC', + }, + ], + builder: { queryData: [], queryFormulas: [] }, + }, + graphType: PANEL_TYPES.TABLE, + selectedTime: 'GLOBAL_TIME', + start, + end, + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: { Q: 'LC' }, + queryPayload: expect.objectContaining({ + compositeQuery: expect.objectContaining({ + queries: [ + { + type: 'clickhouse_sql', + spec: expect.objectContaining({ + name: 'Q', + query: 'SELECT 1', + legend: 'LC', + }), + }, + ], + }), + requestType: 'scalar', + formatOptions: expect.objectContaining({ + formatTableResultForUI: true, + fillGaps: false, + }), + start: start * 1000, + end: end * 1000, + variables: {}, + }), + }), + ); + + expect(result.legendMap).toEqual({ Q: 'LC' }); + + const payload: QueryRangePayloadV5 = result.queryPayload; + expect(payload.requestType).toBe('scalar'); + expect(payload.compositeQuery.queries).toHaveLength(1); + const ch = payload.compositeQuery.queries[0]; + expect(ch.type).toBe('clickhouse_sql'); + const chSpec = ch.spec as ClickHouseQuery; + expect(chSpec.name).toBe('Q'); + expect(chSpec.query).toBe('SELECT 1'); + expect(chSpec.legend).toBe('LC'); + }); + + it('uses getStartEndRangeTime when start/end are not provided', () => { + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.QUERY_BUILDER, + id: 'q4', + unit: undefined, + promql: [], + clickhouse_sql: [], + builder: { queryData: [], queryFormulas: [] }, + }, + graphType: PANEL_TYPES.TIME_SERIES, + selectedTime: 'GLOBAL_TIME', + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: {}, + queryPayload: expect.objectContaining({ + compositeQuery: { queries: [] }, + requestType: 'time_series', + formatOptions: expect.objectContaining({ + formatTableResultForUI: false, + fillGaps: false, + }), + start: 100 * 1000, + end: 200 * 1000, + variables: {}, + }), + }), + ); + + const payload: QueryRangePayloadV5 = result.queryPayload; + expect(payload.start).toBe(100 * 1000); + expect(payload.end).toBe(200 * 1000); + }); + + it('includes reduceTo for metrics in scalar panels (TABLE)', () => { + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.QUERY_BUILDER, + id: 'q5', + unit: undefined, + promql: [], + clickhouse_sql: [], + builder: { + queryData: [baseBuilderQuery()], + queryFormulas: [], + }, + }, + graphType: PANEL_TYPES.TABLE, + selectedTime: 'GLOBAL_TIME', + start, + end, + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: { A: 'Legend A' }, + queryPayload: expect.objectContaining({ + compositeQuery: expect.objectContaining({ + queries: [ + { + type: 'builder_query', + spec: expect.objectContaining({ + name: 'A', + signal: 'metrics', + stepInterval: 600, + functions: [{ name: 'timeShift', args: [{ value: '5m' }] }], + aggregations: [ + expect.objectContaining({ + metricName: 'cpu_usage', + timeAggregation: 'sum', + spaceAggregation: 'avg', + reduceTo: 'avg', + temporality: undefined, + }), + ], + }), + }, + ], + }), + requestType: 'scalar', + formatOptions: expect.objectContaining({ + formatTableResultForUI: true, + fillGaps: false, + }), + start: start * 1000, + end: end * 1000, + variables: {}, + }), + }), + ); + + const payload: QueryRangePayloadV5 = result.queryPayload; + const builderQuery = payload.compositeQuery.queries.find( + (q) => q.type === 'builder_query', + ) as QueryEnvelope; + const builderSpec = builderQuery.spec as MetricBuilderQuery; + expect(builderSpec.aggregations?.[0].reduceTo).toBe('avg'); + }); + + it('omits aggregations for raw request type (LIST panel)', () => { + const logAgg: LogAggregation[] = [{ expression: 'count()' }]; + const logsQuery = baseBuilderQuery({ + dataSource: DataSource.LOGS, + aggregations: logAgg, + } as Partial); + + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.QUERY_BUILDER, + id: 'q6', + unit: undefined, + promql: [], + clickhouse_sql: [], + builder: { + queryData: [logsQuery], + queryFormulas: [], + }, + }, + graphType: PANEL_TYPES.LIST, + selectedTime: 'GLOBAL_TIME', + start, + end, + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: { A: 'Legend A' }, + queryPayload: expect.objectContaining({ + compositeQuery: expect.objectContaining({ + queries: [ + { + type: 'builder_query', + spec: expect.objectContaining({ + name: 'A', + signal: 'logs', + stepInterval: 600, + functions: [{ name: 'timeShift', args: [{ value: '5m' }] }], + aggregations: undefined, + }), + }, + ], + }), + requestType: 'raw', + formatOptions: expect.objectContaining({ + formatTableResultForUI: false, + fillGaps: false, + }), + start: start * 1000, + end: end * 1000, + variables: {}, + }), + }), + ); + + const payload: QueryRangePayloadV5 = result.queryPayload; + expect(payload.requestType).toBe('raw'); + const builderQuery = payload.compositeQuery.queries.find( + (q) => q.type === 'builder_query', + ) as QueryEnvelope; + // For RAW request type, aggregations should be omitted + const logSpec = builderQuery.spec as LogBuilderQuery; + expect(logSpec.aggregations).toBeUndefined(); + }); + + it('maps groupBy, order, having, aggregations and filter for logs builder query', () => { + const getStartEndRangeTime = jest.requireMock('lib/getStartEndRangeTime') + .default as jest.Mock; + getStartEndRangeTime.mockReturnValueOnce({ + start: '1754623641', + end: '1754645241', + }); + + const props: GetQueryResultsProps = { + query: { + queryType: EQueryType.QUERY_BUILDER, + id: 'e643e387-1996-4449-97b6-9ef4498a0573', + unit: undefined, + promql: [{ name: 'A', query: '', legend: '', disabled: false }], + clickhouse_sql: [{ name: 'A', legend: '', disabled: false, query: '' }], + builder: { + queryData: [ + { + dataSource: DataSource.LOGS, + queryName: 'A', + aggregateOperator: 'count', + aggregateAttribute: { + key: '', + dataType: DataTypes.EMPTY, + type: '', + }, + timeAggregation: 'rate', + spaceAggregation: 'sum', + filter: { expression: "service.name = 'adservice'" }, + aggregations: [ + { expression: 'count() as cnt avg(code.lineno) ' } as LogAggregation, + ], + functions: [], + filters: { + items: [ + { + id: '14c790ec-54d1-42f0-a889-3b4f0fb79852', + op: '=', + key: { id: 'service.name', key: 'service.name', type: '' }, + value: 'adservice', + }, + ], + op: 'AND', + }, + expression: 'A', + disabled: false, + stepInterval: 80, + having: { expression: 'count() > 0' }, + limit: 600, + orderBy: [{ columnName: 'service.name', order: 'desc' }], + groupBy: [ + { + key: 'service.name', + type: '', + }, + ], + legend: '{{service.name}}', + reduceTo: 'avg', + offset: 0, + pageSize: 100, + }, + ], + queryFormulas: [], + }, + }, + graphType: PANEL_TYPES.TIME_SERIES, + selectedTime: 'GLOBAL_TIME', + globalSelectedInterval: 'custom' as never, + variables: {}, + }; + + const result = prepareQueryRangePayloadV5(props); + + expect(result).toEqual( + expect.objectContaining({ + legendMap: { A: '{{service.name}}' }, + queryPayload: expect.objectContaining({ + schemaVersion: 'v1', + start: 1754623641000, + end: 1754645241000, + requestType: 'time_series', + compositeQuery: expect.objectContaining({ + queries: [ + { + type: 'builder_query', + spec: expect.objectContaining({ + name: 'A', + signal: 'logs', + stepInterval: 80, + disabled: false, + filter: { expression: "service.name = 'adservice'" }, + groupBy: [ + { + name: 'service.name', + fieldDataType: '', + fieldContext: '', + }, + ], + limit: 600, + order: [ + { + key: { name: 'service.name' }, + direction: 'desc', + }, + ], + legend: '{{service.name}}', + having: { expression: 'count() > 0' }, + aggregations: [ + { expression: 'count()', alias: 'cnt' }, + { expression: 'avg(code.lineno)' }, + ], + }), + }, + ], + }), + formatOptions: { formatTableResultForUI: false, fillGaps: false }, + variables: {}, + }), + }), + ); + }); +}); diff --git a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts index b80cf0a8dff9..f5c036a31d12 100644 --- a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts +++ b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts @@ -117,7 +117,7 @@ function createBaseSpec( )[])?.filter((c) => ('key' in c ? c?.key : c?.name)); return { - stepInterval: queryData?.stepInterval || undefined, + stepInterval: queryData?.stepInterval || null, disabled: queryData.disabled, filter: queryData?.filter?.expression ? queryData.filter : undefined, groupBy: @@ -125,8 +125,8 @@ function createBaseSpec( ? queryData.groupBy.map( (item: any): GroupByKey => ({ name: item.key, - fieldDataType: item?.dataType, - fieldContext: item?.type, + fieldDataType: item?.dataType || '', + fieldContext: item?.type || '', description: item?.description, unit: item?.unit, signal: item?.signal, @@ -203,6 +203,7 @@ function createBaseSpec( // Utility to parse aggregation expressions with optional alias export function parseAggregations( expression: string, + availableAlias?: string, ): { expression: string; alias?: string }[] { const result: { expression: string; alias?: string }[] = []; // Matches function calls like "count()" or "sum(field)" with optional alias like "as 'alias'" @@ -211,7 +212,7 @@ export function parseAggregations( let match = regex.exec(expression); while (match !== null) { const expr = match[1]; - let alias = match[2]; + let alias = match[2] || availableAlias; // Use provided alias or availableAlias if not matched if (alias) { // Remove quotes if present alias = alias.replace(/^['"]|['"]$/g, ''); @@ -262,9 +263,14 @@ export function createAggregation( } if (queryData.aggregations?.length > 0) { - return isEmpty(parseAggregations(queryData.aggregations?.[0].expression)) - ? [{ expression: 'count()' }] - : parseAggregations(queryData.aggregations?.[0].expression); + return queryData.aggregations.flatMap( + (agg: { expression: string; alias?: string }) => { + const parsedAggregations = parseAggregations(agg.expression, agg?.alias); + return isEmpty(parsedAggregations) + ? [{ expression: 'count()' }] + : parsedAggregations; + }, + ); } return [{ expression: 'count()' }]; diff --git a/frontend/src/components/CeleryTask/CeleryTaskGraph/CeleryTaskGraphUtils.ts b/frontend/src/components/CeleryTask/CeleryTaskGraph/CeleryTaskGraphUtils.ts index e13e70d6c7ee..2cae18a08070 100644 --- a/frontend/src/components/CeleryTask/CeleryTaskGraph/CeleryTaskGraphUtils.ts +++ b/frontend/src/components/CeleryTask/CeleryTaskGraph/CeleryTaskGraphUtils.ts @@ -32,8 +32,6 @@ export const celeryAllStateWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -50,8 +48,6 @@ export const celeryAllStateWidgetData = ( { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -88,7 +84,6 @@ export const celeryRetryStateWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -103,8 +98,6 @@ export const celeryRetryStateWidgetData = ( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -119,8 +112,6 @@ export const celeryRetryStateWidgetData = ( { dataType: DataTypes.String, id: 'celery.hostname--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', }, @@ -153,8 +144,6 @@ export const celeryFailedStateWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -169,8 +158,6 @@ export const celeryFailedStateWidgetData = ( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -185,8 +172,6 @@ export const celeryFailedStateWidgetData = ( { dataType: DataTypes.String, id: 'celery.hostname--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', }, @@ -219,8 +204,6 @@ export const celerySuccessStateWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -235,8 +218,6 @@ export const celerySuccessStateWidgetData = ( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -251,8 +232,6 @@ export const celerySuccessStateWidgetData = ( { dataType: DataTypes.String, id: 'celery.hostname--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', }, @@ -284,7 +263,6 @@ export const celeryTasksByWorkerWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -301,8 +279,6 @@ export const celeryTasksByWorkerWidgetData = ( { dataType: DataTypes.String, id: 'celery.hostname--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', }, @@ -338,8 +314,6 @@ export const celeryErrorByWorkerWidgetData = ( aggregateAttribute: { dataType: 'string', id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -353,8 +327,6 @@ export const celeryErrorByWorkerWidgetData = ( key: { dataType: DataTypes.bool, id: 'has_error--bool----true', - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -373,8 +345,6 @@ export const celeryErrorByWorkerWidgetData = ( groupBy: [ { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', id: 'celery.hostname--string--tag--false', @@ -390,8 +360,6 @@ export const celeryErrorByWorkerWidgetData = ( aggregateAttribute: { dataType: 'string', id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -411,8 +379,6 @@ export const celeryErrorByWorkerWidgetData = ( groupBy: [ { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', id: 'celery.hostname--string--tag--false', @@ -445,8 +411,6 @@ export const celeryLatencyByWorkerWidgetData = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -463,8 +427,6 @@ export const celeryLatencyByWorkerWidgetData = ( { dataType: DataTypes.String, id: 'celery.hostname--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.hostname', type: 'tag', }, @@ -498,8 +460,6 @@ export const celeryActiveTasksWidgetData = ( dataType: DataTypes.Float64, id: 'flower_worker_number_of_currently_executing_tasks--float64--Gauge--true', - isColumn: true, - isJSON: false, key: 'flower_worker_number_of_currently_executing_tasks', type: 'Gauge', }, @@ -516,8 +476,6 @@ export const celeryActiveTasksWidgetData = ( { dataType: DataTypes.String, id: 'worker--string--tag--false', - isColumn: false, - isJSON: false, key: 'worker', type: 'tag', }, @@ -551,8 +509,6 @@ export const celeryTaskLatencyWidgetData = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -569,8 +525,6 @@ export const celeryTaskLatencyWidgetData = ( { dataType: DataTypes.String, id: 'celery.task_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.task_name', type: 'tag', }, @@ -606,8 +560,6 @@ export const celerySlowestTasksTableWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -624,8 +576,6 @@ export const celerySlowestTasksTableWidgetData = getWidgetQueryBuilder( { dataType: DataTypes.String, id: 'celery.task_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.task_name', type: 'tag', }, @@ -660,8 +610,6 @@ export const celeryRetryTasksTableWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -676,8 +624,6 @@ export const celeryRetryTasksTableWidgetData = getWidgetQueryBuilder( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -692,8 +638,6 @@ export const celeryRetryTasksTableWidgetData = getWidgetQueryBuilder( { dataType: DataTypes.String, id: 'celery.task_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.task_name', type: 'tag', }, @@ -729,8 +673,6 @@ export const celeryFailedTasksTableWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -745,8 +687,6 @@ export const celeryFailedTasksTableWidgetData = getWidgetQueryBuilder( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -761,8 +701,6 @@ export const celeryFailedTasksTableWidgetData = getWidgetQueryBuilder( { dataType: DataTypes.String, id: 'celery.task_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.task_name', type: 'tag', }, @@ -796,8 +734,6 @@ export const celerySuccessTasksTableWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -812,8 +748,6 @@ export const celerySuccessTasksTableWidgetData = getWidgetQueryBuilder( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -828,8 +762,6 @@ export const celerySuccessTasksTableWidgetData = getWidgetQueryBuilder( { dataType: DataTypes.String, id: 'celery.task_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.task_name', type: 'tag', }, @@ -869,8 +801,6 @@ export const celeryTimeSeriesTablesWidgetData = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -885,8 +815,6 @@ export const celeryTimeSeriesTablesWidgetData = ( key: { dataType: DataTypes.String, id: `${entity}--string--tag--false`, - isColumn: false, - isJSON: false, key: `${entity}`, type: 'tag', }, @@ -901,8 +829,6 @@ export const celeryTimeSeriesTablesWidgetData = ( { dataType: DataTypes.String, id: 'celery.task_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.task_name', type: 'tag', }, @@ -933,8 +859,6 @@ export const celeryAllStateCountWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -972,8 +896,6 @@ export const celerySuccessStateCountWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -988,8 +910,6 @@ export const celerySuccessStateCountWidgetData = getWidgetQueryBuilder( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -1025,8 +945,6 @@ export const celeryFailedStateCountWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -1041,8 +959,6 @@ export const celeryFailedStateCountWidgetData = getWidgetQueryBuilder( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, @@ -1078,7 +994,6 @@ export const celeryRetryStateCountWidgetData = getWidgetQueryBuilder( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, key: 'span_id', type: '', }, @@ -1093,8 +1008,6 @@ export const celeryRetryStateCountWidgetData = getWidgetQueryBuilder( key: { dataType: DataTypes.String, id: 'celery.state--string--tag--false', - isColumn: false, - isJSON: false, key: 'celery.state', type: 'tag', }, diff --git a/frontend/src/components/CeleryTask/CeleryUtils.ts b/frontend/src/components/CeleryTask/CeleryUtils.ts index 8e3eb19acc11..41278c378e8b 100644 --- a/frontend/src/components/CeleryTask/CeleryUtils.ts +++ b/frontend/src/components/CeleryTask/CeleryUtils.ts @@ -39,8 +39,6 @@ export function getFiltersFromQueryParams( key, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, id: `${key}--string--tag--false`, }, op: '=', @@ -100,8 +98,7 @@ export const createFiltersFromData = ( key: string; dataType: DataTypes; type: string; - isColumn: boolean; - isJSON: boolean; + id: string; }; op: string; @@ -119,8 +116,6 @@ export const createFiltersFromData = ( key, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, id: `${key}--string--tag--false`, }, op: '=', diff --git a/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx b/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx index 1a6d501ff663..9cb6733c8d99 100644 --- a/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx +++ b/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx @@ -241,8 +241,6 @@ function ClientSideQBSearch( key: 'body', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'body--string----true', }, op: OPERATORS.CONTAINS, diff --git a/frontend/src/components/HostMetricsDetail/HostMetricTraces/constants.ts b/frontend/src/components/HostMetricsDetail/HostMetricTraces/constants.ts index 8e2a3d62388a..80a4d3ed2173 100644 --- a/frontend/src/components/HostMetricsDetail/HostMetricTraces/constants.ts +++ b/frontend/src/components/HostMetricsDetail/HostMetricTraces/constants.ts @@ -55,37 +55,31 @@ export const selectedColumns: BaseAutocompleteData[] = [ key: 'timestamp', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'serviceName', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'name', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'durationNano', dataType: DataTypes.Float64, type: 'tag', - isColumn: true, }, { key: 'httpMethod', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'responseStatusCode', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, ]; @@ -108,9 +102,7 @@ export const getHostTracesQueryPayload = ( id: '------false', dataType: DataTypes.EMPTY, key: '', - isColumn: false, type: '', - isJSON: false, }, timeAggregation: 'rate', spaceAggregation: 'sum', @@ -154,8 +146,6 @@ export const getHostTracesQueryPayload = ( key: 'serviceName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'serviceName--string--tag--true', isIndexed: false, }, @@ -163,8 +153,6 @@ export const getHostTracesQueryPayload = ( key: 'name', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', isIndexed: false, }, @@ -172,8 +160,6 @@ export const getHostTracesQueryPayload = ( key: 'durationNano', dataType: 'float64', type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNano--float64--tag--true', isIndexed: false, }, @@ -181,8 +167,6 @@ export const getHostTracesQueryPayload = ( key: 'httpMethod', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'httpMethod--string--tag--true', isIndexed: false, }, @@ -190,8 +174,6 @@ export const getHostTracesQueryPayload = ( key: 'responseStatusCode', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'responseStatusCode--string--tag--true', isIndexed: false, }, diff --git a/frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx b/frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx index 5e2ebe291841..a4dbb3e81a84 100644 --- a/frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx +++ b/frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx @@ -119,8 +119,6 @@ function HostMetricsDetails({ key: 'host.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'host.name--string--resource--false', }, op: '=', diff --git a/frontend/src/components/HostMetricsDetail/HostMetricsLogs/constants.ts b/frontend/src/components/HostMetricsDetail/HostMetricsLogs/constants.ts index 4acbcb567b8f..694a841993ca 100644 --- a/frontend/src/components/HostMetricsDetail/HostMetricsLogs/constants.ts +++ b/frontend/src/components/HostMetricsDetail/HostMetricsLogs/constants.ts @@ -26,9 +26,7 @@ export const getHostLogsQueryPayload = ( id: '------false', dataType: DataTypes.String, key: '', - isColumn: false, type: '', - isJSON: false, }, timeAggregation: 'rate', spaceAggregation: 'sum', diff --git a/frontend/src/components/InputWithLabel/InputWithLabel.tsx b/frontend/src/components/InputWithLabel/InputWithLabel.tsx index 6fef16100d0e..0e089acea986 100644 --- a/frontend/src/components/InputWithLabel/InputWithLabel.tsx +++ b/frontend/src/components/InputWithLabel/InputWithLabel.tsx @@ -17,7 +17,7 @@ function InputWithLabel({ closeIcon, }: { label: string; - initialValue?: string | number; + initialValue?: string | number | null; placeholder: string; type?: string; onClose?: () => void; diff --git a/frontend/src/components/LogDetail/LogDetail.interfaces.ts b/frontend/src/components/LogDetail/LogDetail.interfaces.ts index d7b14d4f03f4..9ee892a45fdd 100644 --- a/frontend/src/components/LogDetail/LogDetail.interfaces.ts +++ b/frontend/src/components/LogDetail/LogDetail.interfaces.ts @@ -10,11 +10,7 @@ import { VIEWS } from './constants'; export type LogDetailProps = { log: ILog | null; selectedTab: VIEWS; - onGroupByAttribute?: ( - fieldKey: string, - isJSON?: boolean, - dataType?: DataTypes, - ) => Promise; + onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise; isListViewPanel?: boolean; listViewPanelSelectedFields?: IField[] | null; } & Pick & diff --git a/frontend/src/components/Logs/AddToQueryHOC.tsx b/frontend/src/components/Logs/AddToQueryHOC.tsx index a41432b26839..c7ec382e801e 100644 --- a/frontend/src/components/Logs/AddToQueryHOC.tsx +++ b/frontend/src/components/Logs/AddToQueryHOC.tsx @@ -17,7 +17,7 @@ function AddToQueryHOC({ }: AddToQueryHOCProps): JSX.Element { const handleQueryAdd = (event: MouseEvent): void => { event.stopPropagation(); - onAddToQuery(fieldKey, fieldValue, OPERATORS['='], undefined, dataType); + onAddToQuery(fieldKey, fieldValue, OPERATORS['='], dataType); }; const popOverContent = useMemo(() => Add to query: {fieldKey}, [ @@ -41,7 +41,6 @@ export interface AddToQueryHOCProps { fieldKey: string, fieldValue: string, operator: string, - isJSON?: boolean, dataType?: DataTypes, ) => void; fontSize: FontSize; diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx index 6f9820ab1655..d852a4578fa7 100644 --- a/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx +++ b/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx @@ -160,7 +160,7 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({ label="Seconds" placeholder="Auto" labelAfter - initialValue={query?.stepInterval ?? undefined} + initialValue={query?.stepInterval ?? null} /> @@ -283,7 +283,7 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({ label="Seconds" placeholder="Auto" labelAfter - initialValue={query?.stepInterval ?? undefined} + initialValue={query?.stepInterval ?? null} className="histogram-every-input" /> diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx index 683f375ca497..137718428f75 100644 --- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx +++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx @@ -81,9 +81,7 @@ function QueryAggregationOptions({
+ aggregations + ?.map(({ expression, alias }: any) => + alias ? `${expression} as ${alias}` : expression, + ) + .join(' ') || '', + [], + ); + const [input, setInput] = useState( - queryData?.aggregations?.map((i: any) => i.expression).join(' ') || '', + formatAggregations(queryData?.aggregations), ); useEffect(() => { - setInput( - queryData?.aggregations?.map((i: any) => i.expression).join(' ') || '', - ); - }, [queryData?.aggregations]); + setInput(formatAggregations(queryData?.aggregations)); + }, [queryData?.aggregations, formatAggregations]); const [cursorPos, setCursorPos] = useState(0); const [functionArgPairs, setFunctionArgPairs] = useState< diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx index 6df5e647b794..d7feb3ea5b56 100644 --- a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx +++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx @@ -1292,7 +1292,7 @@ function QuerySearch({ if (onRun && typeof onRun === 'function') { onRun(query); } else { - handleRunQuery(true, true); + handleRunQuery(); } return true; }, diff --git a/frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx b/frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx index c482165dd15d..1d09df70de5a 100644 --- a/frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx +++ b/frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx @@ -133,8 +133,6 @@ function OtherFilters({ { key: filter.key, dataType: filter.dataType, - isColumn: filter.isColumn, - isJSON: filter.isJSON, type: filter.type, }, ]); diff --git a/frontend/src/components/QuickFilters/tests/constants.ts b/frontend/src/components/QuickFilters/tests/constants.ts index 9bf7a00265c1..4fb808d90c0c 100644 --- a/frontend/src/components/QuickFilters/tests/constants.ts +++ b/frontend/src/components/QuickFilters/tests/constants.ts @@ -10,8 +10,6 @@ export const QuickFiltersConfig = [ key: 'deployment.environment', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -22,8 +20,6 @@ export const QuickFiltersConfig = [ key: 'service.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, diff --git a/frontend/src/components/QuickFilters/utils.tsx b/frontend/src/components/QuickFilters/utils.tsx index 4df900e8354d..a73513f56a1a 100644 --- a/frontend/src/components/QuickFilters/utils.tsx +++ b/frontend/src/components/QuickFilters/utils.tsx @@ -53,8 +53,6 @@ export const getFilterConfig = ( key: att.key, dataType: att.dataType, type: att.type, - isColumn: att.isColumn, - isJSON: att.isJSON, }, defaultOpen: index < 2, } as IQuickFiltersConfig), diff --git a/frontend/src/constants/queryBuilder.ts b/frontend/src/constants/queryBuilder.ts index 0a94b4f074ca..64b786f47ab3 100644 --- a/frontend/src/constants/queryBuilder.ts +++ b/frontend/src/constants/queryBuilder.ts @@ -55,8 +55,8 @@ export const selectValueDivider = '__'; export const baseAutoCompleteIdKeysOrder: (keyof Omit< BaseAutocompleteData, - 'id' | 'isJSON' | 'isIndexed' ->)[] = ['key', 'dataType', 'type', 'isColumn']; + 'id' | 'isIndexed' +>)[] = ['key', 'dataType', 'type']; export const autocompleteType: Record = { resource: 'resource', @@ -150,14 +150,12 @@ export const initialHavingValues: HavingForm = { export const initialAutocompleteData: BaseAutocompleteData = { id: createIdFromObjectFields( - { dataType: null, key: '', isColumn: null, type: null }, + { dataType: null, key: '', type: null }, baseAutoCompleteIdKeysOrder, ), dataType: DataTypes.EMPTY, key: '', - isColumn: false, type: '', - isJSON: false, }; export const initialFilters: TagFilter = { @@ -189,7 +187,7 @@ export const initialQueryBuilderFormValues: IBuilderQuery = { sourceNames: alphabet, }), disabled: false, - stepInterval: undefined, + stepInterval: null, having: [], limit: null, orderBy: [], @@ -237,7 +235,7 @@ export const initialQueryBuilderFormMeterValues: IBuilderQuery = { sourceNames: alphabet, }), disabled: false, - stepInterval: undefined, + stepInterval: null, having: [], limit: null, orderBy: [], diff --git a/frontend/src/container/ApiMonitoring/APIMonitoringUtils.test.tsx b/frontend/src/container/ApiMonitoring/APIMonitoringUtils.test.tsx index 7596d272f56f..4c7a192dcf48 100644 --- a/frontend/src/container/ApiMonitoring/APIMonitoringUtils.test.tsx +++ b/frontend/src/container/ApiMonitoring/APIMonitoringUtils.test.tsx @@ -56,8 +56,6 @@ describe('API Monitoring Utils', () => { const groupBy = [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, // eslint-disable-next-line sonarjs/no-duplicate-string key: 'http.method', type: '', @@ -72,8 +70,6 @@ describe('API Monitoring Utils', () => { id: 'test-filter', key: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'test-key', type: '', }, @@ -144,8 +140,6 @@ describe('API Monitoring Utils', () => { [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'custom.field', type: '', }, @@ -180,24 +174,18 @@ describe('API Monitoring Utils', () => { id: 'group-by-1', key: 'http.method', dataType: DataTypes.String, - isColumn: true, - isJSON: false, type: '', }, { id: 'group-by-2', key: 'http.status_code', dataType: DataTypes.String, - isColumn: true, - isJSON: false, type: '', }, { id: 'group-by-3', key: 'service.name', dataType: DataTypes.String, - isColumn: false, - isJSON: false, type: 'tag', }, ]; @@ -258,8 +246,6 @@ describe('API Monitoring Utils', () => { id: 'group-by-1', key: 'http.method', dataType: DataTypes.String, - isColumn: true, - isJSON: false, type: '', }, ]; @@ -281,7 +267,6 @@ describe('API Monitoring Utils', () => { expect(knownField).toBeDefined(); if (knownField && knownField.key) { expect(knownField.key.dataType).toBe(DataTypes.String); - expect(knownField.key.isColumn).toBe(true); } // Should include the unknown field @@ -430,8 +415,6 @@ describe('API Monitoring Utils', () => { id: 'test-filter', key: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'test-key', type: '', }, @@ -543,8 +526,6 @@ describe('API Monitoring Utils', () => { id: 'test-filter', key: { dataType: 'string', - isColumn: true, - isJSON: false, key: 'test.key', type: '', }, @@ -1401,8 +1382,6 @@ describe('API Monitoring Utils', () => { id: 'custom-filter', key: { dataType: 'string', - isColumn: true, - isJSON: false, key: 'custom.key', type: '', }, diff --git a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/EndPointDetails.tsx b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/EndPointDetails.tsx index e4b1433aeb81..c2573dc9e5fb 100644 --- a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/EndPointDetails.tsx +++ b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/EndPointDetails.tsx @@ -32,8 +32,6 @@ import { SPAN_ATTRIBUTES } from './constants'; const httpUrlKey = { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.URL_PATH, type: 'tag', }; diff --git a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx index 315e89370b19..909a46558106 100644 --- a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx +++ b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx @@ -58,8 +58,6 @@ function TopErrors({ id: '92b8a1c1', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.URL_PATH, type: 'tag', }, diff --git a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx index b79725e4e8ab..69557df7c536 100644 --- a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx +++ b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx @@ -99,8 +99,6 @@ function DomainList(): JSX.Element { key: 'kind_string', dataType: 'string', type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', diff --git a/frontend/src/container/ApiMonitoring/__tests__/AllEndPoints.test.tsx b/frontend/src/container/ApiMonitoring/__tests__/AllEndPoints.test.tsx index 68d1d33ea546..69860ba4e91a 100644 --- a/frontend/src/container/ApiMonitoring/__tests__/AllEndPoints.test.tsx +++ b/frontend/src/container/ApiMonitoring/__tests__/AllEndPoints.test.tsx @@ -123,8 +123,6 @@ describe('AllEndPoints', () => { { key: 'http.status_code', dataType: 'string', - isColumn: true, - isJSON: false, type: '', }, ], diff --git a/frontend/src/container/ApiMonitoring/__tests__/EndPointDetails.test.tsx b/frontend/src/container/ApiMonitoring/__tests__/EndPointDetails.test.tsx index 8f32f2a2e758..33bf79814bfd 100644 --- a/frontend/src/container/ApiMonitoring/__tests__/EndPointDetails.test.tsx +++ b/frontend/src/container/ApiMonitoring/__tests__/EndPointDetails.test.tsx @@ -76,8 +76,6 @@ jest.mock( key: 'test.key', dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, op: '=', value: 'test-value', @@ -335,8 +333,6 @@ describe('EndPointDetails Component', () => { key: 'service.name', dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, op: '=', value: 'test-service', diff --git a/frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarCharts.test.tsx b/frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarCharts.test.tsx index b9bbf654441d..9affe5ae7e23 100644 --- a/frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarCharts.test.tsx +++ b/frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarCharts.test.tsx @@ -172,8 +172,6 @@ describe('StatusCodeBarCharts', () => { key: { dataType: 'string', id: 'response_status_code--string--tag--false', - isColumn: false, - isJSON: false, key: 'response_status_code', type: 'tag', }, @@ -185,8 +183,6 @@ describe('StatusCodeBarCharts', () => { key: { dataType: 'string', id: 'response_status_code--string--tag--false', - isColumn: false, - isJSON: false, key: 'response_status_code', type: 'tag', }, diff --git a/frontend/src/container/ApiMonitoring/utils.tsx b/frontend/src/container/ApiMonitoring/utils.tsx index 22c6ad49c64d..312530cc844b 100644 --- a/frontend/src/container/ApiMonitoring/utils.tsx +++ b/frontend/src/container/ApiMonitoring/utils.tsx @@ -43,8 +43,6 @@ export const ApiMonitoringQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'deployment.environment', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, dataSource: DataSource.TRACES, defaultOpen: true, @@ -56,8 +54,6 @@ export const ApiMonitoringQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'service.name', dataType: DataTypes.String, type: 'resource', - isColumn: true, - isJSON: false, }, dataSource: DataSource.TRACES, defaultOpen: true, @@ -69,8 +65,6 @@ export const ApiMonitoringQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'rpc.method', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, }, dataSource: DataSource.TRACES, defaultOpen: true, @@ -255,22 +249,16 @@ export const hardcodedAttributeKeys: BaseAutocompleteData[] = [ key: 'deployment.environment', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'service.name', dataType: DataTypes.String, type: 'resource', - isColumn: true, - isJSON: false, }, { key: 'rpc.method', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, }, ]; @@ -352,8 +340,6 @@ export const getDomainMetricsQueryPayload = ( aggregateOperator: 'count', aggregateAttribute: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.URL_PATH, type: 'tag', }, @@ -366,8 +352,6 @@ export const getDomainMetricsQueryPayload = ( id: '4c57937c', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -394,8 +378,6 @@ export const getDomainMetricsQueryPayload = ( aggregateOperator: 'p99', aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -408,8 +390,6 @@ export const getDomainMetricsQueryPayload = ( id: '2cf675cd', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -437,7 +417,6 @@ export const getDomainMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -450,8 +429,6 @@ export const getDomainMetricsQueryPayload = ( id: '3db0f605', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -462,8 +439,6 @@ export const getDomainMetricsQueryPayload = ( id: '6096f745', key: { dataType: DataTypes.bool, - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -491,7 +466,6 @@ export const getDomainMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: 'timestamp------false', - isColumn: false, key: 'timestamp', type: '', }, @@ -504,8 +478,6 @@ export const getDomainMetricsQueryPayload = ( id: '8ff8dea1', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -639,8 +611,6 @@ export const getEndPointsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -654,8 +624,6 @@ export const getEndPointsQueryPayload = ( id: 'ec316e57', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -668,8 +636,6 @@ export const getEndPointsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -692,8 +658,6 @@ export const getEndPointsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -707,8 +671,6 @@ export const getEndPointsQueryPayload = ( id: '46d57857', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -721,8 +683,6 @@ export const getEndPointsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -746,7 +706,6 @@ export const getEndPointsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: 'timestamp------false', - isColumn: false, key: 'timestamp', type: '', }, @@ -760,8 +719,6 @@ export const getEndPointsQueryPayload = ( id: '4a237616', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -774,8 +731,6 @@ export const getEndPointsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -798,8 +753,6 @@ export const getEndPointsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -813,8 +766,6 @@ export const getEndPointsQueryPayload = ( id: 'f162de1e', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -825,8 +776,6 @@ export const getEndPointsQueryPayload = ( id: '3df0ac1d', key: { dataType: DataTypes.bool, - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -839,8 +788,6 @@ export const getEndPointsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -919,9 +866,7 @@ export const getTopErrorsQueryPayload = ( id: '------false', dataType: DataTypes.String, key: '', - isColumn: false, type: '', - isJSON: false, }, timeAggregation: 'rate', spaceAggregation: 'sum', @@ -935,8 +880,6 @@ export const getTopErrorsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -947,8 +890,6 @@ export const getTopErrorsQueryPayload = ( key: SPAN_ATTRIBUTES.URL_PATH, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, op: 'exists', value: '', @@ -961,8 +902,6 @@ export const getTopErrorsQueryPayload = ( key: 'status_message', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: 'exists', value: '', @@ -975,8 +914,6 @@ export const getTopErrorsQueryPayload = ( key: SPAN_ATTRIBUTES.SERVER_NAME, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, op: '=', value: domainName, @@ -987,8 +924,6 @@ export const getTopErrorsQueryPayload = ( key: 'has_error', dataType: DataTypes.bool, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: true, @@ -1012,13 +947,9 @@ export const getTopErrorsQueryPayload = ( key: SPAN_ATTRIBUTES.URL_PATH, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'response_status_code', type: '', id: 'response_status_code--string----true', @@ -1027,8 +958,6 @@ export const getTopErrorsQueryPayload = ( key: 'status_message', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, ], legend: '', @@ -1404,8 +1333,6 @@ export const getTopErrorsCoRelationQueryFilters = ( key: 'http.url', dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, id: 'http.url--string--tag--false', }, op: '=', @@ -1417,8 +1344,6 @@ export const getTopErrorsCoRelationQueryFilters = ( key: 'has_error', dataType: DataTypes.bool, type: '', - isColumn: false, - isJSON: false, }, op: '=', value: 'true', @@ -1429,8 +1354,6 @@ export const getTopErrorsCoRelationQueryFilters = ( key: 'net.peer.name', dataType: DataTypes.String, type: '', - isColumn: false, - isJSON: false, }, op: '=', value: domainName, @@ -1441,8 +1364,6 @@ export const getTopErrorsCoRelationQueryFilters = ( key: 'response_status_code', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'response_status_code--string----true', }, op: '=', @@ -1551,8 +1472,6 @@ export const getEndPointDetailsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -1566,8 +1485,6 @@ export const getEndPointDetailsQueryPayload = ( id: '874562e1', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1580,8 +1497,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1605,8 +1520,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -1620,8 +1533,6 @@ export const getEndPointDetailsQueryPayload = ( id: '0c5564e0', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1634,8 +1545,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1659,8 +1568,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -1674,8 +1581,6 @@ export const getEndPointDetailsQueryPayload = ( id: '0d656701', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1686,8 +1591,6 @@ export const getEndPointDetailsQueryPayload = ( id: '83ef9a1b', key: { dataType: DataTypes.bool, - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -1700,8 +1603,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1726,7 +1627,6 @@ export const getEndPointDetailsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: 'timestamp------false', - isColumn: false, key: 'timestamp', type: '', }, @@ -1740,8 +1640,6 @@ export const getEndPointDetailsQueryPayload = ( id: '918f5b99', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1754,8 +1652,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1779,8 +1675,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -1794,8 +1688,6 @@ export const getEndPointDetailsQueryPayload = ( id: 'b355d1aa', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1808,8 +1700,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1874,8 +1764,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -1889,8 +1777,6 @@ export const getEndPointDetailsQueryPayload = ( id: '23450eb8', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1903,8 +1789,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1917,8 +1801,6 @@ export const getEndPointDetailsQueryPayload = ( groupBy: [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'response_status_code', type: '', }, @@ -1936,8 +1818,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -1951,8 +1831,6 @@ export const getEndPointDetailsQueryPayload = ( id: '2687dc18', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -1965,8 +1843,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -1979,8 +1855,6 @@ export const getEndPointDetailsQueryPayload = ( groupBy: [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'response_status_code', type: '', }, @@ -2002,7 +1876,6 @@ export const getEndPointDetailsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -2016,8 +1889,6 @@ export const getEndPointDetailsQueryPayload = ( key: { dataType: DataTypes.String, id: 'net.peer.name--string--tag--false', - isColumn: false, - isJSON: false, key: 'net.peer.name', type: 'tag', }, @@ -2030,8 +1901,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2049,8 +1918,6 @@ export const getEndPointDetailsQueryPayload = ( groupBy: [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'response_status_code', type: '', id: 'response_status_code--string----true', @@ -2100,7 +1967,6 @@ export const getEndPointDetailsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, key: '', - isColumn: false, type: '', }, timeAggregation: 'count', @@ -2114,8 +1980,6 @@ export const getEndPointDetailsQueryPayload = ( key: SPAN_ATTRIBUTES.SERVER_NAME, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, op: '=', value: domainName, @@ -2126,8 +1990,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2148,8 +2010,6 @@ export const getEndPointDetailsQueryPayload = ( key: SPAN_ATTRIBUTES.URL_PATH, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, ], reduceTo: 'avg', @@ -2191,8 +2051,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -2206,8 +2064,6 @@ export const getEndPointDetailsQueryPayload = ( id: 'b78ff216', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -2220,8 +2076,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2235,8 +2089,6 @@ export const getEndPointDetailsQueryPayload = ( { dataType: DataTypes.String, id: 'service.name--string--resource--true', - isColumn: true, - isJSON: false, key: 'service.name', type: 'resource', }, @@ -2254,8 +2106,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -2269,8 +2119,6 @@ export const getEndPointDetailsQueryPayload = ( id: 'a9024472', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -2283,8 +2131,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2298,8 +2144,6 @@ export const getEndPointDetailsQueryPayload = ( { dataType: DataTypes.String, id: 'service.name--string--resource--true', - isColumn: true, - isJSON: false, key: 'service.name', type: 'resource', }, @@ -2318,7 +2162,6 @@ export const getEndPointDetailsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -2332,8 +2175,6 @@ export const getEndPointDetailsQueryPayload = ( id: '1b6c062d', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -2346,8 +2187,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2361,8 +2200,6 @@ export const getEndPointDetailsQueryPayload = ( { dataType: DataTypes.String, id: 'service.name--string--resource--true', - isColumn: true, - isJSON: false, key: 'service.name', type: 'resource', }, @@ -2380,8 +2217,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -2395,8 +2230,6 @@ export const getEndPointDetailsQueryPayload = ( id: 'd14792a8', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -2406,9 +2239,6 @@ export const getEndPointDetailsQueryPayload = ( { id: '3212bf1a', key: { - dataType: DataTypes.bool, - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -2421,8 +2251,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2436,8 +2264,6 @@ export const getEndPointDetailsQueryPayload = ( { dataType: DataTypes.String, id: 'service.name--string--resource--true', - isColumn: true, - isJSON: false, key: 'service.name', type: 'resource', }, @@ -2497,7 +2323,6 @@ export const getEndPointDetailsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -2511,8 +2336,6 @@ export const getEndPointDetailsQueryPayload = ( id: 'c6724407', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -2525,8 +2348,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2539,8 +2360,6 @@ export const getEndPointDetailsQueryPayload = ( groupBy: [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'response_status_code', type: '', }, @@ -2592,8 +2411,6 @@ export const getEndPointDetailsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -2607,8 +2424,6 @@ export const getEndPointDetailsQueryPayload = ( id: 'aae93366', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -2621,8 +2436,6 @@ export const getEndPointDetailsQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2635,8 +2448,6 @@ export const getEndPointDetailsQueryPayload = ( groupBy: [ { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'response_status_code', type: '', }, @@ -2699,7 +2510,6 @@ export const getEndPointZeroStateQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, key: '', - isColumn: false, type: '', }, timeAggregation: 'count', @@ -2713,8 +2523,6 @@ export const getEndPointZeroStateQueryPayload = ( key: SPAN_ATTRIBUTES.SERVER_NAME, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, op: '=', value: domainName, @@ -2725,8 +2533,6 @@ export const getEndPointZeroStateQueryPayload = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -2746,8 +2552,6 @@ export const getEndPointZeroStateQueryPayload = ( key: SPAN_ATTRIBUTES.URL_PATH, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, }, ], reduceTo: 'avg', @@ -3280,7 +3084,6 @@ export const getStatusCodeBarChartWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -3294,8 +3097,6 @@ export const getStatusCodeBarChartWidgetData = ( id: 'c6724407', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -3308,8 +3109,6 @@ export const getStatusCodeBarChartWidgetData = ( id: '8b1be6f0', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.URL_PATH, type: 'tag', }, @@ -3427,8 +3226,6 @@ export const getAllEndpointsWidgetData = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -3442,8 +3239,6 @@ export const getAllEndpointsWidgetData = ( id: 'ec316e57', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -3456,8 +3251,6 @@ export const getAllEndpointsWidgetData = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -3483,8 +3276,6 @@ export const getAllEndpointsWidgetData = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -3498,8 +3289,6 @@ export const getAllEndpointsWidgetData = ( id: '46d57857', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -3512,8 +3301,6 @@ export const getAllEndpointsWidgetData = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -3540,7 +3327,6 @@ export const getAllEndpointsWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: 'timestamp------false', - isColumn: false, key: 'timestamp', type: '', }, @@ -3554,8 +3340,6 @@ export const getAllEndpointsWidgetData = ( id: '4a237616', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -3568,8 +3352,6 @@ export const getAllEndpointsWidgetData = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -3595,8 +3377,6 @@ export const getAllEndpointsWidgetData = ( { aggregateAttribute: { dataType: DataTypes.String, - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -3610,8 +3390,6 @@ export const getAllEndpointsWidgetData = ( id: 'f162de1e', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -3622,13 +3400,11 @@ export const getAllEndpointsWidgetData = ( id: '3df0ac1d', key: { dataType: DataTypes.bool, - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, op: '=', - value: 'true', + value: true, }, { id: '212678b9', @@ -3636,8 +3412,6 @@ export const getAllEndpointsWidgetData = ( key: 'kind_string', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, }, op: '=', value: 'Client', @@ -3773,8 +3547,6 @@ export const getGroupByFiltersFromGroupByValues = ( id: groupByAttribute?.id || v4(), key: { dataType: groupByAttribute?.dataType || DataTypes.String, - isColumn: groupByAttribute?.isColumn || true, - isJSON: groupByAttribute?.isJSON || false, key: groupByAttribute?.key || key, type: groupByAttribute?.type || '', }, @@ -3810,7 +3582,6 @@ export const getRateOverTimeWidgetData = ( aggregateAttribute: { dataType: DataTypes.String, id: '------false', - isColumn: false, key: '', type: '', }, @@ -3824,8 +3595,6 @@ export const getRateOverTimeWidgetData = ( id: '3c76fe0b', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -3874,8 +3643,6 @@ export const getLatencyOverTimeWidgetData = ( { aggregateAttribute: { dataType: DataTypes.Float64, - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -3889,8 +3656,6 @@ export const getLatencyOverTimeWidgetData = ( id: '63adb3ff', key: { dataType: DataTypes.String, - isColumn: false, - isJSON: false, key: SPAN_ATTRIBUTES.SERVER_NAME, type: 'tag', }, @@ -4000,8 +3765,6 @@ export const getCustomFiltersForBarChart = ( key: { dataType: DataTypes.String, id: 'response_status_code--string--tag--false', - isColumn: false, - isJSON: false, key: 'response_status_code', type: 'tag', }, @@ -4013,8 +3776,6 @@ export const getCustomFiltersForBarChart = ( key: { dataType: DataTypes.String, id: 'response_status_code--string--tag--false', - isColumn: false, - isJSON: false, key: 'response_status_code', type: 'tag', }, diff --git a/frontend/src/container/ExplorerOrderBy/index.tsx b/frontend/src/container/ExplorerOrderBy/index.tsx index fb962233f1db..82f65fed7539 100644 --- a/frontend/src/container/ExplorerOrderBy/index.tsx +++ b/frontend/src/container/ExplorerOrderBy/index.tsx @@ -34,7 +34,7 @@ function ExplorerOrderBy({ query, onChange }: OrderByFilterProps): JSX.Element { const keysOptions = createOptions(data?.payload?.attributeKeys || []); const customOptions = createOptions([ - { key: 'timestamp', isColumn: true, type: '', dataType: DataTypes.EMPTY }, + { key: 'timestamp', type: '', dataType: DataTypes.EMPTY }, ]); const baseOptions = [ diff --git a/frontend/src/container/FormAlertRules/ChartPreview/index.tsx b/frontend/src/container/FormAlertRules/ChartPreview/index.tsx index 9be72e44e663..c6a4a7be6e50 100644 --- a/frontend/src/container/FormAlertRules/ChartPreview/index.tsx +++ b/frontend/src/container/FormAlertRules/ChartPreview/index.tsx @@ -142,7 +142,6 @@ function ChartPreview({ return false; } }, [query]); - const queryResponse = useGetQueryRange( { query: query || initialQueriesMap.metrics, diff --git a/frontend/src/container/FormAlertRules/index.tsx b/frontend/src/container/FormAlertRules/index.tsx index c6952c32950b..fa2969375984 100644 --- a/frontend/src/container/FormAlertRules/index.tsx +++ b/frontend/src/container/FormAlertRules/index.tsx @@ -864,7 +864,7 @@ function FormAlertRules({ queryCategory={currentQuery.queryType} setQueryCategory={onQueryCategoryChange} alertType={alertType || AlertTypes.METRICS_BASED_ALERT} - runQuery={(): void => handleRunQuery(true, true)} + runQuery={(): void => handleRunQuery()} alertDef={alertDef} panelType={panelType || PANEL_TYPES.TIME_SERIES} key={currentQuery.queryType} diff --git a/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.test.tsx b/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.test.tsx index e81208854520..ea94d567208c 100644 --- a/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.test.tsx +++ b/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.test.tsx @@ -65,8 +65,6 @@ const mockProps: WidgetGraphComponentProps = { aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, diff --git a/frontend/src/container/GridCardLayout/__tests__/utils.test.ts b/frontend/src/container/GridCardLayout/__tests__/utils.test.ts index 37f910811847..67ba61c260d9 100644 --- a/frontend/src/container/GridCardLayout/__tests__/utils.test.ts +++ b/frontend/src/container/GridCardLayout/__tests__/utils.test.ts @@ -2,16 +2,16 @@ import { Query } from 'types/api/queryBuilder/queryBuilderData'; import { EQueryType } from 'types/common/dashboard'; import { DataSource } from 'types/common/queryBuilder'; -import { getStepIntervalPoints, updateStepInterval } from '../utils'; +import { getBarStepIntervalPoints, updateBarStepInterval } from '../utils'; describe('GridCardLayout Utils', () => { - describe('getStepIntervalPoints', () => { + describe('getBarStepIntervalPoints', () => { it('should return 60 points for duration <= 1 hour', () => { // 30 minutes in milliseconds const start = Date.now(); const end = start + 30 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(60); + expect(getBarStepIntervalPoints(start, end)).toBe(60); }); it('should return 60 points for exactly 1 hour', () => { @@ -19,7 +19,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 60 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(60); + expect(getBarStepIntervalPoints(start, end)).toBe(60); }); it('should return 120 points for duration <= 3 hours', () => { @@ -27,7 +27,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 2 * 60 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(120); + expect(getBarStepIntervalPoints(start, end)).toBe(120); }); it('should return 120 points for exactly 3 hours', () => { @@ -35,7 +35,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 3 * 60 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(120); + expect(getBarStepIntervalPoints(start, end)).toBe(120); }); it('should return 180 points for duration <= 5 hours', () => { @@ -43,7 +43,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 4 * 60 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(180); + expect(getBarStepIntervalPoints(start, end)).toBe(180); }); it('should return 180 points for exactly 5 hours', () => { @@ -51,7 +51,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 5 * 60 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(180); + expect(getBarStepIntervalPoints(start, end)).toBe(180); }); it('should calculate dynamic interval for duration > 5 hours', () => { @@ -59,7 +59,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 10 * 60 * 60 * 1000; - const result = getStepIntervalPoints(start, end); + const result = getBarStepIntervalPoints(start, end); // For 10 hours (600 minutes), interval should be ceil(600/80) = 8, rounded to 10, then * 60 = 600 expect(result).toBe(600); @@ -70,7 +70,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 7 * 24 * 60 * 60 * 1000; - const result = getStepIntervalPoints(start, end); + const result = getBarStepIntervalPoints(start, end); // For 7 days (10080 minutes), interval should be ceil(10080/80) = 126, rounded to 130, then * 60 = 7800 expect(result).toBe(7800); @@ -81,7 +81,7 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 12 * 60 * 60 * 1000; - const result = getStepIntervalPoints(start, end); + const result = getBarStepIntervalPoints(start, end); // For 12 hours (720 minutes), interval should be ceil(720/80) = 9, rounded to 10, then * 60 = 600 expect(result).toBe(600); @@ -92,24 +92,24 @@ describe('GridCardLayout Utils', () => { const start = Date.now(); const end = start + 1 * 60 * 1000; - expect(getStepIntervalPoints(start, end)).toBe(60); + expect(getBarStepIntervalPoints(start, end)).toBe(60); }); it('should handle zero duration', () => { const start = Date.now(); const end = start; - expect(getStepIntervalPoints(start, end)).toBe(60); + expect(getBarStepIntervalPoints(start, end)).toBe(60); }); }); - describe('updateStepInterval', () => { + describe('updateBarStepInterval', () => { const mockQuery: Query = { queryType: EQueryType.QUERY_BUILDER, builder: { queryData: [ { - stepInterval: 60, + stepInterval: null, aggregateOperator: 'avg', dataSource: DataSource.METRICS, queryName: 'A', @@ -142,7 +142,7 @@ describe('GridCardLayout Utils', () => { const minTime = Date.now(); const maxTime = minTime + 2 * 60 * 60 * 1000; - const result = updateStepInterval(mockQuery, minTime, maxTime); + const result = updateBarStepInterval(mockQuery, minTime, maxTime); expect(result.builder.queryData[0].stepInterval).toBe(120); }); @@ -151,7 +151,7 @@ describe('GridCardLayout Utils', () => { const minTime = Date.now(); const maxTime = minTime + 1 * 60 * 60 * 1000; - const result = updateStepInterval(mockQuery, minTime, maxTime); + const result = updateBarStepInterval(mockQuery, minTime, maxTime); expect(result.builder.queryData[0].aggregateOperator).toBe('avg'); expect(result.builder.queryData[0].queryName).toBe('A'); @@ -177,7 +177,7 @@ describe('GridCardLayout Utils', () => { const minTime = Date.now(); const maxTime = minTime + 4 * 60 * 60 * 1000; - const result = updateStepInterval(multiQueryMock, minTime, maxTime); + const result = updateBarStepInterval(multiQueryMock, minTime, maxTime); expect(result.builder.queryData).toHaveLength(2); expect(result.builder.queryData[0].stepInterval).toBe(180); @@ -201,7 +201,11 @@ describe('GridCardLayout Utils', () => { const minTime = Date.now(); const maxTime = minTime + 1 * 60 * 60 * 1000; - const result = updateStepInterval(queryWithUndefinedStep, minTime, maxTime); + const result = updateBarStepInterval( + queryWithUndefinedStep, + minTime, + maxTime, + ); expect(result.builder.queryData[0].stepInterval).toBe(60); }); @@ -210,7 +214,7 @@ describe('GridCardLayout Utils', () => { const minTime = Date.now(); const maxTime = minTime; // Same time = 0 duration - const result = updateStepInterval(mockQuery, minTime, maxTime); + const result = updateBarStepInterval(mockQuery, minTime, maxTime); expect(result.builder.queryData[0].stepInterval).toBe(60); }); @@ -219,10 +223,66 @@ describe('GridCardLayout Utils', () => { const minTime = Date.now(); const maxTime = minTime + 30 * 24 * 60 * 60 * 1000; // 30 days - const result = updateStepInterval(mockQuery, minTime, maxTime); + const result = updateBarStepInterval(mockQuery, minTime, maxTime); // Should calculate appropriate interval for 30 days expect(result.builder.queryData[0].stepInterval).toBeGreaterThan(180); }); + + it('should handle stepInterval as 0', () => { + const queryWithZeroStep: Query = { + ...mockQuery, + builder: { + queryData: [ + { + ...mockQuery.builder.queryData[0], + stepInterval: 0, + }, + ], + queryFormulas: [], + }, + }; + + const minTime = Date.now(); + let maxTime = minTime + 1 * 60 * 60 * 1000; + + const result = updateBarStepInterval(queryWithZeroStep, minTime, maxTime); + + expect(result.builder.queryData[0].stepInterval).toBe(60); + + maxTime = minTime + 30 * 24 * 60 * 60 * 1000; // 30 days + + const result1 = updateBarStepInterval(queryWithZeroStep, minTime, maxTime); + + expect(result1.builder.queryData[0].stepInterval).toBe(32400); + }); + + it('should respect user entered inputs', () => { + const queryWithUserStep: Query = { + ...mockQuery, + builder: { + queryData: [ + { + ...mockQuery.builder.queryData[0], + stepInterval: 120, + }, + ], + queryFormulas: [], + }, + }; + + const minTime = Date.now(); + let maxTime = minTime + 1 * 60 * 60 * 1000; + + const result = updateBarStepInterval(queryWithUserStep, minTime, maxTime); + + expect(result.builder.queryData[0].stepInterval).toBe(120); // not 60 + + maxTime = minTime + 30 * 24 * 60 * 60 * 1000; // 30 days + + const result1 = updateBarStepInterval(queryWithUserStep, minTime, maxTime); + + expect(result1.builder.queryData[0].stepInterval).toBe(120); // not 32400 + }); }); }); diff --git a/frontend/src/container/GridCardLayout/useResolveQuery.ts b/frontend/src/container/GridCardLayout/useResolveQuery.ts index bf2529ab4304..9f373d3154a8 100644 --- a/frontend/src/container/GridCardLayout/useResolveQuery.ts +++ b/frontend/src/container/GridCardLayout/useResolveQuery.ts @@ -53,10 +53,7 @@ function useUpdatedQuery(): UseUpdatedQueryResult { const queryResult = await queryRangeMutation.mutateAsync(queryPayload); // Map query data from API response - return mapQueryDataFromApi( - queryResult.data.compositeQuery, - widgetConfig?.query, - ); + return mapQueryDataFromApi(queryResult.data.compositeQuery); }, [globalSelectedInterval, queryRangeMutation], ); diff --git a/frontend/src/container/GridCardLayout/utils.ts b/frontend/src/container/GridCardLayout/utils.ts index c06f2cc91d5a..6c8bb7ffc336 100644 --- a/frontend/src/container/GridCardLayout/utils.ts +++ b/frontend/src/container/GridCardLayout/utils.ts @@ -57,6 +57,8 @@ export const hasColumnWidthsChanged = ( * Calculates the step interval in uPlot points (1 minute = 60 points) * based on the time duration between two timestamps in nanoseconds. * + * NOTE: This function is specifically designed for BAR visualization panels only. + * * Conversion logic: * - <= 1 hr → 1 min (60 points) * - <= 3 hr → 2 min (120 points) @@ -67,7 +69,7 @@ export const hasColumnWidthsChanged = ( * @param endNano - end time in nanoseconds * @returns stepInterval in uPlot points */ -export function getStepIntervalPoints( +export function getBarStepIntervalPoints( startNano: number, endNano: number, ): number { @@ -92,18 +94,18 @@ export function getStepIntervalPoints( return roundedInterval * 60; // convert min to points } -export function updateStepInterval( +export function updateBarStepInterval( query: Query, minTime: number, maxTime: number, ): Query { - const stepIntervalPoints = getStepIntervalPoints(minTime, maxTime); + const stepIntervalPoints = getBarStepIntervalPoints(minTime, maxTime); // if user haven't enter anything manually, that is we have default value of 60 then do the interval adjustment for bar otherwise apply the user's value - const getSteps = (queryData: IBuilderQuery): number => - queryData?.stepInterval === 60 - ? stepIntervalPoints || 60 - : queryData?.stepInterval || 60; + const getBarSteps = (queryData: IBuilderQuery): number | null => + !queryData.stepInterval + ? stepIntervalPoints || null + : queryData?.stepInterval; return { ...query, @@ -112,7 +114,7 @@ export function updateStepInterval( queryData: [ ...(query?.builder?.queryData ?? []).map((queryData) => ({ ...queryData, - stepInterval: getSteps(queryData), + stepInterval: getBarSteps(queryData), })), ], }, diff --git a/frontend/src/container/GridTableComponent/__tests__/response.ts b/frontend/src/container/GridTableComponent/__tests__/response.ts index 789727270b66..c19a25917494 100644 --- a/frontend/src/container/GridTableComponent/__tests__/response.ts +++ b/frontend/src/container/GridTableComponent/__tests__/response.ts @@ -105,8 +105,6 @@ export const widgetQueryWithLegend = { aggregateAttribute: { dataType: 'float64', id: 'signoz_latency--float64--ExponentialHistogram--true', - isColumn: true, - isJSON: false, key: 'signoz_latency', type: 'ExponentialHistogram', }, @@ -126,8 +124,6 @@ export const widgetQueryWithLegend = { groupBy: [ { dataType: 'string', - isColumn: false, - isJSON: false, key: 'service_name', type: 'tag', id: 'service_name--string--tag--false', @@ -143,8 +139,6 @@ export const widgetQueryWithLegend = { aggregateAttribute: { dataType: 'float64', id: 'system_disk_operations--float64--Sum--true', - isColumn: true, - isJSON: false, key: 'system_disk_operations', type: 'Sum', }, diff --git a/frontend/src/container/Home/Services/ServiceMetrics.tsx b/frontend/src/container/Home/Services/ServiceMetrics.tsx index 6abbf2d04695..7dfd6f7571c5 100644 --- a/frontend/src/container/Home/Services/ServiceMetrics.tsx +++ b/frontend/src/container/Home/Services/ServiceMetrics.tsx @@ -220,18 +220,10 @@ function ServiceMetrics({ () => getQueryRangeRequestData({ topLevelOperations, - minTime: timeRange.startTime * 1e6, - maxTime: timeRange.endTime * 1e6, globalSelectedInterval, dotMetricsEnabled, }), - [ - globalSelectedInterval, - timeRange.endTime, - timeRange.startTime, - topLevelOperations, - dotMetricsEnabled, - ], + [globalSelectedInterval, topLevelOperations, dotMetricsEnabled], ); const dataQueries = useGetQueriesRange( diff --git a/frontend/src/container/InfraMonitoringHosts/utils.tsx b/frontend/src/container/InfraMonitoringHosts/utils.tsx index 6f39f25af8f8..786eab89a38d 100644 --- a/frontend/src/container/InfraMonitoringHosts/utils.tsx +++ b/frontend/src/container/InfraMonitoringHosts/utils.tsx @@ -182,8 +182,6 @@ export const HostsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'host_name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: 'system_cpu_load_average_15m', @@ -197,8 +195,6 @@ export const HostsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'os_type', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: 'system_cpu_load_average_15m', @@ -230,8 +226,6 @@ export function GetHostsQuickFiltersConfig( key: hostNameKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: metricName, @@ -245,8 +239,6 @@ export function GetHostsQuickFiltersConfig( key: osTypeKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: metricName, @@ -260,8 +252,6 @@ export function GetHostsQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, diff --git a/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx b/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx index a73e9cc0fd8a..ca0807698536 100644 --- a/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx @@ -122,8 +122,6 @@ function ClusterDetails({ key: QUERY_KEYS.K8S_CLUSTER_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_cluster_name--string--resource--false', }, op: '=', @@ -150,8 +148,6 @@ function ClusterDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -163,8 +159,6 @@ function ClusterDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts index 58949d50811c..647bec7e4b7f 100644 --- a/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts @@ -147,8 +147,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -163,8 +161,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -190,8 +186,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -206,8 +200,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -233,8 +225,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -249,8 +239,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -276,8 +264,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_cpu--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeAllocatableCpuKey, type: 'Gauge', }, @@ -292,8 +278,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -352,8 +336,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -368,8 +350,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -395,8 +375,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -411,8 +389,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -438,8 +414,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -454,8 +428,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -481,8 +453,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_memory--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeAllocatableMemoryKey, type: 'Gauge', }, @@ -497,8 +467,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -557,8 +525,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_condition_ready--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeConditionReadyKey, type: 'Gauge', }, @@ -573,8 +539,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -589,8 +553,6 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -648,8 +610,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_condition_ready--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeConditionReadyKey, type: 'Gauge', }, @@ -664,8 +624,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -680,8 +638,6 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -739,8 +695,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_deployment_available--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sDeploymentAvailableKey, type: 'Gauge', }, @@ -755,8 +709,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -771,16 +723,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_deployment_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -799,8 +747,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_deployment_desired--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sDeploymentDesiredKey, type: 'Gauge', }, @@ -815,8 +761,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -831,16 +775,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_deployment_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -904,8 +844,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_statefulset_current_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sStatefulsetCurrentPodsKey, type: 'Gauge', }, @@ -920,8 +858,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -936,16 +872,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_statefulset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -964,8 +896,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_statefulset_desired_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sStatefulsetDesiredPodsKey, type: 'Gauge', }, @@ -980,8 +910,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -996,16 +924,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_statefulset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1024,8 +948,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_statefulset_ready_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sStatefulsetReadyPodsKey, type: 'Gauge', }, @@ -1040,8 +962,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1056,16 +976,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_statefulset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1084,8 +1000,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_statefulset_updated_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sStatefulsetUpdatedPodsKey, type: 'Gauge', }, @@ -1100,8 +1014,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1116,16 +1028,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_statefulset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1213,8 +1121,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_daemonset_current_scheduled_nodes--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sDaemonsetCurrentScheduledNodesKey, type: 'Gauge', }, @@ -1229,8 +1135,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1245,8 +1149,6 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1265,8 +1167,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_daemonset_desired_scheduled_nodes--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sDaemonsetDesiredScheduledNodesKey, type: 'Gauge', }, @@ -1281,8 +1181,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1297,8 +1195,6 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1317,8 +1213,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_daemonset_ready_nodes--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sDaemonsetReadyNodesKey, type: 'Gauge', }, @@ -1333,8 +1227,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1349,8 +1241,6 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1426,8 +1316,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_job_active_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sJobActivePodsKey, type: 'Gauge', }, @@ -1442,8 +1330,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1458,16 +1344,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1486,8 +1368,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_job_successful_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sJobSuccessfulPodsKey, type: 'Gauge', }, @@ -1502,8 +1382,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1518,16 +1396,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1546,8 +1420,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_job_failed_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sJobFailedPodsKey, type: 'Gauge', }, @@ -1562,8 +1434,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1578,16 +1448,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1606,8 +1472,6 @@ export const getClusterMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_job_desired_successful_pods--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sJobDesiredSuccessfulPodsKey, type: 'Gauge', }, @@ -1622,8 +1486,6 @@ export const getClusterMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -1638,16 +1500,12 @@ export const getClusterMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx b/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx index b7930891b4f5..806852d13dae 100644 --- a/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx @@ -121,8 +121,6 @@ function DaemonSetDetails({ key: QUERY_KEYS.K8S_DAEMON_SET_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_daemonSet_name--string--resource--false', }, op: '=', @@ -134,8 +132,6 @@ function DaemonSetDetails({ key: QUERY_KEYS.K8S_NAMESPACE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_daemonSet_name--string--resource--false', }, op: '=', @@ -166,8 +162,6 @@ function DaemonSetDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -179,8 +173,6 @@ function DaemonSetDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts index 53ac8bb76c06..39ccdd849ee8 100644 --- a/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts @@ -85,8 +85,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -101,8 +99,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonSetNameKey, type: 'tag', }, @@ -114,8 +110,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -141,8 +135,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -157,8 +149,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -170,8 +160,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -197,8 +185,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuLimitKey, type: 'Gauge', }, @@ -213,8 +199,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -226,8 +210,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -286,8 +268,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -302,8 +282,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonSetNameKey, type: 'tag', }, @@ -315,8 +293,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -342,8 +318,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryRequestKey, type: 'Gauge', }, @@ -358,8 +332,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -371,8 +343,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -398,8 +368,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryLimitKey, type: 'Gauge', }, @@ -414,8 +382,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -427,8 +393,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -487,8 +451,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkIoKey, type: 'Sum', }, @@ -503,8 +465,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonSetNameKey, type: 'tag', }, @@ -516,8 +476,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -532,16 +490,12 @@ export const getDaemonSetMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, @@ -593,8 +547,6 @@ export const getDaemonSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_errors--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkErrorsKey, type: 'Sum', }, @@ -609,8 +561,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_daemonset_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDaemonSetNameKey, type: 'tag', }, @@ -622,8 +572,6 @@ export const getDaemonSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -638,16 +586,12 @@ export const getDaemonSetMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx b/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx index 45c83519b88b..a0a497480433 100644 --- a/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx @@ -125,8 +125,6 @@ function DeploymentDetails({ key: QUERY_KEYS.K8S_DEPLOYMENT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_deployment_name--string--resource--false', }, op: '=', @@ -138,8 +136,6 @@ function DeploymentDetails({ key: QUERY_KEYS.K8S_NAMESPACE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_deployment_name--string--resource--false', }, op: '=', @@ -170,8 +166,6 @@ function DeploymentDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -183,8 +177,6 @@ function DeploymentDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts index 4600d8e11327..2212b9ccd3c3 100644 --- a/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts @@ -81,8 +81,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -97,8 +95,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_deployment_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, @@ -124,8 +120,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -140,8 +134,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -167,8 +159,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuLimitKey, type: 'Gauge', }, @@ -183,8 +173,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -243,8 +231,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -259,8 +245,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_deployment_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, @@ -286,8 +270,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryRequestKey, type: 'Gauge', }, @@ -302,8 +284,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -329,8 +309,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryLimitKey, type: 'Gauge', }, @@ -345,8 +323,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -405,8 +381,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkIoKey, type: 'Sum', }, @@ -421,8 +395,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_deployment_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, @@ -437,16 +409,12 @@ export const getDeploymentMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, @@ -498,8 +466,6 @@ export const getDeploymentMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_errors--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkErrorsKey, type: 'Sum', }, @@ -514,8 +480,6 @@ export const getDeploymentMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_deployment_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, @@ -530,16 +494,12 @@ export const getDeploymentMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx b/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx index 058105fc3ea9..bda94ab5d724 100644 --- a/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx +++ b/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx @@ -93,10 +93,8 @@ const mockFilters: IBuilderQuery['filters'] = { key: { id: 'pod-name', dataType: DataTypes.String, - isColumn: true, key: 'pod-name', type: 'tag', - isJSON: false, isIndexed: false, }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.test.tsx b/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.test.tsx index c553ce799111..40977f9ea253 100644 --- a/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.test.tsx +++ b/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.test.tsx @@ -99,10 +99,8 @@ const mockTracesFilters: IBuilderQuery['filters'] = { key: { id: 'service-name', dataType: DataTypes.String, - isColumn: true, key: 'service.name', type: 'tag', - isJSON: false, isIndexed: false, }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/utils.tsx b/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/utils.tsx index c7c25ee14441..3b82925f009e 100644 --- a/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/utils.tsx +++ b/frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/utils.tsx @@ -54,9 +54,7 @@ export const getEntityEventsOrLogsQueryPayload = ( id: '------false', dataType: DataTypes.String, key: '', - isColumn: false, type: '', - isJSON: false, }, timeAggregation: 'rate', spaceAggregation: 'sum', @@ -158,37 +156,31 @@ export const selectedEntityTracesColumns: BaseAutocompleteData[] = [ key: 'timestamp', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'serviceName', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'name', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'durationNano', dataType: DataTypes.Float64, type: 'tag', - isColumn: true, }, { key: 'httpMethod', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, { key: 'responseStatusCode', dataType: DataTypes.String, type: 'tag', - isColumn: true, }, ]; @@ -211,9 +203,7 @@ export const getEntityTracesQueryPayload = ( id: '------false', dataType: DataTypes.EMPTY, key: '', - isColumn: false, type: '', - isJSON: false, }, timeAggregation: 'rate', spaceAggregation: 'sum', @@ -257,8 +247,6 @@ export const getEntityTracesQueryPayload = ( key: 'serviceName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'serviceName--string--tag--true', isIndexed: false, }, @@ -266,8 +254,6 @@ export const getEntityTracesQueryPayload = ( key: 'name', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', isIndexed: false, }, @@ -275,8 +261,6 @@ export const getEntityTracesQueryPayload = ( key: 'durationNano', dataType: 'float64', type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNano--float64--tag--true', isIndexed: false, }, @@ -284,8 +268,6 @@ export const getEntityTracesQueryPayload = ( key: 'httpMethod', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'httpMethod--string--tag--true', isIndexed: false, }, @@ -293,8 +275,6 @@ export const getEntityTracesQueryPayload = ( key: 'responseStatusCode', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'responseStatusCode--string--tag--true', isIndexed: false, }, diff --git a/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/JobDetails.tsx b/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/JobDetails.tsx index 363b4820c890..e827090fc06c 100644 --- a/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/JobDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/JobDetails.tsx @@ -118,8 +118,6 @@ function JobDetails({ key: QUERY_KEYS.K8S_JOB_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_job_name--string--resource--false', }, op: '=', @@ -131,8 +129,6 @@ function JobDetails({ key: QUERY_KEYS.K8S_NAMESPACE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_job_name--string--resource--false', }, op: '=', @@ -159,8 +155,6 @@ function JobDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -172,8 +166,6 @@ function JobDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts index 80c515e63635..ced669949e2a 100644 --- a/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts @@ -60,8 +60,6 @@ export const getJobMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -76,8 +74,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, @@ -89,8 +85,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -149,8 +143,6 @@ export const getJobMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -165,8 +157,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, @@ -178,8 +168,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -238,8 +226,6 @@ export const getJobMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkIoKey, type: 'Sum', }, @@ -254,8 +240,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, @@ -267,8 +251,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -283,16 +265,12 @@ export const getJobMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, @@ -344,8 +322,6 @@ export const getJobMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_errors--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkErrorsKey, type: 'Sum', }, @@ -360,8 +336,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_job_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sJobNameKey, type: 'tag', }, @@ -373,8 +347,6 @@ export const getJobMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -389,16 +361,12 @@ export const getJobMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/NamespaceDetails.tsx b/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/NamespaceDetails.tsx index f38e7077b245..33a9d98a2677 100644 --- a/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/NamespaceDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/NamespaceDetails.tsx @@ -122,8 +122,6 @@ function NamespaceDetails({ key: QUERY_KEYS.K8S_NAMESPACE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_namespace_name--string--resource--false', }, op: '=', @@ -150,8 +148,6 @@ function NamespaceDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -163,8 +159,6 @@ function NamespaceDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts index 64acc4aedacb..94467f772691 100644 --- a/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts @@ -155,8 +155,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodCpuUtilizationKey, - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -171,8 +169,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -198,8 +194,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sContainerCpuRequestKey, - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -214,8 +208,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -241,8 +233,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodCpuUtilizationKey, - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -257,8 +247,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -284,8 +272,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodCpuUtilizationKey, - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -300,8 +286,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -360,8 +344,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodMemoryUsageKey, - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -376,8 +358,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -403,8 +383,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sContainerMemoryRequestKey, - isColumn: true, - isJSON: false, key: k8sContainerMemoryRequestKey, type: 'Gauge', }, @@ -419,8 +397,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -446,8 +422,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodMemoryWorkingSetKey, - isColumn: true, - isJSON: false, key: k8sPodMemoryWorkingSetKey, type: 'Gauge', }, @@ -462,8 +436,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -489,8 +461,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodMemoryRssKey, - isColumn: true, - isJSON: false, key: k8sPodMemoryRssKey, type: 'Gauge', }, @@ -505,8 +475,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -532,8 +500,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodMemoryUsageKey, - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -548,8 +514,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -575,8 +539,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodMemoryUsageKey, - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -591,8 +553,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -651,8 +611,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodCpuUtilizationKey, - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -667,8 +625,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -683,8 +639,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sPodNameKey, - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -736,8 +690,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodMemoryUsageKey, - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -752,8 +704,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -768,8 +718,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sPodNameKey, - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -821,8 +769,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sPodNetworkIoKey, - isColumn: true, - isJSON: false, key: k8sPodNetworkIoKey, type: 'Sum', }, @@ -837,8 +783,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -853,16 +797,12 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'interface', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, { dataType: DataTypes.String, id: 'direction', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, @@ -914,8 +854,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.String, id: k8sPodNetworkErrorsKey, - isColumn: true, - isJSON: false, key: k8sPodNetworkErrorsKey, type: 'Sum', }, @@ -930,8 +868,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -946,16 +882,12 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'interface', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, { dataType: DataTypes.String, id: 'direction', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, @@ -1007,8 +939,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sStatefulsetCurrentPodsKey, - isColumn: true, - isJSON: false, key: k8sStatefulsetCurrentPodsKey, type: 'Gauge', }, @@ -1023,8 +953,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sStatefulsetNameKey, - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, @@ -1039,8 +967,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sStatefulsetNameKey, - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, @@ -1059,8 +985,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sStatefulsetDesiredPodsKey, - isColumn: true, - isJSON: false, key: k8sStatefulsetDesiredPodsKey, type: 'Gauge', }, @@ -1075,8 +999,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1091,8 +1013,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sStatefulsetNameKey, - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, @@ -1111,8 +1031,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sStatefulsetUpdatedPodsKey, - isColumn: true, - isJSON: false, key: k8sStatefulsetUpdatedPodsKey, type: 'Gauge', }, @@ -1127,8 +1045,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1143,8 +1059,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sStatefulsetNameKey, - isColumn: false, - isJSON: false, key: k8sStatefulsetNameKey, type: 'tag', }, @@ -1196,8 +1110,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sReplicasetDesiredKey, - isColumn: true, - isJSON: false, key: k8sReplicasetDesiredKey, type: 'Gauge', }, @@ -1212,8 +1124,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1228,8 +1138,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sReplicasetNameKey, - isColumn: false, - isJSON: false, key: k8sReplicasetNameKey, type: 'tag', }, @@ -1254,8 +1162,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sReplicasetAvailableKey, - isColumn: true, - isJSON: false, key: k8sReplicasetAvailableKey, type: 'Gauge', }, @@ -1270,8 +1176,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1286,8 +1190,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sReplicasetNameKey, - isColumn: false, - isJSON: false, key: k8sReplicasetNameKey, type: 'tag', }, @@ -1345,8 +1247,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sDaemonsetDesiredScheduledNamespacesKey, - isColumn: true, - isJSON: false, key: k8sDaemonsetDesiredScheduledNamespacesKey, type: 'Gauge', }, @@ -1361,8 +1261,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1377,8 +1275,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sDaemonsetNameKey, - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1397,8 +1293,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sDaemonsetCurrentScheduledNamespacesKey, - isColumn: true, - isJSON: false, key: k8sDaemonsetCurrentScheduledNamespacesKey, type: 'Gauge', }, @@ -1413,8 +1307,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1429,8 +1321,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sDaemonsetNameKey, - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1449,8 +1339,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sDaemonsetReadyNamespacesKey, - isColumn: true, - isJSON: false, key: k8sDaemonsetReadyNamespacesKey, type: 'Gauge', }, @@ -1465,8 +1353,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1481,8 +1367,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sDaemonsetNameKey, - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1501,8 +1385,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sDaemonsetMisscheduledNamespacesKey, - isColumn: true, - isJSON: false, key: k8sDaemonsetMisscheduledNamespacesKey, type: 'Gauge', }, @@ -1517,8 +1399,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1533,8 +1413,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sDaemonsetNameKey, - isColumn: false, - isJSON: false, key: k8sDaemonsetNameKey, type: 'tag', }, @@ -1586,8 +1464,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sDeploymentDesiredKey, - isColumn: true, - isJSON: false, key: k8sDeploymentDesiredKey, type: 'Gauge', }, @@ -1602,8 +1478,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1618,8 +1492,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sDeploymentNameKey, - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, @@ -1638,8 +1510,6 @@ export const getNamespaceMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: k8sDeploymentAvailableKey, - isColumn: true, - isJSON: false, key: k8sDeploymentAvailableKey, type: 'Gauge', }, @@ -1654,8 +1524,6 @@ export const getNamespaceMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: k8sNamespaceNameKey, - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1670,8 +1538,6 @@ export const getNamespaceMetricsQueryPayload = ( { dataType: DataTypes.String, id: k8sDeploymentNameKey, - isColumn: false, - isJSON: false, key: k8sDeploymentNameKey, type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx b/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx index 1970a31fc165..c3f6c904c209 100644 --- a/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx @@ -122,8 +122,6 @@ function NodeDetails({ key: QUERY_KEYS.K8S_NODE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_node_name--string--resource--false', }, op: '=', @@ -150,8 +148,6 @@ function NodeDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -163,8 +159,6 @@ function NodeDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts index 429069e19521..f17b1fa6b396 100644 --- a/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts @@ -148,8 +148,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeCpuUtilizationKey, type: 'Gauge', }, @@ -164,8 +162,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -191,8 +187,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_cpu--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeAllocatableCpuKey, type: 'Gauge', }, @@ -207,8 +201,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -234,8 +226,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -250,8 +240,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -277,8 +265,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeCpuUtilizationKey, type: 'Gauge', }, @@ -293,8 +279,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -320,8 +304,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeCpuUtilizationKey, type: 'Gauge', }, @@ -336,8 +318,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -396,8 +376,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeMemoryUsageKey, type: 'Gauge', }, @@ -412,8 +390,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -439,8 +415,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_memory--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeAllocatableMemoryKey, type: 'Gauge', }, @@ -455,8 +429,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -482,8 +454,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryRequestKey, type: 'Gauge', }, @@ -498,8 +468,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -525,8 +493,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeMemoryUsageKey, type: 'Gauge', }, @@ -541,8 +507,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -568,8 +532,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeMemoryUsageKey, type: 'Gauge', }, @@ -584,8 +546,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -611,8 +571,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_working_set--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeMemoryWorkingSetKey, type: 'Gauge', }, @@ -627,8 +585,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -654,8 +610,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_rss--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeMemoryRssKey, type: 'Gauge', }, @@ -670,8 +624,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -730,8 +682,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeCpuUtilizationKey, type: 'Gauge', }, @@ -746,8 +696,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -773,8 +721,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_cpu--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeAllocatableCpuKey, type: 'Gauge', }, @@ -789,8 +735,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -816,8 +760,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -832,8 +774,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -905,8 +845,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeMemoryUsageKey, type: 'Gauge', }, @@ -921,8 +859,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -948,8 +884,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_memory--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeAllocatableMemoryKey, type: 'Gauge', }, @@ -964,8 +898,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -991,8 +923,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryRequestKey, type: 'Gauge', }, @@ -1007,8 +937,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1080,8 +1008,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilizationKey, type: 'Gauge', }, @@ -1096,8 +1022,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1112,8 +1036,6 @@ export const getNodeMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1165,8 +1087,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemoryUsageKey, type: 'Gauge', }, @@ -1181,8 +1101,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1197,8 +1115,6 @@ export const getNodeMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1250,8 +1166,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_network_errors--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sNodeNetworkErrorsKey, type: 'Sum', }, @@ -1266,8 +1180,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1282,16 +1194,12 @@ export const getNodeMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, @@ -1343,8 +1251,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sNodeNetworkIoKey, type: 'Sum', }, @@ -1359,8 +1265,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1375,16 +1279,12 @@ export const getNodeMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, @@ -1436,8 +1336,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeFilesystemUsageKey, type: 'Gauge', }, @@ -1452,8 +1350,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1479,8 +1375,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_capacity--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeFilesystemCapacityKey, type: 'Gauge', }, @@ -1495,8 +1389,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1522,8 +1414,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_available--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeFilesystemAvailableKey, type: 'Gauge', }, @@ -1538,8 +1428,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1598,8 +1486,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeFilesystemUsageKey, type: 'Gauge', }, @@ -1614,8 +1500,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, @@ -1641,8 +1525,6 @@ export const getNodeMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_capacity--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sNodeFilesystemCapacityKey, type: 'Gauge', }, @@ -1657,8 +1539,6 @@ export const getNodeMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNodeNameKey, type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx index 939e8a699da7..e7441b7e44fa 100644 --- a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx @@ -126,8 +126,6 @@ function PodDetails({ key: QUERY_KEYS.K8S_POD_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_pod_name--string--resource--false', }, op: '=', @@ -139,8 +137,6 @@ function PodDetails({ key: QUERY_KEYS.K8S_NAMESPACE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_pod_name--string--resource--false', }, op: '=', @@ -167,8 +163,6 @@ function PodDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -180,8 +174,6 @@ function PodDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts index 331a90a58262..ed3a9380a276 100644 --- a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts @@ -187,8 +187,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilKey, type: 'Gauge', }, @@ -203,8 +201,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -216,8 +212,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -243,8 +237,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilKey, type: 'Gauge', }, @@ -259,8 +251,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -272,8 +262,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -299,8 +287,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilKey, type: 'Gauge', }, @@ -315,8 +301,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -328,8 +312,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -388,8 +370,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_request_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuReqUtilKey, type: 'Gauge', }, @@ -404,8 +384,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -417,8 +395,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -444,8 +420,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_limit_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuLimitUtilKey, type: 'Gauge', }, @@ -460,8 +434,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -473,8 +445,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -500,8 +470,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_request_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuReqUtilKey, type: 'Gauge', }, @@ -516,8 +484,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -529,8 +495,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -556,8 +520,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_request_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuReqUtilKey, type: 'Gauge', }, @@ -572,8 +534,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -585,8 +545,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -612,8 +570,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_limit_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuLimitUtilKey, type: 'Gauge', }, @@ -628,8 +584,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -641,8 +595,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -668,8 +620,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_cpu_limit_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodCpuLimitUtilKey, type: 'Gauge', }, @@ -684,8 +634,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -697,8 +645,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -757,8 +703,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemUsageKey, type: 'Gauge', }, @@ -773,8 +717,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -786,8 +728,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -813,8 +753,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemUsageKey, type: 'Gauge', }, @@ -829,8 +767,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -842,8 +778,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -869,8 +803,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemUsageKey, type: 'Gauge', }, @@ -885,8 +817,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -898,8 +828,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -958,8 +886,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_request_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemReqUtilKey, type: 'Gauge', }, @@ -974,8 +900,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -987,8 +911,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1014,8 +936,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_limit_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemLimitUtilKey, type: 'Gauge', }, @@ -1030,8 +950,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1043,8 +961,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1070,8 +986,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_request_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemReqUtilKey, type: 'Gauge', }, @@ -1086,8 +1000,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1099,8 +1011,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1126,8 +1036,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_limit_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemLimitUtilKey, type: 'Gauge', }, @@ -1142,8 +1050,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1155,8 +1061,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1182,8 +1086,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_request_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemReqUtilKey, type: 'Gauge', }, @@ -1198,8 +1100,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1211,8 +1111,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1238,8 +1136,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_limit_utilization--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemLimitUtilKey, type: 'Gauge', }, @@ -1254,8 +1150,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1267,8 +1161,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1327,8 +1219,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_rss--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemRssKey, type: 'Gauge', }, @@ -1343,8 +1233,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1356,8 +1244,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1383,8 +1269,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_working_set--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemWorkingSetKey, type: 'Gauge', }, @@ -1399,8 +1283,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1412,8 +1294,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1479,8 +1359,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_memory_major_page_faults--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodMemMajorPFKey, type: 'Gauge', }, @@ -1495,8 +1373,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1508,8 +1384,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1568,8 +1442,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerCpuUtilKey, type: 'Gauge', }, @@ -1584,8 +1456,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1597,8 +1467,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1613,8 +1481,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -1666,8 +1532,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerCpuUtilKey, type: 'Gauge', }, @@ -1682,8 +1546,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1695,8 +1557,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1711,8 +1571,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -1731,8 +1589,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -1747,8 +1603,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1760,8 +1614,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1776,8 +1628,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -1796,8 +1646,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuLimitKey, type: 'Gauge', }, @@ -1812,8 +1660,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1825,8 +1671,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1841,8 +1685,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -1907,8 +1749,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerMemUsageKey, type: 'Gauge', }, @@ -1923,8 +1763,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -1936,8 +1774,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -1952,8 +1788,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -1972,8 +1806,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_working_set--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerMemWorkingSetKey, type: 'Gauge', }, @@ -1988,8 +1820,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2001,8 +1831,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2017,8 +1845,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -2037,8 +1863,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_rss--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerMemRssKey, type: 'Gauge', }, @@ -2053,8 +1877,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2066,8 +1888,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2082,8 +1902,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -2135,8 +1953,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerMemUsageKey, type: 'Gauge', }, @@ -2151,8 +1967,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2164,8 +1978,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2180,8 +1992,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -2200,8 +2010,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryRequestKey, type: 'Gauge', }, @@ -2216,8 +2024,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2229,8 +2035,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2245,8 +2049,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -2265,8 +2067,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerMemoryLimitKey, type: 'Gauge', }, @@ -2281,8 +2081,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2294,8 +2092,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2310,8 +2106,6 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_container_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sContainerNameKey, type: 'tag', }, @@ -2376,8 +2170,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkIoKey, type: 'Sum', }, @@ -2392,8 +2184,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2405,8 +2195,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2421,16 +2209,12 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, @@ -2482,8 +2266,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_errors--float64--Sum--true', - isColumn: true, - isJSON: false, key: k8sPodNetworkErrorsKey, type: 'Sum', }, @@ -2498,8 +2280,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2511,8 +2291,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2527,16 +2305,12 @@ export const getPodMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, @@ -2588,8 +2362,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_filesystem_capacity--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodFilesystemCapacityKey, type: 'Gauge', }, @@ -2604,8 +2376,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2617,8 +2387,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2644,8 +2412,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_filesystem_available--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodFilesystemAvailableKey, type: 'Gauge', }, @@ -2660,8 +2426,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2673,8 +2437,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -2700,8 +2462,6 @@ export const getPodMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_filesystem_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sPodFilesystemUsageKey, type: 'Gauge', }, @@ -2716,8 +2476,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -2729,8 +2487,6 @@ export const getPodMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/StatefulSetDetails.tsx b/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/StatefulSetDetails.tsx index 4cff923cbfd5..56d3bc600535 100644 --- a/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/StatefulSetDetails.tsx +++ b/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/StatefulSetDetails.tsx @@ -121,8 +121,6 @@ function StatefulSetDetails({ key: QUERY_KEYS.K8S_STATEFUL_SET_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_statefulset_name--string--resource--false', }, op: '=', @@ -134,8 +132,6 @@ function StatefulSetDetails({ key: QUERY_KEYS.K8S_NAMESPACE_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s_namespace_name--string--resource--false', }, op: '=', @@ -166,8 +162,6 @@ function StatefulSetDetails({ key: QUERY_KEYS.K8S_OBJECT_KIND, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.kind--string--resource--false', }, op: '=', @@ -179,8 +173,6 @@ function StatefulSetDetails({ key: QUERY_KEYS.K8S_OBJECT_NAME, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'k8s.object.name--string--resource--false', }, op: '=', diff --git a/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts index b2b453b99269..4a3a6348a003 100644 --- a/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts @@ -98,8 +98,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'cpu_usage', - isColumn: true, - isJSON: false, key: k8sPodCpuUtilKey, type: 'Gauge', }, @@ -114,8 +112,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -127,8 +123,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -154,8 +148,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'cpu_request', - isColumn: true, - isJSON: false, key: k8sContainerCpuRequestKey, type: 'Gauge', }, @@ -170,8 +162,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'pod_name', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -183,8 +173,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -210,8 +198,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'cpu_limit', - isColumn: true, - isJSON: false, key: k8sContainerCpuLimitKey, type: 'Gauge', }, @@ -226,8 +212,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'pod_name', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -239,8 +223,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -285,8 +267,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'cpu_req_util', - isColumn: true, - isJSON: false, key: k8sPodCpuReqUtilKey, type: 'Gauge', }, @@ -301,8 +281,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -314,8 +292,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -341,8 +317,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'cpu_limit_util', - isColumn: true, - isJSON: false, key: k8sPodCpuLimitUtilKey, type: 'Gauge', }, @@ -357,8 +331,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -370,8 +342,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -416,8 +386,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'mem_usage', - isColumn: true, - isJSON: false, key: k8sPodMemUsageKey, type: 'Gauge', }, @@ -432,8 +400,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -445,8 +411,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -472,8 +436,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'mem_request', - isColumn: true, - isJSON: false, key: k8sContainerMemRequestKey, type: 'Gauge', }, @@ -488,8 +450,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'pod_name', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -501,8 +461,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -528,8 +486,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'mem_limit', - isColumn: true, - isJSON: false, key: k8sContainerMemLimitKey, type: 'Gauge', }, @@ -544,8 +500,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'pod_name', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -557,8 +511,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -603,8 +555,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'mem_req_util', - isColumn: true, - isJSON: false, key: k8sPodMemReqUtilKey, type: 'Gauge', }, @@ -619,8 +569,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -632,8 +580,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -659,8 +605,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'mem_limit_util', - isColumn: true, - isJSON: false, key: k8sPodMemLimitUtilKey, type: 'Gauge', }, @@ -675,8 +619,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -688,8 +630,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -734,8 +674,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'net_io', - isColumn: true, - isJSON: false, key: k8sPodNetworkIoKey, type: 'Sum', }, @@ -750,8 +688,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -763,8 +699,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -779,16 +713,12 @@ export const getStatefulSetMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, @@ -826,8 +756,6 @@ export const getStatefulSetMetricsQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'net_err', - isColumn: true, - isJSON: false, key: k8sPodNetworkErrorsKey, type: 'Sum', }, @@ -842,8 +770,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ss_name', - isColumn: false, - isJSON: false, key: k8sStatefulSetNameKey, type: 'tag', }, @@ -855,8 +781,6 @@ export const getStatefulSetMetricsQueryPayload = ( key: { dataType: DataTypes.String, id: 'ns_name', - isColumn: false, - isJSON: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -871,16 +795,12 @@ export const getStatefulSetMetricsQueryPayload = ( { dataType: DataTypes.String, id: 'direction', - isColumn: false, - isJSON: false, key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'interface', - isColumn: false, - isJSON: false, key: 'interface', type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/Volumes/VolumeDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Volumes/VolumeDetails/constants.ts index d18d5aff6e07..e17ce4426a3a 100644 --- a/frontend/src/container/InfraMonitoringK8s/Volumes/VolumeDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Volumes/VolumeDetails/constants.ts @@ -78,8 +78,6 @@ export const getVolumeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_volume_available--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sVolumeAvailableKey, type: 'Gauge', }, @@ -94,7 +92,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -106,7 +103,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -118,7 +114,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_volume_type--string--tag--false', - isColumn: false, key: k8sVolumeTypeKey, type: 'tag', }, @@ -130,7 +125,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_persistentvolumeclaim_name--string--tag--false', - isColumn: false, key: k8sPVCNameKey, type: 'tag', }, @@ -175,8 +169,6 @@ export const getVolumeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_volume_capacity--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sVolumeCapacityKey, type: 'Gauge', }, @@ -191,7 +183,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -203,7 +194,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -215,7 +205,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_volume_type--string--tag--false', - isColumn: false, key: k8sVolumeTypeKey, type: 'tag', }, @@ -227,7 +216,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_persistentvolumeclaim_name--string--tag--false', - isColumn: false, key: k8sPVCNameKey, type: 'tag', }, @@ -272,7 +260,6 @@ export const getVolumeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_volume_inodes_used--float64----true', - isColumn: true, key: k8sVolumeInodesUsedKey, type: '', }, @@ -287,7 +274,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -299,7 +285,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -311,7 +296,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_volume_type--string--tag--false', - isColumn: false, key: k8sVolumeTypeKey, type: 'tag', }, @@ -323,7 +307,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_persistentvolumeclaim_name--string--tag--false', - isColumn: false, key: k8sPVCNameKey, type: 'tag', }, @@ -368,7 +351,6 @@ export const getVolumeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_volume_inodes--float64----true', - isColumn: true, key: k8sVolumeInodesKey, type: '', }, @@ -383,7 +365,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -395,7 +376,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -407,7 +387,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_volume_type--string--tag--false', - isColumn: false, key: k8sVolumeTypeKey, type: 'tag', }, @@ -419,7 +398,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_persistentvolumeclaim_name--string--tag--false', - isColumn: false, key: k8sPVCNameKey, type: 'tag', }, @@ -464,7 +442,6 @@ export const getVolumeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_volume_inodes_free--float64----true', - isColumn: true, key: k8sVolumeInodesFreeKey, type: '', }, @@ -479,7 +456,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -491,7 +467,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_namespace_name--string--tag--false', - isColumn: false, key: k8sNamespaceNameKey, type: 'tag', }, @@ -503,7 +478,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_volume_type--string--tag--false', - isColumn: false, key: k8sVolumeTypeKey, type: 'tag', }, @@ -515,7 +489,6 @@ export const getVolumeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_persistentvolumeclaim_name--string--tag--false', - isColumn: false, key: k8sPVCNameKey, type: 'tag', }, diff --git a/frontend/src/container/InfraMonitoringK8s/constants.ts b/frontend/src/container/InfraMonitoringK8s/constants.ts index 958ff00f9397..b6bf852c619b 100644 --- a/frontend/src/container/InfraMonitoringK8s/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/constants.ts @@ -107,8 +107,6 @@ export function GetPodsQuickFiltersConfig( key: podKey, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, id: `${podKey}--string--tag--true`, }, aggregateOperator: 'noop', @@ -123,8 +121,6 @@ export function GetPodsQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${namespaceKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -139,8 +135,6 @@ export function GetPodsQuickFiltersConfig( key: nodeKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${nodeKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -155,8 +149,6 @@ export function GetPodsQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -171,8 +163,6 @@ export function GetPodsQuickFiltersConfig( key: deploymentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${deploymentKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -187,8 +177,6 @@ export function GetPodsQuickFiltersConfig( key: statefulsetKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${statefulsetKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -203,8 +191,6 @@ export function GetPodsQuickFiltersConfig( key: daemonsetKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${daemonsetKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -219,8 +205,6 @@ export function GetPodsQuickFiltersConfig( key: jobKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${jobKey}--string--resource--false`, }, aggregateOperator: 'noop', @@ -235,8 +219,6 @@ export function GetPodsQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -266,8 +248,6 @@ export function GetNodesQuickFiltersConfig( key: nodeKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${nodeKey}--string--resource--true`, }, aggregateOperator: 'noop', @@ -282,8 +262,6 @@ export function GetNodesQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource--true`, }, aggregateOperator: 'noop', @@ -298,8 +276,6 @@ export function GetNodesQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -328,8 +304,6 @@ export function GetNamespaceQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${namespaceKey}--string--resource`, }, aggregateOperator: 'noop', @@ -344,8 +318,6 @@ export function GetNamespaceQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource`, }, aggregateOperator: 'noop', @@ -360,8 +332,6 @@ export function GetNamespaceQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -387,8 +357,6 @@ export function GetClustersQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource`, }, aggregateOperator: 'noop', @@ -403,8 +371,6 @@ export function GetClustersQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -429,8 +395,6 @@ export function GetContainersQuickFiltersConfig( key: containerKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${containerKey}--string--resource`, }, defaultOpen: true, @@ -442,8 +406,6 @@ export function GetContainersQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -475,8 +437,6 @@ export function GetVolumesQuickFiltersConfig( key: pvcKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${pvcKey}--string--resource`, }, aggregateOperator: 'noop', @@ -491,8 +451,6 @@ export function GetVolumesQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${namespaceKey}--string--resource`, }, aggregateOperator: 'noop', @@ -507,8 +465,6 @@ export function GetVolumesQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource`, }, aggregateOperator: 'noop', @@ -523,8 +479,6 @@ export function GetVolumesQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -554,8 +508,6 @@ export function GetDeploymentsQuickFiltersConfig( key: deployKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${deployKey}--string--resource`, }, aggregateOperator: 'noop', @@ -570,8 +522,6 @@ export function GetDeploymentsQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${namespaceKey}--string--resource`, }, aggregateOperator: 'noop', @@ -586,8 +536,6 @@ export function GetDeploymentsQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource`, }, aggregateOperator: 'noop', @@ -602,8 +550,6 @@ export function GetDeploymentsQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -633,8 +579,6 @@ export function GetStatefulsetsQuickFiltersConfig( key: ssKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${ssKey}--string--resource`, }, aggregateOperator: 'noop', @@ -649,8 +593,6 @@ export function GetStatefulsetsQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${namespaceKey}--string--resource`, }, aggregateOperator: 'noop', @@ -665,8 +607,6 @@ export function GetStatefulsetsQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${clusterKey}--string--resource`, }, aggregateOperator: 'noop', @@ -681,8 +621,6 @@ export function GetStatefulsetsQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -714,8 +652,6 @@ export function GetDaemonsetsQuickFiltersConfig( key: nameKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${nameKey}--string--resource--true`, }, aggregateOperator: 'noop', @@ -730,8 +666,6 @@ export function GetDaemonsetsQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: metricName, @@ -745,8 +679,6 @@ export function GetDaemonsetsQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: metricName, @@ -760,8 +692,6 @@ export function GetDaemonsetsQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -791,8 +721,6 @@ export function GetJobsQuickFiltersConfig( key: nameKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: `${nameKey}--string--resource--true`, }, aggregateOperator: 'noop', @@ -807,8 +735,6 @@ export function GetJobsQuickFiltersConfig( key: namespaceKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: metricName, @@ -822,8 +748,6 @@ export function GetJobsQuickFiltersConfig( key: clusterKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, aggregateOperator: 'noop', aggregateAttribute: metricName, @@ -837,8 +761,6 @@ export function GetJobsQuickFiltersConfig( key: environmentKey, dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, diff --git a/frontend/src/container/LiveLogs/constants.ts b/frontend/src/container/LiveLogs/constants.ts index 79d341551771..d17a9c1a4933 100644 --- a/frontend/src/container/LiveLogs/constants.ts +++ b/frontend/src/container/LiveLogs/constants.ts @@ -49,5 +49,4 @@ export const idObject: BaseAutocompleteData = { key: 'id', type: '', dataType: DataTypes.String, - isColumn: true, }; diff --git a/frontend/src/container/LogDetailedView/ActionItem.tsx b/frontend/src/container/LogDetailedView/ActionItem.tsx index a736750a66a7..41f021560d9a 100644 --- a/frontend/src/container/LogDetailedView/ActionItem.tsx +++ b/frontend/src/container/LogDetailedView/ActionItem.tsx @@ -56,7 +56,6 @@ export interface ActionItemProps { fieldKey: string, fieldValue: string, operator: string, - isJSON?: boolean, dataType?: DataTypes, fieldType?: string, ) => void; diff --git a/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx b/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx index aee97d32ef6d..76e232990c0a 100644 --- a/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx +++ b/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx @@ -36,7 +36,6 @@ function BodyTitleRenderer({ isFilterIn ? QUERY_BUILDER_FUNCTIONS.HAS : negateOperator(QUERY_BUILDER_FUNCTIONS.HAS), - true, parentIsArray ? getDataTypes([value]) : getDataTypes(value), ); } else { @@ -44,7 +43,6 @@ function BodyTitleRenderer({ `body.${removeObjectFromString(nodeKey)}`, `${value}`, isFilterIn ? OPERATORS['='] : OPERATORS['!='], - true, getDataTypes(value), ); } diff --git a/frontend/src/container/LogDetailedView/ContextView/__tests__/mockData.ts b/frontend/src/container/LogDetailedView/ContextView/__tests__/mockData.ts index 9cc991090aa6..8e0b3894cb75 100644 --- a/frontend/src/container/LogDetailedView/ContextView/__tests__/mockData.ts +++ b/frontend/src/container/LogDetailedView/ContextView/__tests__/mockData.ts @@ -43,7 +43,6 @@ export const mockQuery: Query = { key: 'body', type: 'string', dataType: DataTypes.String, - isColumn: true, }, timeAggregation: 'sum', functions: [], @@ -69,7 +68,6 @@ const mockBaseAutocompleteData: BaseAutocompleteData = { key: 'service', type: 'string', dataType: DataTypes.String, - isColumn: true, }; export const mockTagFilter: TagFilter = { diff --git a/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts b/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts index c16749cea186..0882ec6d1c58 100644 --- a/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts +++ b/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts @@ -64,8 +64,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerCpuUtilKey, type: 'Gauge', }, @@ -80,8 +78,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -93,8 +90,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -109,8 +105,6 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -148,8 +142,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerMemUsageKey, type: 'Gauge', }, @@ -164,8 +156,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -177,8 +167,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -193,8 +181,6 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -232,8 +218,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerCpuUtilKey, type: 'Gauge', }, @@ -248,7 +232,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -260,7 +243,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, key: k8sPodNameKey, type: 'tag', }, @@ -275,8 +257,6 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -295,8 +275,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_request--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuReqKey, type: 'Gauge', }, @@ -311,8 +289,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -324,8 +300,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -340,8 +314,6 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -386,8 +358,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_cpu_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerCpuUtilKey, type: 'Gauge', }, @@ -402,7 +372,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, key: k8sClusterNameKey, type: 'tag', }, @@ -414,7 +383,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, key: k8sPodNameKey, type: 'tag', }, @@ -429,8 +397,6 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -449,8 +415,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_cpu_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, key: k8sContainerCpuLimitKey, type: 'Gauge', }, @@ -465,8 +429,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sClusterNameKey, type: 'tag', }, @@ -478,8 +440,6 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -494,8 +454,6 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, key: k8sPodNameKey, type: 'tag', }, @@ -540,8 +498,6 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, key: containerMemUsageKey, type: 'Gauge', }, @@ -556,7 +512,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -568,7 +524,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, + key: k8sPodNameKey, type: 'tag', }, @@ -583,8 +539,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -603,8 +558,7 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_request--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sContainerMemReqKey, type: 'Gauge', }, @@ -619,8 +573,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -632,8 +585,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -648,8 +600,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -694,8 +645,7 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'container_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: containerMemUsageKey, type: 'Gauge', }, @@ -710,7 +660,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -722,7 +672,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, + key: k8sPodNameKey, type: 'tag', }, @@ -737,8 +687,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -757,8 +706,7 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_container_memory_limit--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sContainerMemLimitKey, type: 'Gauge', }, @@ -773,8 +721,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -786,8 +733,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -802,8 +748,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -848,8 +793,7 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_filesystem_available--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sPodFsAvailKey, type: 'Gauge', }, @@ -864,7 +808,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -876,7 +820,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, + key: k8sPodNameKey, type: 'tag', }, @@ -891,8 +835,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -911,8 +854,7 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_filesystem_capacity--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sPodFsCapKey, type: 'Gauge', }, @@ -927,7 +869,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -939,7 +881,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, + key: k8sPodNameKey, type: 'tag', }, @@ -954,8 +896,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sPodNameKey, type: 'tag', }, @@ -1001,8 +942,7 @@ export const getPodQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_pod_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, + key: k8sPodNetIoKey, type: 'Sum', }, @@ -1017,7 +957,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -1029,7 +969,7 @@ export const getPodQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, + key: k8sPodNameKey, type: 'tag', }, @@ -1044,7 +984,7 @@ export const getPodQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_pod_name--string--tag--false', - isColumn: false, + key: k8sPodNameKey, type: 'tag', }, @@ -1122,8 +1062,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_cpu_time--float64--Sum--true', - isColumn: true, - isJSON: false, + key: k8sNodeCpuTimeKey, type: 'Sum', }, @@ -1138,7 +1077,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -1150,7 +1089,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1165,8 +1104,7 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1185,8 +1123,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_cpu--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sNodeAllocCpuKey, type: 'Gauge', }, @@ -1201,7 +1138,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1216,8 +1153,7 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, - isJSON: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1263,8 +1199,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_memory_working_set--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sNodeMemWsKey, type: 'Gauge', }, @@ -1279,7 +1214,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -1291,7 +1226,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1306,7 +1241,7 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1325,8 +1260,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_allocatable_memory--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sNodeAllocMemKey, type: 'Gauge', }, @@ -1341,7 +1275,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1356,7 +1290,7 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1402,8 +1336,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, + key: k8sNodeNetIoKey, type: 'Sum', }, @@ -1418,7 +1351,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -1430,7 +1363,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1445,21 +1378,21 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'interface--string--tag--false', - isColumn: false, + key: 'interface', type: 'tag', }, { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, + key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1497,8 +1430,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_available--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sNodeFsAvailKey, type: 'Gauge', }, @@ -1513,7 +1445,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -1525,7 +1457,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1540,7 +1472,7 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1559,8 +1491,7 @@ export const getNodeQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'k8s_node_filesystem_capacity--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: k8sNodeFsCapKey, type: 'Gauge', }, @@ -1575,7 +1506,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_cluster_name--string--tag--false', - isColumn: false, + key: k8sClusterNameKey, type: 'tag', }, @@ -1587,7 +1518,7 @@ export const getNodeQueryPayload = ( key: { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1602,7 +1533,7 @@ export const getNodeQueryPayload = ( { dataType: DataTypes.String, id: 'k8s_node_name--string--tag--false', - isColumn: false, + key: k8sNodeNameKey, type: 'tag', }, @@ -1692,8 +1623,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_cpu_time--float64--Sum--true', - isColumn: true, - isJSON: false, + key: cpuTimeKey, type: 'Sum', }, @@ -1708,8 +1638,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -1724,8 +1653,7 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'state--string--tag--false', - isColumn: false, - isJSON: false, + key: 'state', type: 'tag', }, @@ -1744,8 +1672,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_cpu_time--float64--Sum--true', - isColumn: true, - isJSON: false, + key: cpuTimeKey, type: 'Sum', }, @@ -1760,8 +1687,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -1813,8 +1739,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_memory_usage--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: memUsageKey, type: 'Gauge', }, @@ -1829,8 +1754,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -1845,8 +1769,7 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'state--string--tag--false', - isColumn: false, - isJSON: false, + key: 'state', type: 'tag', }, @@ -1884,8 +1807,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_cpu_load_average_1m--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: load1mKey, type: 'Gauge', }, @@ -1900,8 +1822,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -1927,8 +1848,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_cpu_load_average_5m--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: load5mKey, type: 'Gauge', }, @@ -1943,8 +1863,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -1970,8 +1889,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_cpu_load_average_15m--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: load15mKey, type: 'Gauge', }, @@ -1986,8 +1904,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2032,8 +1949,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_network_io--float64--Sum--true', - isColumn: true, - isJSON: false, + key: netIoKey, type: 'Sum', }, @@ -2048,8 +1964,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2064,16 +1979,14 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, + key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'device--string--tag--false', - isColumn: false, - isJSON: false, + key: 'device', type: 'tag', }, @@ -2117,8 +2030,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_network_packets--float64--Sum--true', - isColumn: true, - isJSON: false, + key: netPktsKey, type: 'Sum', }, @@ -2133,8 +2045,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2149,16 +2060,14 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, + key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'device--string--tag--false', - isColumn: false, - isJSON: false, + key: 'device', type: 'tag', }, @@ -2196,8 +2105,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_network_errors--float64--Sum--true', - isColumn: true, - isJSON: false, + key: netErrKey, type: 'Sum', }, @@ -2212,8 +2120,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2228,16 +2135,14 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, + key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'device--string--tag--false', - isColumn: false, - isJSON: false, + key: 'device', type: 'tag', }, @@ -2275,8 +2180,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_network_dropped--float64--Sum--true', - isColumn: true, - isJSON: false, + key: netDropKey, type: 'Sum', }, @@ -2291,8 +2195,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2307,16 +2210,14 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, + key: 'direction', type: 'tag', }, { dataType: DataTypes.String, id: 'device--string--tag--false', - isColumn: false, - isJSON: false, + key: 'device', type: 'tag', }, @@ -2354,8 +2255,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_network_connections--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: netConnKey, type: 'Gauge', }, @@ -2370,8 +2270,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2386,16 +2285,14 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'protocol--string--tag--false', - isColumn: false, - isJSON: false, + key: 'protocol', type: 'tag', }, { dataType: DataTypes.String, id: 'state--string--tag--false', - isColumn: false, - isJSON: false, + key: 'state', type: 'tag', }, @@ -2433,8 +2330,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_disk_io--float64--Sum--true', - isColumn: true, - isJSON: false, + key: diskIoKey, type: 'Sum', }, @@ -2449,8 +2345,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2495,8 +2390,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_disk_operation_time--float64--Sum--true', - isColumn: true, - isJSON: false, + key: diskOpTimeKey, type: 'Sum', }, @@ -2511,8 +2405,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2527,16 +2420,14 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'device--string--tag--false', - isColumn: false, - isJSON: false, + key: 'device', type: 'tag', }, { dataType: DataTypes.String, id: 'direction--string--tag--false', - isColumn: false, - isJSON: false, + key: 'direction', type: 'tag', }, @@ -2580,8 +2471,7 @@ export const getHostQueryPayload = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'system_disk_pending_operations--float64--Gauge--true', - isColumn: true, - isJSON: false, + key: diskPendingKey, type: 'Gauge', }, @@ -2596,8 +2486,7 @@ export const getHostQueryPayload = ( key: { dataType: DataTypes.String, id: 'host_name--string--tag--false', - isColumn: false, - isJSON: false, + key: hostNameKey, type: 'tag', }, @@ -2612,8 +2501,7 @@ export const getHostQueryPayload = ( { dataType: DataTypes.String, id: 'device--string--tag--false', - isColumn: false, - isJSON: false, + key: 'device', type: 'tag', }, diff --git a/frontend/src/container/LogDetailedView/Overview.tsx b/frontend/src/container/LogDetailedView/Overview.tsx index 5d934ccd8086..a01cf40e5921 100644 --- a/frontend/src/container/LogDetailedView/Overview.tsx +++ b/frontend/src/container/LogDetailedView/Overview.tsx @@ -29,11 +29,7 @@ interface OverviewProps { isListViewPanel?: boolean; selectedOptions: OptionsQuery; listViewPanelSelectedFields?: IField[] | null; - onGroupByAttribute?: ( - fieldKey: string, - isJSON?: boolean, - dataType?: DataTypes, - ) => Promise; + onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise; } type Props = OverviewProps & diff --git a/frontend/src/container/LogDetailedView/TableView.tsx b/frontend/src/container/LogDetailedView/TableView.tsx index 484dd2b7febd..1378ce8dd0bf 100644 --- a/frontend/src/container/LogDetailedView/TableView.tsx +++ b/frontend/src/container/LogDetailedView/TableView.tsx @@ -47,11 +47,7 @@ interface TableViewProps { selectedOptions: OptionsQuery; isListViewPanel?: boolean; listViewPanelSelectedFields?: IField[] | null; - onGroupByAttribute?: ( - fieldKey: string, - isJSON?: boolean, - dataType?: DataTypes, - ) => Promise; + onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise; } type Props = TableViewProps & @@ -123,7 +119,6 @@ function TableView({ fieldKey, validatedFieldValue, operator, - undefined, dataType as DataTypes, fieldType, ); diff --git a/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx b/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx index 4401f59ae099..f073cf2931ef 100644 --- a/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx +++ b/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx @@ -33,11 +33,7 @@ interface ITableViewActionsProps { isListViewPanel: boolean; isfilterInLoading: boolean; isfilterOutLoading: boolean; - onGroupByAttribute?: ( - fieldKey: string, - isJSON?: boolean, - dataType?: DataTypes, - ) => Promise; + onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise; onClickHandler: ( operator: string, fieldKey: string, diff --git a/frontend/src/container/LogsExplorerContext/utils.ts b/frontend/src/container/LogsExplorerContext/utils.ts index ab926ec8aa0e..133af2c43c4f 100644 --- a/frontend/src/container/LogsExplorerContext/utils.ts +++ b/frontend/src/container/LogsExplorerContext/utils.ts @@ -15,7 +15,6 @@ export const getFiltersFromResources = ( key, dataType: DataTypes.String, type: 'resource', - isColumn: false, }, op: OPERATORS['='], value: resourceValue, diff --git a/frontend/src/container/LogsExplorerList/__tests__/LogsExplorerList.test.tsx b/frontend/src/container/LogsExplorerList/__tests__/LogsExplorerList.test.tsx index 45557a728484..191e6c5c22af 100644 --- a/frontend/src/container/LogsExplorerList/__tests__/LogsExplorerList.test.tsx +++ b/frontend/src/container/LogsExplorerList/__tests__/LogsExplorerList.test.tsx @@ -119,7 +119,6 @@ describe('LogsExplorerList - empty states', () => { key: 'trace_id', type: '', dataType: 'string', - isColumn: true, }, op: '=', value: 'test-trace-id', @@ -184,7 +183,6 @@ describe('LogsExplorerList - empty states', () => { key: 'service.name', type: '', dataType: 'string', - isColumn: true, }, op: '=', value: 'test-service-name', diff --git a/frontend/src/container/LogsExplorerViews/index.tsx b/frontend/src/container/LogsExplorerViews/index.tsx index 33214c9962c4..29b3f466b4f9 100644 --- a/frontend/src/container/LogsExplorerViews/index.tsx +++ b/frontend/src/container/LogsExplorerViews/index.tsx @@ -197,8 +197,6 @@ function LogsExplorerViewsContainer({ key: 'severity_text', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'severity_text--string----true', }, ], @@ -214,7 +212,6 @@ function LogsExplorerViewsContainer({ key: 'id', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['<='], value: activeLogId, @@ -329,7 +326,6 @@ function LogsExplorerViewsContainer({ key: 'id', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['<='], value: activeLogId, diff --git a/frontend/src/container/LogsExplorerViews/tests/mock.ts b/frontend/src/container/LogsExplorerViews/tests/mock.ts index fa612054c89d..1e05c1d1714d 100644 --- a/frontend/src/container/LogsExplorerViews/tests/mock.ts +++ b/frontend/src/container/LogsExplorerViews/tests/mock.ts @@ -77,7 +77,6 @@ export const mockQueryBuilderContextValue = { key: 'service', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['='], value: 'frontend', @@ -88,7 +87,6 @@ export const mockQueryBuilderContextValue = { key: 'log_level', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['='], value: 'INFO', @@ -117,7 +115,6 @@ export const mockQueryBuilderContextValue = { key: 'service', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['='], value: 'frontend', @@ -128,7 +125,6 @@ export const mockQueryBuilderContextValue = { key: 'log_level', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['='], value: 'INFO', @@ -156,7 +152,6 @@ export const mockQueryBuilderContextValue = { key: 'service', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['='], value: 'frontend', @@ -167,7 +162,6 @@ export const mockQueryBuilderContextValue = { key: 'log_level', type: '', dataType: DataTypes.String, - isColumn: true, }, op: OPERATORS['='], value: 'INFO', diff --git a/frontend/src/container/MeterExplorer/Breakdown/graphs.ts b/frontend/src/container/MeterExplorer/Breakdown/graphs.ts index 666f876dba33..1be079c99046 100644 --- a/frontend/src/container/MeterExplorer/Breakdown/graphs.ts +++ b/frontend/src/container/MeterExplorer/Breakdown/graphs.ts @@ -86,8 +86,6 @@ export const getTotalLogSizeWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.log.size', id: 'signoz.meter.log.size--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -125,8 +123,6 @@ export const getTotalTraceSizeWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.span.size', id: 'signoz.meter.span.size--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -164,8 +160,6 @@ export const getTotalMetricDatapointCountWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.metric.datapoint.count', id: 'signoz.meter.metric.datapoint.count--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -203,8 +197,6 @@ export const getLogCountWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.log.count', id: 'signoz.meter.log.count--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -242,8 +234,6 @@ export const getLogSizeWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.log.size', id: 'signoz.meter.log.size--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -281,8 +271,6 @@ export const getSpanCountWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.span.count', id: 'signoz.meter.span.count--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -320,8 +308,6 @@ export const getSpanSizeWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.span.size', id: 'signoz.meter.span.size--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', @@ -359,8 +345,6 @@ export const getMetricCountWidgetData = (): Widgets => dataType: DataTypes.Float64, key: 'signoz.meter.metric.datapoint.count', id: 'signoz.meter.metric.datapoint.count--float64--Sum--true', - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'increase', diff --git a/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx b/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx index a8ae3d3e96ce..3a7ac3b7c371 100644 --- a/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx +++ b/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx @@ -143,9 +143,7 @@ function Explorer(): JSX.Element {
- handleRunQuery(true, true)} - /> + handleRunQuery()} />
{ const autocompleteDataA: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozExternalCallLatencySum, type: '', }; const autocompleteDataB: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozExternalCallLatencyCount, type: '', }; @@ -149,7 +141,6 @@ export const externalCallDuration = ({ id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -197,7 +188,6 @@ export const externalCallRpsByAddress = ({ const autocompleteData: BaseAutocompleteData[] = [ { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozExternalCallLatencyCount, type: '', }, @@ -208,7 +198,6 @@ export const externalCallRpsByAddress = ({ id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -246,13 +235,11 @@ export const externalCallDurationByAddress = ({ }: ExternalCallDurationByAddressProps): QueryBuilderData => { const autocompleteDataA: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozExternalCallLatencySum, type: '', }; const autocompleteDataB: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozExternalCallLatencyCount, type: '', }; @@ -264,7 +251,6 @@ export const externalCallDurationByAddress = ({ id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, diff --git a/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts b/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts index 6d6c043fc13d..f0ed40379930 100644 --- a/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts +++ b/frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts @@ -51,7 +51,6 @@ export const latency = ({ ? signozLatencyBucketMetrics : WidgetKeys.DurationNano, dataType: DataTypes.Float64, - isColumn: true, type: isSpanMetricEnable ? '' : MetricsType.Tag, }; @@ -64,7 +63,6 @@ export const latency = ({ key: isSpanMetricEnable ? signozMetricsServiceName : WidgetKeys.ServiceName, dataType: DataTypes.String, type: isSpanMetricEnable ? MetricsType.Resource : MetricsType.Tag, - isColumn: !isSpanMetricEnable, }, op: isSpanMetricEnable ? OPERATORS.IN : OPERATORS['='], value: isSpanMetricEnable ? [servicename] : servicename, @@ -73,7 +71,6 @@ export const latency = ({ id: '', key: { dataType: DataTypes.String, - isColumn: !isSpanMetricEnable, key: isSpanMetricEnable ? WidgetKeys.Operation : WidgetKeys.Name, type: MetricsType.Tag, }, @@ -122,21 +119,18 @@ export const apDexTracesQueryBuilderQueries = ({ }: ApDexProps): QueryBuilderData => { const autoCompleteDataA: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: '', type: '', }; const autoCompleteDataB: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: '', type: '', }; const autoCompleteDataC: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: '', type: '', }; @@ -147,7 +141,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.ServiceName, dataType: DataTypes.String, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -158,7 +151,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.Name, dataType: DataTypes.String, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -173,7 +165,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.HasError, dataType: DataTypes.bool, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -184,7 +175,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.DurationNano, dataType: DataTypes.Float64, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['<='], @@ -195,7 +185,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.ServiceName, dataType: DataTypes.String, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -206,7 +195,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.Name, dataType: DataTypes.String, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -220,7 +208,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.DurationNano, dataType: DataTypes.Float64, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['<='], @@ -231,7 +218,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.HasError, dataType: DataTypes.bool, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -242,7 +228,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.ServiceName, dataType: DataTypes.String, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -253,7 +238,6 @@ export const apDexTracesQueryBuilderQueries = ({ key: { key: WidgetKeys.Name, dataType: DataTypes.String, - isColumn: true, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -310,7 +294,6 @@ export const apDexMetricsQueryBuilderQueries = ({ ? WidgetKeys.SignozLatencyCount : WidgetKeys.SignozLatencyCountNorm, dataType: DataTypes.Float64, - isColumn: true, type: '', }; @@ -319,7 +302,6 @@ export const apDexMetricsQueryBuilderQueries = ({ ? WidgetKeys.Signoz_latency_bucket : WidgetKeys.Signoz_latency_bucket_norm, dataType: DataTypes.Float64, - isColumn: true, type: '', }; @@ -328,7 +310,6 @@ export const apDexMetricsQueryBuilderQueries = ({ ? WidgetKeys.Signoz_latency_bucket : WidgetKeys.Signoz_latency_bucket_norm, dataType: DataTypes.Float64, - isColumn: true, type: '', }; @@ -340,7 +321,6 @@ export const apDexMetricsQueryBuilderQueries = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -351,7 +331,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: WidgetKeys.Operation, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -366,7 +345,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['!='], @@ -377,7 +355,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: WidgetKeys.Le, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -390,7 +367,6 @@ export const apDexMetricsQueryBuilderQueries = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -401,7 +377,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: WidgetKeys.Operation, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -416,7 +391,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: WidgetKeys.Le, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -427,7 +401,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['!='], @@ -440,7 +413,6 @@ export const apDexMetricsQueryBuilderQueries = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS['='], @@ -451,7 +423,6 @@ export const apDexMetricsQueryBuilderQueries = ({ key: { key: WidgetKeys.Operation, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -511,7 +482,6 @@ export const operationPerSec = ({ ? WidgetKeys.SignozLatencyCount : WidgetKeys.SignozLatencyCountNorm, dataType: DataTypes.Float64, - isColumn: true, type: '', }, ]; @@ -525,7 +495,6 @@ export const operationPerSec = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Resource, }, op: OPERATORS.IN, @@ -536,7 +505,6 @@ export const operationPerSec = ({ key: { key: WidgetKeys.Operation, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -571,13 +539,11 @@ export const errorPercentage = ({ const autocompleteDataA: BaseAutocompleteData = { key: WidgetKeys.SignozCallsTotal, dataType: DataTypes.Float64, - isColumn: true, type: '', }; const autocompleteDataB: BaseAutocompleteData = { key: WidgetKeys.SignozCallsTotal, dataType: DataTypes.Float64, - isColumn: true, type: '', }; @@ -591,7 +557,6 @@ export const errorPercentage = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Resource, }, op: OPERATORS.IN, @@ -602,7 +567,6 @@ export const errorPercentage = ({ key: { key: WidgetKeys.Operation, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -613,7 +577,6 @@ export const errorPercentage = ({ key: { key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm, dataType: DataTypes.Int64, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, @@ -630,7 +593,6 @@ export const errorPercentage = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Resource, }, op: OPERATORS.IN, @@ -641,7 +603,6 @@ export const errorPercentage = ({ key: { key: WidgetKeys.Operation, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Tag, }, op: OPERATORS.IN, diff --git a/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts b/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts index d996ebac5ac0..5bc29f6dc9a3 100644 --- a/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts +++ b/frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts @@ -28,14 +28,12 @@ export const topOperationQueries = ({ ? WidgetKeys.Signoz_latency_bucket : WidgetKeys.Signoz_latency_bucket_norm, dataType: DataTypes.Float64, - isColumn: true, type: '', }; const errorRateAutoCompleteData: BaseAutocompleteData = { key: WidgetKeys.SignozCallsTotal, dataType: DataTypes.Float64, - isColumn: true, type: '', }; @@ -44,7 +42,6 @@ export const topOperationQueries = ({ ? WidgetKeys.SignozLatencyCount : WidgetKeys.SignozLatencyCountNorm, dataType: DataTypes.Float64, - isColumn: true, type: '', }; @@ -56,7 +53,6 @@ export const topOperationQueries = ({ ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, dataType: DataTypes.String, - isColumn: false, type: MetricsType.Resource, }, value: [servicename], @@ -69,7 +65,6 @@ export const topOperationQueries = ({ id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -82,7 +77,6 @@ export const topOperationQueries = ({ id: '', key: { dataType: DataTypes.Int64, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm, type: MetricsType.Tag, }, @@ -96,7 +90,6 @@ export const topOperationQueries = ({ const groupBy: BaseAutocompleteData[] = [ { dataType: DataTypes.String, - isColumn: false, key: WidgetKeys.Operation, type: MetricsType.Tag, }, diff --git a/frontend/src/container/MetricsApplication/Tabs/External.tsx b/frontend/src/container/MetricsApplication/Tabs/External.tsx index b77a8b810963..8f9fe4076ae6 100644 --- a/frontend/src/container/MetricsApplication/Tabs/External.tsx +++ b/frontend/src/container/MetricsApplication/Tabs/External.tsx @@ -144,8 +144,6 @@ function External(): JSX.Element { key: 'hasError', dataType: DataTypes.bool, type: 'tag', - isColumn: true, - isJSON: false, id: 'hasError--bool--tag--true', }, op: 'in', diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview.tsx index b68a0cfd8313..2667c1e08bc6 100644 --- a/frontend/src/container/MetricsApplication/Tabs/Overview.tsx +++ b/frontend/src/container/MetricsApplication/Tabs/Overview.tsx @@ -274,8 +274,6 @@ function Application(): JSX.Element { key: 'severity_text', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'severity_text--string----true', }, op: 'in', @@ -292,8 +290,6 @@ function Application(): JSX.Element { key: 'hasError', dataType: DataTypes.bool, type: 'tag', - isColumn: true, - isJSON: false, id: 'hasError--bool--tag--true', }, op: 'in', diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview/TableRenderer/ColumnWithLink.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview/TableRenderer/ColumnWithLink.tsx index 7005e269edbd..c872a61356f0 100644 --- a/frontend/src/container/MetricsApplication/Tabs/Overview/TableRenderer/ColumnWithLink.tsx +++ b/frontend/src/container/MetricsApplication/Tabs/Overview/TableRenderer/ColumnWithLink.tsx @@ -26,8 +26,6 @@ function ColumnWithLink({ key: 'name', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', }, op: 'in', diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx index 30c99b905216..3ccdf647104e 100644 --- a/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx +++ b/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx @@ -5,7 +5,7 @@ import { getWidgetQueryBuilder } from 'container/MetricsApplication/MetricsAppli import { topOperationQueries } from 'container/MetricsApplication/MetricsPageQueries/TopOperationQueries'; import { QueryTable } from 'container/QueryTable'; import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange'; -import { useStepInterval } from 'hooks/queryBuilder/useStepInterval'; +import { updateStepInterval } from 'hooks/queryBuilder/useStepInterval'; import { useNotifications } from 'hooks/useNotifications'; import useResourceAttribute from 'hooks/useResourceAttribute'; import { convertRawQueriesToTraceSelectedTags } from 'hooks/useResourceAttribute/utils'; @@ -65,7 +65,7 @@ function TopOperationMetrics(): JSX.Element { [servicename, dotMetricsEnabled], ); - const updatedQuery = useStepInterval(keyOperationWidget.query); + const updatedQuery = updateStepInterval(keyOperationWidget.query); const isEmptyWidget = keyOperationWidget.id === PANEL_TYPES.EMPTY_WIDGET; diff --git a/frontend/src/container/MetricsApplication/Tabs/util.ts b/frontend/src/container/MetricsApplication/Tabs/util.ts index b6274c109e00..84d271808b5c 100644 --- a/frontend/src/container/MetricsApplication/Tabs/util.ts +++ b/frontend/src/container/MetricsApplication/Tabs/util.ts @@ -163,8 +163,6 @@ export function onViewAPIMonitoringPopupClick({ key: 'hasError', dataType: DataTypes.bool, type: 'tag', - isColumn: true, - isJSON: false, id: 'hasError--bool--tag--true', }, op: 'in', @@ -178,8 +176,6 @@ export function onViewAPIMonitoringPopupClick({ key: 'service.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, op: '=', value: servicename, @@ -308,10 +304,8 @@ export function useGetAPMToLogsQueries({ const serviceName = { id: 'service.name--string--resource--true', dataType: DataTypes.String, - isColumn: false, key: 'service.name', type: 'resource', - isJSON: false, }; if (filters?.length) { @@ -356,8 +350,6 @@ export function useGetAPMToTracesQueries({ key: 'spanKind', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'spanKind--string--tag--true', }, op: '=', @@ -373,8 +365,6 @@ export function useGetAPMToTracesQueries({ key: 'dbSystem', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'dbSystem--string--tag--true', }, op: 'exists', diff --git a/frontend/src/container/MetricsApplication/TopOperationsTable.tsx b/frontend/src/container/MetricsApplication/TopOperationsTable.tsx index fff43cfd6db5..c92978dfa7be 100644 --- a/frontend/src/container/MetricsApplication/TopOperationsTable.tsx +++ b/frontend/src/container/MetricsApplication/TopOperationsTable.tsx @@ -61,8 +61,6 @@ function TopOperationsTable({ key: 'name', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', }, op: 'in', diff --git a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx index f1d3addf768b..05f230104d96 100644 --- a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx +++ b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx @@ -138,9 +138,7 @@ function Explorer(): JSX.Element {
{!isEmpty(warning) && } - handleRunQuery(true, true)} - /> + handleRunQuery()} />
item.key as BaseAutocompleteData, ); - initialTagFilters.items = tags.map((tag, index) => { - const isJsonTrue = query.filters?.items[index]?.key?.isJSON; - + initialTagFilters.items = tags.map((tag) => { const { tagKey, tagOperator, tagValue } = getTagToken(tag); const filterAttribute = [ @@ -293,8 +291,6 @@ function QueryBuilderSearch({ key: tagKey, dataType: fetchValueDataType(computedTagValue, tagOperator), type: '', - isColumn: false, - isJSON: isJsonTrue, }, op: getOperatorValue(tagOperator), value: computedTagValue, diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx index 2505e70eb7ab..72c2aefd4478 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx @@ -321,8 +321,6 @@ function QueryBuilderSearchV2( key: 'body', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, // eslint-disable-next-line sonarjs/no-duplicate-string id: 'body--string----true', }, @@ -352,8 +350,6 @@ function QueryBuilderSearchV2( key: 'body', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'body--string----true', }, op: OPERATORS.CONTAINS, @@ -455,7 +451,7 @@ function QueryBuilderSearchV2( if ((event.ctrlKey || event.metaKey) && event.key === 'Enter') { event.preventDefault(); event.stopPropagation(); - handleRunQuery(false, true); + handleRunQuery(); setIsOpen(false); } }, @@ -481,8 +477,6 @@ function QueryBuilderSearchV2( key: 'body', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'body--string----true', }, op: OPERATORS.CONTAINS, @@ -596,8 +590,6 @@ function QueryBuilderSearchV2( key: tagKey, dataType: DataTypes.EMPTY, type: '', - isColumn: false, - isJSON: false, }, op: tagOperator, value: '', @@ -693,8 +685,6 @@ function QueryBuilderSearchV2( key: tagKey, dataType: DataTypes.EMPTY, type: '', - isColumn: false, - isJSON: false, }, }, ] @@ -728,8 +718,6 @@ function QueryBuilderSearchV2( key: tagKey, dataType: DataTypes.EMPTY, type: '', - isColumn: false, - isJSON: false, }, }, ] diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx index 4ff2170e104a..a9aa2d5fe8ca 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx @@ -44,7 +44,6 @@ const createFilterItem = (config: SpanFilterConfig): TagFilterItem => ({ key: { key: config.key, dataType: undefined, - isColumn: false, type: config?.type, }, op: '=', diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx index d9b2d184625f..060e1683440b 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx @@ -98,8 +98,6 @@ const mockAggregateKeysData = { key: 'http.status', dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, id: 'http.status--string--tag--false', }, ], diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/SpanScopeSelector.test.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/SpanScopeSelector.test.tsx index 9e02758f92d1..ebe7ee5631bd 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/SpanScopeSelector.test.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/SpanScopeSelector.test.tsx @@ -33,7 +33,7 @@ const createSpanScopeFilter = (key: string): TagFilterItem => ({ const createNonScopeFilter = (key: string, value: string): TagFilterItem => ({ id: `non-scope-${key}`, - key: { key, isColumn: false, type: 'tag' }, + key: { key, type: 'tag' }, op: '=', value, }); diff --git a/frontend/src/container/QueryTable/__test__/mocks.ts b/frontend/src/container/QueryTable/__test__/mocks.ts index abdb7bcfe375..8c2758508831 100644 --- a/frontend/src/container/QueryTable/__test__/mocks.ts +++ b/frontend/src/container/QueryTable/__test__/mocks.ts @@ -93,8 +93,6 @@ export const QueryTableProps: any = { aggregateAttribute: { dataType: 'float64', id: 'signoz_calls_total--float64--Sum--true', - isColumn: true, - isJSON: false, key: 'signoz_calls_total', type: 'Sum', }, @@ -111,24 +109,18 @@ export const QueryTableProps: any = { { dataType: 'string', id: 'resource_host_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'resource_host_name', type: 'tag', }, { dataType: 'string', id: 'service_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'service_name', type: 'tag', }, { dataType: 'string', id: 'operation--string--tag--false', - isColumn: false, - isJSON: false, key: 'operation', type: 'tag', }, @@ -256,8 +248,6 @@ export const WidgetHeaderProps: any = { aggregateAttribute: { dataType: 'float64', id: 'signoz_calls_total--float64--Sum--true', - isColumn: true, - isJSON: false, key: 'signoz_calls_total', type: 'Sum', }, @@ -274,24 +264,18 @@ export const WidgetHeaderProps: any = { { dataType: 'string', id: 'resource_host_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'resource_host_name', type: 'tag', }, { dataType: 'string', id: 'service_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'service_name', type: 'tag', }, { dataType: 'string', id: 'operation--string--tag--false', - isColumn: false, - isJSON: false, key: 'operation', type: 'tag', }, @@ -344,40 +328,30 @@ export const WidgetHeaderProps: any = { { dataType: 'string', id: 'serviceName--string--tag--true', - isColumn: true, - isJSON: false, key: 'serviceName', type: 'tag', }, { dataType: 'string', id: 'name--string--tag--true', - isColumn: true, - isJSON: false, key: 'name', type: 'tag', }, { dataType: 'float64', id: 'durationNano--float64--tag--true', - isColumn: true, - isJSON: false, key: 'durationNano', type: 'tag', }, { dataType: 'string', id: 'httpMethod--string--tag--true', - isColumn: true, - isJSON: false, key: 'httpMethod', type: 'tag', }, { dataType: 'string', id: 'responseStatusCode--string--tag--true', - isColumn: true, - isJSON: false, key: 'responseStatusCode', type: 'tag', }, @@ -604,8 +578,6 @@ export const WidgetHeaderProps: any = { aggregateAttribute: { dataType: 'float64', id: 'signoz_calls_total--float64--Sum--true', - isColumn: true, - isJSON: false, key: 'signoz_calls_total', type: 'Sum', }, @@ -622,24 +594,18 @@ export const WidgetHeaderProps: any = { { dataType: 'string', id: 'resource_host_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'resource_host_name', type: 'tag', }, { dataType: 'string', id: 'service_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'service_name', type: 'tag', }, { dataType: 'string', id: 'operation--string--tag--false', - isColumn: false, - isJSON: false, key: 'operation', type: 'tag', }, diff --git a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsApplication.tsx b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsApplication.tsx index 4098b1d4d5d3..6dbf4b36575e 100644 --- a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsApplication.tsx +++ b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsApplication.tsx @@ -12,7 +12,7 @@ import ServiceMetricTable from './ServiceMetricTable'; function ServiceMetricsApplication({ topLevelOperations, }: ServiceMetricsProps): JSX.Element { - const { minTime, maxTime, selectedTime: globalSelectedInterval } = useSelector< + const { selectedTime: globalSelectedInterval } = useSelector< AppState, GlobalReducer >((state) => state.globalTime); @@ -26,18 +26,10 @@ function ServiceMetricsApplication({ () => getQueryRangeRequestData({ topLevelOperations, - minTime, - maxTime, globalSelectedInterval, dotMetricsEnabled, }), - [ - globalSelectedInterval, - maxTime, - minTime, - topLevelOperations, - dotMetricsEnabled, - ], + [globalSelectedInterval, topLevelOperations, dotMetricsEnabled], ); return ( { const p99AutoCompleteData: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: dotMetricsEnabled ? WidgetKeys.Signoz_latency_bucket : WidgetKeys.Signoz_latency_bucket_norm, @@ -32,14 +31,12 @@ export const serviceMetricsQuery = ( const errorRateAutoCompleteData: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozCallsTotal, type: '', }; const operationPrSecondAutoCompleteData: BaseAutocompleteData = { dataType: DataTypes.Float64, - isColumn: true, key: WidgetKeys.SignozCallsTotal, type: '', }; @@ -56,7 +53,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -69,7 +65,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: WidgetKeys.Operation, type: MetricsType.Tag, }, @@ -83,7 +78,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -96,7 +90,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.Int64, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm, type: MetricsType.Tag, }, @@ -107,7 +100,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: WidgetKeys.Operation, type: MetricsType.Tag, }, @@ -121,7 +113,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -134,7 +125,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: WidgetKeys.Operation, type: MetricsType.Tag, }, @@ -148,7 +138,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, @@ -161,7 +150,6 @@ export const serviceMetricsQuery = ( id: '', key: { dataType: DataTypes.String, - isColumn: false, key: WidgetKeys.Operation, type: MetricsType.Tag, }, @@ -205,7 +193,6 @@ export const serviceMetricsQuery = ( const groupBy: BaseAutocompleteData[] = [ { dataType: DataTypes.String, - isColumn: false, key: dotMetricsEnabled ? WidgetKeys.Service_name : WidgetKeys.Service_name_norm, diff --git a/frontend/src/container/ServiceApplication/types.ts b/frontend/src/container/ServiceApplication/types.ts index 077ef90034c2..8f900260554a 100644 --- a/frontend/src/container/ServiceApplication/types.ts +++ b/frontend/src/container/ServiceApplication/types.ts @@ -26,8 +26,6 @@ export interface ServiceMetricsTableProps { export interface GetQueryRangeRequestDataProps { topLevelOperations: [keyof ServiceDataProps, string[]][]; - maxTime: number; - minTime: number; globalSelectedInterval: Time | TimeV2 | CustomTimeType; dotMetricsEnabled: boolean; } diff --git a/frontend/src/container/ServiceApplication/utils.ts b/frontend/src/container/ServiceApplication/utils.ts index 25309ab61736..c868c346a75e 100644 --- a/frontend/src/container/ServiceApplication/utils.ts +++ b/frontend/src/container/ServiceApplication/utils.ts @@ -25,8 +25,6 @@ export function getSeriesValue( export const getQueryRangeRequestData = ({ topLevelOperations, - maxTime, - minTime, globalSelectedInterval, dotMetricsEnabled, }: GetQueryRangeRequestDataProps): GetQueryResultsProps[] => { @@ -43,11 +41,7 @@ export const getQueryRangeRequestData = ({ panelTypes: PANEL_TYPES.TABLE, }); - const updatedQuery = updateStepInterval( - serviceMetricsWidget.query, - maxTime, - minTime, - ); + const updatedQuery = updateStepInterval(serviceMetricsWidget.query); requestData.push({ selectedTime: serviceMetricsWidget?.timePreferance, diff --git a/frontend/src/container/TopNav/DateTimeSelection/index.tsx b/frontend/src/container/TopNav/DateTimeSelection/index.tsx index d67a44f36f04..eef3052f748e 100644 --- a/frontend/src/container/TopNav/DateTimeSelection/index.tsx +++ b/frontend/src/container/TopNav/DateTimeSelection/index.tsx @@ -238,8 +238,6 @@ function DateTimeSelection({ setCustomDTPickerVisible(true); } - const { maxTime, minTime } = GetMinMax(value, getTime()); - if (!isLogsExplorerPage) { urlQuery.set(QueryParams.startTime, minTime.toString()); urlQuery.set(QueryParams.endTime, maxTime.toString()); @@ -250,7 +248,7 @@ function DateTimeSelection({ if (!stagedQuery) { return; } - initQueryBuilderData(updateStepInterval(stagedQuery, maxTime, minTime)); + initQueryBuilderData(updateStepInterval(stagedQuery)); }; const onRefreshHandler = (): void => { diff --git a/frontend/src/container/TraceDetail/SelectedSpanDetails/config.ts b/frontend/src/container/TraceDetail/SelectedSpanDetails/config.ts index 2b6dd6ffea83..209683d6e4ab 100644 --- a/frontend/src/container/TraceDetail/SelectedSpanDetails/config.ts +++ b/frontend/src/container/TraceDetail/SelectedSpanDetails/config.ts @@ -18,9 +18,7 @@ export const getTraceToLogsQuery = ( const key: BaseAutocompleteData = { id: uuid(), dataType: DataTypes.String, - isColumn: true, type: '', - isJSON: false, key: 'trace_id', }; diff --git a/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx b/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx index 70a390825c36..b25094a9e2ed 100644 --- a/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx +++ b/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx @@ -36,8 +36,6 @@ function prepareQuery(filters: TagFilter, traceID: string): Query { key: 'trace_id', dataType: DataTypes.String, type: '', - isColumn: true, - isJSON: false, id: 'trace_id--string----true', }, op: '=', @@ -106,8 +104,6 @@ function Filters({ key: 'name', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', isIndexed: false, }, diff --git a/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/constants.ts b/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/constants.ts index aeaa46baef4d..293140d6c832 100644 --- a/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/constants.ts +++ b/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Filters/constants.ts @@ -10,9 +10,7 @@ export const BASE_FILTER_QUERY: IBuilderQuery = { id: '------false', dataType: DataTypes.EMPTY, key: '', - isColumn: false, type: '', - isJSON: false, }, timeAggregation: 'rate', spaceAggregation: 'sum', diff --git a/frontend/src/hooks/logs/types.ts b/frontend/src/hooks/logs/types.ts index bfeaebad8b9a..ef295fee19f6 100644 --- a/frontend/src/hooks/logs/types.ts +++ b/frontend/src/hooks/logs/types.ts @@ -22,12 +22,7 @@ export type UseActiveLog = { fieldKey: string, fieldValue: string, operator: string, - isJSON?: boolean, dataType?: DataTypes, ) => void; - onGroupByAttribute: ( - fieldKey: string, - isJSON?: boolean, - dataType?: DataTypes, - ) => Promise; + onGroupByAttribute: (fieldKey: string, dataType?: DataTypes) => Promise; }; diff --git a/frontend/src/hooks/logs/useActiveLog.ts b/frontend/src/hooks/logs/useActiveLog.ts index 4e8fe6137bc5..0ebfbe721863 100644 --- a/frontend/src/hooks/logs/useActiveLog.ts +++ b/frontend/src/hooks/logs/useActiveLog.ts @@ -82,7 +82,6 @@ export const useActiveLog = (): UseActiveLog => { fieldKey: string, fieldValue: string, operator: string, - isJSON?: boolean, dataType?: DataTypes, fieldType?: MetricsType | undefined, ): Promise => { @@ -106,7 +105,6 @@ export const useActiveLog = (): UseActiveLog => { const existAutocompleteKey = chooseAutocompleteFromCustomValue( keysAutocomplete, fieldKey, - isJSON, dataType, fieldType, ); @@ -145,11 +143,7 @@ export const useActiveLog = (): UseActiveLog => { ); const onGroupByAttribute = useCallback( - async ( - fieldKey: string, - isJSON?: boolean, - dataType?: DataTypes, - ): Promise => { + async (fieldKey: string, dataType?: DataTypes): Promise => { try { const keysAutocompleteResponse = await queryClient.fetchQuery( [QueryBuilderKeys.GET_AGGREGATE_KEYS, fieldKey], @@ -171,7 +165,6 @@ export const useActiveLog = (): UseActiveLog => { const existAutocompleteKey = chooseAutocompleteFromCustomValue( keysAutocomplete, fieldKey, - isJSON, dataType, ); diff --git a/frontend/src/hooks/queryBuilder/useCreateAlerts.tsx b/frontend/src/hooks/queryBuilder/useCreateAlerts.tsx index 8e80287762be..62966fc5032d 100644 --- a/frontend/src/hooks/queryBuilder/useCreateAlerts.tsx +++ b/frontend/src/hooks/queryBuilder/useCreateAlerts.tsx @@ -67,11 +67,7 @@ const useCreateAlerts = ( }); queryRangeMutation.mutate(queryPayload, { onSuccess: (data) => { - const updatedQuery = mapQueryDataFromApi( - data.data.compositeQuery, - widget?.query, - ); - + const updatedQuery = mapQueryDataFromApi(data.data.compositeQuery); const url = `${ROUTES.ALERTS_NEW}?${ QueryParams.compositeQuery }=${encodeURIComponent(JSON.stringify(updatedQuery))}&${ diff --git a/frontend/src/hooks/queryBuilder/useGetQueryRange.ts b/frontend/src/hooks/queryBuilder/useGetQueryRange.ts index 6dc41bcc47f2..751d069e27f0 100644 --- a/frontend/src/hooks/queryBuilder/useGetQueryRange.ts +++ b/frontend/src/hooks/queryBuilder/useGetQueryRange.ts @@ -1,7 +1,7 @@ import { isAxiosError } from 'axios'; import { PANEL_TYPES } from 'constants/queryBuilder'; import { REACT_QUERY_KEY } from 'constants/reactQueryKeys'; -import { updateStepInterval } from 'container/GridCardLayout/utils'; +import { updateBarStepInterval } from 'container/GridCardLayout/utils'; import { GetMetricQueryRange, GetQueryResultsProps, @@ -97,7 +97,7 @@ export const useGetQueryRange: UseGetQueryRange = ( interval: requestData.globalSelectedInterval, }); - const updatedQuery = updateStepInterval( + const updatedQuery = updateBarStepInterval( requestData.query, requestData.start ? requestData.start * 1e3 : parseInt(start, 10) * 1e3, requestData.end ? requestData.end * 1e3 : parseInt(end, 10) * 1e3, diff --git a/frontend/src/hooks/queryBuilder/useOptions.ts b/frontend/src/hooks/queryBuilder/useOptions.ts index e990f789dee7..f6fa9c72aa6a 100644 --- a/frontend/src/hooks/queryBuilder/useOptions.ts +++ b/frontend/src/hooks/queryBuilder/useOptions.ts @@ -34,7 +34,6 @@ export const useOptions = ( transformStringWithPrefix({ str: data?.key, prefix: data?.type || '', - condition: !data?.isColumn, }), [], ); diff --git a/frontend/src/hooks/queryBuilder/useStepInterval.ts b/frontend/src/hooks/queryBuilder/useStepInterval.ts index 49bbe4fb67ed..0b932df9871f 100644 --- a/frontend/src/hooks/queryBuilder/useStepInterval.ts +++ b/frontend/src/hooks/queryBuilder/useStepInterval.ts @@ -1,46 +1,15 @@ -import getStep from 'lib/getStep'; -import { useSelector } from 'react-redux'; -import { AppState } from 'store/reducers'; import { Widgets } from 'types/api/dashboard/getAll'; -import { GlobalReducer } from 'types/reducer/globalTime'; export const updateStepInterval = ( query: Widgets['query'], - maxTime: number, - minTime: number, - shallUpdateStepInterval?: boolean, -): Widgets['query'] => { - const stepInterval = getStep({ - start: minTime, - end: maxTime, - inputFormat: 'ns', - }); - - function getStepInterval(customInterval: number): number { - // if user enters some value then auto update should never come - if (shallUpdateStepInterval) { - return customInterval; - } - return stepInterval; - } - - return { - ...query, - builder: { - ...query?.builder, - queryData: - query?.builder?.queryData?.map((item) => ({ - ...item, - stepInterval: getStepInterval(item?.stepInterval ?? 60), - })) || [], - }, - }; -}; - -export const useStepInterval = (query: Widgets['query']): Widgets['query'] => { - const { maxTime, minTime } = useSelector( - (state) => state.globalTime, - ); - - return updateStepInterval(query, maxTime, minTime); -}; +): Widgets['query'] => ({ + ...query, + builder: { + ...query?.builder, + queryData: + query?.builder?.queryData?.map((item) => ({ + ...item, + stepInterval: item?.stepInterval ?? null, + })) || [], + }, +}); diff --git a/frontend/src/hooks/trace/useTraceActions.ts b/frontend/src/hooks/trace/useTraceActions.ts index eac6489c027c..cc26020f9732 100644 --- a/frontend/src/hooks/trace/useTraceActions.ts +++ b/frontend/src/hooks/trace/useTraceActions.ts @@ -62,7 +62,6 @@ export const useTraceActions = (): UseTraceActionsReturn => { return chooseAutocompleteFromCustomValue( keysAutocomplete, fieldKey, - false, DataTypes.String, ); }, diff --git a/frontend/src/hooks/useResourceAttribute/utils.ts b/frontend/src/hooks/useResourceAttribute/utils.ts index d0878c6f2b83..0d8f3596a263 100644 --- a/frontend/src/hooks/useResourceAttribute/utils.ts +++ b/frontend/src/hooks/useResourceAttribute/utils.ts @@ -104,7 +104,6 @@ export const resourceAttributesToTagFilterItems = ( key: { dataType: DataTypes.String, type: MetricsType.Resource, - isColumn: false, key: e.Key, }, })); @@ -114,7 +113,6 @@ export const resourceAttributesToTagFilterItems = ( id: `${res.id}`, key: { key: res.tagKey, - isColumn: false, type: '', dataType: DataTypes.EMPTY, }, @@ -130,7 +128,6 @@ export const resourceAttributesToTracesFilterItems = ( id: `${res.id}`, key: { key: convertMetricKeyToTrace(res.tagKey), - isColumn: false, type: MetricsType.Resource, dataType: DataTypes.String, id: `${convertMetricKeyToTrace(res.tagKey)}--string--resource--true`, diff --git a/frontend/src/lib/__tests__/chooseAutocompleteFromCustomValue.test.ts b/frontend/src/lib/__tests__/chooseAutocompleteFromCustomValue.test.ts index 375d8c980420..decae9a70d60 100644 --- a/frontend/src/lib/__tests__/chooseAutocompleteFromCustomValue.test.ts +++ b/frontend/src/lib/__tests__/chooseAutocompleteFromCustomValue.test.ts @@ -17,14 +17,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'string_key', dataType: DataTypes.String, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'string_key', - isColumn: false, type: '', }, baseAutoCompleteIdKeysOrder, @@ -33,14 +30,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'number_key', dataType: DataTypes.Float64, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.Float64, key: 'number_key', - isColumn: false, type: '', }, baseAutoCompleteIdKeysOrder, @@ -49,25 +43,20 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'bool_key', dataType: DataTypes.bool, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( - { dataType: DataTypes.bool, key: 'bool_key', isColumn: false, type: '' }, + { dataType: DataTypes.bool, key: 'bool_key', type: '' }, baseAutoCompleteIdKeysOrder, ), }, { key: 'float_key', dataType: DataTypes.Float64, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.Float64, key: 'float_key', - isColumn: false, type: '', }, baseAutoCompleteIdKeysOrder, @@ -76,14 +65,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'unknown_key', dataType: DataTypes.EMPTY, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.EMPTY, key: 'unknown_key', - isColumn: false, type: '', }, baseAutoCompleteIdKeysOrder, @@ -92,14 +78,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'duplicate_key', dataType: DataTypes.String, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'duplicate_key', - isColumn: false, type: '', }, baseAutoCompleteIdKeysOrder, @@ -108,14 +91,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'duplicate_key', dataType: DataTypes.Float64, - isJSON: false, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.Float64, key: 'duplicate_key', - isColumn: false, type: '', }, baseAutoCompleteIdKeysOrder, @@ -129,7 +109,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'string_key', - false, 'string' as DataTypes, ); @@ -141,7 +120,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'number_key', - false, 'number', ); @@ -153,7 +131,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'bool_key', - false, 'bool' as DataTypes, ); @@ -165,7 +142,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'float_key', - false, 'number', ); @@ -177,7 +153,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'unknown_key', - false, 'unknown' as DataTypes, ); @@ -185,7 +160,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'unknown_key', dataType: 'unknown', - isJSON: false, }); }); @@ -195,16 +169,12 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'json_key', dataType: DataTypes.String, - isJSON: true, - isColumn: false, type: '', id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'json_key', - isColumn: false, type: '', - isJSON: true, }, baseAutoCompleteIdKeysOrder, ), @@ -213,7 +183,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( jsonSourceList as BaseAutocompleteData[], 'json_key', - true, 'string' as DataTypes, ); expect(result).toEqual(jsonSourceList[0]); @@ -226,7 +195,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'string_key', - false, 'number', ); @@ -234,7 +202,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'string_key', dataType: DataTypes.Float64, - isJSON: false, }); }); @@ -243,7 +210,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'number_key', - false, 'string' as DataTypes, ); @@ -251,7 +217,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'number_key', dataType: DataTypes.String, - isJSON: false, }); }); @@ -260,7 +225,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'bool_key', - false, 'string' as DataTypes, ); @@ -268,7 +232,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'bool_key', dataType: DataTypes.String, - isJSON: false, }); }); @@ -277,7 +240,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'duplicate_key', - false, 'number' as DataTypes, ); @@ -291,7 +253,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_string_key', - false, 'string' as DataTypes, ); @@ -299,7 +260,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_string_key', dataType: DataTypes.String, - isJSON: false, }); }); @@ -308,7 +268,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_number_key', - false, 'number' as DataTypes, ); @@ -316,7 +275,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_number_key', dataType: DataTypes.Float64, - isJSON: false, }); }); @@ -325,7 +283,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_bool_key', - false, 'bool' as DataTypes, ); @@ -333,7 +290,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_bool_key', dataType: DataTypes.bool, - isJSON: false, }); }); @@ -342,7 +298,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_unknown_key', - false, 'unknown' as DataTypes, ); @@ -350,7 +305,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_unknown_key', dataType: 'unknown', - isJSON: false, }); }); @@ -359,14 +313,12 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_undefined_key', - false, ); expect(result).toEqual({ ...initialAutocompleteData, key: 'new_undefined_key', dataType: DataTypes.EMPTY, - isJSON: false, }); }); @@ -375,14 +327,12 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'json_not_found', - true, 'string' as DataTypes, ); expect(result).toEqual({ ...initialAutocompleteData, key: 'json_not_found', dataType: DataTypes.String, - isJSON: true, }); }); }); @@ -392,14 +342,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'tag_key', dataType: DataTypes.String, - isJSON: false, type: MetricsType.Tag, - isColumn: false, id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'tag_key', - isColumn: false, type: MetricsType.Tag, }, baseAutoCompleteIdKeysOrder, @@ -408,14 +355,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'resource_key', dataType: DataTypes.Float64, - isJSON: false, type: MetricsType.Resource, - isColumn: false, id: createIdFromObjectFields( { dataType: DataTypes.Float64, key: 'resource_key', - isColumn: false, type: MetricsType.Resource, }, baseAutoCompleteIdKeysOrder, @@ -424,14 +368,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'scope_key', dataType: DataTypes.bool, - isJSON: false, type: MetricsType.Scope, - isColumn: false, id: createIdFromObjectFields( { dataType: DataTypes.bool, key: 'scope_key', - isColumn: false, type: MetricsType.Scope, }, baseAutoCompleteIdKeysOrder, @@ -440,14 +381,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'tag_key_duplicate', dataType: DataTypes.String, - isJSON: false, type: MetricsType.Tag, - isColumn: false, id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'tag_key_duplicate', - isColumn: false, type: MetricsType.Tag, }, baseAutoCompleteIdKeysOrder, @@ -456,14 +394,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'tag_key_duplicate', dataType: DataTypes.String, - isJSON: false, type: MetricsType.Resource, - isColumn: false, id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'tag_key_duplicate', - isColumn: false, type: MetricsType.Resource, }, baseAutoCompleteIdKeysOrder, @@ -475,7 +410,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( fieldTypeMockSourceList, 'tag_key', - false, 'string' as DataTypes, MetricsType.Tag, ); @@ -486,7 +420,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( fieldTypeMockSourceList, 'resource_key', - false, 'number' as DataTypes, MetricsType.Resource, ); @@ -497,7 +430,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( fieldTypeMockSourceList, 'scope_key', - false, 'bool' as DataTypes, MetricsType.Scope, ); @@ -508,7 +440,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( fieldTypeMockSourceList, 'tag_key_duplicate', - false, 'string' as DataTypes, MetricsType.Resource, ); @@ -521,14 +452,11 @@ describe('chooseAutocompleteFromCustomValue', () => { { key: 'test_key', dataType: DataTypes.String, - isJSON: false, type: MetricsType.Tag, - isColumn: false, id: createIdFromObjectFields( { dataType: DataTypes.String, key: 'test_key', - isColumn: false, type: MetricsType.Tag, }, baseAutoCompleteIdKeysOrder, @@ -540,7 +468,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( fieldTypeMockSourceList, 'test_key', - false, 'string' as DataTypes, MetricsType.Resource, ); @@ -548,7 +475,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'test_key', dataType: DataTypes.String, - isJSON: false, type: MetricsType.Resource, }); }); @@ -559,7 +485,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_key_with_tag_type', - false, 'string' as DataTypes, MetricsType.Tag, ); @@ -567,7 +492,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_key_with_tag_type', dataType: DataTypes.String, - isJSON: false, type: MetricsType.Tag, }); }); @@ -576,7 +500,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_key_with_resource_type', - false, 'number' as DataTypes, MetricsType.Resource, ); @@ -584,7 +507,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_key_with_resource_type', dataType: DataTypes.Float64, - isJSON: false, type: MetricsType.Resource, }); }); @@ -593,7 +515,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_key_with_scope_type', - false, 'bool' as DataTypes, MetricsType.Scope, ); @@ -601,7 +522,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_key_with_scope_type', dataType: DataTypes.bool, - isJSON: false, type: MetricsType.Scope, }); }); @@ -610,7 +530,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'new_key_with_undefined_type', - false, 'string' as DataTypes, undefined, ); @@ -618,7 +537,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'new_key_with_undefined_type', dataType: DataTypes.String, - isJSON: false, type: '', }); }); @@ -627,7 +545,6 @@ describe('chooseAutocompleteFromCustomValue', () => { const result = chooseAutocompleteFromCustomValue( mockSourceList, 'json_not_found_with_type', - true, 'string' as DataTypes, MetricsType.Tag, ); @@ -635,7 +552,6 @@ describe('chooseAutocompleteFromCustomValue', () => { ...initialAutocompleteData, key: 'json_not_found_with_type', dataType: DataTypes.String, - isJSON: true, type: MetricsType.Tag, }); }); diff --git a/frontend/src/lib/newQueryBuilder/chooseAutocompleteFromCustomValue.ts b/frontend/src/lib/newQueryBuilder/chooseAutocompleteFromCustomValue.ts index 69087ad044c3..38bbb7d3923a 100644 --- a/frontend/src/lib/newQueryBuilder/chooseAutocompleteFromCustomValue.ts +++ b/frontend/src/lib/newQueryBuilder/chooseAutocompleteFromCustomValue.ts @@ -24,7 +24,6 @@ const getDataTypeForCustomValue = (dataType?: string): DataTypes => { export const chooseAutocompleteFromCustomValue = ( sourceList: BaseAutocompleteData[], value: string, - isJSON?: boolean, dataType?: DataTypes | 'number', fieldType?: MetricsType | undefined, ): BaseAutocompleteData => { @@ -43,7 +42,6 @@ export const chooseAutocompleteFromCustomValue = ( key: value, dataType: dataTypeToUse, type: fieldType || '', - isJSON, }; } diff --git a/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts b/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts index ad8173c93eca..39a28149c77a 100644 --- a/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts +++ b/frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts @@ -72,7 +72,6 @@ export const getPaginationQueryData: SetupPaginationQueryData = ({ key: 'id', type: '', dataType: DataTypes.String, - isColumn: true, }, op: orderByTimestamp.order === ORDERBY_FILTERS.ASC diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApi.test.tsx b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApi.test.tsx index 2a72ab5d1079..262b4eec3be1 100644 --- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApi.test.tsx +++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApi.test.tsx @@ -7,9 +7,6 @@ import { outputWithFunctions, replaceVariables, stepIntervalUnchanged, - widgetQueriesWithFunctions, - widgetQueryWithoutVariables, - widgetQueryWithVariables, } from './mapQueryDataFromApiInputs'; jest.mock('uuid', () => ({ @@ -18,10 +15,7 @@ jest.mock('uuid', () => ({ describe('mapQueryDataFromApi function tests', () => { it('should not update the step interval when query is passed', () => { - const output = mapQueryDataFromApi( - compositeQueryWithoutVariables, - widgetQueryWithoutVariables, - ); + const output = mapQueryDataFromApi(compositeQueryWithoutVariables); // composite query is the response from the `v3/query_range/format` API call. // even if the composite query returns stepInterval updated do not modify it @@ -29,20 +23,14 @@ describe('mapQueryDataFromApi function tests', () => { }); it('should update filter from the composite query', () => { - const output = mapQueryDataFromApi( - compositeQueryWithVariables, - widgetQueryWithVariables, - ); + const output = mapQueryDataFromApi(compositeQueryWithVariables); // replace the variables in the widget query and leave the rest items untouched expect(output).toStrictEqual(replaceVariables); }); it('should not update the step intervals with multiple queries and functions', () => { - const output = mapQueryDataFromApi( - compositeQueriesWithFunctions, - widgetQueriesWithFunctions, - ); + const output = mapQueryDataFromApi(compositeQueriesWithFunctions); expect(output).toStrictEqual(outputWithFunctions); }); diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApiInputs.ts b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApiInputs.ts index 8992e005639e..e1a23d4c9ff2 100644 --- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApiInputs.ts +++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/__tests__/mapQueryDataFromApiInputs.ts @@ -2,7 +2,6 @@ import { PANEL_TYPES } from 'constants/queryBuilder'; import { ICompositeMetricQuery } from 'types/api/alerts/compositeQuery'; 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'; @@ -17,8 +16,6 @@ export const compositeQueryWithoutVariables = ({ key: 'system_disk_operations', dataType: DataTypes.Float64, type: 'Sum', - isColumn: true, - isJSON: false, }, filters: { op: 'AND', @@ -39,114 +36,53 @@ export const compositeQueryWithoutVariables = ({ queryType: EQueryType.QUERY_BUILDER, } as unknown) as ICompositeMetricQuery; -export const widgetQueryWithoutVariables = ({ - clickhouse_sql: [ - { - name: 'A', - legend: '', - disabled: false, - query: '', - }, - ], - promql: [ - { - name: 'A', - query: '', - legend: '', - disabled: false, - }, - ], - builder: { - queryData: [ - { - dataSource: 'metrics', - queryName: 'A', - aggregateOperator: 'rate', - aggregateAttribute: { - key: 'system_disk_operations', - dataType: 'float64', - type: 'Sum', - isColumn: true, - isJSON: false, - id: 'system_disk_operations--float64--Sum--true', - }, - timeAggregation: 'rate', - spaceAggregation: 'sum', - functions: [], - filters: { - items: [], - op: 'AND', - }, - expression: 'A', - disabled: false, - stepInterval: 60, - having: [], - limit: null, - orderBy: [], - groupBy: [], - legend: '', - reduceTo: 'avg', - }, - ], - queryFormulas: [], - }, - id: '2bbbd8d8-db99-40be-b9c6-9e197c5bc537', - queryType: 'builder', -} as unknown) as Query; - export const stepIntervalUnchanged = { builder: { queryData: [ { + dataSource: 'metrics', + queryName: 'A', + aggregateOperator: 'rate', aggregateAttribute: { - dataType: 'float64', - id: 'system_disk_operations--float64--Sum--true', - isColumn: true, - isJSON: false, key: 'system_disk_operations', + dataType: 'float64', type: 'Sum', }, - aggregateOperator: 'rate', - dataSource: 'metrics', - disabled: false, - expression: 'A', - filters: { - items: [], - op: 'AND', - }, - functions: [], - groupBy: [], - having: [], - legend: '', - limit: null, - orderBy: [], - queryName: 'A', - reduceTo: 'avg', - spaceAggregation: 'sum', - stepInterval: 60, timeAggregation: 'rate', + spaceAggregation: 'sum', + filter: { expression: '' }, + aggregations: [ + { + metricName: '', + temporality: '', + timeAggregation: 'count', + spaceAggregation: 'sum', + reduceTo: 'avg', + }, + ], + functions: [], + filters: { op: 'AND', items: [] }, + expression: 'A', + disabled: false, + stepInterval: 240, // unchanged + having: [], + limit: 0, + orderBy: [], + groupBy: [], + legend: '', + reduceTo: 'avg', + source: '', + offset: 0, + pageSize: 0, + ShiftBy: 0, }, ], queryFormulas: [], }, - clickhouse_sql: [ - { - disabled: false, - legend: '', - name: 'A', - query: '', - }, - ], - id: 'test-id', - promql: [ - { - disabled: false, - legend: '', - name: 'A', - query: '', - }, - ], + promql: [{ name: 'A', query: '', legend: '', disabled: false }], + clickhouse_sql: [{ name: 'A', legend: '', disabled: false, query: '' }], queryType: 'builder', + id: 'test-id', unit: undefined, }; @@ -161,8 +97,6 @@ export const compositeQueryWithVariables = ({ key: 'signoz_calls_total', dataType: 'float64', type: '', - isColumn: true, - isJSON: false, }, filters: { op: 'AND', @@ -172,8 +106,6 @@ export const compositeQueryWithVariables = ({ key: 'deployment_environment', dataType: 'string', type: 'tag', - isColumn: false, - isJSON: false, }, value: 'default', op: 'in', @@ -183,8 +115,6 @@ export const compositeQueryWithVariables = ({ key: 'service_name', dataType: 'string', type: 'tag', - isColumn: false, - isJSON: false, }, value: 'frontend', op: 'in', @@ -194,8 +124,6 @@ export const compositeQueryWithVariables = ({ key: 'operation', dataType: 'string', type: 'tag', - isColumn: false, - isJSON: false, }, value: 'HTTP GET /dispatch', op: 'in', @@ -207,15 +135,11 @@ export const compositeQueryWithVariables = ({ key: 'service_name', dataType: 'string', type: 'tag', - isColumn: false, - isJSON: false, }, { key: 'operation', dataType: 'string', type: 'tag', - isColumn: false, - isJSON: false, }, ], expression: 'A', @@ -234,222 +158,95 @@ export const compositeQueryWithVariables = ({ queryType: 'builder', } as unknown) as ICompositeMetricQuery; -export const widgetQueryWithVariables = ({ - clickhouse_sql: [ - { - name: 'A', - legend: '', - disabled: false, - query: '', - }, - ], - promql: [ - { - name: 'A', - query: '', - legend: '', - disabled: false, - }, - ], - builder: { - queryData: [ - { - dataSource: 'metrics', - queryName: 'A', - aggregateOperator: 'sum_rate', - aggregateAttribute: { - dataType: 'float64', - id: 'signoz_calls_total--float64----true', - isColumn: true, - isJSON: false, - key: 'signoz_calls_total', - type: '', - }, - timeAggregation: 'rate', - spaceAggregation: 'sum', - functions: [], - filters: { - items: [ - { - id: 'aa56621e', - key: { - dataType: 'string', - id: 'deployment_environment--string--tag--false', - isColumn: false, - isJSON: false, - key: 'deployment_environment', - type: 'tag', - }, - op: 'in', - value: ['{{.deployment_environment}}'], - }, - { - id: '97055a02', - key: { - dataType: 'string', - id: 'service_name--string--tag--false', - isColumn: false, - isJSON: false, - key: 'service_name', - type: 'tag', - }, - op: 'in', - value: ['{{.service_name}}'], - }, - { - id: '8c4599f2', - key: { - dataType: 'string', - id: 'operation--string--tag--false', - isColumn: false, - isJSON: false, - key: 'operation', - type: 'tag', - }, - op: 'in', - value: ['{{.endpoint}}'], - }, - ], - op: 'AND', - }, - expression: 'A', - disabled: false, - stepInterval: 60, - having: [], - limit: null, - orderBy: [], - groupBy: [ - { - dataType: 'string', - isColumn: false, - isJSON: false, - key: 'service_name', - type: 'tag', - id: 'service_name--string--tag--false', - }, - { - dataType: 'string', - isColumn: false, - isJSON: false, - key: 'operation', - type: 'tag', - id: 'operation--string--tag--false', - }, - ], - legend: '{{service_name}}-{{operation}}', - reduceTo: 'sum', - }, - ], - queryFormulas: [], - }, - id: '64fcd7be-61d0-4f92-bbb2-1449b089f766', - queryType: 'builder', -} as unknown) as Query; - export const replaceVariables = { builder: { queryData: [ { + dataSource: 'metrics', + queryName: 'A', + aggregateOperator: 'sum_rate', aggregateAttribute: { - dataType: 'float64', - id: 'signoz_calls_total--float64----true', - isColumn: true, - isJSON: false, key: 'signoz_calls_total', + dataType: 'float64', type: '', }, - aggregateOperator: 'sum_rate', - dataSource: 'metrics', - disabled: false, - expression: 'A', + timeAggregation: 'rate', + spaceAggregation: 'sum', + filter: { expression: '' }, + aggregations: [ + { + metricName: '', + temporality: '', + timeAggregation: 'count', + spaceAggregation: 'sum', + reduceTo: 'avg', + }, + ], + functions: [], filters: { + op: 'AND', items: [ { key: { - dataType: 'string', - isColumn: false, - isJSON: false, key: 'deployment_environment', + dataType: 'string', type: 'tag', }, - op: 'in', value: 'default', + op: 'in', }, { key: { - dataType: 'string', - isColumn: false, - isJSON: false, key: 'service_name', + dataType: 'string', type: 'tag', }, - op: 'in', value: 'frontend', + op: 'in', }, { key: { - dataType: 'string', - isColumn: false, - isJSON: false, key: 'operation', + dataType: 'string', type: 'tag', }, - op: 'in', value: 'HTTP GET /dispatch', + op: 'in', }, ], - op: 'AND', }, - functions: [], + expression: 'A', + disabled: false, + stepInterval: 240, + having: [], + limit: 0, + orderBy: [], groupBy: [ { - dataType: 'string', - id: 'service_name--string--tag--false', - isColumn: false, - isJSON: false, key: 'service_name', + dataType: 'string', type: 'tag', }, { - dataType: 'string', - id: 'operation--string--tag--false', - isColumn: false, - isJSON: false, key: 'operation', + dataType: 'string', type: 'tag', }, ], - having: [], legend: '{{service_name}}-{{operation}}', - limit: null, - orderBy: [], - queryName: 'A', reduceTo: 'sum', - spaceAggregation: 'sum', - stepInterval: 60, - timeAggregation: 'rate', + source: '', + offset: 0, + pageSize: 0, + ShiftBy: 0, }, ], queryFormulas: [], }, - clickhouse_sql: [ - { - disabled: false, - legend: '', - name: 'A', - query: '', - }, - ], - id: 'test-id', - promql: [ - { - disabled: false, - legend: '', - name: 'A', - query: '', - }, - ], + promql: [{ name: 'A', query: '', legend: '', disabled: false }], + clickhouse_sql: [{ name: 'A', legend: '', disabled: false, query: '' }], queryType: 'builder', + id: 'test-id', unit: undefined, }; @@ -460,8 +257,6 @@ export const defaultOutput = { ShiftBy: 0, aggregateAttribute: { dataType: 'float64', - isColumn: true, - isJSON: false, key: 'system_disk_operations', type: 'Sum', }, @@ -516,8 +311,6 @@ export const compositeQueriesWithFunctions = ({ key: 'signoz_latency_bucket', dataType: 'float64', type: 'Histogram', - isColumn: true, - isJSON: false, }, filters: { op: 'AND', @@ -541,8 +334,6 @@ export const compositeQueriesWithFunctions = ({ key: 'system_disk_io', dataType: 'float64', type: 'Sum', - isColumn: true, - isJSON: false, }, filters: { op: 'AND', @@ -567,8 +358,6 @@ export const compositeQueriesWithFunctions = ({ key: '', dataType: '', type: '', - isColumn: false, - isJSON: false, }, expression: 'A / B ', disabled: false, @@ -582,97 +371,6 @@ export const compositeQueriesWithFunctions = ({ queryType: 'builder', } as unknown) as ICompositeMetricQuery; -export const widgetQueriesWithFunctions = ({ - clickhouse_sql: [ - { - name: 'A', - legend: '', - disabled: false, - query: '', - }, - ], - promql: [ - { - name: 'A', - query: '', - legend: '', - disabled: false, - }, - ], - builder: { - queryData: [ - { - dataSource: 'metrics', - queryName: 'A', - aggregateOperator: 'count', - aggregateAttribute: { - dataType: 'float64', - id: 'signoz_latency_bucket--float64--Histogram--true', - isColumn: true, - isJSON: false, - key: 'signoz_latency_bucket', - type: 'Histogram', - }, - timeAggregation: '', - spaceAggregation: 'p90', - functions: [], - filters: { - items: [], - op: 'AND', - }, - expression: 'A', - disabled: false, - stepInterval: 120, - having: [], - limit: null, - orderBy: [], - groupBy: [], - legend: '', - reduceTo: 'avg', - }, - { - dataSource: 'metrics', - queryName: 'B', - aggregateOperator: 'rate', - aggregateAttribute: { - key: 'system_disk_io', - dataType: 'float64', - type: 'Sum', - isColumn: true, - isJSON: false, - id: 'system_disk_io--float64--Sum--true', - }, - timeAggregation: 'rate', - spaceAggregation: 'sum', - functions: [], - filters: { - items: [], - op: 'AND', - }, - expression: 'B', - disabled: false, - stepInterval: 120, - having: [], - limit: null, - orderBy: [], - groupBy: [], - legend: '', - reduceTo: 'avg', - }, - ], - queryFormulas: [ - { - queryName: 'F1', - expression: 'A / B ', - disabled: false, - legend: '', - }, - ], - }, - id: '5d1844fe-9b44-4f15-b6fe-f1b843550b77', - queryType: 'builder', -} as unknown) as Query; - export const outputWithFunctions = { builder: { queryData: [ @@ -681,29 +379,37 @@ export const outputWithFunctions = { queryName: 'A', aggregateOperator: 'count', aggregateAttribute: { - dataType: 'float64', - id: 'signoz_latency_bucket--float64--Histogram--true', - isColumn: true, - isJSON: false, key: 'signoz_latency_bucket', + dataType: 'float64', type: 'Histogram', }, - timeAggregation: '', + timeAggregation: 'rate', spaceAggregation: 'p90', + filter: { expression: '' }, + aggregations: [ + { + metricName: '', + temporality: '', + timeAggregation: 'count', + spaceAggregation: 'sum', + reduceTo: 'avg', + }, + ], functions: [], - filters: { - op: 'AND', - items: [], - }, + filters: { op: 'AND', items: [] }, expression: 'A', disabled: false, - stepInterval: 120, + stepInterval: 60, having: [], - limit: null, + limit: 0, orderBy: [], groupBy: [], legend: '', reduceTo: 'avg', + source: '', + offset: 0, + pageSize: 0, + ShiftBy: 0, }, { dataSource: 'metrics', @@ -713,26 +419,34 @@ export const outputWithFunctions = { key: 'system_disk_io', dataType: 'float64', type: 'Sum', - isColumn: true, - isJSON: false, - id: 'system_disk_io--float64--Sum--true', }, timeAggregation: 'rate', spaceAggregation: 'sum', + filter: { expression: '' }, + aggregations: [ + { + metricName: '', + temporality: '', + timeAggregation: 'count', + spaceAggregation: 'sum', + reduceTo: 'avg', + }, + ], functions: [], - filters: { - op: 'AND', - items: [], - }, + filters: { op: 'AND', items: [] }, expression: 'B', disabled: false, stepInterval: 120, having: [], - limit: null, + limit: 0, orderBy: [], groupBy: [], legend: '', reduceTo: 'avg', + source: '', + offset: 0, + pageSize: 0, + ShiftBy: 0, }, ], queryFormulas: [ @@ -741,12 +455,24 @@ export const outputWithFunctions = { expression: 'A / B ', disabled: false, legend: '', + stepInterval: 1, + dataSource: '', + aggregateOperator: '', + aggregateAttribute: { + key: '', + dataType: '', + type: '', + }, + limit: 0, + offset: 0, + pageSize: 0, + ShiftBy: 0, }, ], }, - clickhouse_sql: [{ disabled: false, legend: '', name: 'A', query: '' }], - id: 'test-id', - promql: [{ disabled: false, legend: '', name: 'A', query: '' }], + promql: [{ name: 'A', query: '', legend: '', disabled: false }], + clickhouse_sql: [{ name: 'A', legend: '', disabled: false, query: '' }], queryType: 'builder', + id: 'test-id', unit: undefined, }; diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts index ab892740bf12..b47281b71a3c 100644 --- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts +++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts @@ -21,11 +21,12 @@ import { v4 as uuid } from 'uuid'; import { transformQueryBuilderDataModel } from '../transformQueryBuilderDataModel'; -const mapQueryFromV5 = ( - compositeQuery: ICompositeMetricQuery, - query?: Query, -): Query => { +const mapQueryFromV5 = (compositeQuery: ICompositeMetricQuery): Query => { const builderQueries: Record = {}; + const builderQueryTypes: Record< + string, + 'builder_query' | 'builder_formula' + > = {}; const promQueries: IPromQLQuery[] = []; const clickhouseQueries: IClickHouseQuery[] = []; @@ -36,12 +37,14 @@ const mapQueryFromV5 = ( builderQueries[spec.name] = convertBuilderQueryToIBuilderQuery( spec as BuilderQuery, ); + builderQueryTypes[spec.name] = 'builder_query'; } } else if (q.type === 'builder_formula') { if (spec.name) { builderQueries[spec.name] = convertQueryBuilderFormulaToIBuilderFormula( (spec as unknown) as QueryBuilderFormula, ); + builderQueryTypes[spec.name] = 'builder_formula'; } } else if (q.type === 'promql') { const promSpec = spec as PromQuery; @@ -62,7 +65,7 @@ const mapQueryFromV5 = ( } }); return { - builder: transformQueryBuilderDataModel(builderQueries, query?.builder), + builder: transformQueryBuilderDataModel(builderQueries, builderQueryTypes), promql: promQueries, clickhouse_sql: clickhouseQueries, queryType: compositeQuery.queryType, @@ -71,15 +74,9 @@ const mapQueryFromV5 = ( }; }; -const mapQueryFromV3 = ( - compositeQuery: ICompositeMetricQuery, - query?: Query, -): Query => { +const mapQueryFromV3 = (compositeQuery: ICompositeMetricQuery): Query => { const builder = compositeQuery.builderQueries - ? transformQueryBuilderDataModel( - compositeQuery.builderQueries, - query?.builder, - ) + ? transformQueryBuilderDataModel(compositeQuery.builderQueries) : initialQueryState.builder; const promql = compositeQuery.promQueries @@ -109,10 +106,9 @@ const mapQueryFromV3 = ( export const mapQueryDataFromApi = ( compositeQuery: ICompositeMetricQuery, - query?: Query, ): Query => { if (compositeQuery.queries && compositeQuery.queries.length > 0) { - return mapQueryFromV5(compositeQuery, query); + return mapQueryFromV5(compositeQuery); } - return mapQueryFromV3(compositeQuery, query); + return mapQueryFromV3(compositeQuery); }; diff --git a/frontend/src/lib/newQueryBuilder/transformQueryBuilderDataModel.ts b/frontend/src/lib/newQueryBuilder/transformQueryBuilderDataModel.ts index f2a24eef8423..2b619f7d57df 100644 --- a/frontend/src/lib/newQueryBuilder/transformQueryBuilderDataModel.ts +++ b/frontend/src/lib/newQueryBuilder/transformQueryBuilderDataModel.ts @@ -3,7 +3,6 @@ import { initialQueryBuilderFormValuesMap, } from 'constants/queryBuilder'; import { FORMULA_REGEXP } from 'constants/regExp'; -import { isUndefined } from 'lodash-es'; import { BuilderQueryDataResourse, IBuilderFormula, @@ -13,45 +12,25 @@ import { QueryBuilderData } from 'types/common/queryBuilder'; export const transformQueryBuilderDataModel = ( data: BuilderQueryDataResourse, - query?: QueryBuilderData, + queryTypes?: Record, ): QueryBuilderData => { const queryData: QueryBuilderData['queryData'] = []; const queryFormulas: QueryBuilderData['queryFormulas'] = []; - Object.entries(data).forEach(([, value]) => { - if (FORMULA_REGEXP.test(value.queryName)) { + Object.entries(data).forEach(([key, value]) => { + const isFormula = queryTypes + ? queryTypes[key] === 'builder_formula' + : FORMULA_REGEXP.test(value.queryName); + + if (isFormula) { const formula = value as IBuilderFormula; - const baseFormula = query?.queryFormulas?.find( - (f) => f.queryName === value.queryName, - ); - if (!isUndefined(baseFormula)) { - // this is part of the flow where we create alerts from dashboard. - // we pass the formula as is from the widget query as we do not want anything to update in formula from the format api call - queryFormulas.push({ ...baseFormula }); - } else { - queryFormulas.push({ ...initialFormulaBuilderFormValues, ...formula }); - } + queryFormulas.push({ ...initialFormulaBuilderFormValues, ...formula }); } else { const queryFromData = value as IBuilderQuery; - const baseQuery = query?.queryData?.find( - (q) => q.queryName === queryFromData.queryName, - ); - - if (!isUndefined(baseQuery)) { - // this is part of the flow where we create alerts from dashboard. - // we pass the widget query as the base query and accept the filters from the format API response. - // which fills the variable values inside the same and is used to create alerts - // do not accept the full object as the stepInterval field is subject to changes - queryData.push({ - ...baseQuery, - filters: queryFromData.filters, - }); - } else { - queryData.push({ - ...initialQueryBuilderFormValuesMap.metrics, - ...queryFromData, - }); - } + queryData.push({ + ...initialQueryBuilderFormValuesMap.metrics, + ...queryFromData, + }); } }); diff --git a/frontend/src/lib/query/transformStringWithPrefix.ts b/frontend/src/lib/query/transformStringWithPrefix.ts index 83799143ca7d..5aef4652c495 100644 --- a/frontend/src/lib/query/transformStringWithPrefix.ts +++ b/frontend/src/lib/query/transformStringWithPrefix.ts @@ -1,16 +1,14 @@ type TransformStringWithPrefixParams = { str: string; prefix: string; - condition: boolean; }; export const transformStringWithPrefix = ({ str, prefix, - condition, }: TransformStringWithPrefixParams): string => { if (prefix) { - return condition ? `${prefix}_${str}` : str; + return `${prefix}_${str}`; } return str; }; diff --git a/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts b/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts index bcb69e0db705..c37a835dfac3 100644 --- a/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts +++ b/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts @@ -7,78 +7,56 @@ export const quickFiltersListResponse = { key: 'os.description', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'service.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'duration_nano', dataType: 'float64', type: 'tag', - isColumn: false, - isJSON: false, }, { key: 'quantity', dataType: 'float64', type: 'tag', - isColumn: false, - isJSON: false, }, { key: 'body', dataType: 'string', type: '', - isColumn: false, - isJSON: false, }, { key: 'deployment.environment', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'service.namespace', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'k8s.namespace.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'service.instance.id', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'k8s.pod.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'process.owner', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, ], }, @@ -92,64 +70,46 @@ export const otherFiltersResponse = { key: 'service.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'k8s.deployment.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'deployment.environment', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'service.namespace', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'k8s.namespace.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'service.instance.id', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'k8s.pod.name', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'k8s.pod.uid', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, { key: 'os.description', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, ], }, diff --git a/frontend/src/mocks-server/__mockdata__/explorer_views.ts b/frontend/src/mocks-server/__mockdata__/explorer_views.ts index a81d53840578..7fa031702463 100644 --- a/frontend/src/mocks-server/__mockdata__/explorer_views.ts +++ b/frontend/src/mocks-server/__mockdata__/explorer_views.ts @@ -22,8 +22,6 @@ export const explorerView = { key: 'component', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, }, filters: { op: 'AND', @@ -33,8 +31,6 @@ export const explorerView = { key: 'component', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, }, value: 'test-component', op: '!=', @@ -46,15 +42,11 @@ export const explorerView = { key: 'component', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, }, { key: 'client-uuid', dataType: 'string', type: 'resource', - isColumn: false, - isJSON: false, }, ], expression: 'A', @@ -98,8 +90,6 @@ export const explorerView = { key: '', dataType: '', type: '', - isColumn: false, - isJSON: false, }, filters: { op: 'AND', @@ -109,8 +99,6 @@ export const explorerView = { key: 'httpMethod', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, }, value: 'GET', op: '=', diff --git a/frontend/src/pages/AllErrors/utils.tsx b/frontend/src/pages/AllErrors/utils.tsx index af0e7c29e7b0..bde4354ec1ec 100644 --- a/frontend/src/pages/AllErrors/utils.tsx +++ b/frontend/src/pages/AllErrors/utils.tsx @@ -14,8 +14,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'deployment.environment', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: true, }, @@ -27,8 +25,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'service.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -40,8 +36,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'host.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -53,8 +47,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.cluster.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -66,8 +58,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.deployment.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -79,8 +69,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.namespace.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -92,8 +80,6 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.pod.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, diff --git a/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewDetail/ValueInfo.tsx b/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewDetail/ValueInfo.tsx index 0fbaa879c853..0d2183afeadf 100644 --- a/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewDetail/ValueInfo.tsx +++ b/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewDetail/ValueInfo.tsx @@ -188,8 +188,6 @@ export default function ValueInfo({ key: { dataType: DataTypes.bool, id: 'has_error--bool----true', - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, diff --git a/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewGraphUtils.ts b/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewGraphUtils.ts index 9948bb8b1519..af050a208eb3 100644 --- a/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewGraphUtils.ts +++ b/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewGraphUtils.ts @@ -24,8 +24,6 @@ export const celeryOverviewRequestRateWidgetData = ( aggregateAttribute: { dataType: DataTypes.EMPTY, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -66,8 +64,6 @@ export const celeryOverviewErrorRateWidgetData = ( aggregateAttribute: { dataType: DataTypes.EMPTY, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -83,8 +79,6 @@ export const celeryOverviewErrorRateWidgetData = ( key: { dataType: DataTypes.bool, id: 'has_error--bool----true', - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -123,8 +117,6 @@ export const celeryOverviewAvgLatencyWidgetData = ( aggregateAttribute: { dataType: DataTypes.Float64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -168,8 +160,6 @@ export const celeryOverviewRequestRateGraphData = ( aggregateAttribute: { dataType: DataTypes.EMPTY, id: '------false', - isColumn: false, - isJSON: false, key: '', type: '', }, @@ -217,8 +207,6 @@ export const celeryOverviewErrorRateGraphData = ( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -233,8 +221,6 @@ export const celeryOverviewErrorRateGraphData = ( key: { dataType: DataTypes.bool, id: 'has_error--bool----true', - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -261,8 +247,6 @@ export const celeryOverviewErrorRateGraphData = ( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -277,8 +261,6 @@ export const celeryOverviewErrorRateGraphData = ( key: { dataType: DataTypes.bool, id: 'has_error--bool----true', - isColumn: true, - isJSON: false, key: 'has_error', type: '', }, @@ -305,8 +287,6 @@ export const celeryOverviewErrorRateGraphData = ( aggregateAttribute: { dataType: DataTypes.String, id: 'span_id--string----true', - isColumn: true, - isJSON: false, key: 'span_id', type: '', }, @@ -360,8 +340,6 @@ export const celeryOverviewAvgLatencyGraphData = ( aggregateAttribute: { dataType: DataTypes.ArrayFloat64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -389,8 +367,6 @@ export const celeryOverviewAvgLatencyGraphData = ( aggregateAttribute: { dataType: DataTypes.ArrayFloat64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, @@ -418,8 +394,6 @@ export const celeryOverviewAvgLatencyGraphData = ( aggregateAttribute: { dataType: DataTypes.ArrayFloat64, id: 'duration_nano--float64----true', - isColumn: true, - isJSON: false, key: 'duration_nano', type: '', }, diff --git a/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewUtils.ts b/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewUtils.ts index 98d735c4d3a3..ba5a37a5f1d2 100644 --- a/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewUtils.ts +++ b/frontend/src/pages/Celery/CeleryOverview/CeleryOverviewUtils.ts @@ -38,8 +38,6 @@ export const getFiltersFromKeyValue = ( key, dataType: dataType || DataTypes.String, type: type || 'tag', - isColumn: false, - isJSON: false, id: `${key}--${dataType || DataTypes.String}--${type || 'tag'}--false`, }, op: op || '=', diff --git a/frontend/src/pages/LogsExplorer/index.tsx b/frontend/src/pages/LogsExplorer/index.tsx index 47e6fb90f495..5daff85dd48d 100644 --- a/frontend/src/pages/LogsExplorer/index.tsx +++ b/frontend/src/pages/LogsExplorer/index.tsx @@ -365,7 +365,7 @@ function LogsExplorer(): JSX.Element { } rightActions={ handleRunQuery(true, true)} + onStageRunQuery={(): void => handleRunQuery()} listQueryKeyRef={listQueryKeyRef} chartQueryKeyRef={chartQueryKeyRef} isLoadingQueries={isLoadingQueries} diff --git a/frontend/src/pages/LogsExplorer/utils.tsx b/frontend/src/pages/LogsExplorer/utils.tsx index 7bc4e46d3d80..50dd7c4262af 100644 --- a/frontend/src/pages/LogsExplorer/utils.tsx +++ b/frontend/src/pages/LogsExplorer/utils.tsx @@ -33,8 +33,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'severity_text', dataType: DataTypes.String, type: '', - isColumn: false, - isJSON: false, id: 'severity_text--string----true', }, defaultOpen: true, @@ -46,8 +44,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'deployment.environment', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -58,8 +54,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'service.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'service.name--string--resource--true', }, defaultOpen: false, @@ -71,8 +65,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'host.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -83,8 +75,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.cluster.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -95,8 +85,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.deployment.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -107,8 +95,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.namespace.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, @@ -119,8 +105,6 @@ export const LogsQuickFiltersConfig: IQuickFiltersConfig[] = [ key: 'k8s.pod.name', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, }, defaultOpen: false, }, diff --git a/frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil.ts b/frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil.ts index fdb304b9704f..c81fa8817ac2 100644 --- a/frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil.ts +++ b/frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil.ts @@ -94,8 +94,6 @@ export const getRequestTimesWidgetData = ( : 'kafka_request_time_avg', // mirror into the id as well id: 'kafka_request_time_avg--float64--Gauge--true', - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -134,8 +132,6 @@ export const getBrokerCountWidgetData = (dotMetricsEnabled: boolean): Widgets => dataType: DataTypes.Float64, key: dotMetricsEnabled ? 'kafka.brokers' : 'kafka_brokers', id: 'kafka_brokers--float64--Gauge--true', - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'sum', @@ -175,8 +171,6 @@ export const getProducerFetchRequestPurgatoryWidgetData = ( id: `${ dotMetricsEnabled ? 'kafka.purgatory.size' : 'kafka_purgatory_size' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -221,8 +215,6 @@ export const getBrokerNetworkThroughputWidgetData = ( ? 'kafka_server_brokertopicmetrics_total_replicationbytesinpersec_oneminuterate' : 'kafka_server_brokertopicmetrics_bytesoutpersec_oneminuterate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -265,8 +257,6 @@ export const getIoWaitTimeWidgetData = (dotMetricsEnabled: boolean): Widgets => ? 'kafka.producer.io_waittime_total' : 'kafka_producer_io_waittime_total' }--float64--Sum--true`, - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'rate', @@ -310,8 +300,6 @@ export const getRequestResponseWidgetData = ( ? 'kafka.producer.request_rate' : 'kafka_producer_request_rate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -342,8 +330,6 @@ export const getRequestResponseWidgetData = ( ? 'kafka.producer.response_rate' : 'kafka_producer_response_rate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -387,8 +373,6 @@ export const getAverageRequestLatencyWidgetData = ( ? 'kafka.producer.request_latency_avg' : 'kafka_producer_request_latency_avg' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -432,8 +416,6 @@ export const getKafkaProducerByteRateWidgetData = ( ? 'kafka.producer.byte_rate' : 'kafka_producer_byte_rate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -446,8 +428,6 @@ export const getKafkaProducerByteRateWidgetData = ( { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, @@ -488,8 +468,6 @@ export const getBytesConsumedWidgetData = ( ? 'kafka.consumer.bytes_consumed_rate' : 'kafka_consumer_bytes_consumed_rate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -534,8 +512,6 @@ export const getConsumerOffsetWidgetData = ( ? 'kafka.consumer_group.offset' : 'kafka_consumer_group_offset' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -548,24 +524,18 @@ export const getConsumerOffsetWidgetData = ( { dataType: DataTypes.String, id: 'group--string--tag--false', - isColumn: false, - isJSON: false, key: 'group', type: 'tag', }, { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, { dataType: DataTypes.String, id: 'partition--string--tag--false', - isColumn: false, - isJSON: false, key: 'partition', type: 'tag', }, @@ -604,8 +574,6 @@ export const getConsumerGroupMemberWidgetData = ( ? 'kafka.consumer_group.members' : 'kafka_consumer_group_members' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'sum', @@ -618,8 +586,6 @@ export const getConsumerGroupMemberWidgetData = ( { dataType: DataTypes.String, id: 'group--string--tag--false', - isColumn: false, - isJSON: false, key: 'group', type: 'tag', }, @@ -657,8 +623,6 @@ export const getConsumerLagByGroupWidgetData = ( ? 'kafka.consumer_group.lag' : 'kafka_consumer_group_lag' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -671,24 +635,18 @@ export const getConsumerLagByGroupWidgetData = ( { dataType: DataTypes.String, id: 'group--string--tag--false', - isColumn: false, - isJSON: false, key: 'group', type: 'tag', }, { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, { dataType: DataTypes.String, id: 'partition--string--tag--false', - isColumn: false, - isJSON: false, key: 'partition', type: 'tag', }, @@ -727,8 +685,6 @@ export const getConsumerFetchRateWidgetData = ( ? 'kafka.consumer.fetch_rate' : 'kafka_consumer_fetch_rate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -741,8 +697,6 @@ export const getConsumerFetchRateWidgetData = ( { dataType: DataTypes.String, id: 'service_name--string--tag--false', - isColumn: false, - isJSON: false, key: dotMetricsEnabled ? 'service.name' : 'service_name', type: 'tag', }, @@ -781,8 +735,6 @@ export const getMessagesConsumedWidgetData = ( ? 'kafka.consumer.records_consumed_rate' : 'kafka_consumer_records_consumed_rate' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -824,8 +776,6 @@ export const getJvmGCCountWidgetData = (dotMetricsEnabled: boolean): Widgets => ? 'jvm.gc.collections.count' : 'jvm_gc_collections_count' }--float64--Sum--true`, - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'rate', @@ -869,8 +819,6 @@ export const getJvmGcCollectionsElapsedWidgetData = ( ? 'jvm.gc.collections.elapsed' : 'jvm_gc_collections_elapsed' }--float64--Sum--true`, - isColumn: true, - isJSON: false, type: 'Sum', }, aggregateOperator: 'rate', @@ -916,8 +864,6 @@ export const getCpuRecentUtilizationWidgetData = ( ? 'jvm.cpu.recent_utilization' : 'jvm_cpu_recent_utilization' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -957,8 +903,6 @@ export const getJvmMemoryHeapWidgetData = ( id: `${ dotMetricsEnabled ? 'jvm.memory.heap.max' : 'jvm_memory_heap_max' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -1000,8 +944,6 @@ export const getPartitionCountPerTopicWidgetData = ( id: `${ dotMetricsEnabled ? 'kafka.topic.partitions' : 'kafka_topic_partitions' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'sum', @@ -1014,8 +956,6 @@ export const getPartitionCountPerTopicWidgetData = ( { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, @@ -1053,8 +993,6 @@ export const getCurrentOffsetPartitionWidgetData = ( ? 'kafka.partition.current_offset' : 'kafka_partition_current_offset' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -1067,16 +1005,12 @@ export const getCurrentOffsetPartitionWidgetData = ( { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, { dataType: DataTypes.String, id: 'partition--string--tag--false', - isColumn: false, - isJSON: false, key: 'partition', type: 'tag', }, @@ -1115,8 +1049,6 @@ export const getOldestOffsetWidgetData = ( ? 'kafka.partition.oldest_offset' : 'kafka_partition_oldest_offset' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -1129,16 +1061,12 @@ export const getOldestOffsetWidgetData = ( { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, { dataType: DataTypes.String, id: 'partition--string--tag--false', - isColumn: false, - isJSON: false, key: 'partition', type: 'tag', }, @@ -1177,8 +1105,6 @@ export const getInsyncReplicasWidgetData = ( ? 'kafka.partition.replicas_in_sync' : 'kafka_partition_replicas_in_sync' }--float64--Gauge--true`, - isColumn: true, - isJSON: false, type: 'Gauge', }, aggregateOperator: 'avg', @@ -1191,16 +1117,12 @@ export const getInsyncReplicasWidgetData = ( { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, { dataType: DataTypes.String, id: 'partition--string--tag--false', - isColumn: false, - isJSON: false, key: 'partition', type: 'tag', }, diff --git a/frontend/src/pages/MessagingQueues/MessagingQueuesUtils.ts b/frontend/src/pages/MessagingQueues/MessagingQueuesUtils.ts index c79c3a94727d..636e961e9fd3 100644 --- a/frontend/src/pages/MessagingQueues/MessagingQueuesUtils.ts +++ b/frontend/src/pages/MessagingQueues/MessagingQueuesUtils.ts @@ -62,8 +62,6 @@ export function createWidgetFilterItem( key, dataType: DataTypes.String, type: 'tag', - isColumn: false, - isJSON: false, id, }, op: '=', @@ -113,8 +111,6 @@ export function getWidgetQuery({ aggregateAttribute: { dataType: DataTypes.Float64, id: 'kafka_consumer_group_lag--float64--Gauge--true', - isColumn: true, - isJSON: false, key: 'kafka_consumer_group_lag', type: 'Gauge', }, @@ -131,24 +127,18 @@ export function getWidgetQuery({ { dataType: DataTypes.String, id: 'group--string--tag--false', - isColumn: false, - isJSON: false, key: 'group', type: 'tag', }, { dataType: DataTypes.String, id: 'topic--string--tag--false', - isColumn: false, - isJSON: false, key: 'topic', type: 'tag', }, { dataType: DataTypes.String, id: 'partition--string--tag--false', - isColumn: false, - isJSON: false, key: 'partition', type: 'tag', }, diff --git a/frontend/src/pages/TracesExplorer/Filter/filterUtils.ts b/frontend/src/pages/TracesExplorer/Filter/filterUtils.ts index 273ad6c4e6ea..0de12e225167 100644 --- a/frontend/src/pages/TracesExplorer/Filter/filterUtils.ts +++ b/frontend/src/pages/TracesExplorer/Filter/filterUtils.ts @@ -194,24 +194,18 @@ export const traceFilterKeys: Record< key: 'durationNano', dataType: DataTypes.Float64, type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNano--float64--tag--true', }, hasError: { key: 'hasError', dataType: DataTypes.bool, type: 'tag', - isColumn: true, - isJSON: false, id: 'hasError--bool--tag--true', }, serviceName: { key: 'serviceName', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'serviceName--string--tag--true', }, @@ -219,88 +213,66 @@ export const traceFilterKeys: Record< key: 'deployment.environment', dataType: DataTypes.String, type: 'resource', - isColumn: false, - isJSON: false, id: 'deployment.environment--string--resource--false', }, name: { key: 'name', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', }, rpcMethod: { key: 'rpcMethod', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'rpcMethod--string--tag--true', }, responseStatusCode: { key: 'responseStatusCode', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'responseStatusCode--string--tag--true', }, httpHost: { key: 'httpHost', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'httpHost--string--tag--true', }, httpMethod: { key: 'httpMethod', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'httpMethod--string--tag--true', }, httpRoute: { key: 'httpRoute', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'httpRoute--string--tag--true', }, httpUrl: { key: 'httpUrl', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'httpUrl--string--tag--true', }, traceID: { key: 'traceID', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'traceID--string--tag--true', }, durationNanoMin: { key: 'durationNanoMin', dataType: DataTypes.Float64, type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNanoMin--float64--tag--true', }, durationNanoMax: { key: 'durationNanoMax', dataType: DataTypes.Float64, type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNanoMax--float64--tag--true', }, } as const; diff --git a/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx b/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx index 971249bedb88..163fa5fd6027 100644 --- a/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx +++ b/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx @@ -308,8 +308,6 @@ describe('TracesExplorer - Filters', () => { key: 'hasError', type: 'tag', dataType: 'bool', - isColumn: true, - isJSON: false, }, op: 'in', value: ['false'], @@ -332,8 +330,6 @@ describe('TracesExplorer - Filters', () => { key: 'hasError', type: 'tag', dataType: 'bool', - isColumn: true, - isJSON: false, }, op: 'in', value: ['false', 'true'], @@ -460,8 +456,6 @@ describe('TracesExplorer - Filters', () => { key: 'hasError', type: 'tag', dataType: 'bool', - isColumn: true, - isJSON: false, }, op: 'in', value: ['false'], @@ -471,8 +465,6 @@ describe('TracesExplorer - Filters', () => { key: 'serviceName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: expect.any(String), }, op: 'in', @@ -497,8 +489,6 @@ describe('TracesExplorer - Filters', () => { key: 'serviceName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: expect.any(String), }, op: 'in', diff --git a/frontend/src/pages/TracesExplorer/__test__/testUtils.ts b/frontend/src/pages/TracesExplorer/__test__/testUtils.ts index 22817103e548..1fdc8b36b243 100644 --- a/frontend/src/pages/TracesExplorer/__test__/testUtils.ts +++ b/frontend/src/pages/TracesExplorer/__test__/testUtils.ts @@ -20,56 +20,42 @@ export const optionMenuReturn = { key: 'serviceName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'serviceName--string--tag--true', }, { key: 'name', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', }, { key: 'durationNano', dataType: 'float64', type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNano--float64--tag--true', }, { key: 'httpMethod', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'httpMethod--string--tag--true', }, { key: 'responseStatusCode', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'responseStatusCode--string--tag--true', }, { key: 'statusCode', dataType: 'float64', type: 'tag', - isColumn: true, - isJSON: false, id: 'statusCode--float64--tag--true', }, { key: 'dbName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'dbName--string--tag--true', }, ], @@ -85,56 +71,42 @@ export const optionMenuReturn = { key: 'serviceName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'serviceName--string--tag--true', }, { key: 'name', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', }, { key: 'durationNano', dataType: 'float64', type: 'tag', - isColumn: true, - isJSON: false, id: 'durationNano--float64--tag--true', }, { key: 'httpMethod', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'httpMethod--string--tag--true', }, { key: 'responseStatusCode', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'responseStatusCode--string--tag--true', }, { key: 'statusCode', dataType: 'float64', type: 'tag', - isColumn: true, - isJSON: false, id: 'statusCode--float64--tag--true', }, { key: 'dbName', dataType: 'string', type: 'tag', - isColumn: true, - isJSON: false, id: 'dbName--string--tag--true', }, ], @@ -164,8 +136,6 @@ export const compositeQuery: Query = { key: 'name', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'name--string--tag--true', }, op: 'in', @@ -177,8 +147,6 @@ export const compositeQuery: Query = { key: 'serviceName', dataType: DataTypes.String, type: 'tag', - isColumn: true, - isJSON: false, id: 'serviceName--string--tag--true', }, op: 'in', diff --git a/frontend/src/pages/TracesExplorer/index.tsx b/frontend/src/pages/TracesExplorer/index.tsx index f49b3ba24b0f..671202e9176d 100644 --- a/frontend/src/pages/TracesExplorer/index.tsx +++ b/frontend/src/pages/TracesExplorer/index.tsx @@ -323,7 +323,7 @@ function TracesExplorer(): JSX.Element { } rightActions={ handleRunQuery(true, true)} + onStageRunQuery={(): void => handleRunQuery()} isLoadingQueries={isLoadingQueries} /> } diff --git a/frontend/src/providers/QueryBuilder.tsx b/frontend/src/providers/QueryBuilder.tsx index c07bfecd269e..576cef827abc 100644 --- a/frontend/src/providers/QueryBuilder.tsx +++ b/frontend/src/providers/QueryBuilder.tsx @@ -39,9 +39,7 @@ import { useRef, useState, } from 'react'; -import { useSelector } from 'react-redux'; import { useLocation } from 'react-router-dom'; -import { AppState } from 'store/reducers'; import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse'; // ** Types import { @@ -60,7 +58,6 @@ import { QueryBuilderContextType, QueryBuilderData, } from 'types/common/queryBuilder'; -import { GlobalReducer } from 'types/reducer/globalTime'; import { sanitizeOrderByForExplorer } from 'utils/sanitizeOrderBy'; import { v4 as uuid } from 'uuid'; @@ -109,10 +106,6 @@ export function QueryBuilderProvider({ setCalledFromHandleRunQuery, ] = useState(false); - const { maxTime, minTime } = useSelector( - (state) => state.globalTime, - ); - const compositeQueryParam = useGetCompositeQueryParam(); const { queryType: queryTypeParam, ...queryState } = compositeQueryParam || initialQueriesMap.metrics; @@ -887,67 +880,49 @@ export function QueryBuilderProvider({ [], ); - const handleRunQuery = useCallback( - (shallUpdateStepInterval?: boolean, newQBQuery?: boolean) => { - const isExplorer = - location.pathname === ROUTES.LOGS_EXPLORER || - location.pathname === ROUTES.TRACES_EXPLORER; - if (isExplorer) { - setCalledFromHandleRunQuery(true); - } - let currentQueryData = currentQuery; - - if (newQBQuery) { - currentQueryData = { - ...currentQueryData, - builder: { - ...currentQueryData.builder, - queryData: currentQueryData.builder.queryData.map((item) => ({ - ...item, - filter: { - ...item.filter, - expression: - item.filter?.expression.trim() === '' - ? '' - : item.filter?.expression ?? '', - }, - filters: { - items: [], - op: 'AND', - }, - })), + const handleRunQuery = useCallback(() => { + const isExplorer = + location.pathname === ROUTES.LOGS_EXPLORER || + location.pathname === ROUTES.TRACES_EXPLORER; + if (isExplorer) { + setCalledFromHandleRunQuery(true); + } + const currentQueryData = { + ...currentQuery, + builder: { + ...currentQuery.builder, + queryData: currentQuery.builder.queryData.map((item) => ({ + ...item, + filter: { + ...item.filter, + expression: + item.filter?.expression.trim() === '' + ? '' + : item.filter?.expression ?? '', }, - }; - } - redirectWithQueryBuilderData({ - ...{ - ...currentQueryData, - ...updateStepInterval( - { - builder: currentQueryData.builder, - clickhouse_sql: currentQueryData.clickhouse_sql, - promql: currentQueryData.promql, - id: currentQueryData.id, - queryType, - unit: currentQueryData.unit, - }, - maxTime, - minTime, - !!shallUpdateStepInterval, - ), - }, - queryType, - }); - }, - [ - location.pathname, - currentQuery, + filters: { + items: [], + op: 'AND', + }, + })), + }, + }; + + redirectWithQueryBuilderData({ + ...{ + ...currentQueryData, + ...updateStepInterval({ + builder: currentQueryData.builder, + clickhouse_sql: currentQueryData.clickhouse_sql, + promql: currentQueryData.promql, + id: currentQueryData.id, + queryType, + unit: currentQueryData.unit, + }), + }, queryType, - maxTime, - minTime, - redirectWithQueryBuilderData, - ], - ); + }); + }, [currentQuery, location.pathname, queryType, redirectWithQueryBuilderData]); useEffect(() => { if (location.pathname !== currentPathnameRef.current) { diff --git a/frontend/src/providers/preferences/__tests__/logsLoaderConfig.test.ts b/frontend/src/providers/preferences/__tests__/logsLoaderConfig.test.ts index 6791efcf5d4b..c8d32a4c205d 100644 --- a/frontend/src/providers/preferences/__tests__/logsLoaderConfig.test.ts +++ b/frontend/src/providers/preferences/__tests__/logsLoaderConfig.test.ts @@ -62,7 +62,6 @@ describe('logsLoaderConfig', () => { key: 'test-column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ]; @@ -106,7 +105,6 @@ describe('logsLoaderConfig', () => { key: 'url-column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ]; diff --git a/frontend/src/providers/preferences/__tests__/logsUpdaterConfig.test.ts b/frontend/src/providers/preferences/__tests__/logsUpdaterConfig.test.ts index 5ed12bda4f8d..c707d1ce02ef 100644 --- a/frontend/src/providers/preferences/__tests__/logsUpdaterConfig.test.ts +++ b/frontend/src/providers/preferences/__tests__/logsUpdaterConfig.test.ts @@ -68,7 +68,6 @@ describe('logsUpdaterConfig', () => { name: 'new-column', fieldContext: '', fieldDataType: DataTypes.String, - isColumn: true, }, ]; @@ -79,7 +78,6 @@ describe('logsUpdaterConfig', () => { key: 'old-column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ], maxLines: 2, @@ -117,7 +115,6 @@ describe('logsUpdaterConfig', () => { name: 'new-column', fieldContext: '', fieldDataType: DataTypes.String, - isColumn: true, }, ]; @@ -154,7 +151,6 @@ describe('logsUpdaterConfig', () => { key: 'column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ], maxLines: 2, @@ -183,7 +179,6 @@ describe('logsUpdaterConfig', () => { key: 'column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ]); // Should preserve columns }); @@ -209,7 +204,6 @@ describe('logsUpdaterConfig', () => { key: 'column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ], maxLines: 2, diff --git a/frontend/src/providers/preferences/__tests__/tracesLoaderConfig.test.ts b/frontend/src/providers/preferences/__tests__/tracesLoaderConfig.test.ts index f0cf4ee8e437..6487a6e5b824 100644 --- a/frontend/src/providers/preferences/__tests__/tracesLoaderConfig.test.ts +++ b/frontend/src/providers/preferences/__tests__/tracesLoaderConfig.test.ts @@ -59,8 +59,6 @@ describe('tracesLoaderConfig', () => { { key: 'test-trace-column', type: 'tag', - dataType: DataTypes.String, - isColumn: true, }, ]; @@ -93,7 +91,6 @@ describe('tracesLoaderConfig', () => { key: 'url-trace-column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ]; diff --git a/frontend/src/providers/preferences/__tests__/tracesUpdaterConfig.test.ts b/frontend/src/providers/preferences/__tests__/tracesUpdaterConfig.test.ts index 1b1fafdcee19..d8cfb8c65d0e 100644 --- a/frontend/src/providers/preferences/__tests__/tracesUpdaterConfig.test.ts +++ b/frontend/src/providers/preferences/__tests__/tracesUpdaterConfig.test.ts @@ -37,7 +37,6 @@ describe('tracesUpdaterConfig', () => { name: 'test-trace-column', fieldContext: '', fieldDataType: DataTypes.String, - isColumn: true, }, ]; @@ -76,7 +75,6 @@ describe('tracesUpdaterConfig', () => { key: 'existing-column', type: 'tag', dataType: DataTypes.String, - isColumn: true, }, ], otherProp: 'value', diff --git a/frontend/src/providers/preferences/__tests__/usePreferenceUpdater.test.tsx b/frontend/src/providers/preferences/__tests__/usePreferenceUpdater.test.tsx index 757ad2c81823..3bb372a9ede5 100644 --- a/frontend/src/providers/preferences/__tests__/usePreferenceUpdater.test.tsx +++ b/frontend/src/providers/preferences/__tests__/usePreferenceUpdater.test.tsx @@ -84,7 +84,6 @@ describe('usePreferenceUpdater', () => { name: 'new-column', fieldContext: '', fieldDataType: DataTypes.String, - isColumn: true, }, ]; @@ -150,7 +149,6 @@ describe('usePreferenceUpdater', () => { name: 'new-trace-column', fieldContext: '', fieldDataType: DataTypes.String, - isColumn: true, }, ]; @@ -228,7 +226,6 @@ describe('usePreferenceUpdater', () => { name: 'column', fieldContext: '', fieldDataType: DataTypes.String, - isColumn: true, }, ]); }); diff --git a/frontend/src/tests/mapQueryDataFromApi.test.ts b/frontend/src/tests/mapQueryDataFromApi.test.ts new file mode 100644 index 000000000000..ebb4407b6260 --- /dev/null +++ b/frontend/src/tests/mapQueryDataFromApi.test.ts @@ -0,0 +1,213 @@ +/* eslint-disable sonarjs/no-duplicate-string */ +import { PANEL_TYPES } from 'constants/queryBuilder'; +import { ICompositeMetricQuery } from 'types/api/alerts/compositeQuery'; +import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse'; +import { + BuilderQuery, + QueryEnvelope, + TraceAggregation, +} from 'types/api/v5/queryRange'; +import { EQueryType } from 'types/common/dashboard'; +import { DataSource } from 'types/common/queryBuilder'; + +import { mapQueryDataFromApi } from '../lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi'; + +jest.mock('uuid', () => ({ + v4: (): string => 'b5f4b7db-799c-47d2-bf32-090340995e20', +})); + +describe('mapQueryDataFromApi', (): void => { + it('maps V5 compositeQuery builder_query into Query builder data using base query', () => { + const builderSpec: BuilderQuery = { + name: 'A', + stepInterval: 60, + signal: 'traces', + // fields below align to V5 builder query spec + filter: { expression: "service.name = 'adservice'" }, + groupBy: [ + { + name: 'service.name', + signal: undefined, + fieldContext: 'resource', + fieldDataType: 'string', + }, + ], + order: [ + { + key: { + name: 'avg(app.ads.count)', + signal: undefined, + fieldContext: '', + fieldDataType: '', + }, + direction: 'asc', + }, + ], + having: { expression: 'avg(app.ads.count) != 0' }, + disabled: false, + legend: '', + functions: [], + selectFields: undefined, + limit: undefined, + limitBy: undefined, + offset: undefined, + cursor: undefined, + secondaryAggregations: undefined, + aggregations: [ + { expression: 'count()' } as TraceAggregation, + { expression: 'avg(app.ads.count)', alias: 'avtv' } as TraceAggregation, + ], + }; + + const compositeQuery: ICompositeMetricQuery = { + queryType: EQueryType.QUERY_BUILDER, + panelType: PANEL_TYPES.TIME_SERIES, + unit: undefined, + queries: [ + { + type: 'builder_query', + spec: builderSpec, + } as QueryEnvelope, + ], + }; + + const result = mapQueryDataFromApi(compositeQuery); + + expect(result.queryType).toBe(EQueryType.QUERY_BUILDER); + expect(result.promql).toEqual([]); + expect(result.clickhouse_sql).toEqual([]); + + // Expect one builder query mapped and merged using base query fields + expect(result.builder.queryData).toHaveLength(1); + const q = result.builder.queryData[0]; + + expect(q.queryName).toBe('A'); + expect(q.dataSource).toBe(DataSource.TRACES); + expect(q.stepInterval).toBe(60); + // filter overridden from V5 spec (no trailing space) + expect(q.filter).toEqual({ expression: "service.name = 'adservice'" }); + // having overridden from V5 spec + expect(((q.having as unknown) as { expression: string }).expression).toBe( + 'avg(app.ads.count) != 0', + ); + // orderBy preserved from base + expect(q.orderBy).toEqual([ + { columnName: 'avg(app.ads.count)', order: 'asc' }, + ]); + // groupBy converted from V5 spec + expect(q.groupBy).toEqual([ + { + key: 'service.name', + dataType: DataTypes.String, + type: 'resource', + id: 'service.name--string--resource', + }, + ]); + // aggregations replaced with array from V5 spec + expect(q.aggregations).toEqual([ + { expression: 'count()' }, + { expression: 'avg(app.ads.count)', alias: 'avtv' }, + ]); + }); + + it('returns expected equality shape for mapped result', () => { + const builderSpec: BuilderQuery = { + name: 'A', + stepInterval: 60, + signal: 'traces', + filter: { expression: "service.name = 'adservice'" }, + groupBy: [ + { + name: 'service.name', + fieldContext: 'resource', + fieldDataType: 'string', + }, + ], + order: [ + { + key: { name: 'avg(app.ads.count)', fieldContext: '', fieldDataType: '' }, + direction: 'asc', + }, + ], + having: { expression: 'avg(app.ads.count) != 0' }, + disabled: false, + legend: '', + functions: [], + aggregations: [ + { expression: 'count()' } as TraceAggregation, + { expression: 'avg(app.ads.count)', alias: 'avtv' } as TraceAggregation, + ], + }; + + const compositeQuery: ICompositeMetricQuery = { + queryType: EQueryType.QUERY_BUILDER, + panelType: PANEL_TYPES.TIME_SERIES, + unit: undefined, + queries: [{ type: 'builder_query', spec: builderSpec } as QueryEnvelope], + }; + + const result = mapQueryDataFromApi(compositeQuery); + + const projected = { + builder: { + queryData: [ + { + aggregations: result.builder.queryData[0].aggregations, + dataSource: result.builder.queryData[0].dataSource, + disabled: result.builder.queryData[0].disabled, + expression: result.builder.queryData[0].expression, + filter: result.builder.queryData[0].filter, + functions: result.builder.queryData[0].functions, + groupBy: result.builder.queryData[0].groupBy, + having: result.builder.queryData[0].having, + legend: result.builder.queryData[0].legend, + limit: result.builder.queryData[0].limit, + orderBy: result.builder.queryData[0].orderBy, + queryName: result.builder.queryData[0].queryName, + stepInterval: result.builder.queryData[0].stepInterval, + }, + ], + queryFormulas: [], + }, + promql: [], + clickhouse_sql: [], + id: 'b5f4b7db-799c-47d2-bf32-090340995e20', + }; + + expect(projected).toStrictEqual({ + builder: { + queryData: [ + { + aggregations: [ + { expression: 'count()' }, + { expression: 'avg(app.ads.count)', alias: 'avtv' }, + ], + dataSource: 'traces', + disabled: false, + expression: 'A', + filter: { expression: "service.name = 'adservice'" }, + functions: [], + groupBy: [ + { + dataType: 'string', + id: 'service.name--string--resource', + key: 'service.name', + type: 'resource', + }, + ], + having: { expression: 'avg(app.ads.count) != 0' }, + legend: '', + limit: null, + orderBy: [{ columnName: 'avg(app.ads.count)', order: 'asc' }], + queryName: 'A', + stepInterval: 60, + }, + ], + queryFormulas: [], + }, + promql: [], + clickhouse_sql: [], + id: 'b5f4b7db-799c-47d2-bf32-090340995e20', + }); + }); +}); diff --git a/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts b/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts index f2f67520d22b..41a21e191678 100644 --- a/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts +++ b/frontend/src/types/api/queryBuilder/queryAutocompleteResponse.ts @@ -17,10 +17,8 @@ export type AutocompleteType = 'tag' | 'resource' | ''; export interface BaseAutocompleteData { id?: string; dataType?: DataTypes; - isColumn?: boolean; key: string; type: AutocompleteType | string | null; - isJSON?: boolean; isIndexed?: boolean; } diff --git a/frontend/src/types/api/queryBuilder/queryBuilderData.ts b/frontend/src/types/api/queryBuilder/queryBuilderData.ts index 82a5aa820743..6934456bebed 100644 --- a/frontend/src/types/api/queryBuilder/queryBuilderData.ts +++ b/frontend/src/types/api/queryBuilder/queryBuilderData.ts @@ -80,7 +80,7 @@ export type IBuilderQuery = { disabled: boolean; having: Having[] | HavingV5; limit: number | null; - stepInterval: number | undefined; + stepInterval: number | undefined | null; orderBy: OrderByPayload[]; reduceTo?: ReduceOperators; legend: string; diff --git a/frontend/src/types/api/quickFilters/getCustomFilters.ts b/frontend/src/types/api/quickFilters/getCustomFilters.ts index 3b9a9e68d262..202b5644387f 100644 --- a/frontend/src/types/api/quickFilters/getCustomFilters.ts +++ b/frontend/src/types/api/quickFilters/getCustomFilters.ts @@ -2,8 +2,6 @@ export interface Filter { key: string; dataType: string; type: string; - isColumn: boolean; - isJSON: boolean; } export interface Props { diff --git a/frontend/src/types/api/v5/queryRange.ts b/frontend/src/types/api/v5/queryRange.ts index bd56c8e5e521..8cb04a6daa3e 100644 --- a/frontend/src/types/api/v5/queryRange.ts +++ b/frontend/src/types/api/v5/queryRange.ts @@ -134,8 +134,6 @@ export interface TelemetryFieldKey { fieldContext?: FieldContext; fieldDataType?: FieldDataType; materialized?: boolean; - isColumn?: boolean; - isJSON?: boolean; isIndexed?: boolean; } @@ -208,7 +206,7 @@ export interface SecondaryAggregation { export interface BaseBuilderQuery { name?: string; - stepInterval?: Step; + stepInterval?: Step | null; disabled?: boolean; filter?: Filter; groupBy?: GroupByKey[]; diff --git a/frontend/src/types/common/queryBuilder.ts b/frontend/src/types/common/queryBuilder.ts index 3a5c73502fec..8f987ec8aed5 100644 --- a/frontend/src/types/common/queryBuilder.ts +++ b/frontend/src/types/common/queryBuilder.ts @@ -263,10 +263,7 @@ export type QueryBuilderContextType = { redirectToUrl?: typeof ROUTES[keyof typeof ROUTES], shallStringify?: boolean, ) => void; - handleRunQuery: ( - shallUpdateStepInterval?: boolean, - newQBQuery?: boolean, - ) => void; + handleRunQuery: () => void; resetQuery: (newCurrentQuery?: QueryState) => void; handleOnUnitsChange: (units: Format['id']) => void; updateAllQueriesOperators: ( diff --git a/frontend/src/utils/aggregationConverter.ts b/frontend/src/utils/aggregationConverter.ts index a07c09828cf9..47355405e0ec 100644 --- a/frontend/src/utils/aggregationConverter.ts +++ b/frontend/src/utils/aggregationConverter.ts @@ -33,9 +33,7 @@ export function convertAggregationsToBaseAutocompleteData( { id: uuid(), dataType: DataTypes.Float64, - isColumn: false, type: '', - isJSON: false, key: `${spaceAggregation || 'avg'}(${metricName || 'metric'})`, }, ]; @@ -46,9 +44,7 @@ export function convertAggregationsToBaseAutocompleteData( { id: uuid(), dataType: DataTypes.Float64, - isColumn: false, type: '', - isJSON: false, key: 'count()', }, ]; @@ -65,9 +61,7 @@ export function convertAggregationsToBaseAutocompleteData( return { id: uuid(), dataType: DataTypes.Float64, - isColumn: false, type: '', - isJSON: false, key: displayKey, }; } @@ -81,9 +75,7 @@ export function convertAggregationsToBaseAutocompleteData( return { id: uuid(), dataType: DataTypes.Float64, - isColumn: false, type: '', - isJSON: false, key: displayKey, }; }); diff --git a/frontend/src/utils/convertNewToOldQueryBuilder.ts b/frontend/src/utils/convertNewToOldQueryBuilder.ts index e181b8e04037..f0d0fe16834e 100644 --- a/frontend/src/utils/convertNewToOldQueryBuilder.ts +++ b/frontend/src/utils/convertNewToOldQueryBuilder.ts @@ -38,9 +38,7 @@ export const convertBuilderQueryToIBuilderQuery = ( key: group?.name, dataType: group?.fieldDataType, type: group?.fieldContext, - isColumn: group?.isColumn ?? true, - isJSON: group?.isJSON || false, - id: `${group?.name}--${group?.fieldDataType}--${group?.fieldContext}--${group?.isColumn}`, + id: `${group?.name}--${group?.fieldDataType}--${group?.fieldContext}`, })), orderBy: builderQuery.order?.map((order) => ({ columnName: order?.key?.name,