ClusterCockpit/cc-metric-store
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-store.git synced 2026-03-03 15:17:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:ClusterCockpit/cc-metric-store into dev

Browse Source
This commit is contained in:
Jan Eitzinger
2026-03-03 07:14:15 +01:00
parent b764120501 4de275ac92
commit 3cc9420047
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/api/metricstore.go
View File

@@ -20,7 +20,6 @@ import (
cclog "github.com/ClusterCockpit/cc-lib/v2/ccLogger"
"github.com/ClusterCockpit/cc-lib/v2/schema"
"github.com/ClusterCockpit/cc-lib/v2/util"
"github.com/ClusterCockpit/cc-line-protocol/v2/lineprotocol"
)
@@ -248,15 +247,18 @@ func handleQuery(rw http.ResponseWriter, r *http.Request) {
res := make([]APIMetricData, 0, len(sels))
for _, sel := range sels {
data := APIMetricData{}
if ver == "v1" {
data.Data, data.From, data.To, data.Resolution, err = ms.Read(sel, query.Metric, req.From, req.To, 0)
} else {
data.Data, data.From, data.To, data.Resolution, err = ms.Read(sel, query.Metric, req.From, req.To, query.Resolution)
}
data.Data, data.From, data.To, data.Resolution, err = ms.Read(sel, query.Metric, req.From, req.To, query.Resolution)
if err != nil {
msg := err.Error()
data.Error = &msg
res = append(res, data)
// Skip Error If Just Missing Host or Metric, Continue
// Empty Return For Metric Handled Gracefully By Frontend
if err != metricstore.ErrNoHostOrMetric {
msg := err.Error()
data.Error = &msg
res = append(res, data)
} else {
cclog.Warnf("failed to fetch '%s' from host '%s' (cluster: %s): %s", query.Metric, query.Hostname, req.Cluster, err.Error())
}
continue
}