From e4b0636878be7768c0e55ea5fb2686846b122613 Mon Sep 17 00:00:00 2001 From: Eric Van Norman Date: Fri, 26 Feb 2021 11:37:39 -0600 Subject: [PATCH] Manual cherry picks (#9063) --- content/en/docs/reference/config/metrics/index.md | 4 ++-- .../distributed-tracing/configurability/index.md | 2 +- content/en/docs/tasks/observability/gateways/index.md | 2 +- .../faq/distributed-tracing/how-envoy-based-tracing-works.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/en/docs/reference/config/metrics/index.md b/content/en/docs/reference/config/metrics/index.md index 2ab37d2bb6..8f6561eea8 100644 --- a/content/en/docs/reference/config/metrics/index.md +++ b/content/en/docs/reference/config/metrics/index.md @@ -32,10 +32,10 @@ For HTTP, HTTP/2, and GRPC traffic, Istio generates the following metrics: For TCP traffic, Istio generates the following metrics: -* **Tcp Byte Sent** (`istio_tcp_sent_bytes_total`): This is a `COUNTER` which measures the size of total bytes sent during response in case of a TCP +* **Tcp Bytes Sent** (`istio_tcp_sent_bytes_total`): This is a `COUNTER` which measures the size of total bytes sent during response in case of a TCP connection. -* **Tcp Byte Received** (`istio_tcp_received_bytes_total`): This is a `COUNTER` which measures the size of total +* **Tcp Bytes Received** (`istio_tcp_received_bytes_total`): This is a `COUNTER` which measures the size of total bytes received during request in case of a TCP connection. * **Tcp Connections Opened** (`istio_tcp_connections_opened_total`): This is a `COUNTER` incremented for every opened connection. diff --git a/content/en/docs/tasks/observability/distributed-tracing/configurability/index.md b/content/en/docs/tasks/observability/distributed-tracing/configurability/index.md index e7e0b15260..cd4f47adcf 100644 --- a/content/en/docs/tasks/observability/distributed-tracing/configurability/index.md +++ b/content/en/docs/tasks/observability/distributed-tracing/configurability/index.md @@ -39,7 +39,7 @@ There are two ways you can configure tracing options: 1. Globally via `MeshConfig` options. -1. Per pod annotations for workload specific customization. +1. Per-pod annotations for workload specific customization. {{< warning >}} In order for the new tracing configuration to take effect for either of these diff --git a/content/en/docs/tasks/observability/gateways/index.md b/content/en/docs/tasks/observability/gateways/index.md index 3c11b208d5..68891d6b61 100644 --- a/content/en/docs/tasks/observability/gateways/index.md +++ b/content/en/docs/tasks/observability/gateways/index.md @@ -52,7 +52,7 @@ addons to require authentication when exposing them externally. This example uses self-signed certificates, which may not be appropriate for production usages. For these cases, consider using [cert-manager](/docs/ops/integrations/certmanager/) or other tools to provision certificates. You may also visit the [Securing Gateways with HTTPS](/docs/tasks/traffic-management/ingress/secure-ingress/) task for general information on using HTTPS on the gateway. -1. Setup the certificates. This example uses `openssl` to self sign. +1. Set up the certificates. This example uses `openssl` to self sign. {{< text bash >}} $ CERT_DIR=/tmp/certs diff --git a/content/en/faq/distributed-tracing/how-envoy-based-tracing-works.md b/content/en/faq/distributed-tracing/how-envoy-based-tracing-works.md index e569a1a9d8..b3c5b64456 100644 --- a/content/en/faq/distributed-tracing/how-envoy-based-tracing-works.md +++ b/content/en/faq/distributed-tracing/how-envoy-based-tracing-works.md @@ -7,8 +7,8 @@ For Envoy-based tracing integrations, Envoy (the sidecar proxy) sends tracing in Envoy: -- generates request IDs and trace headers (i.e. `X-B3-TraceId`) for requests as they flow through the proxy -- generates trace spans for each request based on request and response metadata (i.e. response time) +- generates request IDs and trace headers (i.e., `X-B3-TraceId`) for requests as they flow through the proxy +- generates trace spans for each request based on request and response metadata (i.e., response time) - sends the generated trace spans to the tracing backends - forwards the trace headers to the proxied application