diff --git a/playbooks/link.yml b/playbooks/link.yml index 669ad9a..f24fe85 100644 --- a/playbooks/link.yml +++ b/playbooks/link.yml @@ -22,7 +22,7 @@ - name: Podman CDR Link | Update instance list for Prometheus ansible.builtin.template: src: link_sd.yml - dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/link.yml" + dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/link.node.yml" owner: "{{ podman_prometheus_podman_rootless_user }}" group: "{{ podman_prometheus_podman_rootless_user }}" mode: "0444" @@ -30,7 +30,7 @@ - name: Podman CDR Link | Update legacy instance list for Prometheus ansible.builtin.template: src: oldlink_sd.yml - dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/oldlink.yml" + dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/oldlink.oldnode.yml" owner: "{{ podman_prometheus_podman_rootless_user }}" group: "{{ podman_prometheus_podman_rootless_user }}" mode: "0444" diff --git a/playbooks/seafile.yml b/playbooks/seafile.yml index 4b6a53c..226b7b6 100644 --- a/playbooks/seafile.yml +++ b/playbooks/seafile.yml @@ -22,7 +22,7 @@ - name: Podman Seafile | Update instance list for Seafile ansible.builtin.template: src: seafile_sd.yml - dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/seafile.yml" + dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/seafile.node.yml" owner: "{{ podman_prometheus_podman_rootless_user }}" group: "{{ podman_prometheus_podman_rootless_user }}" mode: "0444" diff --git a/playbooks/templates/link_sd.yml b/playbooks/templates/link_sd.yml index e54fe47..62d6c86 100644 --- a/playbooks/templates/link_sd.yml +++ b/playbooks/templates/link_sd.yml @@ -1,8 +1,10 @@ --- -- targets: {% for host in groups['cdr_link'] %} - - "{{ host }}:9100" -{% endfor %} +- targets: + - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100" labels: + instance: "{{ host }}" + hostname: "{{ host }}" job: node app: link +{% endfor %} diff --git a/playbooks/templates/oldlink_sd.yml b/playbooks/templates/oldlink_sd.yml index 0b92fd5..58833f0 100644 --- a/playbooks/templates/oldlink_sd.yml +++ b/playbooks/templates/oldlink_sd.yml @@ -6,4 +6,5 @@ job: node app: legacy_link instance: "{{ host }}" + hostname: "{{ host }}" {% endfor %} diff --git a/playbooks/templates/seafile_sd.yml b/playbooks/templates/seafile_sd.yml index cae407a..cc2fbdd 100644 --- a/playbooks/templates/seafile_sd.yml +++ b/playbooks/templates/seafile_sd.yml @@ -1,8 +1,10 @@ --- -- targets: {% for host in groups['seafile'] %} - - "{{ host }}:9100" -{% endfor %} +- targets: + - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100" labels: job: node app: seafile + instance: "{{ host }}" + hostname: "{{ host }}" +{% endfor %}