From 0942a9b52cb60915ec3944b45542cc76d46dfdac Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Mon, 20 Jul 2020 21:42:50 -0400 Subject: [PATCH] Cleaning up Jenkins and Prometheus roles --- dev/host_vars/dockerbox.yml | 4 ++-- roles/jenkins/defaults/main.yml | 2 ++ roles/jenkins/tasks/main.yml | 7 +++---- roles/prometheus/defaults/main.yml | 3 +++ roles/prometheus/tasks/main.yml | 15 +++++++-------- .../prometheus.yml.j2} | 0 6 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 roles/prometheus/defaults/main.yml rename roles/prometheus/{prometheus-config.yml => templates/prometheus.yml.j2} (100%) diff --git a/dev/host_vars/dockerbox.yml b/dev/host_vars/dockerbox.yml index dd3e108..3215e27 100644 --- a/dev/host_vars/dockerbox.yml +++ b/dev/host_vars/dockerbox.yml @@ -23,9 +23,9 @@ nextcloud_dbpass: password jenkins_version: lts jenkins_domain: jenkins.vm.krislamo.org -# prometheus -prom_name: prometheus +# prometheus (includes grafana) 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']" diff --git a/roles/jenkins/defaults/main.yml b/roles/jenkins/defaults/main.yml index e69de29..a05629d 100644 --- a/roles/jenkins/defaults/main.yml +++ b/roles/jenkins/defaults/main.yml @@ -0,0 +1,2 @@ +jenkins_name: jenkins +jenkins_root: "/opt/{{ jenkins_name }}/jenkins_home" diff --git a/roles/jenkins/tasks/main.yml b/roles/jenkins/tasks/main.yml index 760be5c..bf81c1b 100644 --- a/roles/jenkins/tasks/main.yml +++ b/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 diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml new file mode 100644 index 0000000..e39238b --- /dev/null +++ b/roles/prometheus/defaults/main.yml @@ -0,0 +1,3 @@ +prom_name: prometheus +grafana_name: grafana +prom_root: "/opt/{{ prom_name }}/config" diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 544b9b4..ceb56de 100644 --- a/roles/prometheus/tasks/main.yml +++ b/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 - dest: /home/{{ docker_user }}/prometheus/prometheus.yml + src: prometheus.yml.j2 + 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: - - /home/{{ docker_user }}/prometheus:/etc/prometheus + volumes: "{{ prom_root }}:/etc/prometheus" networks_cli_compatible: true networks: - name: "{{ prom_name }}" @@ -42,8 +41,8 @@ - name: Start Grafana container docker_container: - name: grafana - image: grafana/grafana:latest + name: "{{ grafana_name }}" + image: grafana/grafana:{{ grafana_version }} networks_cli_compatible: true networks: - name: "{{ prom_name }}" diff --git a/roles/prometheus/prometheus-config.yml b/roles/prometheus/templates/prometheus.yml.j2 similarity index 100% rename from roles/prometheus/prometheus-config.yml rename to roles/prometheus/templates/prometheus.yml.j2