merge upstream

2021-06-01 16:00:13 +08:00
parent 6f40d78353
commit ad7bbd6442
38 changed files with 496 additions and 45 deletions
--- a/roles/matrix-prometheus/templates/prometheus.yml.j2
+++ b/roles/matrix-prometheus/templates/prometheus.yml.j2
@ -38,3 +38,9 @@ scrape_configs:
    static_configs:
      - targets: {{ matrix_prometheus_scraper_node_targets|to_json }}
  {% endif %}
+
+  {% if matrix_prometheus_scraper_postgres_enabled %}
+  - job_name: postgres
+    static_configs:
+      - targets: {{ matrix_prometheus_scraper_postgres_targets|to_json }}
+  {% endif %}