From 31e6b1f3304e0ad2208c476fa2f8a047a0d8a4f5 Mon Sep 17 00:00:00 2001
From: Alexander Gorelyshev <corvus-migratorius@proton.me>
Date: Sun, 28 Dec 2025 15:59:40 +0400
Subject: [PATCH] Hardcode `prometheus` as user and group name

Not much sense or need in using variables here. The systemd unit file
was using hard-coded values anyway.
---
 roles/prometheus/defaults/main.yml   |  2 --
 roles/prometheus/tasks/configure.yml |  8 +++----
 roles/prometheus/tasks/install.yml   | 33 +++++++++++-----------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index 5ecc61c..59c8728 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -1,7 +1,5 @@
 ---
 prometheus_version: 3.2.1
 prometheus_dir: "/etc/prometheus"
-prometheus_user: prometheus
-prometheus_group: prometheus
 prometheus_config_dir: "/etc/prometheus/conf"
 prometheus_db_dir: "/var/lib/prometheus"
diff --git a/roles/prometheus/tasks/configure.yml b/roles/prometheus/tasks/configure.yml
index d8cd506..0d123be 100644
--- a/roles/prometheus/tasks/configure.yml
+++ b/roles/prometheus/tasks/configure.yml
@@ -6,8 +6,8 @@
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "{{ prometheus_config_dir }}/{{ item | basename }}"
-    owner: "{{ prometheus_user }}"
-    group: "{{ prometheus_group }}"
+    owner: "prometheus"
+    group: "prometheus"
     mode: "0660"
 
 - name: "Configure | Copy alert rules"
@@ -18,6 +18,6 @@
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "{{ prometheus_config_dir }}/{{ item | basename }}"
-    owner: "{{ prometheus_user }}"
-    group: "{{ prometheus_group }}"
+    owner: "prometheus"
+    group: "prometheus"
     mode: "0660"
diff --git a/roles/prometheus/tasks/install.yml b/roles/prometheus/tasks/install.yml
index c4922e8..cfac627 100644
--- a/roles/prometheus/tasks/install.yml
+++ b/roles/prometheus/tasks/install.yml
@@ -1,14 +1,7 @@
 ---
-- name: "Install | Create Prometheus system group"
-  ansible.builtin.group:
-    name: "{{ prometheus_group }}"
-    system: true
-    state: present
-
 - name: "Install | Create Prometheus system user"
   ansible.builtin.user:
-    name: "{{ prometheus_user }}"
-    group: "{{ prometheus_group }}"
+    name: "prometheus"
     system: true
     shell: "/sbin/nologin"
     create_home: false
@@ -30,23 +23,23 @@
 
   rescue:
     - name: "Install | Create directories {{ item }}"
-      ansible.builtin.file:
-        path: "{{ item }}"
-        state: directory
-        owner: "{{ prometheus_user }}"
-        group: "{{ prometheus_group }}"
-        mode: "0755"
       with_items:
         - "{{ prometheus_config_dir }}"
         - "{{ prometheus_dir }}"
         - "{{ prometheus_db_dir }}"
+      ansible.builtin.file:
+        path: "{{ item }}"
+        state: directory
+        owner: "prometheus"
+        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_user }}"
-        group: "{{ prometheus_group }}"
+        owner: "prometheus"
+        group: "prometheus"
         mode: "0644"
 
     - name: "Install | Unpack the distribution"
@@ -70,8 +63,8 @@
         src: "{{ prometheus_dir }}/prometheus-{{ prometheus_version }}.linux-amd64/{{ item }}"
         dest: "/usr/local/bin/{{ item }}"
         mode: "0755"
-        owner: "{{ prometheus_user }}"
-        group: "{{ prometheus_group }}"
+        owner: "prometheus"
+        group: "prometheus"
         remote_src: true
 
 - name: "Install | Create a systemd service unit"
@@ -79,6 +72,6 @@
   ansible.builtin.template:
     src: prometheus.service.j2
     dest: /etc/systemd/system/prometheus.service
-    owner: "{{ prometheus_user }}"
-    group: "{{ prometheus_group }}"
+    owner: "prometheus"
+    group: "prometheus"
     mode: "0660"