Merge ~verterok/prometheus-charm/+git/prometheus-charm:scrape_interval_and_timeout_support into prometheus-charm:master

[Guillermo Gonzalez]

Add support for scrape_interval and scrape_timeout from the scrape relation data

Add support for scrape_interval and scrape_timeout from the scrape relation data

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alexandre Gomes (alejdg)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 50542c12a0df6f935144522c8a58f18bb398a630

diff --git a/templates/prometheus.yml.j2 b/templates/prometheus.yml.j2
index a63be80..cd010f4 100644
--- a/templates/prometheus.yml.j2
+++ b/templates/prometheus.yml.j2
@@ -40,6 +40,12 @@ scrape_configs:
 {%- for scrape_job in scrape_jobs %}
   - job_name: '{{ scrape_job.job_name }}'
     metrics_path: '{{ scrape_job.metrics_path }}'
+{%- if scrape_job.get('scrape_interval') %}
+    scrape_interval: {{ scrape_job['scrape_interval']}}
+{%- endif %}
+{%- if scrape_job.get('scrape_timeout') %}
+    scrape_timeout: {{ scrape_job['scrape_timeout']}}
+{%- endif %}
 {%- if scrape_job.get('scheme') %}
     scheme: {{ scrape_job['scheme']}}
 {%- endif %}