Run ansible-lint and yamllint

handlers/main.yml

@@ -2,7 +2,8 @@
 # handlers file for ansible-prometheus
 
 - name: reload daemon
-  command: systemctl daemon-reload
+  systemd:
+    daemon_reload: yes
 
 - name: restart prometheus
   service: name=prometheus state=restarted enabled=yes

meta/main.yml

@@ -5,7 +5,7 @@ galaxy_info:
 
   license: BSD
 
-  min_ansible_version: 2.1
+  min_ansible_version: 2.4
 
   platforms:
     - name: EL

tasks/install-alert_manager.yml

@@ -1,4 +1,5 @@
-- include_vars: 'alertmanager.yml'
+- name: Include alert manager variables
+  include_vars: 'alertmanager.yml'
 
 - name: Creating alert manager directories
   file:
@@ -22,15 +23,15 @@
     group: "{{ prometheus_group }}"
     copy: no
     creates: "{{ prometheus_install_dir }}/{{ prometheus_alert_manager_archive }}"
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Copy alert manager config
   template:
     src: alertmanager.yml.j2
     dest: "{{ prometheus_alert_manager_config_dir }}/alertmanager.yml"
     owner: "{{ prometheus_owner }}"
     group: "{{ prometheus_group }}"
-    validate: "{{ prometheus_install_dir }}/{{ prometheus_alert_manager_archive }}/amtool check-config %s --alertmanager.url={% if prometheus_alert_manager_web__external_url is not none %}{{ prometheus_alert_manager_web__external_url }}{% else %}'http://127.0.0.1:9093'{% endif %}"
+    validate: "{{ prometheus_install_dir }}/{{ prometheus_alert_manager_archive }}/amtool check-config %s --alertmanager.url={{ _alert_manager_validate_url }}"
   notify:
     restart alertmanager
 

tasks/install-blackbox_exporter.yml

@@ -1,4 +1,5 @@
-- include_vars: 'blackboxexporter.yml'
+- name: Include blackbox exporter variables
+  include_vars: 'blackboxexporter.yml'
 
 - name: Creating blackbox exporter directories
   file:
@@ -19,7 +20,7 @@
     group: "{{ prometheus_group }}"
     copy: no
     creates: "{{ prometheus_install_dir }}/{{ prometheus_blackbox_exporter_archive }}"
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Copy blackbox exporter config
   template:
@@ -35,7 +36,7 @@
     path: "{{ prometheus_install_dir }}/{{ prometheus_blackbox_exporter_archive }}/blackbox_exporter"
     capability: cap_net_raw+ep
     state: present
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
   notify:
     - reload blackboxexporter
 

tasks/install-node_exporter.yml

@@ -1,4 +1,5 @@
-- include_vars: 'nodeexporter.yml'
+- name: Include node exporter variables
+  include_vars: 'nodeexporter.yml'
 
 - name: Download and extract Prometheus node exporter tarball
   unarchive:
@@ -8,7 +9,7 @@
     group: "{{ prometheus_group }}"
     copy: no
     creates: "{{ prometheus_install_dir }}/{{ prometheus_node_exporter_archive }}"
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Install Prometheus node exporter systemd service
   template:

tasks/install-prometheus.yml

@@ -1,4 +1,5 @@
-- include_vars: 'prometheus.yml'
+- name: Include prometheus variables
+  include_vars: 'prometheus.yml'
 
 - name: Creating Prometheus directories
   file:
@@ -21,7 +22,7 @@
     group: "{{ prometheus_group }}"
     copy: no
     creates: "{{ prometheus_install_dir }}/{{ prometheus_archive }}"
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Copy Prometheus config
   template:

tasks/install-push_gateway.yml

@@ -1,4 +1,5 @@
-- include_vars: 'pushgateway.yml'
+- name: Include pushgateway variables
+  include_vars: 'pushgateway.yml'
 
 - name: Download and extract Prometheus push gateway tarball
   unarchive:
@@ -8,7 +9,7 @@
     group: "{{ prometheus_group }}"
     copy: no
     creates: "{{ prometheus_install_dir }}/{{ prometheus_push_gateway_archive }}"
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Install Prometheus push gateway systemd service
   template:

tasks/install-snmp_exporter.yml

@@ -1,4 +1,5 @@
-- include_vars: 'snmpexporter.yml'
+- name: Include snmp exporter variables
+  include_vars: 'snmpexporter.yml'
 
 - name: Creating snmp exporter directories
   file:
@@ -19,7 +20,7 @@
     group: "{{ prometheus_group }}"
     copy: no
     creates: "{{ prometheus_install_dir }}/{{ prometheus_snmp_exporter_archive }}"
-  ignore_errors: "{{ansible_check_mode}}"
+  ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Copy snmp exporter config
   copy:

vars/alertmanager.yml

@@ -1,3 +1,6 @@
+_alert_manager_validate_url:
+  "{% if prometheus_alert_manager_web__external_url is not none %}{{ prometheus_alert_manager_web__external_url }}{% else %}'http://127.0.0.1:9093'{% endif %}"
+
 ############################################################
 # Auto generated
 ############################################################