External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-29 16:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: fixed panel correlation and alert multiaggregation issues (#8733)

Browse Source 
* feat: fixed panel coorelation not spreading the filter expression in explorer pages

* feat: fixed multiagregation not getting sent in create alert

* fix: fixed failing test cases

* Update frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

* fix: fix lint error

* fix: stepInterval not updating in panel qb

* fix: added test cases for mapQueryDataFromApi and prepareQueryRangePayloadV5

* fix: added convertV5Response test cases - timeseries, pie and table

* fix: refactored handleRunQuery

* fix: code refactor

* fix: refactored the mapQueryDataFromApi function according to new sub_var api

* fix: updated test cases

* fix: removed isJSON and isColumn from everywhere

* fix: fixed code and test cases

* fix: fixed bar chart custom - step interval for qb v5 (#8806)

* fix: added querytype boolean check for v5 changes

* fix: fixed typechecks

* fix: fixed typechecks

---------

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
This commit is contained in:
SagarRajput-7 2025-08-25 16:45:17 +05:30 committed by GitHub
parent deddf47e84
commit c4044fa2c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
156 changed files with 1598 additions and 3053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

284
frontend/src/api/v5/queryRange/convertV5Response.test.ts Normal file
View File

@ -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<T>(
payload: T,
params: QueryRangeRequestV5,
): SuccessResponse<T, QueryRangeRequestV5> {
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,
},
});
});
});

633
frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts Normal file
View File

@ -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>,
): 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>,
): 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<IBuilderQuery>);
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: {},
}),
}),
);
});
});

20
frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts
View File

@ -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()' }];

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

@ -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',
},

7
frontend/src/components/CeleryTask/CeleryUtils.ts
View File

@ -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: '=',

2
frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx
View File

@ -241,8 +241,6 @@ function ClientSideQBSearch(
key: 'body',
dataType: DataTypes.String,
type: '',
isColumn: true,
isJSON: false,
id: 'body--string----true',
},
op: OPERATORS.CONTAINS,

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

@ -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,
},

2
frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx
View File

@ -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: '=',

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

@ -26,9 +26,7 @@ export const getHostLogsQueryPayload = (
id: '------false',
dataType: DataTypes.String,
key: '',
isColumn: false,
type: '',
isJSON: false,
},
timeAggregation: 'rate',
spaceAggregation: 'sum',

2
frontend/src/components/InputWithLabel/InputWithLabel.tsx
View File

