fixups from code review

This commit is contained in:
Chelsea Holland Komlo 2017-09-12 14:16:18 +00:00
parent faabf61c6d
commit fcc3071e52
3 changed files with 5 additions and 6 deletions

View file

@ -1,6 +1,7 @@
## 0.7 (Unreleased)
IMPROVEMENTS:
* api: Metrics endpoint exposes Prometheus formatted metrics [GH-3171]
* telemetry: Add support for tagged metrics for Nomad clients [GH-3147]
BUG FIXES:
@ -15,7 +16,7 @@ BUG FIXES:
* cli: Sort task groups when displaying a deployment [GH-3137]
* cli: Handle reading files that are in a symlinked directory [GH-3164]
* cli: All status commands handle even UUID prefixes with hyphens [GH-3122]
* cli: Fix autocompletion of paths that include directories on zsh [GH-3129]
* cli: Fix autocompletion of paths that include directories on zsh [GH-3129]
* cli: Fix job deployment -latest handling of jobs without deployments
[GH-3166]
* cli: Hide CLI commands not expected to be run by user from autocomplete

View file

@ -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

View file

@ -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`