From 200db54daf22a9b339589826c7033924c2fd7f73 Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:07:22 +0100 Subject: [PATCH 1/7] Typo --- .yamllint | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamllint b/.yamllint index b4f3fc1..ac440f1 100644 --- a/.yamllint +++ b/.yamllint @@ -1,3 +1,4 @@ +--- extends: default ignore: | .travis.yml From 0d6808346c04b456d0e0ed640b0706abcf2e6979 Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:08:09 +0100 Subject: [PATCH 2/7] Fix duplicate handlers execution --- handlers/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 00a35ca..951b143 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -6,4 +6,3 @@ name: '{{ prometheus_exporter__service_name }}' state: restarted when: prometheus_exporter__service_enabled|bool - listen: ['restart-{{ prometheus_exporter__tag_name }}'] From eb22d26431ecbc500c655c1bf9173279f29270dd Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:08:31 +0100 Subject: [PATCH 3/7] Improve tag name regex --- defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 823ecc9..96b58bd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,9 +8,10 @@ prometheus_exporter__name: node_exporter # Name of the default variables -prometheus_exporter__variables_prefix: "{{ prometheus_exporter__name|regex_replace('[\\w]exporter$', '') }}_exporter" +prometheus_exporter__variables_prefix: "{{ prometheus_exporter__name|regex_replace('[^a-zA-Z0-9]exporter$', '') }}_exporter" + # Name of the tasks tags -prometheus_exporter__tag_name: "{{ prometheus_exporter__name|regex_replace('[\\w]exporter$', '') }}-exporter" +prometheus_exporter__tag_name: "{{ prometheus_exporter__name|regex_replace('[^a-zA-Z0-9]exporter$', '') }}-exporter" # Select the exporter version to install prometheus_exporter__version: "{{ vars[prometheus_exporter__variables_prefix~'__version'] }}" From d1cf868eff7c306d2fd209a6783adf64394c8d28 Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:08:41 +0100 Subject: [PATCH 4/7] Update molecule tests syntax --- molecule/default/molecule.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 0a15ade..e366ba0 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,8 +3,7 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint +lint: yamllint . platforms: - name: debian8 image: turgon37/docker-debian8-ansible From b1bb9ebebde196ee9af919578917a6ead8969d21 Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:09:08 +0100 Subject: [PATCH 5/7] Add buster compatibility --- meta/main.yml | 1 + molecule/default/molecule.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index 4952b10..7186b99 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,6 +10,7 @@ galaxy_info: versions: - jessie - stretch + - buster - name: EL versions: - 7 diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e366ba0..4b0c799 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -17,6 +17,12 @@ platforms: privileged: true volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro + - name: debian10 + image: turgon37/docker-debian10-ansible + command: /lib/systemd/systemd + privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro - name: centos7 image: turgon37/docker-centos7-ansible command: /usr/lib/systemd/systemd From 7eea1d789092232d3e693f855ef623e33c9a333f Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:09:16 +0100 Subject: [PATCH 6/7] remove useless tags --- tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 8643596..02947ea 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,15 +23,15 @@ - name: Importing install tasks import_tasks: install.yml - tags: ['prometheus-exporter', 'prometheus-exporter-install', '{{ prometheus_exporter__tag_name }}', '{{ prometheus_exporter__tag_name }}-install'] + tags: ['prometheus-exporter', 'prometheus-exporter-install'] - name: Importing configuration tasks import_tasks: configure.yml - tags: ['prometheus-exporter', 'prometheus-exporter-configure', '{{ prometheus_exporter__tag_name }}', '{{ prometheus_exporter__tag_name }}-configure'] + tags: ['prometheus-exporter', 'prometheus-exporter-configure'] - name: Importing service tasks import_tasks: service.yml - tags: ['prometheus-exporter', 'prometheus-exporter-service', '{{ prometheus_exporter__tag_name }}', '{{ prometheus_exporter__tag_name }}-service'] + tags: ['prometheus-exporter', 'prometheus-exporter-service'] - name: Ensure handlers are trigger correctly meta: flush_handlers From 467193e6e7cdda4c0ea8f29b2357e29f7d9ccf92 Mon Sep 17 00:00:00 2001 From: Pierre GINDRAUD Date: Wed, 18 Mar 2020 22:10:14 +0100 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2027425..1d5201e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ Items starting with `DEPRECATE` are important deprecation notices. +## 1.0.2 (2020-03-18) + +* Add Debian buster compatibility +* Fix duplicate handlers execution + ## 1.0.1 (2019-07-24) * Systemd service start after network-online instead of network