diff --git a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx index b3c563c27a..192a98f6ed 100644 --- a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx +++ b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx @@ -84,7 +84,22 @@ function DomainList({ showIP }: { showIP: boolean }): JSX.Element { show_ip: showIP, filters: { op: 'AND', - items: query?.filters.items, + items: [ + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: 'string', + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, + ...(query?.filters.items || []), + ], }, }; diff --git a/frontend/src/container/ApiMonitoring/utils.tsx b/frontend/src/container/ApiMonitoring/utils.tsx index a854161283..5062535601 100644 --- a/frontend/src/container/ApiMonitoring/utils.tsx +++ b/frontend/src/container/ApiMonitoring/utils.tsx @@ -368,7 +368,7 @@ export const getEndPointsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: false, expression: 'A', @@ -387,6 +387,19 @@ export const getEndPointsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ], op: 'AND', }, @@ -400,7 +413,7 @@ export const getEndPointsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, { aggregateAttribute: { @@ -430,6 +443,19 @@ export const getEndPointsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ], op: 'AND', }, @@ -472,6 +498,19 @@ export const getEndPointsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ], op: 'AND', }, @@ -496,7 +535,7 @@ export const getEndPointsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: true, expression: 'D', @@ -528,6 +567,19 @@ export const getEndPointsQueryPayload = ( op: '=', value: 'true', }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ], op: 'AND', }, @@ -541,7 +593,7 @@ export const getEndPointsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, ], queryFormulas: [ @@ -948,6 +1000,20 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, + ...filters.items, ], op: 'AND', }, @@ -1004,6 +1070,20 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, + ...filters.items, ], op: 'AND', }, @@ -1028,7 +1108,7 @@ export const getEndPointDetailsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: true, expression: 'C', @@ -1073,6 +1153,20 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: 'true', }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, + ...filters.items, ], op: 'AND', }, @@ -1086,7 +1180,7 @@ export const getEndPointDetailsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, { aggregateAttribute: { @@ -1128,6 +1222,20 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, + ...filters.items, ], op: 'AND', }, @@ -1152,7 +1260,7 @@ export const getEndPointDetailsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: true, expression: 'E', @@ -1184,6 +1292,20 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, + ...filters.items, ], op: 'AND', }, @@ -1197,7 +1319,7 @@ export const getEndPointDetailsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, ], queryFormulas: [ @@ -1249,7 +1371,7 @@ export const getEndPointDetailsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: false, expression: 'A', @@ -1281,6 +1403,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: endPointName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1304,7 +1439,7 @@ export const getEndPointDetailsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, { aggregateAttribute: { @@ -1347,6 +1482,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: endPointName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1433,6 +1581,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1498,7 +1659,7 @@ export const getEndPointDetailsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: false, expression: 'A', @@ -1530,6 +1691,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1553,7 +1727,7 @@ export const getEndPointDetailsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, { aggregateAttribute: { @@ -1596,6 +1770,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1661,6 +1848,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1695,7 +1895,7 @@ export const getEndPointDetailsQueryPayload = ( key: 'span_id', type: '', }, - aggregateOperator: 'count_distinct', + aggregateOperator: 'count', dataSource: DataSource.TRACES, disabled: true, expression: 'D', @@ -1740,6 +1940,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: 'true', }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1763,7 +1976,7 @@ export const getEndPointDetailsQueryPayload = ( reduceTo: 'avg', spaceAggregation: 'sum', stepInterval: 60, - timeAggregation: 'count_distinct', + timeAggregation: 'count', }, ], queryFormulas: [ @@ -1846,6 +2059,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: endPointName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -1946,6 +2172,19 @@ export const getEndPointDetailsQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ...filters.items, ], op: 'AND', @@ -2039,6 +2278,19 @@ export const getEndPointZeroStateQueryPayload = ( op: '=', value: domainName, }, + { + id: '212678b9', + key: { + key: 'kind_string', + dataType: DataTypes.String, + type: '', + isColumn: true, + isJSON: false, + id: 'kind_string--string----true', + }, + op: '=', + value: 'Client', + }, ], op: 'AND', },