2 files changed, 11 insertions, 2 deletions
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.service.j2 b/roles/monitoring/prometheus/server/templates/prometheus.service.j2
index e65e9425..86c30cbd 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.service.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.service.j2
@@ -6,7 +6,7 @@ After=time-sync.target
 [Service]
 Restart=on-failure
 User=prometheus
-ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/metrics2/ --storage.tsdb.retention.time={{ prometheus_server_retention }}{% if prometheus_server_web_external_url is defined %} --web.external-url={{ prometheus_server_web_external_url }}{% endif %}{% if prometheus_server_web_route_prefix is defined %} --web.route-prefix={{ prometheus_server_web_route_prefix }}{% endif %}{% if prometheus_server_auth_users is defined %} --web.config.file=/etc/prometheus/prometheus-web.yml{% endif %} --web.listen-address={{ prometheus_server_web_listen_address }}
+ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/metrics2/ --storage.tsdb.retention.time={{ prometheus_server_retention }}{% if prometheus_server_web_external_url is defined %} --web.external-url={{ prometheus_server_web_external_url }}{% endif %}{% if prometheus_server_web_route_prefix is defined %} --web.route-prefix={{ prometheus_server_web_route_prefix }}{% endif %}{% if prometheus_server_auth_users is defined %} --web.config.file=/etc/prometheus/prometheus-web.yml{% endif %}{% if prometheus_server_remote_write_receiver %} --web.enable-remote-write-receiver{% endif %} --web.listen-address={{ prometheus_server_web_listen_address }}
 ExecReload=/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s
 SendSIGKILL=no
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2 b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
index 09d5452d..d72a4815 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
@@ -45,7 +45,7 @@ scrape_configs:
     - targets: ['localhost:9090']
       labels:
         instance: '{{ inventory_hostname }}'
-{% if prometheus_server_alertmanager is defined %}
+{% if prometheus_server_alertmanager is defined and 'scrape_instance' in prometheus_server_alertmanager %}
 
   - job_name: 'alertmanager'
 {%   if 'path_prefix' in prometheus_server_alertmanager %}
@@ -58,6 +58,8 @@ scrape_configs:
 {%   endif %}
     static_configs:
     - targets: ['{{ prometheus_server_alertmanager.url }}']
+      labels:
+        instance: '{{ prometheus_server_alertmanager.scrape_instance }}'
 {% endif %}
 {% for job in (prometheus_server_jobs) %}
 
@@ -94,3 +96,10 @@ scrape_configs:
     - targets: ['{{ config.url }}']
 {%   endfor %}
 {% endfor %}
+{% if prometheus_server_remote_write_destinations is defined %}
+
+remote_write:
+{%   for name, config in prometheus_server_remote_write_destinations.items() %}
+  - {{ config | combine({'name': name }) | to_nice_yaml(indent=2) | indent(4) }}
+{%   endfor %}
+{% endif %}