Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Loki
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a2a7925f

Commit a2a7925f authored 5 years ago by Sandeep Sukhani

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/grafana/loki into live-log-tailing-improvements

parents b0774be7 017bcefb

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
Makefile 47 additions, 3 deletions

Makefile
cmd/loki/Dockerfile.debug 17 additions, 0 deletions

cmd/loki/Dockerfile.debug
cmd/promtail/Dockerfile.debug 17 additions, 0 deletions

cmd/promtail/Dockerfile.debug
debug/README.md 57 additions, 0 deletions

debug/README.md
debug/docker-compose.yaml 37 additions, 0 deletions

debug/docker-compose.yaml
loki-build-image/Dockerfile 1 addition, 0 deletions

loki-build-image/Dockerfile
pkg/ingester/flush.go 2 additions, 2 deletions

pkg/ingester/flush.go
pkg/ingester/stream.go 1 addition, 1 deletion

pkg/ingester/stream.go
pkg/promtail/positions/positions.go 16 additions, 7 deletions

pkg/promtail/positions/positions.go

with 199 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment