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

feat: Add prometheus_scrape_config feature #237

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

romanbilenko174
Copy link
Contributor

@romanbilenko174 romanbilenko174 commented Oct 21, 2023

Added prometheus_scrape_config_files support as mentioned in #145

@romanbilenko174 romanbilenko174 changed the title Patch add scrape config files Add prometheus_scrape_config functionality Oct 21, 2023
@github-actions
Copy link
Contributor

Docs Build 📝

Thank you for contribution!✨

The docs for this PR have been published here:
https://prometheus-community.github.io/ansible/pr/237

You can compare to the docs for the main branch here:
https://prometheus-community.github.io/ansible/branch/main

The docsite for this PR is also available for download as an artifact from this run:
https://github.com/prometheus-community/ansible/actions/runs/6598740987

File changes:

Click to see the diff comparison.

NOTE: only file modifications are shown here. New and deleted files are excluded.
See the file list and check the published docs to see those files.

diff --git a/home/runner/work/ansible/ansible/docsbuild/base/prometheus_role.html b/home/runner/work/ansible/ansible/docsbuild/head/prometheus_role.html
index 664fd9d..293366a 100644
--- a/home/runner/work/ansible/ansible/docsbuild/base/prometheus_role.html
+++ b/home/runner/work/ansible/ansible/docsbuild/head/prometheus_role.html
@@ -313,6 +313,21 @@ 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--prometheus_scrape_config_custom"></div><p class="ansible-option-title" id="ansible-collections-prometheus-prometheus-prometheus-role-parameter-main-prometheus-scrape-config-custom"><strong>prometheus_scrape_config_custom</strong></p>
+<a class="ansibleOptionLink" href="#parameter-main--prometheus_scrape_config_custom" 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>Prometheus scrape jobs that should be included via files from scrape_config_directory, provided in same format as in the <a class="reference external" href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config">official docs</a></p>
+</div></td>
+</tr>
+<tr class="row-odd"><td><div class="ansible-option-cell">
+<div class="ansibleOptionAnchor" id="parameter-main--prometheus_scrape_config_files"></div><p class="ansible-option-title" id="ansible-collections-prometheus-prometheus-prometheus-role-parameter-main-prometheus-scrape-config-files"><strong>prometheus_scrape_config_files</strong></p>
+<a class="ansibleOptionLink" href="#parameter-main--prometheus_scrape_config_files" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-type">list</span> / <span class="ansible-option-elements">elements=string</span></p>
+</div></td>
+<td><div class="ansible-option-cell"><p>List of folders where ansible will look for files containing scrape config which will be copied to <code class="docutils literal notranslate"><span class="pre">{{</span> <span class="pre">prometheus_config_dir</span> <span class="pre">}}/configs/</span></code>.</p>
+<p>Files must have <code class="docutils literal notranslate"><span class="pre">*.yaml</span></code> extension</p>
+</div></td>
+</tr>
+<tr class="row-even"><td><div class="ansible-option-cell">
 <div class="ansibleOptionAnchor" id="parameter-main--prometheus_scrape_configs"></div><p class="ansible-option-title" id="ansible-collections-prometheus-prometheus-prometheus-role-parameter-main-prometheus-scrape-configs"><strong>prometheus_scrape_configs</strong></p>
 <a class="ansibleOptionLink" href="#parameter-main--prometheus_scrape_configs" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-type">list</span> / <span class="ansible-option-elements">elements=dictionary</span></p>
 </div></td>

@romanbilenko174 romanbilenko174 changed the title Add prometheus_scrape_config functionality Add prometheus_scrape_config feature Oct 21, 2023
@SuperQ SuperQ changed the title Add prometheus_scrape_config feature feat: Add prometheus_scrape_config feature Nov 14, 2023
@gardar
Copy link
Member

gardar commented Dec 14, 2023

Can you please fix the DCO?

@Lycowolf
Copy link
Contributor

Lycowolf commented Feb 12, 2024

Hi, I am currently being blocked by #145 and would like to have this fixed.

I read the PR and I think there's nothing wrong with it technically. Because the PR is more than 3 months old, I am volunteering to take over this PR and drive it to finsh. IIUC the only missing piece is the missing sign-off, but (as I am not the author), I can't really provide that.

Is there a way forward? Or do I have to write my own version and submit that?

@gardar
Copy link
Member

gardar commented Feb 12, 2024

Is there a way forward? Or do I have to write my own version and submit that?

Yes that would be the correct way for you to "take over".

@romanbilenko174 ping

Can you please fix the DCO?

@Lycowolf
Copy link
Contributor

My version of this is #292

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants