base implementation

Author: paulfantom

defaults/main.yml

@@ -3,10 +3,9 @@ systemd_exporter_version: 0.4.0
 systemd_exporter_binary_local_dir: ""
 systemd_exporter_web_listen_address: "0.0.0.0:9558"
 
-systemd_exporter_enabled_collectors:
-  - systemd
-  - textfile:
-      directory: "{{ systemd_exporter_textfile_dir }}"
-#  - filesystem:
-#      ignored-mount-points: "^/(sys|proc|dev)($|/)"
-#      ignored-fs-types: "^(sys|proc|auto)fs$"
+systemd_exporter_enable_restart_count: true
+systemd_exporter_enable_ip_accounting: true
+systemd_exporter_enable_file_descriptor_size: false
+
+systemd_exporter_unit_allowlist: ""
+systemd_exporter_unit_denylist: ""

molecule/alternative/playbook.yml

@@ -6,4 +6,4 @@
     - ansible-systemd-exporter
   vars:
     systemd_exporter_binary_local_dir: "/tmp/systemd_exporter-linux-amd64"
-    systemd_exporter_web_listen_address: "127.0.0.1:8080"
+    systemd_exporter_web_listen_address: "127.0.0.1:9000"

molecule/alternative/tests/test_alternative.py

@@ -5,24 +5,15 @@
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-def test_directories(host):
-    dirs = [
-        "/var/lib/node_exporter"
-    ]
-    for dir in dirs:
-        d = host.file(dir)
-        assert not d.exists
-
-
 def test_service(host):
-    s = host.service("node_exporter")
+    s = host.service("systemd_exporter")
 #    assert s.is_enabled
     assert s.is_running
 
 
 def test_socket(host):
     sockets = [
-        "tcp://127.0.0.1:8080"
+        "tcp://127.0.0.1:9000"
     ]
     for socket in sockets:
         s = host.socket(socket)

molecule/default/tests/test_default.py

@@ -5,20 +5,10 @@
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-def test_directories(host):
-    dirs = [
-        "/var/lib/node_exporter"
-    ]
-    for dir in dirs:
-        d = host.file(dir)
-        assert d.is_directory
-        assert d.exists
-
-
 def test_files(host):
     files = [
-        "/etc/systemd/system/node_exporter.service",
-        "/usr/local/bin/node_exporter"
+        "/etc/systemd/system/systemd_exporter.service",
+        "/usr/local/bin/systemd_exporter"
     ]
     for file in files:
         f = host.file(file)
@@ -42,21 +32,21 @@ def test_permissions_didnt_change(host):
 
 
 def test_user(host):
-    assert host.group("node-exp").exists
-    assert "node-exp" in host.user("node-exp").groups
-    assert host.user("node-exp").shell == "/usr/sbin/nologin"
-    assert host.user("node-exp").home == "/"
+    assert host.group("systemd-exporter").exists
+    assert "systemd-exporter" in host.user("systemd-exporter").groups
+    assert host.user("systemd-exporter").shell == "/usr/sbin/nologin"
+    assert host.user("systemd-exporter").home == "/"
 
 
 def test_service(host):
-    s = host.service("node_exporter")
+    s = host.service("systemd_exporter")
 #    assert s.is_enabled
     assert s.is_running
 
 
 def test_socket(host):
     sockets = [
-        "tcp://127.0.0.1:9100"
+        "tcp://127.0.0.1:9558"
     ]
     for socket in sockets:
         s = host.socket(socket)

molecule/latest/tests/test_alternative.py

@@ -7,8 +7,8 @@
 
 
 @pytest.mark.parametrize("files", [
-    "/etc/systemd/system/node_exporter.service",
-    "/usr/local/bin/node_exporter"
+    "/etc/systemd/system/systemd_exporter.service",
+    "/usr/local/bin/systemd_exporter"
 ])
 def test_files(host, files):
     f = host.file(files)
@@ -17,11 +17,11 @@ def test_files(host, files):
 
 
 def test_service(host):
-    s = host.service("node_exporter")
+    s = host.service("systemd_exporter")
     # assert s.is_enabled
     assert s.is_running
 
 
 def test_socket(host):
-    s = host.socket("tcp://0.0.0.0:9100")
+    s = host.socket("tcp://0.0.0.0:9558")
     assert s.is_listening

tasks/preflight.yml

@@ -14,13 +14,25 @@
 
 - name: Set systemd version fact
   set_fact:
-    systemd_exporter_systemd_version: "{{ __systemd_version.stdout_lines[0] | regex_replace('^systemd\\s(\\d+).*$', '\\1') }}"
+    _systemd_exporter_systemd_version: "{{ __systemd_version.stdout_lines[0] | regex_replace('^systemd\\s(\\d+).*$', '\\1') }}"
 
 - name: Naive assertion of proper listen address
   assert:
     that:
       - "':' in systemd_exporter_web_listen_address"
 
+- name: Assert that systemd version is >= 235 when enabling ip accounting or measuring restart count
+  assert:
+    that:
+      - _systemd_exporter_systemd_version | int >= 232
+  when: systemd_exporter_enable_ip_accounting or systemd_exporter_enable_restart_count
+
+- name: Set user and group to root to allow access to /proc/X/fd
+  set_fact:
+    _systemd_exporter_system_group: "root"
+    _systemd_exporter_system_user: "root"
+  when: systemd_exporter_enable_file_descriptor_size
+
 - name: Check if systemd_exporter is installed
   stat:
     path: "{{ _systemd_exporter_binary_install_dir }}/systemd_exporter"

templates/systemd_exporter.service.j2

@@ -9,17 +9,21 @@ Type=simple
 User={{ _systemd_exporter_system_user }}
 Group={{ _systemd_exporter_system_group }}
 ExecStart={{ _systemd_exporter_binary_install_dir }}/systemd_exporter \
-{% for collector in systemd_exporter_enabled_collectors -%}
-{%   if not collector is mapping %}
-    --collector.{{ collector }} \
-{%   else -%}
-{%     set name, options = (collector.items()|list)[0] -%}
-    --collector.{{ name }} \
-{%     for k,v in options|dictsort %}
-    --collector.{{ name }}.{{ k }}={{ v | quote }} \
-{%     endfor -%}
-{%   endif -%}
-{% endfor -%}
+{% if systemd_exporter_enable_restart_count %}
+    --collector.enable-restart-count \
+{% endif %}
+{% if systemd_exporter_enable_file_descriptor_size %}
+    --collector.enable-file-descriptor-size \
+{% endif %}
+{% 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 %}
     --web.listen-address={{ systemd_exporter_web_listen_address }}
 
 SyslogIdentifier=systemd_exporter
@@ -30,7 +34,7 @@ StartLimitInterval=0
 ProtectHome=yes
 NoNewPrivileges=yes
 
-{% if systemd_exporter_systemd_version | int >= 232 %}
+{% if _systemd_exporter_systemd_version | int >= 232 %}
 ProtectSystem=strict
 ProtectControlGroups=true
 ProtectKernelModules=true

vars/main.yml

@@ -9,5 +9,6 @@ go_arch_map:
 go_arch: "{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
 
 _systemd_exporter_binary_install_dir: "/usr/local/bin"
-_systemd_exporter_system_group: "systemd-exp"
+
+_systemd_exporter_system_group: "systemd-exporter"
 _systemd_exporter_system_user: "{{ _systemd_exporter_system_group }}"