beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

properly build URL

Browse source
This commit is contained in:
Sebastien Blot 2022-11-28 13:53:53 +01:00 committed by lperdereau
parent 3f56a0759f
commit 2195509218
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/acquisition/modules/loki/internal/lokiclient/loki_client.go
View file

@ -8,7 +8,6 @@ import (
"io/ioutil"
"net/http"
"net/url"
"path/filepath"
"strconv"
"time"
@ -107,7 +106,7 @@ func (lc *LokiClient) queryRange(uri string, ctx context.Context, c chan *LokiQu
//Can we assume we will always have only one stream?
lastTs := lq.Data.Result[0].Entries[len(lq.Data.Result[0].Entries)-1].Timestamp
lc.Logger.Infof("Got %d results, last timestamp: %s (converted: %d)", len(lq.Data.Result[0].Entries), lastTs, strconv.Itoa(lastTs.Nanosecond()))
lc.Logger.Infof("Got %d results, last timestamp: %s (converted: %s)", len(lq.Data.Result[0].Entries), lastTs, strconv.Itoa(lastTs.Nanosecond()))
u, err := url.Parse(uri) //we can ignore the error, we know it's valid
if err != nil {
return errors.Wrapf(err, "error parsing URL")
@ -131,7 +130,11 @@ func (lc *LokiClient) getURLFor(endpoint string, params map[string]string) strin
}
u.RawQuery = queryParams.Encode()
u.Path = filepath.Join(lc.config.LokiPrefix, u.Path, endpoint)
u.Path, err = url.JoinPath(lc.config.LokiPrefix, u.Path, endpoint)
if err != nil {
return ""
}
switch endpoint {
case "loki/api/v1/tail":