Minor cleanup

ooni · Jul 7, 2020 · 5ad8345 · 5ad8345
1 parent ca3d45c
commit 5ad8345
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/ansible/deploy-postgres-11.yml b/ansible/deploy-postgres-11.yml
@@ -10,11 +10,6 @@
   roles:
     - role: postgresql11
 
-
-      # etckeeper
-      # netdata 
-      # firewall
-
 #- name: install prometheus-postgres-exporter
 #  apt:
 #    cache_valid_time: 86400

diff --git a/ansible/roles/prometheus/templates/prometheus.yml.j2 b/ansible/roles/prometheus/templates/prometheus.yml.j2
@@ -154,7 +154,6 @@ scrape_configs:
 {% for host in (groups.have_netdata|sort) %}
         - {{ host }}:9100
 {% endfor %}
-        - ams-pg.ooni.nu:9100
 
   - job_name: 'raw-netdata'
     scrape_interval: 5s
@@ -166,15 +165,15 @@ scrape_configs:
       - targets:
         - ams-pg.ooni.nu:19999
 
-  - job_name: 'raw postgres-exporter'
-    scrape_interval: 5s
-    scheme: https
-    metrics_path: /api/v1/allmetrics
-    params:
-      format: [prometheus]
-    static_configs:
-      - targets:
-        - ams-pg.ooni.nu:9187
+#  - job_name: 'raw postgres-exporter'
+#    scrape_interval: 5s
+#    scheme: https
+#    metrics_path: /api/v1/allmetrics
+#    params:
+#      format: [prometheus]
+#    static_configs:
+#      - targets:
+#        - ams-pg.ooni.nu:9187
 
   - job_name: 'gorush'
     scrape_interval: 5s