Skip to content
Snippets Groups Projects
Commit 351b4c69 authored by Xiang Dai's avatar Xiang Dai Committed by Tom Wilkie
Browse files

delete all duplicate empty blanks (#344)


Signed-off-by: default avatarXiang Dai <764524258@qq.com>
parent b1158354
No related branches found
No related tags found
No related merge requests found
![](https://www.grafanacon.org/2019/images/grafanacon_la_nav-logo.png)
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
......
......@@ -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.
......
......@@ -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"}`
......
......@@ -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>
......
......@@ -99,7 +99,7 @@ module Fluent
end
log.warn "failed to #{req.method} #{uri} (#{res_summary})"
log.warn Yajl.dump(body)
end
end
......
......@@ -6,7 +6,6 @@ package parser
import __yyfmt__ "fmt"
//line pkg/parser/labels.y:2
import (
"github.com/prometheus/prometheus/pkg/labels"
)
......
......@@ -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'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment