prometheus: add support for prometheus.io/scheme #22628 #25163
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
davidor
approved these changes
Apr 26, 2024
Test changes on VMUse this command from test-infra-definitions to manually test this PR changes on a VM: inv create-vm --pipeline-id=32993015 --os-family=ubuntu |
|
/merge |
|
🚂 MergeQueue Pull request added to the queue. This build is next! (estimated merge in less than 47m) Use |
10 tasks
GustavoCaso
pushed a commit
that referenced
this pull request
Apr 26, 2024
Co-authored-by: Mstrodl <ipadlover8322@gmail.com>
alexgallotta
pushed a commit
that referenced
this pull request
May 9, 2024
Co-authored-by: Mstrodl <ipadlover8322@gmail.com>
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.
What does this PR do?
Resolve conflicts of the external contribution #22628
Motivation
Fixes DataDog/integrations-core#16751
Additional Notes
While this PR adds support for the
prometheus.io/scheme: httpsannotation, I cannot see any mechanism to pass custom TLS certificates.So, this may be useful only if either the scraped service uses certificates signed by well known CA or if the agent skips certificate validity check.
Possible Drawbacks / Trade-offs
Describe how to test/QA your changes
Prometheus auto-discovery is covered by e2e tests: https://github.com/DataDog/test-infra-definitions/blob/c757089e5a234e488358c0b7a140485e259e1dca/components/datadog/apps/prometheus/k8s.go#L56 &
datadog-agent/test/new-e2e/tests/containers/k8s_test.go
Line 680 in ac52d6c