@ -17,7 +17,7 @@ function InputWithLabel({
closeIcon,
}: {
label: string;
initialValue?: string | number;
initialValue?: string | number | null;
placeholder: string;
type?: string;
onClose?: () => void;

6
frontend/src/components/LogDetail/LogDetail.interfaces.ts
View File

@ -10,11 +10,7 @@ import { VIEWS } from './constants';
export type LogDetailProps = {
log: ILog | null;
selectedTab: VIEWS;
onGroupByAttribute?: (
fieldKey: string,
isJSON?: boolean,
dataType?: DataTypes,
) => Promise<void>;
onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise<void>;
isListViewPanel?: boolean;
listViewPanelSelectedFields?: IField[] | null;
} & Pick<AddToQueryHOCProps, 'onAddToQuery'> &

3
frontend/src/components/Logs/AddToQueryHOC.tsx
View File

@ -17,7 +17,7 @@ function AddToQueryHOC({
}: AddToQueryHOCProps): JSX.Element {
const handleQueryAdd = (event: MouseEvent<HTMLDivElement>): void => {
event.stopPropagation();
onAddToQuery(fieldKey, fieldValue, OPERATORS['='], undefined, dataType);
onAddToQuery(fieldKey, fieldValue, OPERATORS['='], dataType);
};
const popOverContent = useMemo(() => <span>Add to query: {fieldKey}</span>, [
@ -41,7 +41,6 @@ export interface AddToQueryHOCProps {
fieldKey: string,
fieldValue: string,
operator: string,
isJSON?: boolean,
dataType?: DataTypes,
) => void;
fontSize: FontSize;

4
frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx
View File

@ -160,7 +160,7 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({
label="Seconds"
placeholder="Auto"
labelAfter
initialValue={query?.stepInterval ?? undefined}
initialValue={query?.stepInterval ?? null}
/>
</div>
</div>
@ -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"
/>
</div>

4
frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx
View File

@ -81,9 +81,7 @@ function QueryAggregationOptions({
<div className="query-aggregation-interval-input-container">
<InputWithLabel
initialValue={
queryData?.stepInterval ? queryData?.stepInterval : undefined
}
initialValue={queryData?.stepInterval ? queryData?.stepInterval : null}
className="query-aggregation-interval-input"
label="Seconds"
placeholder="Auto"

18
frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx
View File

@ -154,15 +154,23 @@ function QueryAggregationSelect({
const isDarkMode = useIsDarkMode();
const { setAggregationOptions } = useQueryBuilderV2Context();
const formatAggregations = useCallback(
(aggregations: any[] | undefined): string =>
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<

2
frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
View File

@ -1292,7 +1292,7 @@ function QuerySearch({
if (onRun && typeof onRun === 'function') {
onRun(query);
} else {
handleRunQuery(true, true);
handleRunQuery();
}
return true;
},

2
frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx
View File

@ -133,8 +133,6 @@ function OtherFilters({
{
key: filter.key,
dataType: filter.dataType,
isColumn: filter.isColumn,
isJSON: filter.isJSON,
type: filter.type,
},
]);

4
frontend/src/components/QuickFilters/tests/constants.ts
View File

@ -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,
},

2
frontend/src/components/QuickFilters/utils.tsx
View File

@ -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),

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

@ -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<AutocompleteType, AutocompleteType> = {
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: [],

21
frontend/src/container/ApiMonitoring/APIMonitoringUtils.test.tsx
View File

@ -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: '',
},

2
frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/EndPointDetails.tsx
View File

@ -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',
};

2
frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx
View File

@ -58,8 +58,6 @@ function TopErrors({
id: '92b8a1c1',
key: {
dataType: DataTypes.String,
isColumn: false,
isJSON: false,
key: SPAN_ATTRIBUTES.URL_PATH,
type: 'tag',
},

2
frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx
View File

@ -99,8 +99,6 @@ function DomainList(): JSX.Element {
key: 'kind_string',
dataType: 'string',
type: '',
isColumn: true,
isJSON: false,
},
op: '=',
value: 'Client',

2
frontend/src/container/ApiMonitoring/__tests__/AllEndPoints.test.tsx
View File

@ -123,8 +123,6 @@ describe('AllEndPoints', () => {
{
key: 'http.status_code',
dataType: 'string',
isColumn: true,
isJSON: false,
type: '',
},
],

4
frontend/src/container/ApiMonitoring/__tests__/EndPointDetails.test.tsx
View File

@ -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',

4
frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarCharts.test.tsx
View File

@ -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',
},

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

@ -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',
},

2
frontend/src/container/ExplorerOrderBy/index.tsx
View File

@ -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 = [

1
frontend/src/container/FormAlertRules/ChartPreview/index.tsx
View File

@ -142,7 +142,6 @@ function ChartPreview({
return false;
}
}, [query]);
const queryResponse = useGetQueryRange(
{
query: query || initialQueriesMap.metrics,

2
frontend/src/container/FormAlertRules/index.tsx
View File

@ -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}

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

@ -65,8 +65,6 @@ const mockProps: WidgetGraphComponentProps = {
aggregateAttribute: {
dataType: DataTypes.String,
id: 'span_id--string----true',
isColumn: true,
isJSON: false,
key: 'span_id',
type: '',
},

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

@ -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
});
});
});

5
frontend/src/container/GridCardLayout/useResolveQuery.ts
View File

@ -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],
);

18
frontend/src/container/GridCardLayout/utils.ts
View File

@ -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),
})),
],
},

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

@ -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',
},

10
frontend/src/container/Home/Services/ServiceMetrics.tsx
View File

@ -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(

10
frontend/src/container/InfraMonitoringHosts/utils.tsx
View File

@ -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,
},

6
frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

8
frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

8
frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

2
frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx
View File

@ -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: '=',

