Skip to content

Commit b57b617

Browse files
authored
Merge pull request #26 from VictoriaMetrics/ui-improvements
refactoring of UI
2 parents c93dbf1 + 23b13be commit b57b617

File tree

28 files changed

+1982
-304
lines changed

28 files changed

+1982
-304
lines changed

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v6
1818
with:
19-
go-version: "1.25.3"
19+
go-version: "1.25.5"
2020

2121
- name: Run ui build
2222
run: make ui-build

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Go
2525
uses: actions/setup-go@v6
2626
with:
27-
go-version: 1.25.3
27+
go-version: 1.25.5
2828

2929
- name: Setup Node.js
3030
uses: actions/setup-node@v6

cmd/sql-to-logsql/api/server.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ type queryRequest struct {
107107
SQL string `json:"sql"`
108108
Endpoint string `json:"endpoint,omitempty"`
109109
BearerToken string `json:"bearerToken,omitempty"`
110+
Start string `json:"start,omitempty"`
111+
End string `json:"end,omitempty"`
112+
ExecMode string `json:"execMode,omitempty"`
110113
}
111114

112115
type queryResponse struct {
@@ -135,6 +138,13 @@ func (s *Server) handleQuery(w http.ResponseWriter, r *http.Request) {
135138
writeJSON(w, http.StatusBadRequest, queryResponse{Error: "sql query is required"})
136139
return
137140
}
141+
execMode := strings.TrimSpace(strings.ToLower(req.ExecMode))
142+
if execMode != "" && execMode != "translate" && execMode != "query" {
143+
writeJSON(w, http.StatusBadRequest, queryResponse{Error: "invalid execMode: possible values are translate and query"})
144+
return
145+
}
146+
start := strings.TrimSpace(req.Start)
147+
end := strings.TrimSpace(req.End)
138148

139149
statement, err := processQuery(sqlText, s.sp)
140150
if err != nil {
@@ -158,9 +168,14 @@ func (s *Server) handleQuery(w http.ResponseWriter, r *http.Request) {
158168
}
159169

160170
resp := queryResponse{LogsQL: statement.LogsQL}
161-
data, err := s.api.Execute(r.Context(), statement, vlogs.EndpointConfig{
162-
Endpoint: req.Endpoint,
163-
BearerToken: req.BearerToken,
171+
data, err := s.api.Execute(r.Context(), statement, vlogs.RequestParams{
172+
EndpointConfig: vlogs.EndpointConfig{
173+
Endpoint: req.Endpoint,
174+
BearerToken: req.BearerToken,
175+
},
176+
Start: start,
177+
End: end,
178+
ExecMode: execMode,
164179
})
165180
if err != nil {
166181
log.Printf("ERROR: query execution failed: %v", err)

cmd/sql-to-logsql/api/server_test.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ func TestHandleQuerySuccess(t *testing.T) {
3131
if got := req.Form.Get("query"); got != "*" {
3232
t.Fatalf("unexpected query sent: %q", got)
3333
}
34+
if got := req.Form.Get("start"); got != "1764770090000" {
35+
t.Fatalf("unexpected start sent: %q", got)
36+
}
37+
if got := req.Form.Get("end"); got != "1764856490000" {
38+
t.Fatalf("unexpected end sent: %q", got)
39+
}
3440
resp := &http.Response{
3541
StatusCode: http.StatusOK,
3642
Body: io.NopCloser(bytes.NewBufferString(`{"status":"ok"}`)),
@@ -41,7 +47,11 @@ func TestHandleQuerySuccess(t *testing.T) {
4147
}),
4248
})
4349

44-
reqBody := map[string]string{"sql": "SELECT * FROM logs"}
50+
reqBody := map[string]string{
51+
"sql": "SELECT * FROM logs",
52+
"start": "1764770090000",
53+
"end": "1764856490000",
54+
}
4555
buf, _ := json.Marshal(reqBody)
4656
req := httptest.NewRequest(http.MethodPost, "/api/v1/sql-to-logsql", bytes.NewReader(buf))
4757
req.Header.Set("Content-Type", "application/json")

0 commit comments

Comments
 (0)