Skip to content

Commit 1a5ea82

Browse files
authored
Fix: Make metrics in graph align with badge metrics (#2858)
* Revert "Revert "fix: make point metrics line up with badges (#2739)" (#2857)" This reverts commit bc37fc7. * fix: naming
1 parent a520fb6 commit 1a5ea82

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

api/v1/server/handlers/v1/tasks/get_point_metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ func convertToGenMetrics(metrics []*sqlcv1.GetTaskPointMetricsRow) []gen.V1TaskP
7878
converted := make([]gen.V1TaskPointMetric, len(metrics))
7979

8080
for i, metric := range metrics {
81-
if metric == nil || !metric.Bucket2.Valid {
81+
if metric == nil || !metric.MinuteBucket.Valid {
8282
continue
8383
}
8484

85-
timeMinute := metric.Bucket2.Time.UTC()
85+
timeMinute := metric.MinuteBucket.Time.UTC()
8686

8787
converted[i] = gen.V1TaskPointMetric{
8888
FAILED: int(metric.FailedCount),

pkg/repository/sqlcv1/olap.sql

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,18 +1307,17 @@ ORDER BY r.inserted_at DESC, r.run_id DESC;
13071307
SELECT
13081308
DATE_BIN(
13091309
COALESCE(sqlc.narg('interval')::INTERVAL, '1 minute'),
1310-
task_inserted_at,
1310+
inserted_at,
13111311
TIMESTAMPTZ '1970-01-01 00:00:00+00'
1312-
) :: TIMESTAMPTZ AS bucket_2,
1312+
) :: TIMESTAMPTZ AS minute_bucket,
13131313
COUNT(*) FILTER (WHERE readable_status = 'COMPLETED') AS completed_count,
13141314
COUNT(*) FILTER (WHERE readable_status = 'FAILED') AS failed_count
1315-
FROM
1316-
v1_task_events_olap
1315+
FROM v1_statuses_olap
13171316
WHERE
13181317
tenant_id = @tenantId::UUID
1319-
AND task_inserted_at BETWEEN @createdAfter::TIMESTAMPTZ AND @createdBefore::TIMESTAMPTZ
1320-
GROUP BY bucket_2
1321-
ORDER BY bucket_2;
1318+
AND inserted_at BETWEEN @createdAfter::TIMESTAMPTZ AND @createdBefore::TIMESTAMPTZ
1319+
GROUP BY minute_bucket
1320+
ORDER BY minute_bucket;
13221321

13231322

13241323
-- name: GetTenantStatusMetrics :one

pkg/repository/sqlcv1/olap.sql.go

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)