From 59025238b3af0ac180ac3531db62da2433d09547 Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Thu, 8 Jun 2023 12:26:59 +0530 Subject: [PATCH 1/5] fix: if condition corrected in aggreagte attribute static fields (#2866) --- pkg/query-service/app/clickhouseReader/reader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go index b12d3bbd9e..50e54f40d7 100644 --- a/pkg/query-service/app/clickhouseReader/reader.go +++ b/pkg/query-service/app/clickhouseReader/reader.go @@ -3879,7 +3879,7 @@ func (r *ClickHouseReader) GetLogAggregateAttributes(ctx context.Context, req *v } // add other attributes for _, field := range constants.StaticFieldsLogsV3 { - if !stringAllowed && field.DataType == v3.AttributeKeyDataTypeString && (v3.AttributeKey{} == field) { + if (!stringAllowed && field.DataType == v3.AttributeKeyDataTypeString) || (v3.AttributeKey{} == field) { continue } else if len(req.SearchText) == 0 || strings.Contains(field.Key, req.SearchText) { response.AttributeKeys = append(response.AttributeKeys, field) From 4d59f4c7e598a7897cf1f16e63ec38452da25e09 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 8 Jun 2023 12:31:07 +0530 Subject: [PATCH 2/5] chore: pin SigNoz version to 0.20.1 --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 0a4c98a507..5043df367f 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -137,7 +137,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.20.0 + image: signoz/query-service:0.20.1 command: ["-config=/root/config/prometheus.yml"] # ports: # - "6060:6060" # pprof port @@ -166,7 +166,7 @@ services: <<: *clickhouse-depend frontend: - image: signoz/frontend:0.20.0 + image: signoz/frontend:0.20.1 deploy: restart_policy: condition: on-failure diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 3dbb8f2669..6cefd0e8eb 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -153,7 +153,7 @@ services: # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` query-service: - image: signoz/query-service:${DOCKER_TAG:-0.20.0} + image: signoz/query-service:${DOCKER_TAG:-0.20.1} container_name: query-service command: ["-config=/root/config/prometheus.yml"] # ports: @@ -181,7 +181,7 @@ services: <<: *clickhouse-depend frontend: - image: signoz/frontend:${DOCKER_TAG:-0.20.0} + image: signoz/frontend:${DOCKER_TAG:-0.20.1} container_name: frontend restart: on-failure depends_on: From 99f863f44486fef607e2946a7c85b952ad578926 Mon Sep 17 00:00:00 2001 From: Palash Gupta Date: Fri, 9 Jun 2023 14:14:23 +0530 Subject: [PATCH 3/5] fix: raw query is updated to query (#2881) --- frontend/src/constants/queryBuilder.ts | 1 - frontend/src/container/CreateAlertRule/defaults.ts | 4 ---- frontend/src/container/FormAlertRules/ChartPreview/index.tsx | 2 +- frontend/src/container/FormAlertRules/index.tsx | 2 +- .../QuerySection/QueryBuilder/clickHouse/query.tsx | 4 ++-- .../QuerySection/QueryBuilder/clickHouse/types.ts | 2 +- .../queryBuilderMappers/mapQueryDataFromApi.ts | 2 +- frontend/src/store/actions/dashboard/getQueryResults.ts | 4 ++-- frontend/src/types/api/queryBuilder/queryBuilderData.ts | 1 - 9 files changed, 8 insertions(+), 14 deletions(-) diff --git a/frontend/src/constants/queryBuilder.ts b/frontend/src/constants/queryBuilder.ts index 95faf6149d..a31397dd3c 100644 --- a/frontend/src/constants/queryBuilder.ts +++ b/frontend/src/constants/queryBuilder.ts @@ -146,7 +146,6 @@ export const initialQueryPromQLData: IPromQLQuery = { export const initialClickHouseData: IClickHouseQuery = { name: createNewBuilderItemName({ existNames: [], sourceNames: alphabet }), - rawQuery: '', legend: '', disabled: false, query: '', diff --git a/frontend/src/container/CreateAlertRule/defaults.ts b/frontend/src/container/CreateAlertRule/defaults.ts index a12051da26..523997c2a3 100644 --- a/frontend/src/container/CreateAlertRule/defaults.ts +++ b/frontend/src/container/CreateAlertRule/defaults.ts @@ -39,7 +39,6 @@ export const alertDefaults: AlertDef = { A: { name: 'A', query: ``, - rawQuery: ``, legend: '', disabled: false, }, @@ -73,7 +72,6 @@ export const logAlertDefaults: AlertDef = { A: { name: 'A', query: `select \ntoStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 MINUTE) AS interval, \ntoFloat64(count()) as value \nFROM signoz_logs.distributed_logs \nWHERE timestamp BETWEEN {{.start_timestamp_nano}} AND {{.end_timestamp_nano}} \nGROUP BY interval;\n\n-- available variables:\n-- \t{{.start_timestamp_nano}}\n-- \t{{.end_timestamp_nano}}\n\n-- required columns (or alias):\n-- \tvalue\n-- \tinterval`, - rawQuery: `select \ntoStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 MINUTE) AS interval, \ntoFloat64(count()) as value \nFROM signoz_logs.distributed_logs \nWHERE timestamp BETWEEN {{.start_timestamp_nano}} AND {{.end_timestamp_nano}} \nGROUP BY interval;\n\n-- available variables:\n-- \t{{.start_timestamp_nano}}\n-- \t{{.end_timestamp_nano}}\n\n-- required columns (or alias):\n-- \tvalue\n-- \tinterval`, legend: '', disabled: false, }, @@ -107,7 +105,6 @@ export const traceAlertDefaults: AlertDef = { chQueries: { A: { name: 'A', - rawQuery: `SELECT \n\ttoStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS interval, \n\ttagMap['peer.service'] AS op_name, \n\ttoFloat64(avg(durationNano)) AS value \nFROM signoz_traces.distributed_signoz_index_v2 \nWHERE tagMap['peer.service']!='' \nAND timestamp BETWEEN {{.start_datetime}} AND {{.end_datetime}} \nGROUP BY (op_name, interval);\n\n-- available variables:\n-- \t{{.start_datetime}}\n-- \t{{.end_datetime}}\n\n-- required column alias:\n-- \tvalue\n-- \tinterval`, query: `SELECT \n\ttoStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS interval, \n\ttagMap['peer.service'] AS op_name, \n\ttoFloat64(avg(durationNano)) AS value \nFROM signoz_traces.distributed_signoz_index_v2 \nWHERE tagMap['peer.service']!='' \nAND timestamp BETWEEN {{.start_datetime}} AND {{.end_datetime}} \nGROUP BY (op_name, interval);\n\n-- available variables:\n-- \t{{.start_datetime}}\n-- \t{{.end_datetime}}\n\n-- required column alias:\n-- \tvalue\n-- \tinterval`, legend: '', disabled: false, @@ -142,7 +139,6 @@ export const exceptionAlertDefaults: AlertDef = { chQueries: { A: { name: 'A', - rawQuery: `SELECT \n\tcount() as value,\n\ttoStartOfInterval(timestamp, toIntervalMinute(1)) AS interval,\n\tserviceName\nFROM signoz_traces.distributed_signoz_error_index_v2\nWHERE exceptionType !='OSError'\nAND timestamp BETWEEN {{.start_datetime}} AND {{.end_datetime}}\nGROUP BY serviceName, interval;\n\n-- available variables:\n-- \t{{.start_datetime}}\n-- \t{{.end_datetime}}\n\n-- required column alias:\n-- \tvalue\n-- \tinterval`, query: `SELECT \n\tcount() as value,\n\ttoStartOfInterval(timestamp, toIntervalMinute(1)) AS interval,\n\tserviceName\nFROM signoz_traces.distributed_signoz_error_index_v2\nWHERE exceptionType !='OSError'\nAND timestamp BETWEEN {{.start_datetime}} AND {{.end_datetime}}\nGROUP BY serviceName, interval;\n\n-- available variables:\n-- \t{{.start_datetime}}\n-- \t{{.end_datetime}}\n\n-- required column alias:\n-- \tvalue\n-- \tinterval`, legend: '', disabled: false, diff --git a/frontend/src/container/FormAlertRules/ChartPreview/index.tsx b/frontend/src/container/FormAlertRules/ChartPreview/index.tsx index e1d2dcf220..c0732264e2 100644 --- a/frontend/src/container/FormAlertRules/ChartPreview/index.tsx +++ b/frontend/src/container/FormAlertRules/ChartPreview/index.tsx @@ -64,7 +64,7 @@ function ChartPreview({ case EQueryType.CLICKHOUSE: return ( query.clickhouse_sql?.length > 0 && - query.clickhouse_sql[0].rawQuery?.length > 0 + query.clickhouse_sql[0].query?.length > 0 ); case EQueryType.QUERY_BUILDER: return ( diff --git a/frontend/src/container/FormAlertRules/index.tsx b/frontend/src/container/FormAlertRules/index.tsx index 8be331f4c5..6ed81a93d8 100644 --- a/frontend/src/container/FormAlertRules/index.tsx +++ b/frontend/src/container/FormAlertRules/index.tsx @@ -162,7 +162,7 @@ function FormAlertRules({ } currentQuery.clickhouse_sql.forEach((item) => { - if (item.rawQuery === '') { + if (item.query === '') { notifications.error({ message: 'Error', description: t('chquery_required'), diff --git a/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/query.tsx b/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/query.tsx index 8526f62309..304680c97c 100644 --- a/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/query.tsx +++ b/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/query.tsx @@ -50,7 +50,7 @@ function ClickHouseQueryBuilder({ const handleUpdateEditor = useCallback( (value: string) => { - handleUpdateQuery('rawQuery', value); + handleUpdateQuery('query', value); }, [handleUpdateQuery], ); @@ -75,7 +75,7 @@ function ClickHouseQueryBuilder({ language="sql" height="200px" onChange={handleUpdateEditor} - value={queryData.rawQuery} + value={queryData.query} options={{ scrollbar: { alwaysConsumeMouseWheel: false, diff --git a/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/types.ts b/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/types.ts index e2842e8392..63cc36c2a4 100644 --- a/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/types.ts +++ b/frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/clickHouse/types.ts @@ -2,7 +2,7 @@ import { IClickHouseQuery } from 'types/api/queryBuilder/queryBuilderData'; export interface IClickHouseQueryHandleChange { queryIndex: number | string; - rawQuery?: IClickHouseQuery['rawQuery']; + query?: IClickHouseQuery['query']; legend?: IClickHouseQuery['legend']; toggleDisable?: IClickHouseQuery['disabled']; toggleDelete?: boolean; diff --git a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts index e75995f943..860b2d1266 100644 --- a/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts +++ b/frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts @@ -22,7 +22,7 @@ export const mapQueryDataFromApi = ( ? Object.keys(compositeQuery.chQueries).map((key) => ({ ...compositeQuery.chQueries[key], name: key, - rawQuery: compositeQuery.chQueries[key].query, + query: compositeQuery.chQueries[key].query, })) : initialQuery.clickhouse_sql; diff --git a/frontend/src/store/actions/dashboard/getQueryResults.ts b/frontend/src/store/actions/dashboard/getQueryResults.ts index 32cfee21fb..8f87e8cb49 100644 --- a/frontend/src/store/actions/dashboard/getQueryResults.ts +++ b/frontend/src/store/actions/dashboard/getQueryResults.ts @@ -67,9 +67,9 @@ export async function GetMetricQueryRange({ case EQueryType.CLICKHOUSE: { const chQueries = {}; queryData.map((query) => { - if (!query.rawQuery) return; + if (!query.query) return; chQueries[query.name] = { - query: query.rawQuery, + query: query.query, disabled: query.disabled, }; legendMap[query.name] = query.legend; diff --git a/frontend/src/types/api/queryBuilder/queryBuilderData.ts b/frontend/src/types/api/queryBuilder/queryBuilderData.ts index bbcca2b08c..b89c81346a 100644 --- a/frontend/src/types/api/queryBuilder/queryBuilderData.ts +++ b/frontend/src/types/api/queryBuilder/queryBuilderData.ts @@ -63,7 +63,6 @@ export type IBuilderQuery = { export interface IClickHouseQuery { name: string; - rawQuery: string; legend: string; disabled: boolean; query: string; From 0cf56d82477128faa26685a550a08724ffed5a5f Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Fri, 9 Jun 2023 14:18:48 +0530 Subject: [PATCH 4/5] fix: allow unspecified key type --- pkg/query-service/model/v3/v3.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/query-service/model/v3/v3.go b/pkg/query-service/model/v3/v3.go index d2f8f45fa5..e323f7e47c 100644 --- a/pkg/query-service/model/v3/v3.go +++ b/pkg/query-service/model/v3/v3.go @@ -293,7 +293,7 @@ func (a AttributeKey) Validate() error { if a.IsColumn { switch a.Type { - case AttributeKeyTypeResource, AttributeKeyTypeTag: + case AttributeKeyTypeResource, AttributeKeyTypeTag, AttributeKeyTypeUnspecified: break default: return fmt.Errorf("invalid attribute type: %s", a.Type) From 84c4668b671eae9f54a7dbf6f52b46eff6a186e4 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Fri, 9 Jun 2023 14:20:15 +0530 Subject: [PATCH 5/5] chore: pin SigNoz version to 0.20.2 --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 5043df367f..2af03d4255 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -137,7 +137,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.20.1 + image: signoz/query-service:0.20.2 command: ["-config=/root/config/prometheus.yml"] # ports: # - "6060:6060" # pprof port @@ -166,7 +166,7 @@ services: <<: *clickhouse-depend frontend: - image: signoz/frontend:0.20.1 + image: signoz/frontend:0.20.2 deploy: restart_policy: condition: on-failure diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 6cefd0e8eb..a270892a88 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -153,7 +153,7 @@ services: # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` query-service: - image: signoz/query-service:${DOCKER_TAG:-0.20.1} + image: signoz/query-service:${DOCKER_TAG:-0.20.2} container_name: query-service command: ["-config=/root/config/prometheus.yml"] # ports: @@ -181,7 +181,7 @@ services: <<: *clickhouse-depend frontend: - image: signoz/frontend:${DOCKER_TAG:-0.20.1} + image: signoz/frontend:${DOCKER_TAG:-0.20.2} container_name: frontend restart: on-failure depends_on: