From 351b4c69ac215f305054a6c9abd39a9f4e0b287b Mon Sep 17 00:00:00 2001
From: Xiang Dai <764524258@qq.com>
Date: Wed, 20 Feb 2019 18:55:53 +0800
Subject: [PATCH] delete all duplicate empty blanks (#344)
Signed-off-by: Xiang Dai <764524258@qq.com>
---
README.md | 2 +-
docs/operations.md | 4 ++--
fluentd/fluent-plugin-loki/README.md | 4 ++--
fluentd/fluent-plugin-loki/docker/conf/systemd.conf | 2 +-
fluentd/fluent-plugin-loki/lib/fluent/plugin/out_loki.rb | 2 +-
pkg/parser/labels.go | 1 -
production/ksonnet/promtail/promtail.libsonnet | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index ebbf79ee..2e67f6b0 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 9be83fef..c37e0931 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 8a1c32d0..69945010 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 dfff868e..0137172b 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 ea93d980..0cf4e1db 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 b7dd7312..6863c196 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 c3aedd2d..ea600a9e 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'],
--
GitLab