feat: add support for Docker SD in ScrapeConfig #6421
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mviswanathsai
force-pushed
the
docker_sd_copy
branch
from
9d05c21
to
992e988
Compare
mviswanathsai
force-pushed
the
docker_sd_copy
branch
from
2313586
to
d5f9240
Compare
|
Thanks for addressing comments from #6386 Overall it looks good to me but let @simonpasquier also take a look before merging :) |
slashpai
approved these changes
Mar 25, 2024
|
@simonpasquier can you review too? |
nicolastakashi
approved these changes
Apr 1, 2024
ArthurSens
reviewed
Apr 1, 2024
ArthurSens
reviewed
Apr 1, 2024
|
Ah, looks like we have many PRs open related to service discovery in scrape configs 😬 Could you also rebase the PR? |
mviswanathsai
force-pushed
the
docker_sd_copy
branch
from
d5f9240
to
08ff9a7
Compare
Add DockerSDConfig struct and array of DockerSDConfig to the ScrapeConfig struct Add code block placeholder to process DockerSDConfig Add Code-gen for the updated scrapeconfig with DockerSDConfig Revert "Add Code-gen for the updated scrapeconfig with DockerSDConfig" This reverts commit f7d2ff9. Edit DockerSDConfig struct Add Code-gen for the updated DockerSDConfig Add processing code block for DockerSDConfig in the ScrapeConfig CRD Update processing filters in DockerSDConfig Add tests for DockerSDConfig Add missing host field to DockerSDConfig struct and remove TODOs in promcfg.go Update promcfg.go to append host field to the DockerSDConfiguration Update autogen code and perform formatting fixes Update DockerSD tests to include Host field Add resource_selector validation and tests for Docker SD configs Update tests according to host variable, tests pass Add DockerFilter type for the filters field in DockerSDConfigs Add code-gen for DockerFilter type update Update promcfg test and test data for DockerFilter type Update DockerFilter Format code Update pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go Co-authored-by: Jayapriya Pai <slashpai9@gmail.com> Add validation for host field Add relevant comments and remove unrelated debug code Code-gen and format code Revert "Change git mod file" This reverts commit 232816f. Change from pointer to ProxyConfig to variable reference Generate Code and Format Format code Refactor test cases for Docker SD One test case each for OAuth, BasicAuth and Authorization fields. Also includes other fields like TLSConfig, hostnetworkinghost etc. Format code
mviswanathsai
force-pushed
the
docker_sd_copy
branch
from
08ff9a7
to
f13a442
Compare
ArthurSens
approved these changes
Apr 2, 2024
There was a problem hiding this comment.
I'll let @slashpai handle the merge since she is coordinating the 0.73 release. I'm not sure if there's extra coordination going on between other PRs that touch service discoveries
|
Yes this one should be good to go was next on queue for SDs |
|
@mviswanathsai I remember seeing a test with Docker filter when reviewing earlier not sure if that was removed. I think a test for that would be good to see if it is configured correctly |
mviswanathsai
commented
Apr 2, 2024
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR aims to add Docker service discovery config support to the
ScrapeConfigAlpha CRD.Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Verification
I have written tests under
pkg/prometheus/promfg_test.gofor verifying the working of DockerSD config.Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.