2
frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.test.tsx
View File

@ -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: '=',

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

@ -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,
},

8
frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/JobDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

6
frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/NamespaceDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

6
frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

8
frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx generated
View File

@ -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: '=',

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

@ -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',
},

8
frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/StatefulSetDetails.tsx
View File

@ -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: '=',

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

@ -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',
},

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

@ -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',
},

78
frontend/src/container/InfraMonitoringK8s/constants.ts
View File

@ -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,
},

1
frontend/src/container/LiveLogs/constants.ts
View File

@ -49,5 +49,4 @@ export const idObject: BaseAutocompleteData = {
key: 'id',
type: '',
dataType: DataTypes.String,
isColumn: true,
};

1
frontend/src/container/LogDetailedView/ActionItem.tsx
View File

@ -56,7 +56,6 @@ export interface ActionItemProps {
fieldKey: string,
fieldValue: string,
operator: string,
isJSON?: boolean,
dataType?: DataTypes,
fieldType?: string,
) => void;

2
frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx
View File

@ -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),
);
}

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

@ -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 = {

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

File diff suppressed because it is too large Load Diff

6
frontend/src/container/LogDetailedView/Overview.tsx
View File

@ -29,11 +29,7 @@ interface OverviewProps {
isListViewPanel?: boolean;
selectedOptions: OptionsQuery;
listViewPanelSelectedFields?: IField[] | null;
onGroupByAttribute?: (
fieldKey: string,
isJSON?: boolean,
dataType?: DataTypes,
) => Promise<void>;
onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise<void>;
}
type Props = OverviewProps &

7
frontend/src/container/LogDetailedView/TableView.tsx
View File

@ -47,11 +47,7 @@ interface TableViewProps {
selectedOptions: OptionsQuery;
isListViewPanel?: boolean;
listViewPanelSelectedFields?: IField[] | null;
onGroupByAttribute?: (
fieldKey: string,
isJSON?: boolean,
dataType?: DataTypes,
) => Promise<void>;
onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise<void>;
}
type Props = TableViewProps &
@ -123,7 +119,6 @@ function TableView({
fieldKey,
validatedFieldValue,
operator,
undefined,
dataType as DataTypes,
fieldType,
);

6
frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx
View File

@ -33,11 +33,7 @@ interface ITableViewActionsProps {
isListViewPanel: boolean;
isfilterInLoading: boolean;
isfilterOutLoading: boolean;
onGroupByAttribute?: (
fieldKey: string,
isJSON?: boolean,
dataType?: DataTypes,
) => Promise<void>;
onGroupByAttribute?: (fieldKey: string, dataType?: DataTypes) => Promise<void>;
onClickHandler: (
operator: string,
fieldKey: string,

1
frontend/src/container/LogsExplorerContext/utils.ts
View File

@ -15,7 +15,6 @@ export const getFiltersFromResources = (
key,
dataType: DataTypes.String,
type: 'resource',
isColumn: false,
},
op: OPERATORS['='],
value: resourceValue,

2
frontend/src/container/LogsExplorerList/__tests__/LogsExplorerList.test.tsx
View File

@ -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',

4
frontend/src/container/LogsExplorerViews/index.tsx
View File

@ -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,

6
frontend/src/container/LogsExplorerViews/tests/mock.ts
View File

@ -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',

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

@ -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',

4
frontend/src/container/MeterExplorer/Explorer/Explorer.tsx
View File

@ -143,9 +143,7 @@ function Explorer(): JSX.Element {
<div className="explore-header-right-actions">
<DateTimeSelector showAutoRefresh />
<RightToolbarActions
onStageRunQuery={(): void => handleRunQuery(true, true)}
/>
<RightToolbarActions onStageRunQuery={(): void => handleRunQuery()} />
</div>
</div>
<QueryBuilderV2

6
frontend/src/container/MetricsApplication/MetricsPageQueries/DBCallQueries.ts
View File

@ -27,14 +27,12 @@ export const databaseCallsRPS = ({
{
key: WidgetKeys.SignozDBLatencyCount,
dataType: DataTypes.Float64,
isColumn: true,
type: '',
},
];
const groupBy: BaseAutocompleteData[] = [
{
dataType: DataTypes.String,
isColumn: false,
key: dotMetricsEnabled ? WidgetKeys.Db_system : WidgetKeys.Db_system_norm,
type: 'tag',
},
@ -48,7 +46,6 @@ export const databaseCallsRPS = ({
? WidgetKeys.Service_name
: WidgetKeys.Service_name_norm,
dataType: DataTypes.String,
isColumn: false,
type: MetricsType.Resource,
},
op: OPERATORS.IN,
@ -83,13 +80,11 @@ export const databaseCallsAvgDuration = ({
const autocompleteDataA: BaseAutocompleteData = {
key: WidgetKeys.SignozDbLatencySum,
dataType: DataTypes.Float64,
isColumn: true,
type: '',
};
const autocompleteDataB: BaseAutocompleteData = {
key: WidgetKeys.SignozDBLatencyCount,
dataType: DataTypes.Float64,
isColumn: true,
type: '',
};
@ -101,7 +96,6 @@ export const databaseCallsAvgDuration = ({
? WidgetKeys.Service_name
: WidgetKeys.Service_name_norm,
dataType: DataTypes.String,
isColumn: false,
type: MetricsType.Resource,
},
op: OPERATORS.IN,

14
frontend/src/container/MetricsApplication/MetricsPageQueries/ExternalQueries.ts
View File

@ -23,7 +23,6 @@ import {
const groupBy: BaseAutocompleteData[] = [
{
dataType: DataTypes.String,
isColumn: false,
key: WidgetKeys.Address,
type: MetricsType.Tag,
},
@ -38,13 +37,11 @@ export const externalCallErrorPercent = ({
const autocompleteDataA: BaseAutocompleteData = {
key: WidgetKeys.SignozExternalCallLatencyCount,
dataType: DataTypes.Float64,
isColumn: true,
type: '',
};
const autocompleteDataB: BaseAutocompleteData = {
key: WidgetKeys.SignozExternalCallLatencyCount,
dataType: DataTypes.Float64,
isColumn: true,
type: '',
};
@ -56,7 +53,6 @@ export const externalCallErrorPercent = ({
? WidgetKeys.Service_name
: WidgetKeys.Service_name_norm,
dataType: DataTypes.String,
isColumn: false,
type: MetricsType.Resource,
},
op: OPERATORS.IN,
@ -67,7 +63,6 @@ export const externalCallErrorPercent = ({
key: {
key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
dataType: DataTypes.Int64,
isColumn: false,
type: MetricsType.Tag,
},
op: OPERATORS.IN,
@ -83,7 +78,6 @@ export const externalCallErrorPercent = ({
? WidgetKeys.Service_name
: WidgetKeys.Service_name_norm,
dataType: DataTypes.String,
isColumn: false,
type: MetricsType.Resource,
},
op: OPERATORS.IN,
@ -130,13 +124,11 @@ export const externalCallDuration = ({
}: ExternalCallProps): 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: '',
};
@ -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,

39
frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts
View File

@ -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,

7
frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts
View File

@ -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,
},

2
frontend/src/container/MetricsApplication/Tabs/External.tsx
View File

@ -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',

4
frontend/src/container/MetricsApplication/Tabs/Overview.tsx
View File

@ -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',

2
frontend/src/container/MetricsApplication/Tabs/Overview/TableRenderer/ColumnWithLink.tsx
View File

@ -26,8 +26,6 @@ function ColumnWithLink({
key: 'name',
dataType: DataTypes.String,
type: 'tag',
isColumn: true,
isJSON: false,
id: 'name--string--tag--true',
},
op: 'in',

4
frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx
View File

@ -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;

10
frontend/src/container/MetricsApplication/Tabs/util.ts
View File

@ -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',

2
frontend/src/container/MetricsApplication/TopOperationsTable.tsx
View File

@ -61,8 +61,6 @@ function TopOperationsTable({
key: 'name',
dataType: DataTypes.String,
type: 'tag',
isColumn: true,
isJSON: false,
id: 'name--string--tag--true',
},
op: 'in',

4
frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
View File

@ -138,9 +138,7 @@ function Explorer(): JSX.Element {
<div className="explore-header-right-actions">
{!isEmpty(warning) && <WarningPopover warningData={warning} />}
<DateTimeSelector showAutoRefresh />
<RightToolbarActions
onStageRunQuery={(): void => handleRunQuery(true, true)}
/>
<RightToolbarActions onStageRunQuery={(): void => handleRunQuery()} />
</div>
</div>
<QueryBuilderV2

2
frontend/src/container/MetricsExplorer/Inspect/utils.tsx
View File

@ -117,8 +117,6 @@ export function MetricFilters({
key: metricName ?? '',
dataType: DataTypes.String,
type: metricType,
isColumn: true,
isJSON: false,
id: `${metricName}--${DataTypes.String}--${metricType}--true`,
}),
[metricName, metricType],

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

@ -107,8 +107,6 @@ export function getMetricDetailsQuery(
key: metricName,
type: metricType ?? '',
id: `${metricName}----${metricType}---string--`,
isColumn: true,
isJSON: false,
dataType: DataTypes.String,
},
aggregations: [
@ -145,8 +143,6 @@ export function getMetricDetailsQuery(
key: groupBy,
dataType: DataTypes.String,
type: 'tag',
isColumn: false,
isJSON: false,
id: `${groupBy}--string--tag--false`,
},
]

2
frontend/src/container/NewWidget/LeftContainer/QuerySection/index.tsx
View File

@ -102,7 +102,7 @@ function QuerySection({
],
},
});
handleRunQueryFromQueryBuilder(false, true);
handleRunQueryFromQueryBuilder();
},
[
selectedDashboard,

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

@ -18,8 +18,6 @@ const compositeQueryParam = {
key: 'signoz_latency',
dataType: 'float64',
type: 'ExponentialHistogram',
isColumn: true,
isJSON: false,
id: 'signoz_latency--float64--ExponentialHistogram--true',
},
timeAggregation: '',
@ -40,8 +38,6 @@ const compositeQueryParam = {
key: 'service_name',
dataType: 'string',
type: 'tag',
isColumn: false,
isJSON: false,
id: 'service_name--string--tag--false',
},
],

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

@ -49,7 +49,6 @@ export default function LogsConnectionStatus(): JSX.Element {
id: '------false',
dataType: DataTypes.EMPTY,
key: '',
isColumn: false,
type: '',
},
filters: {

4
frontend/src/container/OptionsMenu/constants.ts
View File

@ -17,8 +17,6 @@ export const defaultLogsSelectedColumns: TelemetryFieldKey[] = [
signal: 'logs',
fieldContext: 'log',
fieldDataType: '',
isColumn: true,
isJSON: false,
isIndexed: false,
},
{
@ -26,8 +24,6 @@ export const defaultLogsSelectedColumns: TelemetryFieldKey[] = [
signal: 'logs',
fieldContext: 'log',
fieldDataType: '',
isColumn: true,
isJSON: false,
isIndexed: false,
},
];

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

@ -33,8 +33,6 @@ export const tablePanelWidgetQuery = {
key: 'signoz_latency',
dataType: 'float64',
type: 'ExponentialHistogram',
isColumn: true,
isJSON: false,
id: 'signoz_latency--float64--ExponentialHistogram--true',
},
timeAggregation: '',
@ -55,8 +53,6 @@ export const tablePanelWidgetQuery = {
key: 'service_name',
dataType: 'string',
type: 'tag',
isColumn: false,
isJSON: false,
id: 'service_name--string--tag--false',
},
],
@ -89,40 +85,30 @@ export const tablePanelWidgetQuery = {
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',
},
],
@ -235,8 +221,6 @@ export const tablePanelQueryResponse = {
key: 'signoz_latency',
dataType: 'float64',
type: 'ExponentialHistogram',
isColumn: true,
isJSON: false,
id: 'signoz_latency--float64--ExponentialHistogram--true',
},
timeAggregation: '',
@ -257,8 +241,6 @@ export const tablePanelQueryResponse = {
key: 'service_name',
dataType: 'string',
type: 'tag',
isColumn: false,
isJSON: false,
id: 'service_name--string--tag--false',
},
],

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

@ -33,8 +33,6 @@ export const valuePanelWidget = {
key: 'signoz_latency',
dataType: 'float64',
type: 'ExponentialHistogram',
isColumn: true,
isJSON: false,
id: 'signoz_latency--float64--ExponentialHistogram--true',
},
timeAggregation: '',
@ -80,40 +78,30 @@ export const valuePanelWidget = {
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',
},
],
@ -225,8 +213,6 @@ export const valuePanelQueryResponse = {
key: 'signoz_latency',
dataType: 'float64',
type: 'ExponentialHistogram',
isColumn: true,
isJSON: false,
id: 'signoz_latency--float64--ExponentialHistogram--true',
},
timeAggregation: '',

4
frontend/src/container/PipelinePage/Layouts/ChangeHistory/tests/testUtils.ts
View File

@ -30,8 +30,6 @@ export const pipelineData: Pipeline = {
key: 'container_name',
dataType: DataTypes.String,
type: 'tag',
isColumn: false,
isJSON: false,
},
id: 'sampleid',
value: 'hotrod',
@ -100,8 +98,6 @@ export const pipelineData: Pipeline = {
key: 'service',
dataType: DataTypes.String,
type: 'tag',
isColumn: false,
isJSON: false,
},
id: 'sample-test-1',
value: 'customer',

2
frontend/src/container/PipelinePage/mocks/pipeline.ts
View File

@ -18,8 +18,6 @@ export function mockPipelineFilter(
key,
dataType: DataTypes.String,
type: '',
isColumn: false,
isJSON: false,
},
op,
value,

9
frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx
View File

@ -88,15 +88,13 @@ export const AggregatorFilter = memo(function AggregatorFilter({
label={transformStringWithPrefix({
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
})}
value={removePrefix(
transformStringWithPrefix({
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
}),
!item.isColumn && item.type ? item.type : '',
item.type || '',
)}
dataType={item.dataType}
type={item.type || ''}
@ -288,11 +286,8 @@ export const AggregatorFilter = memo(function AggregatorFilter({
query.aggregateAttribute?.key ||
'',
prefix: query.aggregateAttribute?.type || '',
condition: !query.aggregateAttribute?.isColumn,
}),
!query.aggregateAttribute?.isColumn && query.aggregateAttribute?.type
? query.aggregateAttribute?.type
: '',
query.aggregateAttribute?.type ? query.aggregateAttribute?.type : '',
);
return (

7
frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
View File

@ -83,15 +83,13 @@ export const GroupByFilter = memo(function GroupByFilter({
label={transformStringWithPrefix({
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
})}
value={removePrefix(
transformStringWithPrefix({
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
}),
!item.isColumn && item.type ? item.type : '',
item.type || '',
)}
dataType={item.dataType || ''}
type={item.type || ''}
@ -182,9 +180,8 @@ export const GroupByFilter = memo(function GroupByFilter({
transformStringWithPrefix({
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
}),
!item.isColumn && item.type ? item.type : '',
item.type || '',
)}`,
value: `${item.id}`,
}),

1
frontend/src/container/QueryBuilder/filters/HavingFilter/HavingFilter.tsx
View File

@ -47,7 +47,6 @@ export function HavingFilter({
transformStringWithPrefix({
str: query.aggregateAttribute?.key || '',
prefix: query.aggregateAttribute?.type || '',
condition: !query.aggregateAttribute?.isColumn,
}),
[query],
);

1
frontend/src/container/QueryBuilder/filters/HavingFilter/__tests__/utils.test.tsx
View File

@ -18,7 +18,6 @@ const valueWithAttributeAndOperator: IBuilderQuery = {
...initialQueryBuilderFormValuesMap.logs,
aggregateOperator: 'SUM',
aggregateAttribute: {
isColumn: false,
key: 'bytes',
type: 'tag',
dataType: DataTypes.Float64,

6
frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx
View File

@ -272,9 +272,7 @@ function QueryBuilderSearch({
(item) => 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,

14
frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
View File

@ -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,
},
},
]

Some files were not shown because too many files have changed in this diff Show More