diff --git a/README.md b/README.md index ebbf79ee6e90f2ffcb19957b16d1d7568e4568ec..2e67f6b0a5f3ab647e1a3d149c8e44a4eee866b3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@  -Join us Feb 25-26 in Los Angeles, California for GrafanaCon - a two-day event with talks focused on Grafana and the surrounding open source monitoring ecosystem. Get deep dives into Loki, the Explore workflow and all of the new features of Grafana 6, plus participate in hands on workshops to help you get the most out of your data. +Join us Feb 25-26 in Los Angeles, California for GrafanaCon - a two-day event with talks focused on Grafana and the surrounding open source monitoring ecosystem. Get deep dives into Loki, the Explore workflow and all of the new features of Grafana 6, plus participate in hands on workshops to help you get the most out of your data. Time is running out - grab your ticket now! http://grafanacon.org diff --git a/docs/operations.md b/docs/operations.md index 9be83fef3852b6ad4b83184483da778b4cf299cd..c37e093199a220d68035a30eaa816d8bf2193976 100644 --- a/docs/operations.md +++ b/docs/operations.md @@ -100,7 +100,7 @@ storage_config: dynamodb: dynamodb://access_key:secret_access_key@region ``` -#### S3 +#### S3 Loki is using S3 as object storage. It stores log within directories based on [`OrgID`](./operations.md#Multi-tenancy). For example, Logs from org `faker` @@ -115,7 +115,7 @@ sure you adjuest your throughput to your usage. DynamoDB access is very similar to S3, however you do not need to specify a table name in the storage section, as Loki will calculate that for you. -You will need to set the table name prefix inside schema config section, +You will need to set the table name prefix inside schema config section, and ensure the `index.prefix` table exists. You can setup DynamoDB by yourself, or have `table-manager` setup for you. diff --git a/fluentd/fluent-plugin-loki/README.md b/fluentd/fluent-plugin-loki/README.md index 8a1c32d076138ef926ab8ffc5fba4dd32a03e99c..69945010104a5bf3d17c956da5747391dcf2c8e8 100644 --- a/fluentd/fluent-plugin-loki/README.md +++ b/fluentd/fluent-plugin-loki/README.md @@ -41,7 +41,7 @@ By default the url is set to `https://logs-us-west1.grafana.net`, the url of the Starting with version 0.8.0, this gem uses excon, which supports proxy with environment variables - https://github.com/excon/excon#proxy-support ### username / password -Specify a username and password if the Loki server requires authentication. +Specify a username and password if the Loki server requires authentication. If using the GrafanaLab's hosted Loki, the username needs to be set to your instanceId and the password should be a Grafana.com api key. ### tenant @@ -49,7 +49,7 @@ Loki is a multi-tenant log storage platform and all requests sent must include a ### output format -Loki is intended to index and group log streams using only a small set of labels. It is not intended for full-text indexing. When sending logs to Loki the majority of log message will be sent as a single log "line". +Loki is intended to index and group log streams using only a small set of labels. It is not intended for full-text indexing. When sending logs to Loki the majority of log message will be sent as a single log "line". There are 3 configurations settings to control the output format. - extra_labels: (default: nil) set of labels to include with every Loki stream. eg `{"env":"dev", "datacenter": "dc1"}` diff --git a/fluentd/fluent-plugin-loki/docker/conf/systemd.conf b/fluentd/fluent-plugin-loki/docker/conf/systemd.conf index dfff868ed19a5d4e31758724da578fc95e026704..0137172ba171f8b1f78c71dd5e21705f3af6f529 100644 --- a/fluentd/fluent-plugin-loki/docker/conf/systemd.conf +++ b/fluentd/fluent-plugin-loki/docker/conf/systemd.conf @@ -26,7 +26,7 @@ # re-label the HOSTNAME to "instance" instance ${record["HOSTNAME"]} - + # change priority from an int to a string. level ${record["PRIORITY"] ? record["PRIORITY"] == "0" ? "EMERG" : record["PRIORITY"] == "1" ? "ALERT" : record["PRIORITY"] == "2" ? "CRIT" : record["PRIORITY"] == "3" ? "ERROR" : record["PRIORITY"] == "4" ? "WARN" : record["PRIORITY"] == "5" ? "NOTICE" : record["PRIORITY"] == "6" ? "INFO" : record["PRIORITY"] == "7" ? "DEBUG" : record["PRIORITY"] : "unset"} </record> diff --git a/fluentd/fluent-plugin-loki/lib/fluent/plugin/out_loki.rb b/fluentd/fluent-plugin-loki/lib/fluent/plugin/out_loki.rb index ea93d98028a12f897b71880d66b4b399f56d50f4..0cf4e1dba0c3291649af2e9658059e6e57cd5cb1 100644 --- a/fluentd/fluent-plugin-loki/lib/fluent/plugin/out_loki.rb +++ b/fluentd/fluent-plugin-loki/lib/fluent/plugin/out_loki.rb @@ -99,7 +99,7 @@ module Fluent end log.warn "failed to #{req.method} #{uri} (#{res_summary})" log.warn Yajl.dump(body) - + end end diff --git a/pkg/parser/labels.go b/pkg/parser/labels.go index b7dd7312fbe4b66ba50dd889ed0024ac5cc26122..6863c1963cfc25521a83f179dc76720c9424b774 100644 --- a/pkg/parser/labels.go +++ b/pkg/parser/labels.go @@ -6,7 +6,6 @@ package parser import __yyfmt__ "fmt" //line pkg/parser/labels.y:2 - import ( "github.com/prometheus/prometheus/pkg/labels" ) diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet index c3aedd2df358854ae43f0d4f4779d47f6019c435..ea600a9e445520ebbdfbee695af9d78be2fe4593 100644 --- a/production/ksonnet/promtail/promtail.libsonnet +++ b/production/ksonnet/promtail/promtail.libsonnet @@ -129,7 +129,7 @@ k { regex: '^$', }, - // Drop pods with a 'name' and an 'app' label. They will have already been added by + // Drop pods with a 'name' and an 'app' label. They will have already been added by // the scrape_config that matches on the 'name' label { source_labels: ['__meta_kubernetes_pod_label_name'],