-
Notifications
You must be signed in to change notification settings - Fork 132
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
Feature: Add web_config to blackbox_exporter #207
base: main
Are you sure you want to change the base?
Conversation
Could you provide an estimation of when this PR will be merged? We are eager to use this exporter, and we would like to configure the TLS in the same way we do for all the other exporters. |
@Wesley1999git As the changes have been shown to be stable I'll remove the WIP flag. |
bf2e2e3
to
9d6c97d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please rebase this now that we've offloaded a lot of tasks over to the _common
role. See #425
f6b1aea
to
64349b7
Compare
Docs Build 📝Thank you for contribution!✨ The docs for this PR have been published here: You can compare to the docs for the The docsite for this PR is also available for download as an artifact from this run: File changes: Click to see the diff comparison.NOTE: only file modifications are shown here. New and deleted files are excluded. diff --git a/home/runner/work/ansible/ansible/docsbuild/base/blackbox_exporter_role.html b/home/runner/work/ansible/ansible/docsbuild/head/blackbox_exporter_role.html
index 86c78f4..9857a48 100644
--- a/home/runner/work/ansible/ansible/docsbuild/base/blackbox_exporter_role.html
+++ b/home/runner/work/ansible/ansible/docsbuild/head/blackbox_exporter_role.html
@@ -254,6 +254,13 @@ To check whether it is installed, run <code class="code docutils literal notrans
</div></td>
</tr>
<tr class="row-even"><td><div class="ansible-option-cell">
+<div class="ansibleOptionAnchor" id="parameter-main--blackbox_exporter_web_config"></div><p class="ansible-option-title" id="ansible-collections-prometheus-prometheus-blackbox-exporter-role-parameter-main-blackbox-exporter-web-config"><strong>blackbox_exporter_web_config</strong></p>
+<a class="ansibleOptionLink" href="#parameter-main--blackbox_exporter_web_config" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-type">dictionary</span></p>
+</div></td>
+<td><div class="ansible-option-cell"><p>A Prometheus <a class="reference external" href="https://github.com/prometheus/exporter-toolkit/blob/master/docs/web-configuration.md">web config yaml</a> for configuring TLS and auth.</p>
+</div></td>
+</tr>
+<tr class="row-odd"><td><div class="ansible-option-cell">
<div class="ansibleOptionAnchor" id="parameter-main--blackbox_exporter_web_listen_address"></div><p class="ansible-option-title" id="ansible-collections-prometheus-prometheus-blackbox-exporter-role-parameter-main-blackbox-exporter-web-listen-address"><strong>blackbox_exporter_web_listen_address</strong></p>
<a class="ansibleOptionLink" href="#parameter-main--blackbox_exporter_web_listen_address" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-type">string</span></p>
</div></td>
|
Signed-off-by: Jadyn Emma Jäger <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please also add configuration for the web_config to the molecule tests?
You can take a look at how we test it any of the other roles, such as the bind_exporter:
ansible/roles/bind_exporter/molecule/alternative/molecule.yml
Lines 16 to 22 in f3514a9
bind_exporter_tls_server_config: | |
cert_file: /etc/bind_exporter/tls.cert | |
key_file: /etc/bind_exporter/tls.key | |
bind_exporter_http_server_config: | |
http2: true | |
bind_exporter_basic_auth_users: | |
randomuser: examplepassword |
This adds the web_config option from roles/prometheus to roles/blackbox_exporter