add start/end parameter for LabelNames

Nexucis · Nexucis · commit 6ce5f2ca8ad2 · 2020-06-11T13:02:32.000+02:00
Signed-off-by: Augustin Husson &lt;husson.augustin@gmail.com&gt;
diff --git a/api/prometheus/v1/api.go b/api/prometheus/v1/api.go
@@ -232,7 +232,7 @@ type API interface {
 	// Flags returns the flag values that Prometheus was launched with.
 	Flags(ctx context.Context) (FlagsResult, error)
 	// LabelNames returns all the unique label names present in the block in sorted order.
-	LabelNames(ctx context.Context) ([]string, Warnings, error)
+	LabelNames(ctx context.Context, startTime time.Time, endTime time.Time) ([]string, Warnings, error)
 	// LabelValues performs a query for the values of the given label.
 	LabelValues(ctx context.Context, label string) (model.LabelValues, Warnings, error)
 	// Query performs a query for the given time.
@@ -676,8 +676,12 @@ func (h *httpAPI) Runtimeinfo(ctx context.Context) (RuntimeinfoResult, error) {
 	return res, json.Unmarshal(body, &res)
 }
 
-func (h *httpAPI) LabelNames(ctx context.Context) ([]string, Warnings, error) {
+func (h *httpAPI) LabelNames(ctx context.Context, startTime time.Time, endTime time.Time) ([]string, Warnings, error) {
 	u := h.client.URL(epLabels, nil)
+	q := u.Query()
+	q.Set("start", formatTime(startTime))
+	q.Set("end", formatTime(endTime))
+
 	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
 	if err != nil {
 		return nil, nil, err
diff --git a/api/prometheus/v1/api_test.go b/api/prometheus/v1/api_test.go
@@ -153,7 +153,7 @@ func TestAPIs(t *testing.T) {
 
 	doLabelNames := func(label string) func() (interface{}, Warnings, error) {
 		return func() (interface{}, Warnings, error) {
-			return promAPI.LabelNames(context.Background())
+			return promAPI.LabelNames(context.Background(), time.Now().Add(-100*time.Hour), time.Now())
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func TestAPIs(t *testing.T) {`
`153`	`153`
`154`	`154`	`doLabelNames := func(label string) func() (interface{}, Warnings, error) {`
`155`	`155`	`return func() (interface{}, Warnings, error) {`
`156`		`- return promAPI.LabelNames(context.Background())`
	`156`	`+ return promAPI.LabelNames(context.Background(), time.Now().Add(-100*time.Hour), time.Now())`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`