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

add additionalScrapeJobs for prometheus #2144

Merged
merged 4 commits into from
Feb 22, 2024

Conversation

guerremdq
Copy link
Contributor

Description

We want to scrape other services like ie: Push gateway running on the same cluster and we need to be able to modify the Prometheus configuration.

is this something that could be supported by Astronomer?

@guerremdq guerremdq requested a review from a team as a code owner February 21, 2024 15:54
@danielhoherd
Copy link
Member

@guerremdq thanks for the submission! Please add additionalScrapeJobs: {} to charts/prometheus/values.yaml so the new feature is more discoverable. Also we need to test the new feature, so please add a new test_additional_scrape_jobs test case for it in tests/chart_tests/test_prometheus_config_configmap.py. There are a bunch of test cases in there that would be great as a copy/paste way to start the new test case. If you need help getting started, here is a short tutorial https://github.com/astronomer/astronomer/blob/master/tests/chart_tests/README.md and I'm free to answer any questions, review code, and give suggestions.

@guerremdq
Copy link
Contributor Author

Thanks @danielhoherd for the quick reply, I added the test and the default values.

Copy link
Member

@danielhoherd danielhoherd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. I'd like @pgvishnuram to sign off on it too.

Co-authored-by: Daniel Hoherd <daniel.hoherd@gmail.com>
@guerremdq
Copy link
Contributor Author

@danielhoherd We are currently running 0.32.4 can this maybe cherry-picked and released under 0.32 too?

@danielhoherd
Copy link
Member

@guerremdq yeah, this is something that is easy to include in all supported versions, which would be 0.32, 0.33, 0.34. https://docs.astronomer.io/software/release-lifecycle-policy#stable

@pgvishnuram
Copy link
Contributor

This PR looks fine we can merge it

@danielhoherd danielhoherd merged commit 53e30bd into astronomer:master Feb 22, 2024
@danielhoherd danielhoherd changed the title add additional scrape jobs for prometheus add additionalScrapeJobs for prometheus Feb 22, 2024
danielhoherd added a commit that referenced this pull request Feb 22, 2024
* add additionalScrapeJobs for prometheus

Co-authored-by: Daniel Hoherd <daniel.hoherd@gmail.com>
danielhoherd added a commit that referenced this pull request Feb 22, 2024
* add additionalScrapeJobs for prometheus

Co-authored-by: Daniel Hoherd <daniel.hoherd@gmail.com>
@danielhoherd
Copy link
Member

danielhoherd commented Feb 22, 2024

Merged to master, merged master to release-0.34, cherry-picked change to release-0.33 and release-0.32

Thanks for the feature addition @guerremdq !

Internal ticket for this issue: https://github.com/astronomer/issues/issues/6192

@guerremdq guerremdq deleted the prom-extra-scrape branch February 26, 2024 09:32
@guerremdq
Copy link
Contributor Author

Hey @danielhoherd when we can expect the new release ?

@danielhoherd
Copy link
Member

danielhoherd commented Mar 21, 2024

@guerremdq 0.34.1 will probably be released in early to mid April, and will include this new feature.

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

Successfully merging this pull request may close these issues.

None yet

3 participants