Cleaning up Jenkins and Prometheus roles

dev/host_vars/dockerbox.yml

@@ -23,9 +23,9 @@ nextcloud_dbpass: password
 jenkins_version: lts
 jenkins_domain: jenkins.vm.krislamo.org
 
-# prometheus
+# prometheus (includes grafana)
-prom_name: prometheus
 prom_version: latest
 prom_domain: prom.vm.krislamo.org
+grafana_version: latest
 grafana_domain: grafana.vm.krislamo.org
 prom_targets: "['127.0.0.1', '127.0.0.1:9100']"

roles/jenkins/defaults/main.yml

@@ -0,0 +1,2 @@
+jenkins_name: jenkins
+jenkins_root: "/opt/{{ jenkins_name }}/jenkins_home"

roles/jenkins/tasks/main.yml

@@ -20,21 +20,20 @@
 
 - name: Create Jenkin's directory
   file:
-    path: /home/{{ docker_user }}/jenkins
+    path: "{{ jenkins_root }}"
     state: directory
-    recurse: yes
     owner: "1000"
     group: "1000"
 
 - name: Start Jenkins Container
   docker_container:
-    name: jenkins
+    name: "{{ jenkins_name }}"
     image: jenkins/jenkins:{{ jenkins_version }}
     state: started
     restart_policy: always
     ports:
       - 50000:50000
-    volumes: "/home/{{ docker_user }}/jenkins:/var/jenkins_home"
+    volumes: "{{ jenkins_root }}:/var/jenkins_home"
     networks_cli_compatible: true
     networks:
       - name: traefik

roles/prometheus/defaults/main.yml

@@ -0,0 +1,3 @@
+prom_name: prometheus
+grafana_name: grafana
+prom_root: "/opt/{{ prom_name }}/config"

roles/prometheus/tasks/main.yml

@@ -8,15 +8,15 @@
     name: prometheus-node-exporter
     state: started
 
-- name: Create Prometheus directory
+- name: Create Prometheus directories
   file:
-    path: /home/{{ docker_user }}/prometheus
+    path: "{{ prom_root }}"
     state: directory
 
 - name: Install Prometheus configuration
   template:
-    src: prometheus-config.yml
+    src: prometheus.yml.j2
-    dest: /home/{{ docker_user }}/prometheus/prometheus.yml
+    dest: "{{ prom_root }}/prometheus.yml"
 
 - name: Create Prometheus network
   docker_network:
@@ -28,8 +28,7 @@
     image: prom/prometheus:{{ prom_version }}
     state: started
     restart_policy: always
-    volumes:
+    volumes: "{{ prom_root }}:/etc/prometheus"
-      - /home/{{ docker_user }}/prometheus:/etc/prometheus
     networks_cli_compatible: true
     networks:
       - name: "{{ prom_name }}"
@@ -42,8 +41,8 @@
 
 - name: Start Grafana container
   docker_container:
-    name: grafana
+    name: "{{ grafana_name }}"
-    image: grafana/grafana:latest
+    image: grafana/grafana:{{ grafana_version }}
     networks_cli_compatible: true
     networks:
       - name: "{{ prom_name }}"