From 327bc57c17e08b338d7ca7b1daa93c86ecb07aaa Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Tue, 22 Sep 2020 09:31:28 -0400 Subject: [PATCH] Addressing review comments Signed-off-by: Dave Henderson --- src/docs/markdown/caddyfile/directives/metrics.md | 10 +++++++++- src/docs/markdown/metrics.md | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/docs/markdown/caddyfile/directives/metrics.md b/src/docs/markdown/caddyfile/directives/metrics.md index 4bd4e18..40c38d6 100644 --- a/src/docs/markdown/caddyfile/directives/metrics.md +++ b/src/docs/markdown/caddyfile/directives/metrics.md @@ -19,7 +19,7 @@ See also [Monitoring Caddy with Prometheus metrics](/docs/metrics). ## Syntax ```caddy-d -metrics +metrics [] ``` ## Examples @@ -35,3 +35,11 @@ Expose metrics at another path: ```caddy-d metrics /foo/bar/baz ``` + +Serve metrics at a separate subdomain: + +```caddy +metrics.example.com { + metrics +} +``` diff --git a/src/docs/markdown/metrics.md b/src/docs/markdown/metrics.md index 6a35740..9f307b4 100644 --- a/src/docs/markdown/metrics.md +++ b/src/docs/markdown/metrics.md @@ -61,7 +61,7 @@ You can see the metrics with any browser or HTTP client like `curl`: $ curl http://localhost:2019/metrics # HELP caddy_admin_http_requests_total Counter of requests made to the Admin API's HTTP endpoints. # TYPE caddy_admin_http_requests_total counter -caddy_admin_http_requests_total{code="200",handler="metrics",method="get",path="/metrics"} 2 +caddy_admin_http_requests_total{code="200",handler="metrics",method="GET",path="/metrics"} 2 # HELP caddy_http_request_duration_seconds Histogram of round-trip request durations. # TYPE caddy_http_request_duration_seconds histogram caddy_http_request_duration_seconds_bucket{code="308",handler="static_response",method="GET",server="remaining_auto_https_redirects",le="0.005"} 1 @@ -99,11 +99,11 @@ For example: ```console $ curl -s http://localhost:2019/metrics | grep ^caddy_admin -caddy_admin_http_requests_total{code="200",handler="admin",method="get",path="/config/"} 1 -caddy_admin_http_requests_total{code="200",handler="admin",method="get",path="/debug/pprof/"} 2 -caddy_admin_http_requests_total{code="200",handler="admin",method="get",path="/debug/pprof/cmdline"} 1 -caddy_admin_http_requests_total{code="200",handler="load",method="post",path="/load"} 1 -caddy_admin_http_requests_total{code="200",handler="metrics",method="get",path="/metrics"} 3 +caddy_admin_http_requests_total{code="200",handler="admin",method="GET",path="/config/"} 1 +caddy_admin_http_requests_total{code="200",handler="admin",method="GET",path="/debug/pprof/"} 2 +caddy_admin_http_requests_total{code="200",handler="admin",method="GET",path="/debug/pprof/cmdline"} 1 +caddy_admin_http_requests_total{code="200",handler="load",method="POST",path="/load"} 1 +caddy_admin_http_requests_total{code="200",handler="metrics",method="GET",path="/metrics"} 3 ``` #### `caddy_admin_http_requests_total`