re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: returns specific type for label values

This commit is contained in:
André Carvalho 2017-03-31 21:29:30 -03:00
parent 123637b5ca
commit 57f23d303f
No known key found for this signature in database
GPG Key ID: 440C9C458D3A1E61
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/prometheus/api.go
View File

@ -283,7 +283,7 @@ type QueryAPI interface {
// QueryRange performs a query for the given range.
QueryRange(ctx context.Context, query string, r Range) (model.Value, error)
// QueryLabelValues performs a query for the values of the given label.
LabelValues(ctx context.Context, label string) ([]string, error)
LabelValues(ctx context.Context, label string) (model.LabelValues, error)
}
// NewQueryAPI returns a new QueryAPI for the client.
@ -355,7 +355,7 @@ func (h *httpQueryAPI) QueryRange(ctx context.Context, query string, r Range) (m
return model.Value(qres.v), err
}
func (h *httpQueryAPI) LabelValues(ctx context.Context, label string) ([]string, error) {
func (h *httpQueryAPI) LabelValues(ctx context.Context, label string) (model.LabelValues, error) {
u := h.client.url(epLabelValues, map[string]string{"name": label})
req, err := http.NewRequest(http.MethodGet, u.String(), nil)
if err != nil {
@ -365,7 +365,7 @@ func (h *httpQueryAPI) LabelValues(ctx context.Context, label string) ([]string,
if err != nil {
return nil, err
}
var values []string
err = json.Unmarshal(body, &values)
return values, err
var labelValues model.LabelValues
err = json.Unmarshal(body, &labelValues)
return labelValues, err
}

2
api/prometheus/api_test.go
View File

@ -438,7 +438,7 @@ func TestAPIs(t *testing.T) {
inRes: []string{"val1", "val2"},
reqMethod: "GET",
reqPath: "/api/v1/label/mylabel/values",
res: []string{"val1", "val2"},
res: model.LabelValues{"val1", "val2"},
},
{