Merge pull request #3947 from Dokploy/3896-application-monitor-problem

fix: enhance container metrics query to support wildcard matching for…
This commit is contained in:
Mauricio Siu
2026-03-08 16:17:14 -06:00
committed by GitHub
+4 -4
View File
@@ -54,13 +54,13 @@ func (db *DB) GetLastNContainerMetrics(containerName string, limit int) ([]Conta
WITH recent_metrics AS ( WITH recent_metrics AS (
SELECT metrics_json SELECT metrics_json
FROM container_metrics FROM container_metrics
WHERE container_name = ? WHERE container_name = ? OR container_name LIKE ?
ORDER BY timestamp DESC ORDER BY timestamp DESC
LIMIT ? LIMIT ?
) )
SELECT metrics_json FROM recent_metrics ORDER BY json_extract(metrics_json, '$.timestamp') ASC SELECT metrics_json FROM recent_metrics ORDER BY json_extract(metrics_json, '$.timestamp') ASC
` `
rows, err := db.Query(query, containerName, limit) rows, err := db.Query(query, containerName, containerName+".%", limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -90,12 +90,12 @@ func (db *DB) GetAllMetricsContainer(containerName string) ([]ContainerMetric, e
WITH recent_metrics AS ( WITH recent_metrics AS (
SELECT metrics_json SELECT metrics_json
FROM container_metrics FROM container_metrics
WHERE container_name = ? WHERE container_name = ? OR container_name LIKE ?
ORDER BY timestamp DESC ORDER BY timestamp DESC
) )
SELECT metrics_json FROM recent_metrics ORDER BY json_extract(metrics_json, '$.timestamp') ASC SELECT metrics_json FROM recent_metrics ORDER BY json_extract(metrics_json, '$.timestamp') ASC
` `
rows, err := db.Query(query, containerName) rows, err := db.Query(query, containerName, containerName+".%")
if err != nil { if err != nil {
return nil, err return nil, err
} }