update monitoring tasks

roles/services/files/prometheus/prometheus.yml

 # Sample config for Prometheus.
 
 global:
-  scrape_interval:     90s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  scrape_interval: 60s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
   evaluation_interval: 60s # Evaluate rules every 15 seconds. The default is every 1 minute.
   # scrape_timeout is set to the global default (10s).
 
 # Alertmanager configuration
 alerting:
   alertmanagers:
-  - static_configs:
-    - targets: ['localhost:9093']
+    - static_configs:
+        - targets: ["localhost:9093"]
 
 # Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
 rule_files:
@@ -20,69 +20,65 @@ rule_files:
 # Here it's Prometheus itself.
 scrape_configs:
   # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'hopglass'
+  - job_name: "hopglass"
     static_configs:
-      - targets: ['localhost:4000']
-  - job_name: 'gateways'
+      - targets: ["localhost:4000"]
+  - job_name: "hosts"
     static_configs:
-    - targets:
-      - "muehlentor.mesh.ffhl.chaotikum.org:9100"
-      - "holstentor.mesh.ffhl.chaotikum.org:9100"
-      - "kaisertor.mesh.ffhl.chaotikum.org:9100"
-      - "huextertor.mesh.ffhl.chaotikum.org:9100"
-      - "builder.luebeck.freifunk.net:9100"
-      - "srv02.luebeck.freifunk.net:9100"
-      - "srv03.luebeck.freifunk.net:9100"
-      - "blueberry.luebeck.freifunk.net:9100"
-      - "strawberry.luebeck.freifunk.net:9100"
+      - targets:
+          - "muehlentor.mesh.ffhl.chaotikum.org:9100"
+          - "holstentor.mesh.ffhl.chaotikum.org:9100"
+          - "kaisertor.mesh.ffhl.chaotikum.org:9100"
+          - "huextertor.mesh.ffhl.chaotikum.org:9100"
+          - "gw05.ffhl.chaotikum.org:9100"
+          - "builder.luebeck.freifunk.net:9100"
+          - "srv02.luebeck.freifunk.net:9100"
+          - "srv03.luebeck.freifunk.net:9100"
+          - "blueberry.luebeck.freifunk.net:9100"
+          - "strawberry.luebeck.freifunk.net:9100"
   - job_name: powerdns
     static_configs:
-    - targets:
-      - 'blueberry.luebeck.freifunk.net:8082'
-      - 'srv02.luebeck.freifunk.net:8082'
-      - 'kaisertor.luebeck.freifunk.net:8082'
-      - 'huextertor.luebeck.freifunk.net:8082'
-      - 'holstentor.luebeck.freifunk.net:8082'
-      - 'muehlentor.luebeck.freifunk.net:8082'
-  - job_name: gitea
-    static_configs:
-      - targets: ['git.luebeck.freifunk.net']
-  - job_name: requestd
-    scrape_interval: 60s
-    metrics_path: "/hooks/metrics"
-    static_configs:
-    - targets: ['localhost:21001']
+      - targets:
+          - "blueberry.luebeck.freifunk.net:8082"
+          - "srv02.luebeck.freifunk.net:8082"
+          - "kaisertor.luebeck.freifunk.net:8082"
+          - "huextertor.luebeck.freifunk.net:8082"
+          - "holstentor.luebeck.freifunk.net:8082"
+          - "muehlentor.luebeck.freifunk.net:8082"
+          - "gw05.ffhl.chaotikum.org:8082"
   - job_name: fastd
     scrape_interval: 15s
     static_configs:
-    - targets:
-      - 'kaisertor.luebeck.freifunk.net:9281'
-      - 'muehlentor.luebeck.freifunk.net:9281'
-      - 'holstentor.luebeck.freifunk.net:9281'
-      - 'huextertor.luebeck.freifunk.net:9281'
-      - 'testgw.luebeck.freifunk.net:9281'
+      - targets:
+          - "kaisertor.luebeck.freifunk.net:9281"
+          - "muehlentor.luebeck.freifunk.net:9281"
+          - "holstentor.luebeck.freifunk.net:9281"
+          - "huextertor.luebeck.freifunk.net:9281"
+          - "testgw.luebeck.freifunk.net:9281"
   - job_name: bird
     scrape_interval: 15s
     static_configs:
       - targets:
-        - 'kaisertor.luebeck.freifunk.net:9324'
-        - 'huextertor.luebeck.freifunk.net:9324'
-        - 'holstentor.luebeck.freifunk.net:9324'
-        - 'muehlentor.luebeck.freifunk.net:8082'
-  - job_name: 'blackbox'
+          - "kaisertor.luebeck.freifunk.net:9324"
+          - "huextertor.luebeck.freifunk.net:9324"
+          - "holstentor.luebeck.freifunk.net:9324"
+          - "muehlentor.luebeck.freifunk.net:9324"
+          - "gw05.ffhl.chaotikum.org:9324"
+
+  - job_name: "blackbox"
     metrics_path: /probe
     scrape_interval: 15s
     params:
       module: [icmp]
     static_configs:
-    - targets:
-      - 'google.com'
-      - 'ipv6.google.com'
-      - '1.1.1.1'
+      - targets:
+          - "google.com"
+          - "ipv6.google.com"
+          - "1.1.1.1"
     relabel_configs:
-    - source_labels: [__address__]
-      target_label: __param_target
-    - source_labels: [__param_target]
-      target_label: target
-    - target_label: __address__
-      replacement: '192.168.1.22:9115'
+      - source_labels: [__address__]
+        target_label: __param_target
+      - source_labels: [__param_target]
+        target_label: target
+      - target_label: __address__
+        replacement: "192.168.1.22:9115"

roles/services/tasks/main.yml

@@ -5,16 +5,16 @@
     file: base.yml
 
 - name: install packages
-  include: software.yml
+  import_tasks: software.yml
   tags: [base, apt, software]
 
 - name: setup monitoring
-  include: monitoring.yml
-  tags: [base, apt, software]
+  tags: [monitoring, base, apt, software]
+  import_tasks: monitoring.yml
 
 - name: setup nginx
-  include: nginx.yml
   tags: [nginx]
+  import_tasks: nginx.yml
 
 - name: ffdyndns
   tags: [ffdyndns]

roles/services/tasks/monitoring.yml

@@ -4,8 +4,16 @@
     src: prometheus
     dest: /etc/
 
+- name: install grafana
+  apt:
+    update_cache: yes
+    state: latest
+    name: prometheus
+
+
 - name: restart prometheus
   systemd:
+    enabled: yes
     state: restarted
     name: prometheus
 
@@ -27,5 +35,5 @@
 - name: install grafana
   apt:
     update_cache: yes
-    state: present
+    state: latest
     name: grafana