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.

Sign up for GitHub

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

Jump to bottom

prometheus: add support for prometheus.io/scheme #22628 #25163

Merged
merged 2 commits into from
Apr 26, 2024
Merged

prometheus: add support for prometheus.io/scheme #22628 #25163

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97087e1
prometheus: add support for scheme
Mstrodl Feb 7, 2024
1e6297e
Merge branch 'main' of ssh://github.com/DataDog/datadog-agent into le…
L3n41c Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 13 additions & 5 deletions comp/core/autodiscovery/common/types/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@ import (

const (
// Default openmetrics check configuration values
openmetricsURLPrefix = "http://%%host%%:"
openmetricsDefaultPort = "%%port%%"
openmetricsDefaultPath = "/metrics"
openmetricsDefaultNS = ""
openmetricsURLInfix = "://%%host%%:"
openmetricsDefaultScheme = "http"
openmetricsDefaultPort = "%%port%%"
openmetricsDefaultPath = "/metrics"
openmetricsDefaultNS = ""

// PrometheusScrapeAnnotation standard Prometheus scrape annotation key
PrometheusScrapeAnnotation = "prometheus.io/scrape"
// PrometheusPathAnnotation standard Prometheus path annotation key
PrometheusPathAnnotation = "prometheus.io/path"
// PrometheusPortAnnotation standard Prometheus port annotation key
PrometheusPortAnnotation = "prometheus.io/port"
// PrometheusSchemeAnnotation standard Prometheus scheme annotation key
PrometheusSchemeAnnotation = "prometheus.io/scheme"
)

var (
Expand Down Expand Up @@ -336,7 +339,12 @@ func BuildURL(annotations map[string]string) string {
path = pathFromAnnotation
}

return openmetricsURLPrefix + port + path
scheme := openmetricsDefaultScheme
if schemeFromAnnotation, found := annotations[PrometheusSchemeAnnotation]; found {
scheme = schemeFromAnnotation
}

return scheme + openmetricsURLInfix + port + path
}

// PrometheusAnnotations abstracts a map of prometheus annotations
Expand Down