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

fix(metrics-explorer): added type in list summary api as filter (#7357)

Browse Source
This commit is contained in:
aniketio-ctrl 2025-03-19 11:30:40 +05:30 committed by GitHub
parent 53d3de4909
commit 7a225e0a4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/query-service/app/clickhouseReader/reader.go
View File

@ -5971,8 +5971,6 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
if req.Limit < 50 { if req.Limit < 50 {
firstQueryLimit = 50 firstQueryLimit = 50
} }
} else if req.OrderBy.ColumnName == "metric_type" {
orderByClauseFirstQuery = fmt.Sprintf("ORDER BY type %s", req.OrderBy.Order)
} else { } else {
orderByClauseFirstQuery = fmt.Sprintf("ORDER BY %s %s", req.OrderBy.ColumnName, req.OrderBy.Order) orderByClauseFirstQuery = fmt.Sprintf("ORDER BY %s %s", req.OrderBy.ColumnName, req.OrderBy.Order)
} }
@ -5985,8 +5983,8 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
`SELECT `SELECT
t.metric_name AS metric_name, t.metric_name AS metric_name,
ANY_VALUE(t.description) AS description, ANY_VALUE(t.description) AS description,
ANY_VALUE(t.type) AS type, ANY_VALUE(t.type) AS metric_type,
ANY_VALUE(t.unit), ANY_VALUE(t.unit) AS metric_unit,
uniq(t.fingerprint) AS timeseries, uniq(t.fingerprint) AS timeseries,
uniq(metric_name) OVER() AS total uniq(metric_name) OVER() AS total
FROM %s.%s AS t FROM %s.%s AS t
@ -6013,7 +6011,7 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
for rows.Next() { for rows.Next() {
var metric metrics_explorer.MetricDetail var metric metrics_explorer.MetricDetail
if err := rows.Scan(&metric.MetricName, &metric.Description, &metric.Type, &metric.Unit, &metric.TimeSeries, &response.Total); err != nil { if err := rows.Scan(&metric.MetricName, &metric.Description, &metric.MetricType, &metric.MetricUnit, &metric.TimeSeries, &response.Total); err != nil {
zap.L().Error("Error scanning metric row", zap.Error(err)) zap.L().Error("Error scanning metric row", zap.Error(err))
return &response, &model.ApiError{Typ: "ClickHouseError", Err: err} return &response, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }

4
pkg/query-service/model/metrics_explorer/summary.go
View File

@ -31,8 +31,8 @@ type TreeMapMetricsRequest struct {
type MetricDetail struct { type MetricDetail struct {
MetricName string `json:"metric_name"` MetricName string `json:"metric_name"`
Description string `json:"description"` Description string `json:"description"`
Type string `json:"type"` MetricType string `json:"metric_type"`
Unit string `json:"unit"` MetricUnit string `json:"metric_unit"`
TimeSeries uint64 `json:"timeseries"` TimeSeries uint64 `json:"timeseries"`
Samples uint64 `json:"samples"` Samples uint64 `json:"samples"`
LastReceived int64 `json:"lastReceived"` LastReceived int64 `json:"lastReceived"`