mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-19 23:37:31 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix target metadata API for empty match_targets (#6303)

Browse source 
According to the documentation, the target metadata API accepts it,
if no value for match_target has been provided. This was not the case
in the implementation.

This commit make the API behave as described in the docs.

Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>
This commit is contained in:
Tobias Guggenmos 2019-11-14 12:09:44 +01:00 committed by Julius Volz
parent 12d347e4db
commit be2bcc50a2
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
web/api/v1/api.go
View file

@ -674,9 +674,17 @@ func (api *API) targetMetadata(r *http.Request) apiFuncResult {
}
}
matchers, err := promql.ParseMetricSelector(r.FormValue("match_target"))
if err != nil {
return apiFuncResult{nil, &apiError{errorBadData, err}, nil, nil}
matchTarget := r.FormValue("match_target")
var matchers []*labels.Matcher
var err error
if matchTarget != "" {
matchers, err = promql.ParseMetricSelector(matchTarget)
if err != nil {
return apiFuncResult{nil, &apiError{errorBadData, err}, nil, nil}
}
}
metric := r.FormValue("metric")
@ -688,7 +696,7 @@ func (api *API) targetMetadata(r *http.Request) apiFuncResult {
break
}
// Filter targets that don't satisfy the label matchers.
if !matchLabels(t.Labels(), matchers) {
if matchTarget != "" && !matchLabels(t.Labels(), matchers) {
continue
}
// If no metric is specified, get the full list for the target.