X-Git-Url: https://git.tokkee.org/?p=sysdb%2Fwebui.git;a=blobdiff_plain;f=server%2Fquery.go;h=22385bf07de13e576e03007b179ede5fd6e97000;hp=bde450fef97dc74911e4aa516b859a3dba85afe7;hb=ed155b476ed90127d81de598b6d4a685ed76f2b3;hpb=479e609aec5229c959a019303e345116b51c74b4 diff --git a/server/query.go b/server/query.go index bde450f..22385bf 100644 --- a/server/query.go +++ b/server/query.go @@ -132,12 +132,18 @@ func fetch(req request, s *Server) (*page, error) { func graphs(req request, s *Server) (*page, error) { p := struct { Query, Metrics string + QueryOptions string + GroupBy string }{ - Query: req.r.PostForm.Get("metrics-query"), + Query: req.r.PostForm.Get("metrics-query"), + GroupBy: req.r.PostForm.Get("group-by"), } if req.r.Method == "POST" { p.Metrics = p.Query + if p.GroupBy != "" { + p.QueryOptions += "/g=" + strings.Join(strings.Fields(p.GroupBy), ",") + } } return tmpl(s.results["graphs"], &p) }