Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(loki): extended tailing #764

Merged
merged 9 commits into from
Jul 19, 2019
Merged

feat(loki): extended tailing #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c24ff7c
refactor(querier/ingester): TailRequest Lookback window
sh0rez Jul 16, 2019
d7a5c75
feat(querier): parse Lookback from HTTP Request
sh0rez Jul 16, 2019
f68b184
feat(logcli): send Lookback Window spec with tail request
sh0rez Jul 16, 2019
be6a953
feat(querier): include historic entries in tail mode
sh0rez Jul 16, 2019
843ed51
fix: adapt tests to Lookback change
sh0rez Jul 16, 2019
ca81de2
feat(querier): check all errors to make the linter happy
sh0rez Jul 16, 2019
a804428
fix(logproto): flatten Lookback window spec
sh0rez Jul 17, 2019
d7d903b
fix(ingester): adapt test to Lookback flatten
sh0rez Jul 17, 2019
0cd2f2d
Merge branch 'master' into loki-extended-tail
sh0rez Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions cmd/logcli/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ const (
queryPath = "/api/prom/query?query=%s&limit=%d&start=%d&end=%d&direction=%s&regexp=%s"
labelsPath = "/api/prom/label"
labelValuesPath = "/api/prom/label/%s/values"
tailPath = "/api/prom/tail?query=%s&regexp=%s&delay_for=%d"
tailPath = "/api/prom/tail?query=%s&regexp=%s&delay_for=%d&limit=%d&start=%d"
)

func query(from, through time.Time, direction logproto.Direction) (*logproto.QueryResponse, error) {
path := fmt.Sprintf(queryPath, url.QueryEscape(*queryStr), *limit, from.UnixNano(),
through.UnixNano(), direction.String(), url.QueryEscape(*regexpStr))
path := fmt.Sprintf(queryPath,
url.QueryEscape(*queryStr), // query
*limit, // limit
from.UnixNano(), // start
through.UnixNano(), // end
direction.String(), // direction
url.QueryEscape(*regexpStr), // regexp
)

var resp logproto.QueryResponse
if err := doRequest(path, &resp); err != nil {
Expand Down Expand Up @@ -105,7 +111,13 @@ func doRequest(path string, out interface{}) error {
}

func liveTailQueryConn() (*websocket.Conn, error) {
path := fmt.Sprintf(tailPath, url.QueryEscape(*queryStr), url.QueryEscape(*regexpStr), *delayFor)
path := fmt.Sprintf(tailPath,
url.QueryEscape(*queryStr), // query
url.QueryEscape(*regexpStr), // regexp
*delayFor, // delay_for
*limit, // limit
getStart(time.Now()).UnixNano(), // start
)
return wsConnect(path)
}

Expand Down
21 changes: 13 additions & 8 deletions cmd/logcli/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ import (
"github.com/grafana/loki/pkg/logproto"
)

func getStart(end time.Time) time.Time {
start := end.Add(-*since)
if *from != "" {
var err error
start, err = time.Parse(time.RFC3339Nano, *from)
if err != nil {
log.Fatalf("error parsing date '%s': %s", *from, err)
}
}
return start
}

func doQuery() {
if *tail {
tailQuery()
Expand All @@ -24,14 +36,7 @@ func doQuery() {
)

end := time.Now()
start := end.Add(-*since)
if *from != "" {
var err error
start, err = time.Parse(time.RFC3339Nano, *from)
if err != nil {
log.Fatalf("error parsing --from date '%s': %s", *from, err)
}
}
start := getStart(end)

if *to != "" {
var err error
Expand Down
Loading