docs and molecule

Author: paulfantom

.travis.yml

@@ -3,14 +3,14 @@ os: linux
 dist: xenial
 language: python
 python:
-  - 3.7
+  - 3.8
 cache: pip
 services:
   - docker
 env:
-  - ANSIBLE=2.7
   - ANSIBLE=2.8
   - ANSIBLE=2.9
+  - ANSIBLE=2.10
 install:
   - pip3 install tox-travis git-semver
 script:

README.md

@@ -13,7 +13,7 @@ Deploy prometheus [systemd exporter](https://github.com/povilasv/systemd_exporte
 
 ## Requirements
 
-- Ansible >= 2.7 (It might work on previous versions, but we cannot guarantee it)
+- Ansible >= 2.8 (It might work on previous versions, but we cannot guarantee it)
 - gnu-tar on Mac deployer host (`brew install gnu-tar`)
 
 ## Role Variables
@@ -25,6 +25,11 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults
 | `systemd_exporter_version` | 0.4.0 | SystemD exporter package version. Also accepts latest as parameter. |
 | `systemd_exporter_binary_local_dir` | "" | Allows to use local packages instead of ones distributed on github. As parameter it takes a directory where `systemd_exporter` binary is stored on host on which ansible is ran. This overrides `systemd_exporter_version` parameter |
 | `systemd_exporter_web_listen_address` | "0.0.0.0:9558" | Address on which systemd exporter will listen |
+| `systemd_exporter_enable_restart_count` | false | Enables service restart count metrics. This feature only works with systemd 235 and above |
+| `systemd_exporter_enable_ip_accounting` | false | Enables service ip accounting metrics. This feature only works with systemd 235 and above |
+| `systemd_exporter_enable_file_descriptor_size` | false | Enables file descriptor size metrics. This feature will cause exporter to run as root as it needs access to /proc/X/fd |
+| `systemd_exporter_unit_allowlist` | "" | Include some systemd units. Expects a regex. More in https://github.com/povilasv/systemd_exporter#configuration |
+| `systemd_exporter_unit_denylist` | "" | Exclude some systemd units. Expects a regex. More in https://github.com/povilasv/systemd_exporter#configuration |
 
 ## Example
 

defaults/main.yml

@@ -3,8 +3,8 @@ systemd_exporter_version: 0.4.0
 systemd_exporter_binary_local_dir: ""
 systemd_exporter_web_listen_address: "0.0.0.0:9558"
 
-systemd_exporter_enable_restart_count: true
-systemd_exporter_enable_ip_accounting: true
+systemd_exporter_enable_restart_count: false
+systemd_exporter_enable_ip_accounting: false
 systemd_exporter_enable_file_descriptor_size: false
 
 systemd_exporter_unit_allowlist: ""

molecule/alternative/prepare.yml

@@ -4,34 +4,34 @@
   gather_facts: false
   vars:
     go_arch: amd64
-    node_exporter_version: 1.0.0
+    systemd_exporter_version: 0.4.0
   tasks:
-    - name: Download node_exporter binary to local folder
+    - name: Download systemd_exporter binary to local folder
       become: false
       get_url:
-        url: "https://github.com/prometheus/node_exporter/releases/download/v{{ node_exporter_version }}/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
-        dest: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
+        url: "https://github.com/povilasv/systemd_exporter/releases/download/v{{ systemd_exporter_version }}/systemd_exporter-{{ systemd_exporter_version }}.linux-{{ go_arch }}.tar.gz"
+        dest: "/tmp/systemd_exporter-{{ systemd_exporter_version }}.linux-{{ go_arch }}.tar.gz"
       register: _download_binary
       until: _download_binary is succeeded
       retries: 5
       delay: 2
       run_once: true
       check_mode: false
 
-    - name: Unpack node_exporter binary
+    - name: Unpack systemd_exporter binary
       become: false
       unarchive:
-        src: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
+        src: "/tmp/systemd_exporter-{{ systemd_exporter_version }}.linux-{{ go_arch }}.tar.gz"
         dest: "/tmp"
-        creates: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}/node_exporter"
+        creates: "/tmp/systemd_exporter-{{ systemd_exporter_version }}.linux-{{ go_arch }}/systemd_exporter"
       run_once: true
       check_mode: false
 
-    - name: link to node_exporter binaries directory
+    - name: link to systemd_exporter binaries directory
       become: false
       file:
-        src: "/tmp/node_exporter-{{ node_exporter_version }}.linux-amd64"
-        dest: "/tmp/node_exporter-linux-amd64"
+        src: "/tmp/systemd_exporter-{{ systemd_exporter_version }}.linux-amd64"
+        dest: "/tmp/systemd_exporter-linux-amd64"
         state: link
       run_once: true
       check_mode: false

tox.ini

@@ -1,21 +1,21 @@
 [tox]
 minversion = 1.8
 basepython = python3.7
-envlist = py37-ansible{27,28,29}
+envlist = py37-ansible{28,29,210}
 skipsdist = true
 
 [travis:env]
 ANSIBLE=
-  2.7: ansible27
   2.8: ansible28
   2.9: ansible29
+  2.10: ansible210
 
 [testenv]
 passenv = GH_* DOCKER_HOST MOLECULE_*
 deps =
     -rtest-requirements.txt
-    ansible27: ansible<2.8
     ansible28: ansible<2.9
     ansible29: ansible<2.10
+    ansible210: ansible<2.11
 commands =
     {posargs:molecule test --all --destroy always}