Merge "Add remote_write"

This commit is contained in:
Filip Pytloun 2017-05-30 10:22:04 +00:00 committed by Gerrit Code Review
commit f4755dfd02
5 changed files with 25 additions and 2 deletions

View file

@ -1,5 +1,5 @@
applications:
- alertmanager
- prometheus
parameters:
prometheus:
alertmanager:

View file

@ -1,5 +1,5 @@
applications:
- pushgateway
- prometheus
parameters:
prometheus:
pushgateway:

View file

@ -0,0 +1,9 @@
applications:
- prometheus
parameters:
prometheus:
remote_storage_adapter:
enabled: true
bind:
address: 0.0.0.0
port: 9201

View file

@ -24,6 +24,16 @@ alerting:
{%- endfor %}
{%- endif %}
{%- if server.get('config', {}).get('remote_write') %}
remote_write:
{%- for name, remote_endpoint in server.config.remote_write.iteritems() %}
{%- if remote_endpoint.get('enabled', True) %}
# {{ name }}
- url: {{ remote_endpoint.url }}
{%- endif %}
{%- endfor %}
{%- endif %}
rule_files:
- alerts.yml

View file

@ -67,6 +67,10 @@ prometheus:
evaluation_interval: "1m"
external_labels:
region: 'region1'
remote_write:
remote_storage_adapter:
enabled: true
url: http://127.0.0.1:9201/write
alertmanager:
docker_swarm_alertmanager:
enabled: true