Skip to content

Commit

Permalink
Merge pull request #3186 from hashicorp/f-prometheus-dashboard
Browse files Browse the repository at this point in the history
Prometheus dashboard
  • Loading branch information
chelseakomlo committed Sep 15, 2017
2 parents cfee523 + e7933df commit 4278a31
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
IMPROVEMENTS:
* api: Metrics endpoint exposes Prometheus formatted metrics [GH-3171]
* telemetry: Add support for tagged metrics for Nomad clients [GH-3147]
* telemetry: Add basic Prometheus configuration for a Nomad cluster [GH-3186]

BUG FIXES:
* core: Fix restoration of stopped periodic jobs [GH-3201]
Expand Down
12 changes: 12 additions & 0 deletions integrations/prometheus/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Prometheus Metrics

This configuration file can be used to set up a Prometheus instance to read
data from Nomad cluster, using Consul for service discovery.

Requirements:
- See Prometheus's
[Getting Started](https://prometheus.io/docs/introduction/getting_started/)
guide for instructions on how to set up a Prometheus server.
- This configuration is written assuming there is a local Consul agent being
run along side the Prometheus server. If this is not the case, the
configuration will need to be updated to point at the remote Consul agent.
16 changes: 16 additions & 0 deletions integrations/prometheus/prometheus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
scrape_configs:
- job_name: 'nomad_metrics'

consul_sd_configs:
- server: 'localhost:8500'
services: ['nomad-client', 'nomad']

relabel_configs:
- source_labels: ['__meta_consul_tags']
regex: '(.*)http(.*)'
action: keep

scrape_interval: 5s
metrics_path: /v1/metrics
params:
format: ['prometheus']

0 comments on commit 4278a31

Please sign in to comment.