enhancement(chrony_exporter): allows using multiple web listen addresses

Signed-off-by: Christian Krause <christian.krause@idiv.de>
This commit is contained in:
Christian Krause 2023-09-04 11:58:08 +02:00
parent 01b437147d
commit bb45a5d23c
No known key found for this signature in database
GPG key ID: 3CD613B9A8567F58
4 changed files with 36 additions and 9 deletions

View file

@ -4,7 +4,9 @@ provisioner:
group_vars:
all:
chrony_exporter_binary_local_dir: "/tmp/chrony_exporter-linux-amd64"
chrony_exporter_web_listen_address: "127.0.0.1:8080"
chrony_exporter_web_listen_address:
- '127.0.0.1:8080'
- '127.0.1.1:8080'
chrony_exporter_enabled_collectors:
- sources
chrony_exporter_disabled_collectors:

View file

@ -3,6 +3,7 @@ __metaclass__ = type
import os
import testinfra.utils.ansible_runner
import pytest
testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
@ -37,10 +38,9 @@ def test_protecthome_property(host):
assert p.get("ProtectHome") == "yes"
def test_socket(host):
sockets = [
"tcp://127.0.0.1:8080"
]
for socket in sockets:
s = host.socket(socket)
assert s.is_listening
@pytest.mark.parametrize("sockets", [
"tcp://127.0.0.1:8080",
"tcp://127.0.1.1:8080",
])
def test_socket(host, sockets):
assert host.socket(sockets).is_listening

View file

@ -20,10 +20,26 @@
ansible.builtin.package_facts:
when: "not 'packages' in ansible_facts"
- name: Assert that used version supports listen address type
ansible.builtin.assert:
that:
- >-
chrony_exporter_web_listen_address is string
or
(
chrony_exporter_version is version('0.5.0', '>=') and
chrony_exporter_web_listen_address | type_debug == "list"
)
- name: Naive assertion of proper listen address
ansible.builtin.assert:
that:
- "':' in chrony_exporter_web_listen_address"
- >-
[chrony_exporter_web_listen_address] |
flatten |
reject('match', '.+:\\d+$') |
list |
length == 0
- name: Assert collectors are not both disabled and enabled at the same time
ansible.builtin.assert:

View file

@ -26,7 +26,16 @@ ExecStart={{ chrony_exporter_binary_install_dir }}/chrony_exporter \
{% if chrony_exporter_tls_server_config | length > 0 or chrony_exporter_http_server_config | length > 0 or chrony_exporter_basic_auth_users | length > 0 %}
'--web.config.file=/etc/chrony_exporter/web_config.yaml' \
{% endif %}
{% if chrony_exporter_version is version('0.5.0', '>=') and
chrony_exporter_web_listen_address is iterable and
chrony_exporter_web_listen_address is not mapping and
chrony_exporter_web_listen_address is not string %}
{% for address in chrony_exporter_web_listen_address %}
'--web.listen-address={{ address }}' \
{% endfor %}
{% else %}
'--web.listen-address={{ chrony_exporter_web_listen_address }}' \
{% endif %}
'--web.telemetry-path={{ chrony_exporter_web_telemetry_path }}'
SyslogIdentifier=chrony_exporter