many corrections

tasks/asserts.yml

@@ -17,3 +17,11 @@
     that: "'docker-ce' in ansible_facts.packages"
   tags:
     - prometheus
+
+- name: 'prometheus | assert | check if docker pyhon libraries are installed'
+  assert:
+    that:
+      - "'python-docker' in ansible_facts.packages"
+      - "'python3-docker' in ansible_facts.packages"
+  tags:
+    - prometheus

tasks/main.yml

@@ -2,5 +2,33 @@
 - name: 'prometheus | include asserts'
   include_tasks: 'asserts.yml'
 
-- name: 'prometheus | install'
-  include_tasks: 'install.yml'
+- name: 'prometheus | server install'
+  include_tasks: 'prometheus.yml'
+  when:
+    - prometheus_server_enable is defined
+    - prometheus_server_enable == "true"
+
+- name: 'prometheus | Node exporter'
+  include_tasks: 'node_exporter.yml'
+  when:
+    - prometheus_node_exporter_enable is defined
+    - prometheus_node_exporter_enable == "true"
+
+- name: 'prometheus | MongoDB exporter'
+  include_tasks: 'mongodb_exporter.yml'
+  when:
+    - prometheus_mongodb_exporter_enable is defined
+    - prometheus_mongodb_exporter_enable == "true"
+
+- name: 'prometheus | MySQL exporter'
+  include_tasks: 'mysqld_exporter.yml'
+  when:
+    - prometheus_mysqld_exporter_enable is defined
+    - prometheus_mysqld_exporter_enable == "true"
+
+- name: 'prometheus | PostgreSQL exporter'
+  include_tasks: 'postgresql_exporter.yml'
+  when:
+    - prometheus_postgres_exporter_enable is defined
+    - prometheus_postgres_exporter_enable == "true"
+

tasks/mongodb_exporter.yml

@@ -24,7 +24,7 @@
 
 - name: 'prometheus | mongodb exporter | install unit file to systemd'
   template:
-    src: templates/systemd/prometheus-mongodb-exporter.service.j2
+    src: systemd/prometheus-mongodb-exporter.service.j2
     dest: /etc/systemd/system/prometheus-mongodb-exporter.service
     owner: root
     group: root
@@ -36,5 +36,5 @@
     daemon_reload: yes
     enabled: yes
     state: started
-    name: mongodb_exporter.service
+    name: prometheus-mongodb-exporter.service
   when: prometheus_mongodb_exporter_enable == "true"

tasks/mysqld_exporter.yml

@@ -40,7 +40,7 @@
 
 - name: 'prometheus | mysqld exporter | install unit file to systemd'
   template:
-    src: templates/systemd/prometheus-mysqld-exporter.service.j2
+    src: systemd/prometheus-mysqld-exporter.service.j2
     dest: /etc/systemd/system/prometheus-mysqld-exporter.service
     owner: root
     group: root
@@ -52,5 +52,5 @@
     daemon_reload: yes
     enabled: yes
     state: started
-    name: mysqld_exporter.service
+    name: prometheus-mysqld-exporter.service
   when: prometheus_mysqld_exporter_enable == "true"

tasks/node_exporter.yml

@@ -24,8 +24,8 @@
 
 - name: 'prometheus | node exporter | install unit file to systemd'
   template:
-    src: templates/systemd/prometheus_node_exporter.service.j2
-    dest: /etc/systemd/system/prometheus_node_exporter.service
+    src: systemd/prometheus-node-exporter.service.j2
+    dest: /etc/systemd/system/prometheus-node-exporter.service
     owner: root
     group: root
     mode: 0600
@@ -36,5 +36,5 @@
     daemon_reload: yes
     enabled: yes
     state: started
-    name: node_exporter.service
+    name: prometheus-node-exporter.service
   when: prometheus_node_exporter_enable == "true"

tasks/postgresql_exporter.yml

@@ -22,7 +22,7 @@
     mode: 0755
   when: prometheus_postgres_exporter_enable == "true"
 
-- name: 'prometheus | mysql exporter | configuration'
+- name: 'prometheus | postgres exporter | configuration'
   copy:
     dest: '/var/lib/prometheus/.my.cnf'
     owner: root
@@ -58,10 +58,18 @@
 
 - name: 'prometheus | postgres exporter | install unit file to systemd'
   template:
-    src: templates/systemd/prometheus-postgres-exporter.service.j2
+    src: systemd/prometheus-postgres-exporter.service.j2
     dest: /etc/systemd/system/prometheus-postgres-exporter.service
     owner: root
     group: root
     mode: 0600
   when: prometheus_postgres_exporter_enable == "true"
 
+
+- name: 'prometheus | postgres exporter | configure systemd to use service'
+  systemd:
+    daemon_reload: yes
+    enabled: yes
+    state: started
+    name: prometheus-postgres-exporter.service
+  when: prometheus_postgres_exporter_enable == "true"

tasks/prometheus.yml

@@ -1,40 +1,49 @@
 ---
-- name: 'prometheus | create docker network'
+- name: 'prometheus | server | assert | check mandatory vars are defined'
+  assert:
+    that:
+      - "prometheus_server_monitor is defined"
+  tags:
+    - prometheus
+
+- name: 'prometheus | server | create docker network'
   docker_network:
     name: 'prometheus'
   tags:
     - prometheus
-  when: prometheus_enable == "true"
+  when: prometheus_server_enable == "true"
 
-- name: 'prometheus | create docker volume data'
+- name: 'prometheus | server | create docker volume data'
   docker_volume:
     name: prometheus_data
   register: register_docker_volume_prometheus__prometheus_data
-  when: prometheus_enable == "true"
+  when: prometheus_server_enable == "true"
   tags:
     - prometheus
 
-- name: 'prometheus | create prometheus directory to /etc'
+- name: 'prometheus | server | create prometheus directory to /etc'
   file:
     path: /etc/prometheus
     state: directory
     mode: '0755'
-  when: prometheus_enable == "true"
+  when: prometheus_server_enable == "true"
   tags:
     - prometheus
 
-- name: 'prometheus | copy config prometheus yml'
+- name: 'prometheus | server | copy config prometheus yml'
   template:
-    src: templates/prometheus.yml.j2
+    src: prometheus.yml.j2
     dest: /etc/prometheus/prometheus.yml
     owner: root
     group: root
     mode: 0644
-  when: prometheus_enable == "true"
+  when:
+    - prometheus_server_enable == "true"
+    - prometheus_server_monitor is defined
   tags:
     - prometheus
 
-- name: 'prometheus | deploy container'
+- name: 'prometheus | server | deploy container'
   docker_container:
     name: prometheus
     hostname: '{{ inventory_hostname }}'
@@ -52,14 +61,12 @@
     - { name: prometheus }
     ports:
       - "9090:9090"
-    etc_hosts:
-      foo: 10.1.1.1
-      bar: 10.1.1.2
     log_driver: syslog
     log_options:
       tag: docker_prometheus
     restart_policy: 'unless-stopped'
     pull: '{{ awh_services_docker_pull|default("no") }}'
-  when: prometheus_enable == "true"
-  tags: 
+  when: prometheus_server_enable == "true"
+  tags:
     - prometheus
+