ClusterCockpit/cc-metric-store
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-store.git synced 2024-12-28 09:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix in query endpoint

Browse Source
This commit is contained in:
Lou Knauer 2022-01-10 16:11:13 +01:00
parent 97dcc95a2f
commit 3fb95f88ee
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api.go
View File

@ -370,14 +370,15 @@ func handleQuery(rw http.ResponseWriter, r *http.Request) {
response := make([]ApiQueryResponse, 0, len(req.Queries)) response := make([]ApiQueryResponse, 0, len(req.Queries))
for _, query := range req.Queries { for _, query := range req.Queries {
q := query // One of the few shitty things about Go: range looped-over variables are in the outer scope
res := ApiQueryResponse{ res := ApiQueryResponse{
Query: &query, Query: &q,
} }
sel := Selector{SelectorElement{String: req.Cluster}, SelectorElement{String: query.Hostname}} sel := Selector{SelectorElement{String: req.Cluster}, SelectorElement{String: query.Hostname}}
if query.Type != nil { if query.Type != nil {
if len(query.TypeIds) == 1 { if len(query.TypeIds) == 1 {
sel = append(sel, SelectorElement{String: query.TypeIds[0]}) sel = append(sel, SelectorElement{String: *query.Type + query.TypeIds[0]})
} else { } else {
ids := make([]string, len(query.TypeIds)) ids := make([]string, len(query.TypeIds))
for i, id := range query.TypeIds { for i, id := range query.TypeIds {
@ -388,7 +389,7 @@ func handleQuery(rw http.ResponseWriter, r *http.Request) {
if query.SubType != nil { if query.SubType != nil {
if len(query.SubTypeIds) == 1 { if len(query.SubTypeIds) == 1 {
sel = append(sel, SelectorElement{String: query.SubTypeIds[0]}) sel = append(sel, SelectorElement{String: *query.SubType + query.SubTypeIds[0]})
} else { } else {
ids := make([]string, len(query.SubTypeIds)) ids := make([]string, len(query.SubTypeIds))
for i, id := range query.SubTypeIds { for i, id := range query.SubTypeIds {
@ -399,6 +400,7 @@ func handleQuery(rw http.ResponseWriter, r *http.Request) {
} }
} }
// log.Printf("selector (metric: %s): %v", query.Metric, sel)
res.Data, res.From, res.To, err = memoryStore.Read(sel, query.Metric, req.From, req.To) res.Data, res.From, res.To, err = memoryStore.Read(sel, query.Metric, req.From, req.To)
if err != nil { if err != nil {
msg := err.Error() msg := err.Error()