Merge pull request #92 from ernestas-poskus/run_linter

Run ansible-lint and yamllint

Author: ernestas-poskus

.travis.yml

@@ -55,6 +55,9 @@ script:
   # Test role.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
+  # Lint role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash /etc/ansible/roles/role_under_test/lint /etc/ansible/roles/role_under_test'
+
   # View container logs
   - 'sudo docker logs "$(cat ${container_id})"'
 

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

lint

@@ -0,0 +1,13 @@
+#!/bin/bash
+path=${1:-.}
+
+python_path="$(python -m site --user-base)/bin"
+echo "Python pip bin's path: $python_path"
+
+pip install yamllint --user
+pip install ansible-lint --user
+
+yamllint_file="/tmp/yamllint.yaml"
+
+curl https://raw.githubusercontent.com/ansible/galaxy/devel/galaxy/importer/linters/yamllint.yaml -o "$yamllint_file"
+"$python_path/yamllint" -s -c "$yamllint_file" "$path" && "$python_path/ansible-lint" "$path"

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
 ############################################################

yamllint.yaml

@@ -0,0 +1,21 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+  braces: {max-spaces-inside: 1, level: error}
+  brackets: {max-spaces-inside: 1, level: error}
+  colons: {max-spaces-after: -1, level: error}
+  commas: {max-spaces-after: -1, level: error}
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines: {max: 3, level: error}
+  hyphens: {level: error}
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines: {type: unix}
+  trailing-spaces: disable
+  truthy: disable