Skip to content

Commit

Permalink
Fix a link to correct doc and fix a typo (#1014)
Browse files Browse the repository at this point in the history
* fix typo

* Fix a link to correct doc
  • Loading branch information
polar3130 authored and cyriltovena committed Sep 16, 2019
1 parent 107dfd3 commit 330d1a6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/docker-driver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ To specify additional logging driver options, you can use the --log-opt NAME=VAL
| Option | Required? | Default Value | Description
| ------------------------- | :-------: | :------------------: | -------------------------------------- |
| `loki-url` | Yes | | Loki HTTP push endpoint.
| `loki-external-labels` | No | `container_name={{.Name}}` | Additional label value pair separated by `,` to send with logs. The value is expanded with the [Docker tag template format](https://docs.docker.com/engine/admin/logging/log_tags/). (eg: `container_name={{.ID}}.{{.Name}},cluster=prod`)
| `loki-external-labels` | No | `container_name={{.Name}}` | Additional label value pair separated by `,` to send with logs. The value is expanded with the [Docker tag template format](https://docs.docker.com/config/containers/logging/log_tags/). (eg: `container_name={{.ID}}.{{.Name}},cluster=prod`)
| `loki-timeout` | No | `10s` | The timeout to use when sending logs to the Loki instance. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
| `loki-batch-wait` | No | `1s` | The amount of time to wait before sending a log batch complete or not. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
| `loki-batch-size` | No | `102400` | The maximum size of a log batch to send.
Expand Down
2 changes: 1 addition & 1 deletion pkg/logcli/query/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func parseLabels(streams logql.Streams) (map[string]labels.Labels, []labels.Labe
return cache, lss
}

// return commonLabels labels between given lavels set
// return commonLabels labels between given labels set
func commonLabels(lss []labels.Labels) labels.Labels {
if len(lss) == 0 {
return nil
Expand Down

0 comments on commit 330d1a6

Please sign in to comment.