From 610f083dcf0ecfef80bdf086171fc31b5e48e4e1 Mon Sep 17 00:00:00 2001 From: Xiang Dai <764524258@qq.com> Date: Wed, 18 Dec 2019 10:55:15 +0800 Subject: [PATCH] fix all misspell Signed-off-by: Xiang Dai <764524258@qq.com> --- CHANGELOG.md | 2 +- cmd/docker-driver/Dockerfile | 2 +- cmd/fluent-bit/README.md | 2 +- cmd/loki-canary/Dockerfile.cross | 2 +- cmd/loki/Dockerfile.cross | 2 +- cmd/loki/Dockerfile.debug | 2 +- cmd/promtail/Dockerfile.cross | 2 +- cmd/promtail/Dockerfile.debug | 2 +- docs/architecture.md | 2 +- docs/clients/promtail/stages/cri.md | 2 +- docs/clients/promtail/stages/metrics.md | 8 ++++---- docs/configuration/README.md | 12 ++++++------ production/ksonnet/loki/config.libsonnet | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ede16b6c0f32..0232fb1539c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -282,7 +282,7 @@ A **huge** thanks to the **36 contributors** who submitted **148 PR's** since 0. ## Docs -* **Docs** [1176](https://github.com/grafana/loki/pull/1176) **rfratto**: docs: add exmaple and documentation about using JMESPath literals +* **Docs** [1176](https://github.com/grafana/loki/pull/1176) **rfratto**: docs: add example and documentation about using JMESPath literals * **Docs** [1139](https://github.com/grafana/loki/pull/1139) **joe-elliott**: Moved client docs and add serilog example * **Docs** [1132](https://github.com/grafana/loki/pull/1132) **kailwallin**: FixedTypo.Update README.md * **Docs** [1130](https://github.com/grafana/loki/pull/1130) **pracucci**: docs: fix Promtail / Loki capitalization diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile index 538ab4d6aabe..a5f45d87ec0a 100644 --- a/cmd/docker-driver/Dockerfile +++ b/cmd/docker-driver/Dockerfile @@ -1,6 +1,6 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.9.0 # Directories in this file are referenced from the root of the project not this folder -# This file is intented to be called from the root like so: +# This file is intended to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile . # TODO: add cross-platform support diff --git a/cmd/fluent-bit/README.md b/cmd/fluent-bit/README.md index 0ff9f2c5a112..873c5e375394 100644 --- a/cmd/fluent-bit/README.md +++ b/cmd/fluent-bit/README.md @@ -31,7 +31,7 @@ You can use `Labels`, `RemoveKeys` , `LabelKeys` and `LabelMapPath` to how the o ### AutoKubernetesLabels -If set to true, it will add all Kubernetes labels to Loki labels automatically and ignore paramaters `LabelKeys`, LabelMapPath. +If set to true, it will add all Kubernetes labels to Loki labels automatically and ignore parameters `LabelKeys`, LabelMapPath. ### LabelMapPath diff --git a/cmd/loki-canary/Dockerfile.cross b/cmd/loki-canary/Dockerfile.cross index 17a3b2418b25..715bd855fc3b 100644 --- a/cmd/loki-canary/Dockerfile.cross +++ b/cmd/loki-canary/Dockerfile.cross @@ -1,6 +1,6 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.9.0 # Directories in this file are referenced from the root of the project not this folder -# This file is intented to be called from the root like so: +# This file is intended to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile . FROM golang:1.11.4-alpine as goenv RUN go env GOARCH > /goarch && \ diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross index d5d84b9d5e42..5511c2aed59b 100644 --- a/cmd/loki/Dockerfile.cross +++ b/cmd/loki/Dockerfile.cross @@ -1,6 +1,6 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.9.0 # Directories in this file are referenced from the root of the project not this folder -# This file is intented to be called from the root like so: +# This file is intended to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile . FROM golang:1.11.4-alpine as goenv RUN go env GOARCH > /goarch && \ diff --git a/cmd/loki/Dockerfile.debug b/cmd/loki/Dockerfile.debug index c15efbb38bb3..4027b31ad692 100644 --- a/cmd/loki/Dockerfile.debug +++ b/cmd/loki/Dockerfile.debug @@ -1,5 +1,5 @@ # Directories in this file are referenced from the root of the project not this folder -# This file is intented to be called from the root like so: +# This file is intended to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile.debug . FROM grafana/loki-build-image as build diff --git a/cmd/promtail/Dockerfile.cross b/cmd/promtail/Dockerfile.cross index f3cc25c456ba..cb0ee2a15c36 100644 --- a/cmd/promtail/Dockerfile.cross +++ b/cmd/promtail/Dockerfile.cross @@ -1,6 +1,6 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.9.0 # Directories in this file are referenced from the root of the project not this folder -# This file is intented to be called from the root like so: +# This file is intended to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile . FROM golang:1.11.4-alpine as goenv RUN go env GOARCH > /goarch && \ diff --git a/cmd/promtail/Dockerfile.debug b/cmd/promtail/Dockerfile.debug index a305745ef0ad..045dda505b96 100644 --- a/cmd/promtail/Dockerfile.debug +++ b/cmd/promtail/Dockerfile.debug @@ -1,5 +1,5 @@ # Directories in this file are referenced from the root of the project not this folder -# This file is intented to be called from the root like so: +# This file is intended to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile.debug . FROM grafana/loki-build-image as build diff --git a/docs/architecture.md b/docs/architecture.md index 88c93b8790f7..f3ae00ea8724 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -124,7 +124,7 @@ the hash ring. Each ingester has a state of either `PENDING`, `JOINING`, read requests for data it still has in memory. 5. `UNHEALTHY` is an Ingester's state when it has failed to heartbeat to - Consul. `UNHEALHTY` is set by the distributor when it periodically checks the ring. + Consul. `UNHEALTHY` is set by the distributor when it periodically checks the ring. Each log stream that an ingester receives is built up into a set of many "chunks" in memory and flushed to the backing storage backend at a configurable diff --git a/docs/clients/promtail/stages/cri.md b/docs/clients/promtail/stages/cri.md index a054b9f39542..14c3db4697bb 100644 --- a/docs/clients/promtail/stages/cri.md +++ b/docs/clients/promtail/stages/cri.md @@ -16,7 +16,7 @@ space-delimited values with the following components: 2. `stream`: Either stdout or stderr 3. `log`: The contents of the log line -No whitespace is permitted between the components. In the following exmaple, +No whitespace is permitted between the components. In the following example, only the first log line can be properly formatted using the `cri` stage: ``` diff --git a/docs/clients/promtail/stages/metrics.md b/docs/clients/promtail/stages/metrics.md index b1302c9103ea..2c90a4681553 100644 --- a/docs/clients/promtail/stages/metrics.md +++ b/docs/clients/promtail/stages/metrics.md @@ -130,7 +130,7 @@ increment the counter by one rather than by using the value of `time`. - regex: expression: "^.*(?Porder successful).*$" - metrics: - succesful_orders_total: + successful_orders_total: type: Counter description: "log lines with the message `order successful`" source: order_success @@ -140,7 +140,7 @@ increment the counter by one rather than by using the value of `time`. This pipeline first tries to find `order successful` in the log line, extracting it as the `order_success` field in the extracted map. The metrics stage then -creates a metric called `succesful_orders_total` whose value only increases when +creates a metric called `successful_orders_total` whose value only increases when `order_success` was found in the extracted map. The result of this pipeline is a metric whose value only increases when a log @@ -150,7 +150,7 @@ line with the text `order successful` was scraped by Promtail. - regex: expression: "^.* order_status=(?P.*?) .*$" - metrics: - succesful_orders_total: + successful_orders_total: type: Counter description: "successful orders" source: order_status @@ -170,7 +170,7 @@ This pipeline first tries to find text in the format `order_status=` in the log line, pulling out the `` into the extracted map with the key `order_status`. -The metric stages creates `succesful_orders_total` and `failed_orders_total` +The metric stages creates `successful_orders_total` and `failed_orders_total` metrics that only increment when the value of `order_status` in the extracted map is `success` or `fail` respectively. diff --git a/docs/configuration/README.md b/docs/configuration/README.md index 4292d950d9ce..97cbf429e676 100644 --- a/docs/configuration/README.md +++ b/docs/configuration/README.md @@ -204,7 +204,7 @@ pool_config: The `grpc_client_config` block configures a client connection to a gRPC service. ```yaml -# The maximum size in bytes the client can recieve +# The maximum size in bytes the client can receive [max_recv_msg_size: | default = 104857600] # The maximum size in bytes the client can send @@ -297,7 +297,7 @@ ring. [ring: ] # The number of tokens the lifecycler will generate and put into the ring if -# it joined without transfering tokens from another lifecycler. +# it joined without transferring tokens from another lifecycler. [num_tokens: | default = 128] # Period at which to heartbeat to the underlying ring. @@ -363,9 +363,9 @@ kvstore: # The maximum number of retries to do for failed ops to ETCD. [max_retries: | default = 10] -# The heartbeart timeout after which ingesters are skipped for +# The heartbeat timeout after which ingesters are skipped for # reading and writing. -[heartbeart_timeout: | default = 1m] +[heartbeat_timeout: | default = 1m] # The number of ingesters to write to and read from. Must be at least # 1. @@ -390,7 +390,7 @@ aws: # Set to true to force the request to use path-style addressing [s3forcepathstyle: | default = false] - # Configure the DynamoDB conection + # Configure the DynamoDB connection dynamodbconfig: # URL for DynamoDB with escaped Key and Secret encoded. If only region is specified as a # host, the proper endpoint will be deduced. Use inmemory:/// to @@ -546,7 +546,7 @@ the index to a backing cache store. # Enable in-memory cache. [enable_fifocache: ] -# The default validity of entries for caches unless overriden. +# The default validity of entries for caches unless overridden. # "defaul" is correct. [defaul_validity: ] diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet index ac725aeb2619..2a00a610732b 100644 --- a/production/ksonnet/loki/config.libsonnet +++ b/production/ksonnet/loki/config.libsonnet @@ -193,7 +193,7 @@ max_look_back_period: 0, }, - // Default schema config is bigtable/gcs, this will need to be overriden for other stores + // Default schema config is bigtable/gcs, this will need to be overridden for other stores schema_config: { configs: [{ from: '2018-04-15',