diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fb8de4ca06..fc8e7045aa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ IMPROVEMENTS: BUG FIXES: * api: Search handles prefix longer than allowed UUIDs [GH-3138] * api: Search endpoint handles even UUID prefixes with hyphens [GH-3120] + * api: Metrics endpoint exposes Prometheus formatted metrics * cli: Sort task groups when displaying a deployment [GH-3137] * cli: Handle reading files that are in a symlinked directory [GH-3164] * api: Don't merge empty update stanza from job into task groups [GH-3139] diff --git a/command/agent/config-test-fixtures/basic.hcl b/command/agent/config-test-fixtures/basic.hcl index 237b8c86f86..03a63fa3ac0 100644 --- a/command/agent/config-test-fixtures/basic.hcl +++ b/command/agent/config-test-fixtures/basic.hcl @@ -92,7 +92,7 @@ acl { telemetry { statsite_address = "127.0.0.1:1234" statsd_address = "127.0.0.1:2345" - prometheus_metrics = true + prometheus_metrics = true disable_hostname = true collection_interval = "3s" publish_allocation_metrics = true diff --git a/website/source/docs/agent/configuration/telemetry.html.md b/website/source/docs/agent/configuration/telemetry.html.md index 6ad0704fe5b..b32af1e8173 100644 --- a/website/source/docs/agent/configuration/telemetry.html.md +++ b/website/source/docs/agent/configuration/telemetry.html.md @@ -116,12 +116,10 @@ telemetry { ### `prometheus` -These `telemetry` parameters apply to -[Prometheus](https://prometheus.io). +These `telemetry` parameters apply to [Prometheus](https://prometheus.io). - `prometheus_metrics` `(bool: false)` - Specifies whether the agent should - initialize a PrometheusSink, where metrics will be reachable via the metrics - path `/v1/netrics?format=prometheus`. + make Prometheus formatted metrics available at `/v1/metrics?format=prometheus`. ### `circonus`