initial release

Signed-off-by: paulfantom <[email protected]>

Author: paulfantom

.circleci/config.yml

@@ -46,7 +46,6 @@ jobs:
     environment:
       GIT_MAIL: [email protected]
       GIT_USER: cloudalchemybot
-      GIT_COMMIT_DESC: git log --format=%B -n 1 ${CIRCLE_SHA1}
     steps:
       - checkout
       - setup_remote_docker
@@ -55,6 +54,7 @@ jobs:
       - run: git config --global user.name "${GIT_USER}"
       - run: |
           GIT_TAG=none
+          GIT_COMMIT_DESC=$(git log --format=%B -n 1 ${CIRCLE_SHA1})
           echo "Last commit message: ${GIT_COMMIT_DESC}"
           case "${GIT_COMMIT_DESC}" in
             *"[patch]"*|*"[fix]"*|*"[bugfix]"* )   GIT_TAG=$(git semver --next-patch) ;;

defaults/main.yml

@@ -7,5 +7,11 @@ systemd_exporter_enable_restart_count: false
 systemd_exporter_enable_ip_accounting: false
 systemd_exporter_enable_file_descriptor_size: false
 
-systemd_exporter_unit_allowlist: ""
-systemd_exporter_unit_denylist: ""
+systemd_exporter_unit_whitelist: []
+systemd_exporter_unit_blacklist: []
+
+# Following variables are meant for advanced users only. Changing those is not supported.
+
+_systemd_exporter_binary_install_dir: "/usr/local/bin"
+_systemd_exporter_system_group: "systemd-exporter"
+_systemd_exporter_system_user: "{{ _systemd_exporter_system_group }}"

meta/main.yml

@@ -1,7 +1,8 @@
 ---
 galaxy_info:
   author: Pawel Krupa
-  description: Prometheus SystemD Exporter
+  description: Prometheus Systemd Exporter
+  role_name: systemd-exporter
   license: MIT
   company: none
   min_ansible_version: 2.7

templates/systemd_exporter.service.j2

@@ -18,12 +18,12 @@ ExecStart={{ _systemd_exporter_binary_install_dir }}/systemd_exporter \
 {% if systemd_exporter_enable_ip_accounting %}
     --collector.enable-ip-accounting \
 {% endif %}
-{% if systemd_exporter_unit_allowlist != "" %}
-    --collector.unit-whitelist={{ systemd_exporter_unit_allowlist }} \
-{% endif %}
-{% if systemd_exporter_unit_denylist != "" %}
-    --collector.unit-blacklist={{ systemd_exporter_unit_denylist }} \
-{% endif %}
+{% for item in systemd_exporter_unit_whitelist %}
+    --collector.unit-whitelist={{ item }} \
+{% endfor %}
+{% for item in systemd_exporter_unit_blacklist %}
+    --collector.unit-blacklist={{ item }} \
+{% endfor %}
     --web.listen-address={{ systemd_exporter_web_listen_address }}
 
 SyslogIdentifier=systemd_exporter

vars/main.yml

@@ -7,8 +7,3 @@ go_arch_map:
   armv6l: 'armv6'
 
 go_arch: "{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
-
-_systemd_exporter_binary_install_dir: "/usr/local/bin"
-
-_systemd_exporter_system_group: "systemd-exporter"
-_systemd_exporter_system_user: "{{ _systemd_exporter_system_group }}"