Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correct quotation of flags in systemd config file #71

Merged

Conversation

alkinks
Copy link
Contributor

@alkinks alkinks commented Mar 15, 2023

Correct the quotation around the collector option flags and values in the node_exporter role systemd unit config file template so that regex values get parsed correctly.

Refs: #68

@alkinks
Copy link
Contributor Author

alkinks commented Mar 15, 2023

Molecule testing results:

PLAY RECAP *********************************************************************
almalinux-8                : ok=14   changed=0    unreachable=0    failed=0    skipped=12   rescued=0    ignored=0
centos-7                   : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
centos-stream-8            : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
debian-10                  : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
debian-11                  : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
debian-9                   : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
fedora-30                  : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
ubuntu-18.04               : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0

INFO     Idempotence completed successfully.
INFO     Running default > side_effect
WARNING  Skipping, side effect playbook not configured.
INFO     Running default > verify
INFO     Executing Testinfra tests found in /net/homes-beta/akingsto/git/prometheus.prometheus/roles/node_exporter/molecule/default/tests/...
============================= test session starts ==============================
platform linux -- Python 3.8.11, pytest-7.2.2, pluggy-1.0.0
rootdir: /net
plugins: testinfra-7.0.0
collected 48 items

molecule/default/tests/test_default.py ................................. [ 68%]
...............                                                          [100%]

============================= 48 passed in 17.06s ==============================
INFO     Verifier completed successfully.
PLAY RECAP *********************************************************************
almalinux-8                : ok=15   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
centos-7                   : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
centos-stream-8            : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
debian-10                  : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
debian-11                  : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
debian-9                   : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
fedora-30                  : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
ubuntu-18.04               : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0

INFO     Idempotence completed successfully.
INFO     Running latest > side_effect
WARNING  Skipping, side effect playbook not configured.
INFO     Running latest > verify
INFO     Executing Testinfra tests found in /net/homes-beta/akingsto/git/prometheus.prometheus/roles/node_exporter/molecule/latest/tests/...
============================= test session starts ==============================
platform linux -- Python 3.8.11, pytest-7.2.2, pluggy-1.0.0
rootdir: /net
plugins: testinfra-7.0.0
collected 32 items

molecule/latest/tests/test_alternative.py .............................. [ 93%]
..                                                                       [100%]
PLAY RECAP *********************************************************************
almalinux-8                : ok=15   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
centos-7                   : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
centos-stream-8            : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
debian-10                  : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
debian-11                  : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
debian-9                   : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0
fedora-30                  : ok=13   changed=0    unreachable=0    failed=0    skipped=11   rescued=0    ignored=0
ubuntu-18.04               : ok=14   changed=0    unreachable=0    failed=0    skipped=10   rescued=0    ignored=0

INFO     Idempotence completed successfully.
INFO     Running latest > side_effect
WARNING  Skipping, side effect playbook not configured.
INFO     Running latest > verify
INFO     Executing Testinfra tests found in /net/homes-beta/akingsto/git/prometheus.prometheus/roles/node_exporter/molecule/latest/tests/...
============================= test session starts ==============================
platform linux -- Python 3.8.11, pytest-7.2.2, pluggy-1.0.0
rootdir: /net
plugins: testinfra-7.0.0
collected 32 items

molecule/latest/tests/test_alternative.py .............................. [ 93%]
..                                                                       [100%]

============================== 32 passed in 7.16s ==============================
INFO     Verifier completed successfully.
INFO     Running latest > cleanup

@alkinks alkinks force-pushed the node_exporter_systemd_template_fix branch from e99e461 to 41f46f1 Compare March 16, 2023 11:03
@github-actions github-actions bot added bugfix and removed bugfix labels Mar 16, 2023
@github-actions github-actions bot added bugfix and removed bugfix labels Mar 16, 2023
Correct the quotation around the collector option flags and values
in the node_exporter role systemd unit config file template so that
regex values get parsed correctly.

Refs: prometheus-community#68
Signed-off-by: Andrew Kingston <andrew.kingston@framestore.com>
Remove the quotation around the collector option flags and values
in the node_exporter role systemd unit config file template so that
regex values get parsed correctly.

Refs: prometheus-community#68
Signed-off-by: Andrew Kingston <andrew.kingston@framestore.com>
Correct the quotation around the collector option flags and values
in the node_exporter role systemd unit config file template so that
regex values get parsed correctly.

Refs: prometheus-community#68
Signed-off-by: Andrew Kingston <andrew.kingston@framestore.com>
@alkinks alkinks force-pushed the node_exporter_systemd_template_fix branch from 9e15b99 to 7437ac0 Compare March 20, 2023 12:27
@github-actions github-actions bot added bugfix and removed bugfix labels Mar 20, 2023
@SuperQ SuperQ requested review from gardar March 20, 2023 13:55
@gardar gardar merged commit 4bd1d50 into prometheus-community:main Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants