diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index 7f63286..e7270f8 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -1,5 +1,4 @@ --- prometheus_version: 3.2.1 -prometheus_dir: "/etc/prometheus" prometheus_config_dir: "/etc/prometheus" prometheus_db_dir: "/var/lib/prometheus" diff --git a/roles/prometheus/tasks/install.yml b/roles/prometheus/tasks/install.yml index 2387883..03877de 100644 --- a/roles/prometheus/tasks/install.yml +++ b/roles/prometheus/tasks/install.yml @@ -34,38 +34,30 @@ group: "prometheus" mode: "0755" - - name: "Install | Download the binary distribution" - ansible.builtin.get_url: - url: "https://github.com/prometheus/prometheus/releases/download/v{{ prometheus_version }}/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz" - dest: "/tmp/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz" - owner: "prometheus" - group: "prometheus" - mode: "0644" - - - name: "Install | Unpack the distribution" + - name: "Install | Fetch and unpack the distribution" notify: "(Re)start Prometheus service" ansible.builtin.unarchive: - src: "/tmp/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz" - dest: "{{ prometheus_dir }}" - creates: "{{ prometheus_dir }}/prometheus-{{ prometheus_version }}.linux-amd64" + src: "https://github.com/prometheus/prometheus/releases/download/v{{ prometheus_version }}/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz" + dest: "/tmp" + creates: "/tmp/prometheus-{{ prometheus_version }}.linux-amd64" remote_src: true - - name: "Install | Clean up downloads" - ansible.builtin.file: - path: "/tmp/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz" - state: absent - - - name: "Install | Move official prometheus and promtool binaries" + - name: "Install | Put the binaries under the PATH" with_items: - prometheus - promtool ansible.builtin.copy: - src: "{{ prometheus_dir }}/prometheus-{{ prometheus_version }}.linux-amd64/{{ item }}" - dest: "/usr/local/bin/{{ item }}" - mode: "0755" + remote_src: true + src: "/tmp/prometheus-{{ prometheus_version }}.linux-amd64/{{ item }}" + dest: "/usr/bin/{{ item }}" owner: "prometheus" group: "prometheus" - remote_src: true + mode: "0755" + + - name: "Install | Clean up the downloads" + ansible.builtin.file: + path: "/tmp/prometheus-{{ prometheus_version }}.linux-amd64" + state: absent - name: "Install | Create a systemd service unit" notify: "(Re)start Prometheus service" diff --git a/roles/prometheus/templates/prometheus.service.j2 b/roles/prometheus/templates/prometheus.service.j2 index 2f17191..94804b1 100644 --- a/roles/prometheus/templates/prometheus.service.j2 +++ b/roles/prometheus/templates/prometheus.service.j2 @@ -8,7 +8,7 @@ Documentation="https://prometheus.io/" User=prometheus Group=prometheus Type=simple -ExecStart=/usr/local/bin/prometheus \ +ExecStart=/usr/bin/prometheus \ --config.file {{ prometheus_config_dir }}/prometheus.yml \ --storage.tsdb.path {{ prometheus_db_dir }} \ --storage.tsdb.retention.time=30d