more

roles/podman_prometheus/handlers/main.yml

@@ -23,6 +23,14 @@
   become: true
   become_user: "{{ podman_prometheus_podman_rootless_user }}"
 
+- name: Restart Prometheus-TS
+  ansible.builtin.systemd_service:
+    name: prometheus-ts
+    scope: user
+    state: restarted
+  become: true
+  become_user: "{{ podman_prometheus_podman_rootless_user }}"
+
 - name: Restart nginx
   ansible.builtin.systemd_service:
     name: nginx

roles/podman_prometheus/tasks/main.yml

@@ -111,10 +111,13 @@
     - alertmanager.container
     - grafana.container
     - prometheus.container
+    - prometheus-ts.container
   become: true
   notify:
+    - Restart Alertmanager
     - Restart Grafana
     - Restart Prometheus
+    - Restart Prometheus-TS
 
 - name: Podman Prometheus | PATCH | Install network quadlets
   ansible.builtin.template:
@@ -178,6 +181,7 @@
     - grafana
     - nginx
     - prometheus
+    - prometheus-ts
   become: true
   become_user: "{{ podman_prometheus_podman_rootless_user }}"
 

roles/podman_prometheus/templates/home/podman/config/containers/systemd/prometheus-ts.container

@@ -0,0 +1,16 @@
+[Container]
+ContainerName=prometheus-ts
+Image=docker.io/tailscale/tailscale:latest
+HostName=prometheus
+Environment=TS_AUTH_KEY={{ podman_prometheus_ts_auth_key }}
+Environment=TS_STATE_DIR=/var/lib/tailscale
+Environment=TS_USERSPACE=true
+Environment=TS_EXTRA_ARGS="--login-server https://hs.sr2.uk/"
+Network=monitor.network
+
+[Service]
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
+

roles/podman_prometheus/templates/home/podman/prometheus.yml

@@ -13,26 +13,21 @@ scrape_configs:
       - targets: ['alertmanager:9093']
   - job_name: 'node'
     scrape_interval: 5s
-    scheme: https
-    basic_auth:
-      username: metrics
-      password: "{{ node_exporter_password }}"
-    tls_config:
-      insecure_skip_verify: true
+    scheme: http
     static_configs:
       - targets:
         - 'host.containers.internal:9100'
 {% for host in groups['ipaservers'] %}
-        - '{{ host }}:9100'
+        - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100"
 {% endfor %}
 {% for host in groups['keycloak'] %}
-        - '{{ host }}:9100'
+        - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100"
 {% endfor %}
 {% for host in groups['radius'] %}
-        - '{{ host }}:9100'
+        - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100"
 {% endfor %}
 {% for host in groups['generic'] %}
-        - '{{ host }}:9100'
+        - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100"
 {% endfor %}
     file_sd_configs:
       - files: