Merge branch 'master' into add-grafana-alloy-role

roles/grafana_alloy/tasks/install.yml

@@ -23,16 +23,13 @@
   block:
     - name: "Install | Check Alloy version"
       changed_when: false
-      failed_when: false
       ansible.builtin.command:
         cmd: "alloy --version"
       register: grafana_alloy_ver
 
     - name: "Install | Assert version correctness"
       ansible.builtin.assert:
-        that:
+        that: "grafana_alloy_version in grafana_alloy_ver.stdout"
-          - "grafana_alloy_ver.rc == 0"
-          - "grafana_alloy_version in grafana_alloy_ver.stdout"
         success_msg: "alloy version {{ grafana_alloy_version }} is installed and working"
         fail_msg: "alloy version {{ grafana_alloy_version }} is not installed or not working correctly"
 
@@ -42,26 +39,10 @@
         name: "unzip"
         state: present
 
-    - name: "Install | Download the distribution archive"
+    - name: "Install | Fetch and unpack the distribution"
-      ansible.builtin.get_url:
-        url: "https://github.com/grafana/alloy/releases/download/v{{ grafana_alloy_version }}/alloy-linux-amd64.zip"
-        dest: "/tmp/alloy-linux-amd64.zip"
-        group: "alloy"
-        owner: "alloy"
-        mode: "0644"
-        timeout: 30
-        force: true
-      register: grafana_alloy_download_status
-      until: grafana_alloy_download_status is success
-      retries: 3
-      delay: 5
-
-    - name: "Install | Unpack and delete the distribution"
       ansible.builtin.unarchive:
-        src: "/tmp/alloy-linux-amd64.zip"
+        src: "https://github.com/grafana/alloy/releases/download/v{{ grafana_alloy_version }}/alloy-linux-amd64.zip"
         dest: "/tmp"
-        group: "alloy"
-        owner: "alloy"
         remote_src: true
 
     - name: "Install | Put the binary under the PATH"
@@ -75,11 +56,8 @@
         mode: "0755"
 
     - name: "Install | Clean up the downloads"
-      loop:
-        - "/tmp/alloy-linux-amd64"
-        - "/tmp/alloy-linux-amd64.zip"
       ansible.builtin.file:
-        path: "{{ item }}"
+        path: "/tmp/alloy-linux-amd64"
         state: absent
 
 - name: "Install | Create a systemd service unit"
@@ -87,6 +65,6 @@
   ansible.builtin.template:
     src: alloy.service.j2
     dest: /etc/systemd/system/alloy.service
-    owner: "root"
+    owner: "alloy"
-    group: "root"
+    group: "alloy"
-    mode: "0600"
+    mode: "0660"