From d6520b6e5918518b47a68ac834f402e1762d0e87 Mon Sep 17 00:00:00 2001 From: Edward Huang Date: Tue, 29 Aug 2023 15:23:53 -0700 Subject: [PATCH 1/2] Clarify that metrics are available for Prometheus and OTLP --- docs/source/configuration/metrics.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/configuration/metrics.mdx b/docs/source/configuration/metrics.mdx index bd6d2d37c4..7061a73d7e 100644 --- a/docs/source/configuration/metrics.mdx +++ b/docs/source/configuration/metrics.mdx @@ -58,7 +58,7 @@ apollo_router_http_request_duration_seconds_bucket{le="0.9"} 1 ### Available metrics -The following metrics are available when using Prometheus. Attributes are listed where applicable. +The following metrics are available for Prometheus and OpenTelemetry Protocol (OTLP). Attributes are listed where applicable. #### HTTP From 9c67f14590fe298e89ea0f92fa5b5d10ccc26cd5 Mon Sep 17 00:00:00 2001 From: Edward Huang Date: Tue, 29 Aug 2023 15:36:56 -0700 Subject: [PATCH 2/2] copy edit --- docs/source/configuration/metrics.mdx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/configuration/metrics.mdx b/docs/source/configuration/metrics.mdx index 7061a73d7e..a250824e5b 100644 --- a/docs/source/configuration/metrics.mdx +++ b/docs/source/configuration/metrics.mdx @@ -17,7 +17,7 @@ telemetry: # (Optional) service_namespace: "apollo" prometheus: - # By setting this endpoint you enable the prometheus exporter + # By setting this endpoint you enable the Prometheus exporter # All our endpoints exposed by plugins are namespaced by the name of the plugin enabled: true listen: 127.0.0.1:9090 @@ -26,8 +26,8 @@ telemetry: ### Using in a containers environment -The prometheus endpoint listens to 127.0.0.1 by default, which won't allow connections issued from a network. -While this is a safe default, _other containers won't be able to access the prometheus endpoint_, which will disable metric scraping. +The Prometheus endpoint listens to 127.0.0.1 by default, which won't allow connections issued from a network. +While this is a safe default, _other containers won't be able to access the Prometheus endpoint_, which will disable metric scraping. You can change this by setting: @@ -35,7 +35,7 @@ You can change this by setting: telemetry: metrics: prometheus: - # By setting this endpoint you enable other containers and pods to access the prometheus endpoint + # By setting this endpoint you enable other containers and pods to access the Prometheus endpoint enabled: true listen: 0.0.0.0:9090 path: /metrics @@ -58,7 +58,7 @@ apollo_router_http_request_duration_seconds_bucket{le="0.9"} 1 ### Available metrics -The following metrics are available for Prometheus and OpenTelemetry Protocol (OTLP). Attributes are listed where applicable. +The following metrics are available for Prometheus and OpenTelemetry. Attributes are listed where applicable. #### HTTP