diff --git a/playbooks/link.yml b/playbooks/link.yml index f24fe85..669ad9a 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.node.yml" + dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/link.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.oldnode.yml" + dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/oldlink.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 226b7b6..4b6a53c 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.node.yml" + dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/seafile.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 62d6c86..e54fe47 100644 --- a/playbooks/templates/link_sd.yml +++ b/playbooks/templates/link_sd.yml @@ -1,10 +1,8 @@ --- -{% for host in groups['cdr_link'] %} - targets: - - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100" +{% for host in groups['cdr_link'] %} + - "{{ host }}:9100" +{% endfor %} 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 58833f0..0b92fd5 100644 --- a/playbooks/templates/oldlink_sd.yml +++ b/playbooks/templates/oldlink_sd.yml @@ -6,5 +6,4 @@ 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 cc2fbdd..cae407a 100644 --- a/playbooks/templates/seafile_sd.yml +++ b/playbooks/templates/seafile_sd.yml @@ -1,10 +1,8 @@ --- -{% for host in groups['seafile'] %} - targets: - - "{{ hostvars[host]['node_exporter_tailscale_ipv4'].stdout }}:9100" +{% for host in groups['seafile'] %} + - "{{ host }}:9100" +{% endfor %} labels: job: node app: seafile - instance: "{{ host }}" - hostname: "{{ host }}" -{% endfor %} diff --git a/roles/podman_link/defaults/main.yml b/roles/podman_link/defaults/main.yml index 8dec8f0..4fa74a9 100644 --- a/roles/podman_link/defaults/main.yml +++ b/roles/podman_link/defaults/main.yml @@ -1,6 +1,6 @@ # podman_link_podman_rootless_user: podman_link_web_hostname: "{{ inventory_hostname }}" -podman_link_stack_version: 3.4.3 +podman_link_stack_version: 3.4.3-beta.4 podman_link_postgres_zammad_user: postgres podman_link_postgres_zammad_database: zammad_production podman_link_postgres_link_user: link