finishing up loki-canary move into loki repo

.gitignore

@@ -11,8 +11,10 @@ cmd/promtail/promtail
 cmd/loki/loki-debug
 cmd/promtail/promtail-debug
 cmd/docker-driver/docker-driver
+cmd/loki-canary/loki-canary
 /loki
 /promtail
 /logcli
+/loki-canary
 dlv
-rootfs/
+rootfs/

README.md

@@ -39,6 +39,7 @@ Once you have promtail, Loki, and Grafana running, continue with [our usage docs
 - [Promtail](./docs/promtail.md) is an agent which can tail your log files and push them to Loki.
 - [Docker Logging Driver](./cmd/docker-driver/README.md) is a docker plugin to send logs directly to Loki from Docker containers.
 - [Logcli](./docs/logcli.md) on how to query your logs without Grafana.
+- [Loki Canary](./docs/canary/README.md) for monitoring your Loki installation for missing logs.
 - [Troubleshooting](./docs/troubleshooting.md) for help around frequent error messages.
 - [Usage](./docs/usage.md) for how to set up a Loki datasource in Grafana and query your logs.
 

cmd/loki-canary/Dockerfile

@@ -1,4 +1,4 @@
 FROM       alpine:3.9
 RUN        apk add --update --no-cache ca-certificates
 ADD        loki-canary /usr/bin
-ENTRYPOINT [ "/bin/loki-canary" ]
+ENTRYPOINT [ "/usr/bin/loki-canary" ]

cmd/loki-canary/main.go

@@ -12,9 +12,9 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/grafana/loki-canary/pkg/canary/comparator"
-	"github.com/grafana/loki-canary/pkg/canary/reader"
-	"github.com/grafana/loki-canary/pkg/canary/writer"
+	"github.com/grafana/loki/pkg/canary/comparator"
+	"github.com/grafana/loki/pkg/canary/reader"
+	"github.com/grafana/loki/pkg/canary/writer"
 )
 
 func main() {

docs/canary/README.md

@@ -37,7 +37,7 @@ In the background, loki-canary also runs a timer which iterates through all the
 
 To run the image, you can do something simple like:
 
-`kubectl run loki-canary --generator=run-pod/v1 --image=grafana/loki-canary:latest --restart=Never --image-pull-policy=Never  --labels=name=loki-canary`
+`kubectl run loki-canary --generator=run-pod/v1 --image=grafana/loki-canary:latest --restart=Never --image-pull-policy=Never --labels=name=loki-canary -- -addr=loki:3100`
 
 Or you can do something more complex like deploy it as a daemonset, there is a ksonnet setup for this in the `production` folder, you can import it using jsonnet-bundler:
 

pkg/canary/comparator/comparator.go

@@ -9,7 +9,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
-	"github.com/grafana/loki-canary/pkg/canary/reader"
+	"github.com/grafana/loki/pkg/canary/reader"
 )
 
 const (
@@ -125,7 +125,7 @@ func (c *Comparator) entryReceived(ts time.Time) {
 				outOfOrderEntries.Inc()
 				_, _ = fmt.Fprintf(c.w, ErrOutOfOrderEntry, e, c.entries[:i])
 			}
-			responseLatency.Observe(time.Now().Sub(ts).Seconds())
+			responseLatency.Observe(time.Since(ts).Seconds())
 			// Put this element in the acknowledged entries list so we can use it to check for duplicates
 			c.ackdEntries = append(c.ackdEntries, c.entries[i])
 			// Do not increment output index, effectively causing this element to be dropped