Expose optional label matcher for label values handler (#8824)

CHANGELOG.md

@@ -19,6 +19,7 @@
 
 ##### Enhancements
 
+* [8824](https://github.com/grafana/loki/pull/8824) **periklis**: Expose optional label matcher for label values handler
 * [8852](https://github.com/grafana/loki/pull/8852) **wtchangdm**: Loki: Add `route_randomly` to Redis options.
 * [8848](https://github.com/grafana/loki/pull/8848) **dannykopping**: Ruler: add configurable rule evaluation jitter.
 * [8752](https://github.com/grafana/loki/pull/8752) **chaudum**: Add query fairness control across actors within a tenant to scheduler, which can be enabled by passing the `X-Loki-Actor-Path` header to the HTTP request of the query.

docs/sources/api/_index.md

@@ -483,6 +483,7 @@ It accepts the following query parameters in the URL:
 - `start`: The start time for the query as a nanosecond Unix epoch. Defaults to 6 hours ago.
 - `end`: The end time for the query as a nanosecond Unix epoch. Defaults to now.
 - `since`: A `duration` used to calculate `start` relative to `end`. If `end` is in the future, `start` is calculated as this duration before now. Any value specified for `start` supersedes this parameter.
+- `query`: A set of log stream selector that selects the streams to match and return label values for `<name>`. Example: `{"app": "myapp", "environment": "dev"}`
 
 In microservices mode, `/loki/api/v1/label/<name>/values` is exposed by the querier.
 
@@ -1412,4 +1413,4 @@ $ curl -H "Content-Type: application/json" -XPOST -s "https://localhost:3100/api
 This is helpful for scaling down WAL-enabled ingesters where we want to ensure old WAL directories are not orphaned,
 but instead flushed to our chunk backend.
 
-In microservices mode, the `/ingester/flush_shutdown` endpoint is exposed by the ingester.
+In microservices mode, the `/ingester/flush_shutdown` endpoint is exposed by the ingester.

pkg/ingester/ingester.go

@@ -843,7 +843,16 @@ func (i *Ingester) Label(ctx context.Context, req *logproto.LabelRequest) (*logp
 	if err != nil {
 		return nil, err
 	}
-	resp, err := instance.Label(ctx, req)
+
+	var matchers []*labels.Matcher
+	if req.Query != "" {
+		matchers, err = syntax.ParseMatchers(req.Query)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	resp, err := instance.Label(ctx, req, matchers...)
 	if err != nil {
 		return nil, err
 	}

pkg/loghttp/labels.go

@@ -82,5 +82,7 @@ func ParseLabelQuery(r *http.Request) (*logproto.LabelRequest, error) {
 	}
 	req.Start = &start
 	req.End = &end
+
+	req.Query = query(r)
 	return req, nil
 }

pkg/logproto/logproto.pb.go

@@ -525,6 +525,7 @@ type LabelRequest struct {
 	Values bool       `protobuf:"varint,2,opt,name=values,proto3" json:"values,omitempty"`
 	Start  *time.Time `protobuf:"bytes,3,opt,name=start,proto3,stdtime" json:"start,omitempty"`
 	End    *time.Time `protobuf:"bytes,4,opt,name=end,proto3,stdtime" json:"end,omitempty"`
+	Query  string     `protobuf:"bytes,5,opt,name=query,proto3" json:"query,omitempty"`
 }
 
 func (m *LabelRequest) Reset()      { *m = LabelRequest{} }
@@ -587,6 +588,13 @@ func (m *LabelRequest) GetEnd() *time.Time {
 	return nil
 }
 
+func (m *LabelRequest) GetQuery() string {
+	if m != nil {
+		return m.Query
+	}
+	return ""
+}
+
 type LabelResponse struct {
 	Values []string `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
 }
@@ -2319,138 +2327,139 @@ func init() {
 func init() { proto.RegisterFile("pkg/logproto/logproto.proto", fileDescriptor_c28a5f14f1f4c79a) }
 
 var fileDescriptor_c28a5f14f1f4c79a = []byte{
-	// 2091 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x19, 0x4d, 0x6f, 0x1b, 0xc7,
-	0x95, 0x43, 0x2e, 0x29, 0xf2, 0x91, 0x92, 0xe8, 0x11, 0x63, 0xb3, 0xb4, 0x4d, 0xca, 0x8b, 0xd4,
-	0x16, 0x6c, 0x87, 0xac, 0x95, 0x36, 0x75, 0xec, 0xa6, 0x85, 0x29, 0xc5, 0x8e, 0xfc, 0x9d, 0x91,
-	0xeb, 0x02, 0x41, 0x03, 0x63, 0x45, 0x0e, 0x3f, 0x20, 0x2e, 0x97, 0xde, 0x1d, 0xd6, 0x11, 0xd0,
-	0x43, 0x4f, 0xbd, 0x05, 0xc8, 0xad, 0xe8, 0xad, 0x87, 0x02, 0x2d, 0x0a, 0xb4, 0x87, 0x02, 0xbd,
-	0xb6, 0xbd, 0xd5, 0xbd, 0xb9, 0xb7, 0xa0, 0x07, 0xb6, 0x96, 0x2f, 0x85, 0x4e, 0xf9, 0x05, 0x45,
-	0x31, 0x5f, 0xbb, 0xc3, 0x15, 0x95, 0x84, 0xae, 0x81, 0x20, 0x17, 0x71, 0xe7, 0xbd, 0x37, 0x6f,
-	0xde, 0xf7, 0xbc, 0x37, 0x82, 0x93, 0xa3, 0xdd, 0x6e, 0x63, 0xe0, 0x75, 0x47, 0xbe, 0xc7, 0xbc,
-	0xf0, 0xa3, 0x2e, 0xfe, 0xe2, 0xac, 0x5e, 0x57, 0x4a, 0x5d, 0xaf, 0xeb, 0x49, 0x1a, 0xfe, 0x25,
-	0xf1, 0x95, 0x5a, 0xd7, 0xf3, 0xba, 0x03, 0xda, 0x10, 0xab, 0x9d, 0x71, 0xa7, 0xc1, 0xfa, 0x2e,
-	0x0d, 0x98, 0xe3, 0x8e, 0x14, 0xc1, 0xaa, 0xe2, 0xfe, 0x78, 0xe0, 0x7a, 0x6d, 0x3a, 0x68, 0x04,
-	0xcc, 0x61, 0x81, 0xfc, 0xab, 0x28, 0x56, 0x38, 0xc5, 0x68, 0x1c, 0xf4, 0xc4, 0x1f, 0x09, 0xb4,
+	// 2098 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x19, 0x4b, 0x6f, 0x1b, 0xc7,
+	0x99, 0x43, 0x2e, 0x29, 0xf2, 0x23, 0x25, 0xd1, 0x23, 0xc6, 0x66, 0x69, 0x9b, 0x94, 0x17, 0xa9,
+	0x2d, 0xd8, 0x0e, 0x59, 0x2b, 0x6d, 0xea, 0xd8, 0x4d, 0x0b, 0x53, 0x8a, 0x1d, 0xf9, 0x9d, 0x91,
+	0xeb, 0x02, 0x41, 0x03, 0x63, 0x45, 0x0e, 0x1f, 0x10, 0x97, 0x4b, 0xef, 0x0e, 0xeb, 0x08, 0xe8,
+	0xa1, 0xa7, 0xde, 0x02, 0xe4, 0x56, 0xf4, 0xd6, 0x43, 0x81, 0x16, 0x05, 0x7a, 0x29, 0xd0, 0x6b,
+	0xdb, 0x43, 0x81, 0xba, 0x37, 0xf7, 0x16, 0xf4, 0xc0, 0xd6, 0xf2, 0xa5, 0xd0, 0x29, 0xbf, 0xa0,
+	0x28, 0xe6, 0xb5, 0x3b, 0x5c, 0x51, 0x49, 0xe8, 0x1a, 0x08, 0x72, 0x11, 0x77, 0xbe, 0xf9, 0xe6,
+	0x9b, 0xef, 0xfd, 0x18, 0xc1, 0xc9, 0xd1, 0x6e, 0xb7, 0x31, 0xf0, 0xba, 0x23, 0xdf, 0x63, 0x5e,
+	0xf8, 0x51, 0x17, 0x7f, 0x71, 0x56, 0xaf, 0x2b, 0xa5, 0xae, 0xd7, 0xf5, 0x24, 0x0e, 0xff, 0x92,
+	0xfb, 0x95, 0x5a, 0xd7, 0xf3, 0xba, 0x03, 0xda, 0x10, 0xab, 0x9d, 0x71, 0xa7, 0xc1, 0xfa, 0x2e,
+	0x0d, 0x98, 0xe3, 0x8e, 0x14, 0xc2, 0xaa, 0xa2, 0xfe, 0x78, 0xe0, 0x7a, 0x6d, 0x3a, 0x68, 0x04,
+	0xcc, 0x61, 0x81, 0xfc, 0xab, 0x30, 0x56, 0x38, 0xc6, 0x68, 0x1c, 0xf4, 0xc4, 0x1f, 0x09, 0xb4,
 	0x4b, 0x80, 0xb7, 0x99, 0x4f, 0x1d, 0x97, 0x38, 0x8c, 0x06, 0x84, 0x3e, 0x1e, 0xd3, 0x80, 0xd9,
 	0x77, 0x60, 0x65, 0x0a, 0x1a, 0x8c, 0xbc, 0x61, 0x40, 0xf1, 0x5b, 0x90, 0x0f, 0x22, 0x70, 0x19,
-	0xad, 0xa6, 0xd6, 0xf2, 0xeb, 0xa5, 0x7a, 0xa8, 0x4a, 0xb4, 0x87, 0x98, 0x84, 0xf6, 0xcf, 0x11,
-	0x40, 0x84, 0xc3, 0x55, 0x00, 0x89, 0x7d, 0xcf, 0x09, 0x7a, 0x65, 0xb4, 0x8a, 0xd6, 0x2c, 0x62,
-	0x40, 0xf0, 0x45, 0x38, 0x16, 0xad, 0xee, 0x7a, 0xdb, 0x3d, 0xc7, 0x6f, 0x97, 0x93, 0x82, 0xec,
-	0x30, 0x02, 0x63, 0xb0, 0x7c, 0x87, 0xd1, 0x72, 0x6a, 0x15, 0xad, 0xa5, 0x88, 0xf8, 0xc6, 0xc7,
-	0x21, 0xc3, 0xe8, 0xd0, 0x19, 0xb2, 0xb2, 0xb5, 0x8a, 0xd6, 0x72, 0x44, 0xad, 0xec, 0xbf, 0x25,
-	0xa1, 0xf0, 0xfe, 0x98, 0xfa, 0x7b, 0x4a, 0x51, 0x5c, 0x81, 0x6c, 0x40, 0x07, 0xb4, 0xc5, 0x3c,
-	0x5f, 0x08, 0x92, 0x23, 0xe1, 0x1a, 0x97, 0x20, 0x3d, 0xe8, 0xbb, 0x7d, 0x26, 0x8e, 0x5e, 0x24,
-	0x72, 0x81, 0xaf, 0x40, 0x3a, 0x60, 0x8e, 0xcf, 0xc4, 0x79, 0xf9, 0xf5, 0x4a, 0x5d, 0x3a, 0xa6,
-	0xae, 0x1d, 0x53, 0x7f, 0xa0, 0x1d, 0xd3, 0xcc, 0x3e, 0x9d, 0xd4, 0x12, 0x9f, 0xfc, 0xab, 0x86,
-	0x88, 0xdc, 0x82, 0xdf, 0x82, 0x14, 0x1d, 0xb6, 0x85, 0x4c, 0x5f, 0x76, 0x27, 0xdf, 0x80, 0x2f,
-	0x41, 0xae, 0xdd, 0xf7, 0x69, 0x8b, 0xf5, 0xbd, 0x61, 0x39, 0xbd, 0x8a, 0xd6, 0x96, 0xd6, 0x57,
-	0x22, 0xab, 0x6f, 0x6a, 0x14, 0x89, 0xa8, 0xf0, 0x45, 0xc8, 0x04, 0xdc, 0x3c, 0x41, 0x79, 0x61,
-	0x35, 0xb5, 0x96, 0x6b, 0x96, 0x0e, 0x26, 0xb5, 0xa2, 0x84, 0x5c, 0xf4, 0xdc, 0x3e, 0xa3, 0xee,
-	0x88, 0xed, 0x11, 0x45, 0x83, 0xcf, 0xc3, 0x42, 0x9b, 0x0e, 0x28, 0x77, 0x6a, 0x56, 0x38, 0xb5,
-	0x68, 0xb0, 0x17, 0x08, 0xa2, 0x09, 0x6e, 0x5a, 0xd9, 0x4c, 0x71, 0xc1, 0xfe, 0x2f, 0x02, 0xbc,
-	0xed, 0xb8, 0xa3, 0x01, 0xfd, 0xd2, 0xf6, 0x0c, 0x2d, 0x97, 0x7c, 0x69, 0xcb, 0xa5, 0xe6, 0xb5,
-	0x5c, 0x64, 0x06, 0x6b, 0x3e, 0x33, 0xa4, 0xbf, 0xc0, 0x0c, 0xf6, 0x6d, 0xc8, 0x48, 0xd0, 0x17,
-	0xc5, 0x50, 0xa4, 0x73, 0x4a, 0x6b, 0x53, 0x8c, 0xb4, 0x49, 0x09, 0x39, 0xed, 0x5f, 0x21, 0x58,
-	0x54, 0x86, 0x54, 0xb9, 0xb6, 0x03, 0x0b, 0x32, 0xd6, 0x75, 0x9e, 0x9d, 0x88, 0xe7, 0xd9, 0xb5,
-	0xb6, 0x33, 0x62, 0xd4, 0x6f, 0x36, 0x9e, 0x4e, 0x6a, 0xe8, 0x9f, 0x93, 0xda, 0xb9, 0x6e, 0x9f,
-	0xf5, 0xc6, 0x3b, 0xf5, 0x96, 0xe7, 0x36, 0xba, 0xbe, 0xd3, 0x71, 0x86, 0x4e, 0x63, 0xe0, 0xed,
-	0xf6, 0x1b, 0x3a, 0xef, 0x75, 0x7e, 0x6a, 0xc6, 0xf8, 0x82, 0x90, 0x8e, 0x05, 0xca, 0x23, 0xcb,
-	0x75, 0x59, 0x2e, 0xb6, 0x86, 0x5d, 0x1a, 0x70, 0xce, 0x16, 0x37, 0x26, 0x91, 0x34, 0xf6, 0x4f,
-	0x61, 0x65, 0xca, 0xe1, 0x4a, 0xce, 0xcb, 0x90, 0x09, 0xa8, 0xdf, 0x0f, 0xcb, 0x81, 0x61, 0xb2,
-	0x6d, 0x01, 0x6f, 0x2e, 0x29, 0xf9, 0x32, 0x72, 0x4d, 0x14, 0xfd, 0x7c, 0xa7, 0xff, 0x01, 0x41,
-	0xe1, 0xb6, 0xb3, 0x43, 0x07, 0x3a, 0xd2, 0x30, 0x58, 0x43, 0xc7, 0xa5, 0xca, 0xe2, 0xe2, 0x9b,
-	0xa7, 0xfd, 0x4f, 0x9c, 0xc1, 0x98, 0x4a, 0x96, 0x59, 0xa2, 0x56, 0xf3, 0xe6, 0x2c, 0x7a, 0xe9,
-	0x9c, 0x45, 0x61, 0xe4, 0xd9, 0xe7, 0x60, 0x51, 0xc9, 0xab, 0x0c, 0x15, 0x09, 0xc7, 0x0d, 0x95,
-	0xd3, 0xc2, 0xd9, 0x2e, 0x64, 0xa4, 0x5d, 0xf1, 0xeb, 0x90, 0x0b, 0xab, 0xba, 0xd0, 0x2b, 0xd5,
-	0xcc, 0x1c, 0x4c, 0x6a, 0x49, 0x16, 0x90, 0x08, 0x81, 0x6b, 0x90, 0x16, 0x3b, 0x85, 0x8e, 0xa8,
-	0x99, 0x3b, 0x98, 0xd4, 0x24, 0x80, 0xc8, 0x1f, 0x7c, 0x0a, 0xac, 0x1e, 0x2f, 0xac, 0x5c, 0x59,
-	0xab, 0x99, 0x3d, 0x98, 0xd4, 0xc4, 0x9a, 0x88, 0xbf, 0xf6, 0x0d, 0x28, 0xdc, 0xa6, 0x5d, 0xa7,
-	0xb5, 0xa7, 0x0e, 0x2d, 0x69, 0x76, 0xfc, 0x40, 0xa4, 0x79, 0x9c, 0x81, 0x42, 0x78, 0xe2, 0x23,
-	0x37, 0x50, 0xe1, 0x9b, 0x0f, 0x61, 0x77, 0x02, 0xfb, 0x97, 0x08, 0x94, 0x47, 0xb1, 0x0d, 0x99,
-	0x01, 0xd7, 0x35, 0x90, 0xde, 0x68, 0xc2, 0xc1, 0xa4, 0xa6, 0x20, 0x44, 0xfd, 0xe2, 0xab, 0xb0,
-	0x10, 0x88, 0x13, 0x39, 0xb3, 0x78, 0xa0, 0x08, 0x44, 0x73, 0x99, 0x3b, 0xfc, 0x60, 0x52, 0xd3,
-	0x84, 0x44, 0x7f, 0xe0, 0xfa, 0xd4, 0x8d, 0x21, 0x15, 0x5b, 0x3a, 0x98, 0xd4, 0x0c, 0xa8, 0x79,
-	0x83, 0xd8, 0xbf, 0x40, 0x90, 0x7f, 0xe0, 0xf4, 0xc3, 0x60, 0x29, 0x41, 0xfa, 0x31, 0x8f, 0x5a,
-	0x15, 0x2d, 0x72, 0xc1, 0x13, 0xb7, 0x4d, 0x07, 0xce, 0xde, 0x75, 0xcf, 0x17, 0x3c, 0x17, 0x49,
-	0xb8, 0x8e, 0x8a, 0xbf, 0x35, 0xb3, 0xf8, 0xa7, 0xe7, 0x2e, 0x61, 0x37, 0xad, 0x6c, 0xb2, 0x98,
-	0xb2, 0x7f, 0x8f, 0xa0, 0x20, 0x25, 0x53, 0x61, 0xf1, 0x63, 0xc8, 0x48, 0xc1, 0x85, 0x6c, 0x9f,
-	0x93, 0xe6, 0x17, 0xe6, 0x49, 0x71, 0xc5, 0x13, 0xff, 0x00, 0x96, 0xda, 0xbe, 0x37, 0x1a, 0xd1,
-	0xf6, 0xb6, 0x2a, 0x26, 0xc9, 0x78, 0x31, 0xd9, 0x34, 0xf1, 0x24, 0x46, 0x6e, 0xff, 0x1d, 0xc1,
-	0xa2, 0xca, 0x5b, 0x65, 0xcb, 0xd0, 0x06, 0xe8, 0xa5, 0xcb, 0x78, 0x72, 0xde, 0x32, 0x7e, 0x1c,
-	0x32, 0x5d, 0xdf, 0x1b, 0x8f, 0x82, 0x72, 0x4a, 0xe6, 0x8e, 0x5c, 0xcd, 0x57, 0xde, 0xed, 0x9b,
-	0xb0, 0xa4, 0x55, 0x39, 0xa2, 0x78, 0x55, 0xe2, 0xc5, 0x6b, 0xab, 0x4d, 0x87, 0xac, 0xdf, 0xe9,
-	0x87, 0xe5, 0x48, 0xd1, 0xdb, 0x1f, 0x23, 0x28, 0xc6, 0x49, 0xf0, 0xf7, 0x8d, 0x3c, 0xe0, 0xec,
-	0xce, 0x1e, 0xcd, 0xae, 0x2e, 0x8a, 0x43, 0xf0, 0xee, 0x90, 0xf9, 0x7b, 0x3a, 0x47, 0x2a, 0x6f,
-	0x43, 0xde, 0x00, 0xf3, 0x6b, 0x62, 0x97, 0xea, 0x98, 0xe5, 0x9f, 0x51, 0xb2, 0x26, 0x65, 0x1c,
-	0x8b, 0xc5, 0x95, 0xe4, 0x65, 0xc4, 0x23, 0x7e, 0x71, 0xca, 0x93, 0xf8, 0x32, 0x58, 0x1d, 0xdf,
-	0x73, 0xe7, 0x72, 0x93, 0xd8, 0x81, 0xbf, 0x0d, 0x49, 0xe6, 0xcd, 0xe5, 0xa4, 0x24, 0xf3, 0xb8,
-	0x8f, 0x94, 0xf2, 0x29, 0xd9, 0x73, 0xc9, 0x95, 0xfd, 0x3b, 0x04, 0xcb, 0x7c, 0x8f, 0xb4, 0xc0,
-	0x46, 0x6f, 0x3c, 0xdc, 0xc5, 0x6b, 0x50, 0xe4, 0x27, 0x3d, 0xea, 0xab, 0x5a, 0xff, 0xa8, 0xdf,
-	0x56, 0x6a, 0x2e, 0x71, 0xb8, 0xbe, 0x02, 0xb6, 0xda, 0xf8, 0x04, 0x2c, 0x8c, 0x03, 0x49, 0x20,
-	0x75, 0xce, 0xf0, 0xe5, 0x56, 0x1b, 0x5f, 0x30, 0x8e, 0xe3, 0xb6, 0x36, 0x1a, 0x22, 0x61, 0xc3,
-	0xfb, 0x4e, 0xdf, 0x0f, 0x8b, 0xcf, 0x39, 0xc8, 0xb4, 0xf8, 0xc1, 0x32, 0x4e, 0xf8, 0x5d, 0x13,
-	0x12, 0x0b, 0x81, 0x88, 0x42, 0xdb, 0xdf, 0x81, 0x5c, 0xb8, 0x7b, 0xe6, 0x15, 0x33, 0xd3, 0x03,
-	0xf6, 0x55, 0x58, 0x96, 0x45, 0x75, 0xf6, 0xe6, 0xc2, 0xac, 0xcd, 0x05, 0xbd, 0xf9, 0x24, 0xa4,
-	0xa5, 0x55, 0x30, 0x58, 0x6d, 0x87, 0x39, 0x7a, 0x0b, 0xff, 0xb6, 0xcb, 0x70, 0xfc, 0x81, 0xef,
-	0x0c, 0x83, 0x0e, 0xf5, 0x05, 0x51, 0x18, 0xbb, 0xf6, 0x6b, 0xb0, 0xc2, 0x0b, 0x09, 0xf5, 0x83,
-	0x0d, 0x6f, 0x3c, 0x64, 0xba, 0x75, 0xbf, 0x08, 0xa5, 0x69, 0xb0, 0x0a, 0xf5, 0x12, 0xa4, 0x5b,
-	0x1c, 0x20, 0xb8, 0x2f, 0x12, 0xb9, 0xb0, 0x7f, 0x8d, 0x00, 0xdf, 0xa0, 0x4c, 0xb0, 0xde, 0xda,
-	0x0c, 0x8c, 0x36, 0xce, 0x75, 0x58, 0xab, 0x47, 0xfd, 0x40, 0xb7, 0x34, 0x7a, 0xfd, 0x55, 0xb4,
-	0x71, 0xf6, 0x25, 0x58, 0x99, 0x92, 0x52, 0xe9, 0x54, 0x81, 0x6c, 0x4b, 0xc1, 0xd4, 0xa5, 0x1a,
-	0xae, 0xed, 0x3f, 0x26, 0x21, 0x2b, 0x7d, 0x4b, 0x3b, 0xf8, 0x12, 0xe4, 0x3b, 0x3c, 0xd6, 0xfc,
-	0x91, 0xdf, 0x57, 0x26, 0xb0, 0x9a, 0xcb, 0x07, 0x93, 0x9a, 0x09, 0x26, 0xe6, 0x02, 0xbf, 0x11,
-	0x0b, 0xbc, 0x66, 0x69, 0x7f, 0x52, 0xcb, 0xfc, 0x90, 0x07, 0xdf, 0x26, 0xbf, 0xde, 0x44, 0x18,
-	0x6e, 0x86, 0xe1, 0x78, 0x4b, 0x65, 0x9b, 0xe8, 0xe9, 0x9a, 0xdf, 0xe5, 0xe2, 0xc7, 0xea, 0xf5,
-	0xc8, 0xf7, 0x5c, 0xca, 0x7a, 0x74, 0x1c, 0x34, 0x5a, 0x9e, 0xeb, 0x7a, 0xc3, 0x86, 0x18, 0xd4,
-	0x84, 0xd2, 0xfc, 0x8e, 0xe6, 0xdb, 0x55, 0x02, 0x3e, 0x80, 0x05, 0xd6, 0xf3, 0xbd, 0x71, 0xb7,
-	0x27, 0xae, 0x9f, 0x54, 0xf3, 0xca, 0xfc, 0xfc, 0x34, 0x07, 0xa2, 0x3f, 0xf0, 0x19, 0x6e, 0x2d,
-	0xda, 0xda, 0x0d, 0xc6, 0xae, 0xb8, 0xbf, 0x16, 0x9b, 0xe9, 0x83, 0x49, 0x0d, 0xbd, 0x41, 0x42,
-	0xb0, 0xfd, 0x71, 0x12, 0x6a, 0x22, 0x84, 0x1f, 0x8a, 0xde, 0xe4, 0xba, 0xe7, 0xdf, 0xa1, 0xcc,
-	0xef, 0xb7, 0xee, 0x3a, 0x2e, 0xd5, 0xb1, 0x51, 0x83, 0xbc, 0x2b, 0x80, 0x8f, 0x8c, 0xe4, 0x00,
-	0x37, 0xa4, 0xc3, 0xa7, 0x01, 0x44, 0xda, 0x49, 0xbc, 0xcc, 0x93, 0x9c, 0x80, 0x08, 0xf4, 0xc6,
-	0x94, 0xa5, 0x1a, 0x73, 0x6a, 0xa6, 0x2c, 0xb4, 0x15, 0xb7, 0xd0, 0xdc, 0x7c, 0x42, 0xb3, 0x98,
-	0xb1, 0x9e, 0x9e, 0x8e, 0x75, 0xfb, 0x1f, 0x08, 0xaa, 0xb7, 0xb5, 0xe4, 0x2f, 0x69, 0x0e, 0xad,
-	0x6f, 0xf2, 0x15, 0xe9, 0x9b, 0xfa, 0xff, 0xf4, 0xb5, 0xff, 0x6a, 0xa4, 0x3c, 0xa1, 0x1d, 0xad,
-	0xc7, 0x86, 0x71, 0x5d, 0xbc, 0x0a, 0x31, 0x93, 0xaf, 0xd0, 0x2d, 0xa9, 0x98, 0x5b, 0xde, 0x89,
-	0xca, 0x81, 0xd0, 0x40, 0x95, 0x83, 0xb3, 0x60, 0xf9, 0xb4, 0xa3, 0x2f, 0x5f, 0x1c, 0xaf, 0xf1,
-	0xb4, 0x43, 0x04, 0xde, 0xfe, 0x33, 0x82, 0xe2, 0x0d, 0xca, 0xa6, 0xdb, 0x9a, 0xaf, 0x93, 0xfe,
-	0xef, 0xc1, 0x31, 0x43, 0x7e, 0xa5, 0xfd, 0x9b, 0xb1, 0x5e, 0xe6, 0xb5, 0x48, 0xff, 0xad, 0x61,
-	0x9b, 0x7e, 0xa4, 0xa6, 0xb1, 0xe9, 0x36, 0xe6, 0x3e, 0xe4, 0x0d, 0x24, 0xbe, 0x16, 0x6b, 0x60,
-	0x66, 0x5d, 0xaa, 0xcd, 0x92, 0xd2, 0x49, 0xce, 0x63, 0xaa, 0x3d, 0x0d, 0xaf, 0xfb, 0x6d, 0xc0,
-	0x62, 0x40, 0x14, 0x6c, 0xcd, 0x4a, 0x2d, 0xa0, 0xb7, 0xc2, 0x7e, 0x26, 0x5c, 0xe3, 0x33, 0x60,
-	0xf9, 0xde, 0x13, 0xdd, 0x99, 0x2e, 0x46, 0x47, 0x12, 0xef, 0x09, 0x11, 0x28, 0xfb, 0x2a, 0xa4,
-	0x88, 0xf7, 0x04, 0x57, 0x01, 0x7c, 0x67, 0xd8, 0xa5, 0x0f, 0xc3, 0x81, 0xa5, 0x40, 0x0c, 0xc8,
-	0x11, 0xf7, 0xeb, 0x06, 0x1c, 0x33, 0x25, 0x92, 0xee, 0xae, 0xc3, 0x02, 0x07, 0xf6, 0x67, 0x3d,
-	0x63, 0x09, 0x42, 0x39, 0xe5, 0x6a, 0x22, 0x1e, 0x33, 0x10, 0xc1, 0xf1, 0x29, 0xc8, 0x31, 0x67,
-	0x67, 0x40, 0xef, 0x46, 0x39, 0x1f, 0x01, 0x38, 0x96, 0xcf, 0x5a, 0x0f, 0x8d, 0x46, 0x21, 0x02,
-	0xe0, 0xf3, 0x50, 0x8c, 0x64, 0xbe, 0xef, 0xd3, 0x4e, 0xff, 0x23, 0xe1, 0xe1, 0x02, 0x39, 0x04,
-	0xc7, 0x6b, 0xb0, 0x1c, 0xc1, 0xb6, 0xc5, 0xb5, 0x6b, 0x09, 0xd2, 0x38, 0x98, 0xdb, 0x46, 0xa8,
-	0xfb, 0xee, 0xe3, 0xb1, 0x33, 0x10, 0x85, 0xac, 0x40, 0x0c, 0x88, 0xfd, 0x17, 0x04, 0xc7, 0xa4,
-	0xab, 0xf9, 0x3c, 0xfd, 0x75, 0x8c, 0xfa, 0xdf, 0x20, 0xc0, 0xa6, 0x06, 0x2a, 0xb4, 0xbe, 0x69,
-	0x3e, 0x94, 0xf0, 0x7b, 0x3d, 0x2f, 0x46, 0x48, 0x09, 0x8a, 0xde, 0x3a, 0xec, 0xb0, 0x05, 0x14,
-	0x2f, 0x89, 0x72, 0x46, 0x95, 0x10, 0xdd, 0xfd, 0xf1, 0xd1, 0x7a, 0x67, 0x8f, 0xd1, 0x40, 0x4d,
-	0x98, 0x62, 0xb4, 0x16, 0x00, 0x22, 0x7f, 0xf8, 0x59, 0x74, 0xc8, 0x44, 0xd4, 0x58, 0xd1, 0x59,
-	0x0a, 0x44, 0xf4, 0xc7, 0xf9, 0xb3, 0x90, 0x0b, 0x1f, 0xe5, 0x70, 0x1e, 0x16, 0xae, 0xdf, 0x23,
-	0x3f, 0xba, 0x46, 0x36, 0x8b, 0x09, 0x5c, 0x80, 0x6c, 0xf3, 0xda, 0xc6, 0x2d, 0xb1, 0x42, 0xeb,
-	0x7f, 0xb2, 0x74, 0x14, 0xfa, 0xf8, 0x7b, 0x90, 0x96, 0xa1, 0x75, 0x3c, 0x0a, 0x44, 0xf3, 0x69,
-	0xad, 0x72, 0xe2, 0x10, 0x5c, 0x35, 0x82, 0x89, 0x6f, 0x21, 0x7c, 0x17, 0xf2, 0x02, 0xa8, 0x86,
-	0xfa, 0x53, 0xf1, 0xd9, 0x7a, 0x8a, 0xd3, 0xe9, 0x23, 0xb0, 0x06, 0xbf, 0x2b, 0x90, 0x16, 0xd9,
-	0x6d, 0x4a, 0x63, 0x3e, 0xbf, 0x98, 0xd2, 0x4c, 0x3d, 0x73, 0xd8, 0x09, 0xfc, 0x36, 0x58, 0xbc,
-	0x03, 0xc5, 0x46, 0x01, 0x32, 0x66, 0xf1, 0xca, 0xf1, 0x38, 0xd8, 0x38, 0xf6, 0x9d, 0xf0, 0x49,
-	0xe1, 0x44, 0x7c, 0x74, 0xd2, 0xdb, 0xcb, 0x87, 0x11, 0xe1, 0xc9, 0xf7, 0xe4, 0x6c, 0xad, 0x7b,
-	0x5f, 0x7c, 0x7a, 0xfa, 0xa8, 0x58, 0xab, 0x5c, 0xa9, 0x1e, 0x85, 0x0e, 0x19, 0xde, 0x86, 0xbc,
-	0xd1, 0x77, 0x9a, 0x66, 0x3d, 0xdc, 0x34, 0x9b, 0x66, 0x9d, 0xd1, 0xac, 0xda, 0x09, 0x7c, 0x03,
-	0xb2, 0xbc, 0x6c, 0xf3, 0xe8, 0xc5, 0x27, 0xe3, 0xd5, 0xd9, 0xc8, 0xca, 0xca, 0xa9, 0xd9, 0x48,
-	0xcd, 0x68, 0xfd, 0x43, 0xc8, 0xea, 0x11, 0x09, 0xbf, 0x0f, 0x4b, 0xd3, 0x03, 0x02, 0xfe, 0x86,
-	0xa1, 0xd6, 0xf4, 0xdc, 0x55, 0x59, 0x35, 0x50, 0xb3, 0xa7, 0x8a, 0xc4, 0x1a, 0x5a, 0xff, 0x50,
-	0xbf, 0xd6, 0x6f, 0x3a, 0xcc, 0xc1, 0xf7, 0x60, 0x49, 0x48, 0x1d, 0x3e, 0xe7, 0x4f, 0x45, 0xd7,
-	0xa1, 0xff, 0x1d, 0x4c, 0x45, 0xd7, 0xe1, 0xff, 0x21, 0xd8, 0x89, 0xe6, 0x07, 0xcf, 0x9e, 0x57,
-	0x13, 0x9f, 0x3e, 0xaf, 0x26, 0x3e, 0x7b, 0x5e, 0x45, 0x3f, 0xdb, 0xaf, 0xa2, 0xdf, 0xee, 0x57,
-	0xd1, 0xd3, 0xfd, 0x2a, 0x7a, 0xb6, 0x5f, 0x45, 0xff, 0xde, 0xaf, 0xa2, 0xff, 0xec, 0x57, 0x13,
-	0x9f, 0xed, 0x57, 0xd1, 0x27, 0x2f, 0xaa, 0x89, 0x67, 0x2f, 0xaa, 0x89, 0x4f, 0x5f, 0x54, 0x13,
-	0x1f, 0xbc, 0xfe, 0x79, 0x4f, 0x1f, 0xfa, 0xc4, 0x9d, 0x8c, 0xf8, 0x79, 0xf3, 0x7f, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x3c, 0x59, 0x0f, 0x76, 0x6c, 0x19, 0x00, 0x00,
+	0xad, 0xa6, 0xd6, 0xf2, 0xeb, 0xa5, 0x7a, 0x28, 0x4a, 0x74, 0x86, 0x98, 0x88, 0xf6, 0xcf, 0x11,
+	0x40, 0xb4, 0x87, 0xab, 0x00, 0x72, 0xf7, 0x3d, 0x27, 0xe8, 0x95, 0xd1, 0x2a, 0x5a, 0xb3, 0x88,
+	0x01, 0xc1, 0x17, 0xe1, 0x58, 0xb4, 0xba, 0xeb, 0x6d, 0xf7, 0x1c, 0xbf, 0x5d, 0x4e, 0x0a, 0xb4,
+	0xc3, 0x1b, 0x18, 0x83, 0xe5, 0x3b, 0x8c, 0x96, 0x53, 0xab, 0x68, 0x2d, 0x45, 0xc4, 0x37, 0x3e,
+	0x0e, 0x19, 0x46, 0x87, 0xce, 0x90, 0x95, 0xad, 0x55, 0xb4, 0x96, 0x23, 0x6a, 0x65, 0xff, 0x2d,
+	0x09, 0x85, 0xf7, 0xc7, 0xd4, 0xdf, 0x53, 0x82, 0xe2, 0x0a, 0x64, 0x03, 0x3a, 0xa0, 0x2d, 0xe6,
+	0xf9, 0x82, 0x91, 0x1c, 0x09, 0xd7, 0xb8, 0x04, 0xe9, 0x41, 0xdf, 0xed, 0x33, 0x71, 0xf5, 0x22,
+	0x91, 0x0b, 0x7c, 0x05, 0xd2, 0x01, 0x73, 0x7c, 0x26, 0xee, 0xcb, 0xaf, 0x57, 0xea, 0xd2, 0x30,
+	0x75, 0x6d, 0x98, 0xfa, 0x03, 0x6d, 0x98, 0x66, 0xf6, 0xe9, 0xa4, 0x96, 0xf8, 0xe4, 0x5f, 0x35,
+	0x44, 0xe4, 0x11, 0xfc, 0x16, 0xa4, 0xe8, 0xb0, 0x2d, 0x78, 0xfa, 0xb2, 0x27, 0xf9, 0x01, 0x7c,
+	0x09, 0x72, 0xed, 0xbe, 0x4f, 0x5b, 0xac, 0xef, 0x0d, 0xcb, 0xe9, 0x55, 0xb4, 0xb6, 0xb4, 0xbe,
+	0x12, 0x69, 0x7d, 0x53, 0x6f, 0x91, 0x08, 0x0b, 0x5f, 0x84, 0x4c, 0xc0, 0xd5, 0x13, 0x94, 0x17,
+	0x56, 0x53, 0x6b, 0xb9, 0x66, 0xe9, 0x60, 0x52, 0x2b, 0x4a, 0xc8, 0x45, 0xcf, 0xed, 0x33, 0xea,
+	0x8e, 0xd8, 0x1e, 0x51, 0x38, 0xf8, 0x3c, 0x2c, 0xb4, 0xe9, 0x80, 0x72, 0xa3, 0x66, 0x85, 0x51,
+	0x8b, 0x06, 0x79, 0xb1, 0x41, 0x34, 0xc2, 0x4d, 0x2b, 0x9b, 0x29, 0x2e, 0xd8, 0xff, 0x45, 0x80,
+	0xb7, 0x1d, 0x77, 0x34, 0xa0, 0x5f, 0x5a, 0x9f, 0xa1, 0xe6, 0x92, 0x2f, 0xad, 0xb9, 0xd4, 0xbc,
+	0x9a, 0x8b, 0xd4, 0x60, 0xcd, 0xa7, 0x86, 0xf4, 0x17, 0xa8, 0xc1, 0xbe, 0x0d, 0x19, 0x09, 0xfa,
+	0x22, 0x1f, 0x8a, 0x64, 0x4e, 0x69, 0x69, 0x8a, 0x91, 0x34, 0x29, 0xc1, 0xa7, 0xfd, 0x2b, 0x04,
+	0x8b, 0x4a, 0x91, 0x2a, 0xd6, 0x76, 0x60, 0x41, 0xfa, 0xba, 0x8e, 0xb3, 0x13, 0xf1, 0x38, 0xbb,
+	0xd6, 0x76, 0x46, 0x8c, 0xfa, 0xcd, 0xc6, 0xd3, 0x49, 0x0d, 0xfd, 0x73, 0x52, 0x3b, 0xd7, 0xed,
+	0xb3, 0xde, 0x78, 0xa7, 0xde, 0xf2, 0xdc, 0x46, 0xd7, 0x77, 0x3a, 0xce, 0xd0, 0x69, 0x0c, 0xbc,
+	0xdd, 0x7e, 0x43, 0xc7, 0xbd, 0x8e, 0x4f, 0x4d, 0x18, 0x5f, 0x10, 0xdc, 0xb1, 0x40, 0x59, 0x64,
+	0xb9, 0x2e, 0xd3, 0xc5, 0xd6, 0xb0, 0x4b, 0x03, 0x4e, 0xd9, 0xe2, 0xca, 0x24, 0x12, 0xc7, 0xfe,
+	0x29, 0xac, 0x4c, 0x19, 0x5c, 0xf1, 0x79, 0x19, 0x32, 0x01, 0xf5, 0xfb, 0x61, 0x3a, 0x30, 0x54,
+	0xb6, 0x2d, 0xe0, 0xcd, 0x25, 0xc5, 0x5f, 0x46, 0xae, 0x89, 0xc2, 0x9f, 0xef, 0xf6, 0xbf, 0x22,
+	0x28, 0xdc, 0x76, 0x76, 0xe8, 0x40, 0x7b, 0x1a, 0x06, 0x6b, 0xe8, 0xb8, 0x54, 0x69, 0x5c, 0x7c,
+	0xf3, 0xb0, 0xff, 0x89, 0x33, 0x18, 0x53, 0x49, 0x32, 0x4b, 0xd4, 0x6a, 0xde, 0x98, 0x45, 0x2f,
+	0x1d, 0xb3, 0x28, 0xf2, 0xbc, 0x12, 0xa4, 0x1f, 0x73, 0x45, 0x89, 0x78, 0xcd, 0x11, 0xb9, 0xb0,
+	0xcf, 0xc1, 0xa2, 0x92, 0x42, 0xa9, 0x2f, 0x62, 0x99, 0xab, 0x2f, 0xa7, 0x59, 0xb6, 0x5d, 0xc8,
+	0x48, 0x6d, 0xe3, 0xd7, 0x21, 0x17, 0xe6, 0x7a, 0x21, 0x6d, 0xaa, 0x99, 0x39, 0x98, 0xd4, 0x92,
+	0x2c, 0x20, 0xd1, 0x06, 0xae, 0x41, 0x5a, 0x9c, 0x14, 0x92, 0xa3, 0x66, 0xee, 0x60, 0x52, 0x93,
+	0x00, 0x22, 0x7f, 0xf0, 0x29, 0xb0, 0x7a, 0x3c, 0xdd, 0x72, 0x15, 0x58, 0xcd, 0xec, 0xc1, 0xa4,
+	0x26, 0xd6, 0x44, 0xfc, 0xb5, 0x6f, 0x40, 0xe1, 0x36, 0xed, 0x3a, 0xad, 0x3d, 0x75, 0x69, 0x49,
+	0x93, 0xe3, 0x17, 0x22, 0x4d, 0xe3, 0x0c, 0x14, 0xc2, 0x1b, 0x1f, 0xb9, 0x81, 0x72, 0xea, 0x7c,
+	0x08, 0xbb, 0x13, 0xd8, 0xbf, 0x44, 0xa0, 0xec, 0x8c, 0x6d, 0xc8, 0x0c, 0xb8, 0xac, 0x81, 0xb4,
+	0x51, 0x13, 0x0e, 0x26, 0x35, 0x05, 0x21, 0xea, 0x17, 0x5f, 0x85, 0x85, 0x40, 0xdc, 0xc8, 0x89,
+	0xc5, 0xdd, 0x47, 0x6c, 0x34, 0x97, 0xb9, 0x1b, 0x1c, 0x4c, 0x6a, 0x1a, 0x91, 0xe8, 0x0f, 0x5c,
+	0x9f, 0xaa, 0x23, 0x52, 0xb0, 0xa5, 0x83, 0x49, 0xcd, 0x80, 0x9a, 0x75, 0xc5, 0xfe, 0x05, 0x82,
+	0xfc, 0x03, 0xa7, 0x1f, 0xba, 0x50, 0x68, 0x22, 0x64, 0x98, 0x88, 0x87, 0x73, 0x9b, 0x0e, 0x9c,
+	0xbd, 0xeb, 0x9e, 0x2f, 0x68, 0x2e, 0x92, 0x70, 0x1d, 0x95, 0x04, 0x6b, 0x66, 0x49, 0x48, 0xcf,
+	0x9d, 0xd8, 0x6e, 0x5a, 0xd9, 0x64, 0x31, 0x65, 0xff, 0x1e, 0x41, 0x41, 0x72, 0xa6, 0xdc, 0xe2,
+	0xc7, 0x90, 0x91, 0x8c, 0x0b, 0xde, 0x3e, 0x27, 0xf8, 0x2f, 0xcc, 0x13, 0xf8, 0x8a, 0x26, 0xfe,
+	0x01, 0x2c, 0xb5, 0x7d, 0x6f, 0x34, 0xa2, 0xed, 0x6d, 0x95, 0x62, 0x92, 0xf1, 0x14, 0xb3, 0x69,
+	0xee, 0x93, 0x18, 0xba, 0xfd, 0x77, 0x04, 0x8b, 0x2a, 0x9a, 0x95, 0x2e, 0x43, 0x1d, 0xa0, 0x97,
+	0x4e, 0xee, 0xc9, 0x79, 0x93, 0xfb, 0x71, 0xc8, 0x74, 0x7d, 0x6f, 0x3c, 0x0a, 0xca, 0x29, 0x19,
+	0x3b, 0x72, 0x35, 0x5f, 0xd2, 0xb7, 0x6f, 0xc2, 0x92, 0x16, 0xe5, 0x88, 0x94, 0x56, 0x89, 0xa7,
+	0xb4, 0xad, 0x36, 0x1d, 0xb2, 0x7e, 0xa7, 0x1f, 0x26, 0x29, 0x85, 0x6f, 0x7f, 0x8c, 0xa0, 0x18,
+	0x47, 0xc1, 0xdf, 0x37, 0xe2, 0x80, 0x93, 0x3b, 0x7b, 0x34, 0xb9, 0xba, 0x48, 0x0e, 0xc1, 0xbb,
+	0x43, 0xe6, 0xef, 0xe9, 0x18, 0xa9, 0xbc, 0x0d, 0x79, 0x03, 0xcc, 0x8b, 0xc7, 0x2e, 0xd5, 0x3e,
+	0xcb, 0x3f, 0xa3, 0x60, 0x4d, 0x4a, 0x3f, 0x16, 0x8b, 0x2b, 0xc9, 0xcb, 0x88, 0x7b, 0xfc, 0xe2,
+	0x94, 0x25, 0xf1, 0x65, 0xb0, 0x3a, 0xbe, 0xe7, 0xce, 0x65, 0x26, 0x71, 0x02, 0x7f, 0x1b, 0x92,
+	0xcc, 0x9b, 0xcb, 0x48, 0x49, 0xe6, 0x71, 0x1b, 0x29, 0xe1, 0x53, 0xb2, 0x13, 0x93, 0x2b, 0xfb,
+	0x77, 0x08, 0x96, 0xf9, 0x19, 0xa9, 0x81, 0x8d, 0xde, 0x78, 0xb8, 0x8b, 0xd7, 0xa0, 0xc8, 0x6f,
+	0x7a, 0xd4, 0x57, 0x15, 0xe0, 0x51, 0xbf, 0xad, 0xc4, 0x5c, 0xe2, 0x70, 0x5d, 0x18, 0xb6, 0xda,
+	0xf8, 0x04, 0x2c, 0x8c, 0x03, 0x89, 0x20, 0x65, 0xce, 0xf0, 0xe5, 0x56, 0x1b, 0x5f, 0x30, 0xae,
+	0xe3, 0xba, 0x36, 0xda, 0x24, 0xa1, 0xc3, 0xfb, 0x4e, 0xdf, 0x0f, 0x93, 0xcf, 0x39, 0xc8, 0xb4,
+	0xf8, 0xc5, 0xd2, 0x4f, 0x78, 0x05, 0x0a, 0x91, 0x05, 0x43, 0x44, 0x6d, 0xdb, 0xdf, 0x81, 0x5c,
+	0x78, 0x7a, 0x66, 0xe1, 0x99, 0x69, 0x01, 0xfb, 0x2a, 0x2c, 0xcb, 0xa4, 0x3a, 0xfb, 0x70, 0x61,
+	0xd6, 0xe1, 0x82, 0x3e, 0x7c, 0x12, 0xd2, 0x52, 0x2b, 0x18, 0xac, 0xb6, 0xc3, 0x1c, 0x7d, 0x84,
+	0x7f, 0xdb, 0x65, 0x38, 0xfe, 0xc0, 0x77, 0x86, 0x41, 0x87, 0xfa, 0x02, 0x29, 0xf4, 0x5d, 0xfb,
+	0x35, 0x58, 0xe1, 0x89, 0x84, 0xfa, 0xc1, 0x86, 0x37, 0x1e, 0x32, 0xdd, 0xd0, 0x5f, 0x84, 0xd2,
+	0x34, 0x58, 0xb9, 0x7a, 0x09, 0xd2, 0x2d, 0x0e, 0x10, 0xd4, 0x17, 0x89, 0x5c, 0xd8, 0xbf, 0x46,
+	0x80, 0x6f, 0x50, 0x26, 0x48, 0x6f, 0x6d, 0x06, 0x46, 0x73, 0xe7, 0x3a, 0xac, 0xd5, 0xa3, 0x7e,
+	0xa0, 0x1b, 0x1d, 0xbd, 0xfe, 0x2a, 0x9a, 0x3b, 0xfb, 0x12, 0xac, 0x4c, 0x71, 0xa9, 0x64, 0xaa,
+	0x40, 0xb6, 0xa5, 0x60, 0xaa, 0xa8, 0x86, 0x6b, 0xfb, 0x0f, 0x49, 0xc8, 0x4a, 0xdb, 0xd2, 0x0e,
+	0xbe, 0x04, 0xf9, 0x0e, 0xf7, 0x35, 0x7f, 0xe4, 0xf7, 0x95, 0x0a, 0xac, 0xe6, 0xf2, 0xc1, 0xa4,
+	0x66, 0x82, 0x89, 0xb9, 0xc0, 0x6f, 0xc4, 0x1c, 0xaf, 0x59, 0xda, 0x9f, 0xd4, 0x32, 0x3f, 0xe4,
+	0xce, 0xb7, 0xc9, 0xcb, 0x9b, 0x70, 0xc3, 0xcd, 0xd0, 0x1d, 0x6f, 0xa9, 0x68, 0x13, 0x9d, 0x5e,
+	0xf3, 0xbb, 0x9c, 0xfd, 0x58, 0xbe, 0x1e, 0xf9, 0x9e, 0x4b, 0x59, 0x8f, 0x8e, 0x83, 0x46, 0xcb,
+	0x73, 0x5d, 0x6f, 0xd8, 0x10, 0xe3, 0x9b, 0x10, 0x9a, 0xd7, 0x68, 0x7e, 0x5c, 0x05, 0xe0, 0x03,
+	0x58, 0x60, 0x3d, 0xdf, 0x1b, 0x77, 0x7b, 0xa2, 0xfc, 0xa4, 0x9a, 0x57, 0xe6, 0xa7, 0xa7, 0x29,
+	0x10, 0xfd, 0x81, 0xcf, 0x70, 0x6d, 0xd1, 0xd6, 0x6e, 0x30, 0x76, 0x45, 0xfd, 0x5a, 0x6c, 0xa6,
+	0x0f, 0x26, 0x35, 0xf4, 0x06, 0x09, 0xc1, 0xf6, 0xc7, 0x49, 0xa8, 0x09, 0x17, 0x7e, 0x28, 0x7a,
+	0x93, 0xeb, 0x9e, 0x7f, 0x87, 0x32, 0xbf, 0xdf, 0xba, 0xeb, 0xb8, 0x54, 0xfb, 0x46, 0x0d, 0xf2,
+	0xae, 0x00, 0x3e, 0x32, 0x82, 0x03, 0xdc, 0x10, 0x0f, 0x9f, 0x06, 0x10, 0x61, 0x27, 0xf7, 0x65,
+	0x9c, 0xe4, 0x04, 0x44, 0x6c, 0x6f, 0x4c, 0x69, 0xaa, 0x31, 0xa7, 0x64, 0x4a, 0x43, 0x5b, 0x71,
+	0x0d, 0xcd, 0x4d, 0x27, 0x54, 0x8b, 0xe9, 0xeb, 0xe9, 0x69, 0x5f, 0xb7, 0xff, 0x81, 0xa0, 0x7a,
+	0x5b, 0x73, 0xfe, 0x92, 0xea, 0xd0, 0xf2, 0x26, 0x5f, 0x91, 0xbc, 0xa9, 0xff, 0x4f, 0x5e, 0xfb,
+	0x2f, 0x46, 0xc8, 0x13, 0xda, 0xd1, 0x72, 0x6c, 0x18, 0xe5, 0xe2, 0x55, 0xb0, 0x99, 0x7c, 0x85,
+	0x66, 0x49, 0xc5, 0xcc, 0xf2, 0x4e, 0x94, 0x0e, 0x84, 0x04, 0x2a, 0x1d, 0x9c, 0x05, 0xcb, 0xa7,
+	0x1d, 0x5d, 0x7c, 0x71, 0x3c, 0xc7, 0xd3, 0x0e, 0x11, 0xfb, 0xf6, 0x9f, 0x10, 0x14, 0x6f, 0x50,
+	0x36, 0xdd, 0xd6, 0x7c, 0x9d, 0xe4, 0x7f, 0x0f, 0x8e, 0x19, 0xfc, 0x2b, 0xe9, 0xdf, 0x8c, 0xf5,
+	0x32, 0xaf, 0x45, 0xf2, 0x6f, 0x0d, 0xdb, 0xf4, 0x23, 0x35, 0xa3, 0x4d, 0xb7, 0x31, 0xf7, 0x21,
+	0x6f, 0x6c, 0xe2, 0x6b, 0xb1, 0x06, 0x66, 0x56, 0x51, 0x6d, 0x96, 0x94, 0x4c, 0x72, 0x4a, 0x53,
+	0xed, 0x69, 0x58, 0xee, 0xb7, 0x01, 0x8b, 0xb1, 0x51, 0x90, 0x35, 0x33, 0xb5, 0x80, 0xde, 0x0a,
+	0xfb, 0x99, 0x70, 0x8d, 0xcf, 0x80, 0xe5, 0x7b, 0x4f, 0x74, 0x67, 0xba, 0x18, 0x5d, 0x49, 0xbc,
+	0x27, 0x44, 0x6c, 0xd9, 0x57, 0x21, 0x45, 0xbc, 0x27, 0xb8, 0x0a, 0xe0, 0x3b, 0xc3, 0x2e, 0x7d,
+	0x18, 0x0e, 0x2c, 0x05, 0x62, 0x40, 0x8e, 0xa8, 0xaf, 0x1b, 0x70, 0xcc, 0xe4, 0x48, 0x9a, 0xbb,
+	0x0e, 0x0b, 0x1c, 0xd8, 0x9f, 0xf5, 0xb8, 0x25, 0x10, 0xe5, 0xec, 0xab, 0x91, 0xb8, 0xcf, 0x40,
+	0x04, 0xc7, 0xa7, 0x20, 0xc7, 0x9c, 0x9d, 0x01, 0xbd, 0x1b, 0xc5, 0x7c, 0x04, 0xe0, 0xbb, 0x7c,
+	0xd6, 0x7a, 0x68, 0x34, 0x0a, 0x11, 0x00, 0x9f, 0x87, 0x62, 0xc4, 0xf3, 0x7d, 0x9f, 0x76, 0xfa,
+	0x1f, 0x09, 0x0b, 0x17, 0xc8, 0x21, 0x38, 0x5e, 0x83, 0xe5, 0x08, 0xb6, 0x2d, 0xca, 0xae, 0x25,
+	0x50, 0xe3, 0x60, 0xae, 0x1b, 0x21, 0xee, 0xbb, 0x8f, 0xc7, 0xce, 0x40, 0x24, 0xb2, 0x02, 0x31,
+	0x20, 0xf6, 0x9f, 0x11, 0x1c, 0x93, 0xa6, 0xe6, 0x53, 0xf6, 0xd7, 0xd1, 0xeb, 0x7f, 0x83, 0x00,
+	0x9b, 0x12, 0x28, 0xd7, 0xfa, 0xa6, 0xf9, 0x7c, 0xc2, 0xeb, 0x7a, 0x5e, 0x8c, 0x90, 0x12, 0x14,
+	0xbd, 0x80, 0xd8, 0x61, 0x0b, 0x28, 0xde, 0x17, 0xe5, 0x8c, 0x2a, 0x21, 0xba, 0xfb, 0xe3, 0xa3,
+	0xf5, 0xce, 0x1e, 0xa3, 0x81, 0x9a, 0x30, 0xc5, 0x68, 0x2d, 0x00, 0x44, 0xfe, 0xf0, 0xbb, 0xe8,
+	0x90, 0x09, 0xaf, 0xb1, 0xa2, 0xbb, 0x14, 0x88, 0xe8, 0x8f, 0xf3, 0x67, 0x21, 0x17, 0x3e, 0xd5,
+	0xe1, 0x3c, 0x2c, 0x5c, 0xbf, 0x47, 0x7e, 0x74, 0x8d, 0x6c, 0x16, 0x13, 0xb8, 0x00, 0xd9, 0xe6,
+	0xb5, 0x8d, 0x5b, 0x62, 0x85, 0xd6, 0xff, 0x68, 0x69, 0x2f, 0xf4, 0xf1, 0xf7, 0x20, 0x2d, 0x5d,
+	0xeb, 0x78, 0xe4, 0x88, 0xe6, 0x83, 0x5b, 0xe5, 0xc4, 0x21, 0xb8, 0x6a, 0x04, 0x13, 0xdf, 0x42,
+	0xf8, 0x2e, 0xe4, 0x05, 0x50, 0x0d, 0xf5, 0xa7, 0xe2, 0xb3, 0xf5, 0x14, 0xa5, 0xd3, 0x47, 0xec,
+	0x1a, 0xf4, 0xae, 0x40, 0x5a, 0x44, 0xb7, 0xc9, 0x8d, 0xf9, 0x28, 0x63, 0x72, 0x33, 0xf5, 0xcc,
+	0x61, 0x27, 0xf0, 0xdb, 0x60, 0xf1, 0x0e, 0x14, 0x1b, 0x09, 0xc8, 0x98, 0xc5, 0x2b, 0xc7, 0xe3,
+	0x60, 0xe3, 0xda, 0x77, 0xc2, 0x27, 0x85, 0x13, 0xf1, 0xd1, 0x49, 0x1f, 0x2f, 0x1f, 0xde, 0x08,
+	0x6f, 0xbe, 0x27, 0x67, 0x6b, 0xdd, 0xfb, 0xe2, 0xd3, 0xd3, 0x57, 0xc5, 0x5a, 0xe5, 0x4a, 0xf5,
+	0xa8, 0xed, 0x90, 0xe0, 0x6d, 0xc8, 0x1b, 0x7d, 0xa7, 0xa9, 0xd6, 0xc3, 0x4d, 0xb3, 0xa9, 0xd6,
+	0x19, 0xcd, 0xaa, 0x9d, 0xc0, 0x37, 0x20, 0xcb, 0xd3, 0x36, 0xf7, 0x5e, 0x7c, 0x32, 0x9e, 0x9d,
+	0x8d, 0xa8, 0xac, 0x9c, 0x9a, 0xbd, 0xa9, 0x09, 0xad, 0x7f, 0x08, 0x59, 0x3d, 0x22, 0xe1, 0xf7,
+	0x61, 0x69, 0x7a, 0x40, 0xc0, 0xdf, 0x30, 0xc4, 0x9a, 0x9e, 0xbb, 0x2a, 0xab, 0xc6, 0xd6, 0xec,
+	0xa9, 0x22, 0xb1, 0x86, 0xd6, 0x3f, 0xd4, 0x6f, 0xf8, 0x9b, 0x0e, 0x73, 0xf0, 0x3d, 0x58, 0x12,
+	0x5c, 0x87, 0x8f, 0xfc, 0x53, 0xde, 0x75, 0xe8, 0x3f, 0x0a, 0x53, 0xde, 0x75, 0xf8, 0x3f, 0x0b,
+	0x76, 0xa2, 0xf9, 0xc1, 0xb3, 0xe7, 0xd5, 0xc4, 0xa7, 0xcf, 0xab, 0x89, 0xcf, 0x9e, 0x57, 0xd1,
+	0xcf, 0xf6, 0xab, 0xe8, 0xb7, 0xfb, 0x55, 0xf4, 0x74, 0xbf, 0x8a, 0x9e, 0xed, 0x57, 0xd1, 0xbf,
+	0xf7, 0xab, 0xe8, 0x3f, 0xfb, 0xd5, 0xc4, 0x67, 0xfb, 0x55, 0xf4, 0xc9, 0x8b, 0x6a, 0xe2, 0xd9,
+	0x8b, 0x6a, 0xe2, 0xd3, 0x17, 0xd5, 0xc4, 0x07, 0xaf, 0x7f, 0xde, 0xd3, 0x87, 0xbe, 0x71, 0x27,
+	0x23, 0x7e, 0xde, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x75, 0x18, 0x31, 0x82, 0x19,
+	0x00, 0x00,
 }
 
 func (x Direction) String() string {
@@ -2774,6 +2783,9 @@ func (this *LabelRequest) Equal(that interface{}) bool {
 	} else if !this.End.Equal(*that1.End) {
 		return false
 	}
+	if this.Query != that1.Query {
+		return false
+	}
 	return true
 }
 func (this *LabelResponse) Equal(that interface{}) bool {
@@ -3885,12 +3897,13 @@ func (this *LabelRequest) GoString() string {
 	if this == nil {
 		return "nil"
 	}
-	s := make([]string, 0, 8)
+	s := make([]string, 0, 9)
 	s = append(s, "&logproto.LabelRequest{")
 	s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n")
 	s = append(s, "Values: "+fmt.Sprintf("%#v", this.Values)+",\n")
 	s = append(s, "Start: "+fmt.Sprintf("%#v", this.Start)+",\n")
 	s = append(s, "End: "+fmt.Sprintf("%#v", this.End)+",\n")
+	s = append(s, "Query: "+fmt.Sprintf("%#v", this.Query)+",\n")
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
@@ -5322,6 +5335,13 @@ func (m *LabelRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Query) > 0 {
+		i -= len(m.Query)
+		copy(dAtA[i:], m.Query)
+		i = encodeVarintLogproto(dAtA, i, uint64(len(m.Query)))
+		i--
+		dAtA[i] = 0x2a
+	}
 	if m.End != nil {
 		n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.End, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.End):])
 		if err7 != nil {
@@ -6905,6 +6925,10 @@ func (m *LabelRequest) Size() (n int) {
 		l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.End)
 		n += 1 + l + sovLogproto(uint64(l))
 	}
+	l = len(m.Query)
+	if l > 0 {
+		n += 1 + l + sovLogproto(uint64(l))
+	}
 	return n
 }
 
@@ -7630,6 +7654,7 @@ func (this *LabelRequest) String() string {
 		`Values:` + fmt.Sprintf("%v", this.Values) + `,`,
 		`Start:` + strings.Replace(fmt.Sprintf("%v", this.Start), "Timestamp", "types.Timestamp", 1) + `,`,
 		`End:` + strings.Replace(fmt.Sprintf("%v", this.End), "Timestamp", "types.Timestamp", 1) + `,`,
+		`Query:` + fmt.Sprintf("%v", this.Query) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -9341,6 +9366,38 @@ func (m *LabelRequest) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowLogproto
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthLogproto
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthLogproto
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Query = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipLogproto(dAtA[iNdEx:])

pkg/logproto/logproto.proto

@@ -119,6 +119,7 @@ message LabelRequest {
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = true
   ];
+  string query = 5; // Naming this query instead of match because this should be with queryrangebase.Request interface
 }
 
 message LabelResponse {

pkg/logql/metrics.go

@@ -177,7 +177,7 @@ func RecordLabelQueryMetrics(
 	ctx context.Context,
 	log log.Logger,
 	start, end time.Time,
-	label, status string,
+	label, query, status string,
 	stats logql_stats.Result,
 ) {
 	var (
@@ -199,6 +199,7 @@ func RecordLabelQueryMetrics(
 		"duration", time.Duration(int64(stats.Summary.ExecTime*float64(time.Second))),
 		"status", status,
 		"label", label,
+		"query", query,
 		"splits", stats.Summary.Splits,
 		"throughput", strings.Replace(humanize.Bytes(uint64(stats.Summary.BytesProcessedPerSecond)), " ", "", 1),
 		"total_bytes", strings.Replace(humanize.Bytes(uint64(stats.Summary.TotalBytesProcessed)), " ", "", 1),

pkg/logql/metrics_test.go

@@ -101,7 +101,7 @@ func TestLogLabelsQuery(t *testing.T) {
 	sp := opentracing.StartSpan("")
 	ctx := opentracing.ContextWithSpan(user.InjectOrgID(context.Background(), "foo"), sp)
 	now := time.Now()
-	RecordLabelQueryMetrics(ctx, logger, now.Add(-1*time.Hour), now, "foo", "200", stats.Result{
+	RecordLabelQueryMetrics(ctx, logger, now.Add(-1*time.Hour), now, "foo", "", "200", stats.Result{
 		Summary: stats.Summary{
 			BytesProcessedPerSecond: 100000,
 			ExecTime:                25.25,
@@ -111,7 +111,7 @@ func TestLogLabelsQuery(t *testing.T) {
 	})
 	require.Equal(t,
 		fmt.Sprintf(
-			"level=info org_id=foo traceID=%s latency=slow query_type=labels length=1h0m0s duration=25.25s status=200 label=foo splits=0 throughput=100kB total_bytes=100kB total_entries=12\n",
+			"level=info org_id=foo traceID=%s latency=slow query_type=labels length=1h0m0s duration=25.25s status=200 label=foo query= splits=0 throughput=100kB total_bytes=100kB total_entries=12\n",
 			sp.Context().(jaeger.SpanContext).SpanID().String(),
 		),
 		buf.String())

pkg/querier/http.go

@@ -222,7 +222,7 @@ func (q *QuerierAPI) LabelHandler(w http.ResponseWriter, r *http.Request) {
 		status, _ = server.ClientHTTPStatusAndError(err)
 	}
 
-	logql.RecordLabelQueryMetrics(ctx, log, *req.Start, *req.End, req.Name, strconv.Itoa(status), statResult)
+	logql.RecordLabelQueryMetrics(ctx, log, *req.Start, *req.End, req.Name, req.Query, strconv.Itoa(status), statResult)
 
 	if err != nil {
 		serverutil.WriteError(err, w)

pkg/querier/querier.go

@@ -11,6 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/labels"
 	"github.com/weaveworks/common/httpgrpc"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/health/grpc_health_v1"
@@ -364,6 +365,14 @@ func (q *SingleTenantQuerier) Label(ctx context.Context, req *logproto.LabelRequ
 		return nil, err
 	}
 
+	var matchers []*labels.Matcher
+	if req.Query != "" {
+		matchers, err = syntax.ParseMatchers(req.Query)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	// Enforce the query timeout while querying backends
 	queryTimeout := q.limits.QueryTimeout(ctx, userID)
 	// TODO: remove this clause once we remove the deprecated query-timeout flag.
@@ -401,7 +410,7 @@ func (q *SingleTenantQuerier) Label(ctx context.Context, req *logproto.LabelRequ
 			)
 
 			if req.Values {
-				storeValues, err = q.store.LabelValuesForMetricName(ctx, userID, from, through, "logs", req.Name)
+				storeValues, err = q.store.LabelValuesForMetricName(ctx, userID, from, through, "logs", req.Name, matchers...)
 			} else {
 				storeValues, err = q.store.LabelNamesForMetricName(ctx, userID, from, through, "logs")
 			}

pkg/querier/queryrange/codec.go

@@ -187,10 +187,6 @@ func (r *LokiLabelNamesRequest) WithQuery(query string) queryrangebase.Request {
 	return &new
 }
 
-func (r *LokiLabelNamesRequest) GetQuery() string {
-	return ""
-}
-
 func (r *LokiLabelNamesRequest) GetStep() int64 {
 	return 0
 }
@@ -260,6 +256,7 @@ func (Codec) DecodeRequest(_ context.Context, r *http.Request, forwardHeaders []
 			StartTs: *req.Start,
 			EndTs:   *req.End,
 			Path:    r.URL.Path,
+			Query:   req.Query,
 		}, nil
 	case IndexStatsOp:
 		req, err := loghttp.ParseIndexStatsQuery(r)
@@ -346,6 +343,7 @@ func (Codec) EncodeRequest(ctx context.Context, r queryrangebase.Request) (*http
 		params := url.Values{
 			"start": []string{fmt.Sprintf("%d", request.StartTs.UnixNano())},
 			"end":   []string{fmt.Sprintf("%d", request.EndTs.UnixNano())},
+			"query": []string{request.GetQuery()},
 		}
 
 		u := &url.URL{

pkg/querier/queryrange/codec_test.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	strings "strings"
 	"testing"
 	"time"
@@ -80,6 +81,15 @@ func Test_codec_DecodeRequest(t *testing.T) {
 			StartTs: start,
 			EndTs:   end,
 		}, false},
+		{"label_values", func() (*http.Request, error) {
+			return http.NewRequest(http.MethodGet,
+				fmt.Sprintf(`/label/test/values?start=%d&end=%d&query={foo="bar"}`, start.UnixNano(), end.UnixNano()), nil)
+		}, &LokiLabelNamesRequest{
+			Path:    "/label/test/values",
+			StartTs: start,
+			EndTs:   end,
+			Query:   `{foo="bar"}`,
+		}, false},
 		{"index_stats", func() (*http.Request, error) {
 			return LokiCodec.EncodeRequest(context.Background(), &logproto.IndexStatsRequest{
 				From:     model.TimeFromUnixNano(start.UnixNano()),
@@ -334,6 +344,7 @@ func Test_codec_labels_EncodeRequest(t *testing.T) {
 		Path:    "/loki/api/v1/labels/__name__/values",
 		StartTs: start,
 		EndTs:   end,
+		Query:   `{foo="bar"}`,
 	}
 	got, err = LokiCodec.EncodeRequest(ctx, toEncode)
 	require.NoError(t, err)
@@ -341,13 +352,37 @@ func Test_codec_labels_EncodeRequest(t *testing.T) {
 	require.Equal(t, "/loki/api/v1/labels/__name__/values", got.URL.Path)
 	require.Equal(t, fmt.Sprintf("%d", start.UnixNano()), got.URL.Query().Get("start"))
 	require.Equal(t, fmt.Sprintf("%d", end.UnixNano()), got.URL.Query().Get("end"))
+	require.Equal(t, `{foo="bar"}`, got.URL.Query().Get("query"))
 
 	// testing a full roundtrip
 	req, err = LokiCodec.DecodeRequest(context.TODO(), got, nil)
 	require.NoError(t, err)
 	require.Equal(t, toEncode.StartTs, req.(*LokiLabelNamesRequest).StartTs)
 	require.Equal(t, toEncode.EndTs, req.(*LokiLabelNamesRequest).EndTs)
+	require.Equal(t, toEncode.Query, req.(*LokiLabelNamesRequest).Query)
+	require.Equal(t, "/loki/api/v1/labels/__name__/values", req.(*LokiLabelNamesRequest).Path)
+}
+
+func Test_codec_labels_DecodeRequest(t *testing.T) {
+	ctx := context.Background()
+	u, err := url.Parse(`/loki/api/v1/labels/__name__/values?start=1575285010000000010&end=1575288610000000010&query={foo="bar"}`)
+	require.NoError(t, err)
+
+	r := &http.Request{URL: u}
+	req, err := LokiCodec.DecodeRequest(context.TODO(), r, nil)
+	require.NoError(t, err)
+	require.Equal(t, start, req.(*LokiLabelNamesRequest).StartTs)
+	require.Equal(t, end, req.(*LokiLabelNamesRequest).EndTs)
+	require.Equal(t, `{foo="bar"}`, req.(*LokiLabelNamesRequest).Query)
 	require.Equal(t, "/loki/api/v1/labels/__name__/values", req.(*LokiLabelNamesRequest).Path)
+
+	got, err := LokiCodec.EncodeRequest(ctx, req)
+	require.NoError(t, err)
+	require.Equal(t, ctx, got.Context())
+	require.Equal(t, "/loki/api/v1/labels/__name__/values", got.URL.Path)
+	require.Equal(t, fmt.Sprintf("%d", start.UnixNano()), got.URL.Query().Get("start"))
+	require.Equal(t, fmt.Sprintf("%d", end.UnixNano()), got.URL.Query().Get("end"))
+	require.Equal(t, `{foo="bar"}`, got.URL.Query().Get("query"))
 }
 
 func Test_codec_index_stats_EncodeRequest(t *testing.T) {

pkg/querier/queryrange/queryrange.pb.go

@@ -474,6 +474,7 @@ type LokiLabelNamesRequest struct {
 	StartTs time.Time `protobuf:"bytes,1,opt,name=startTs,proto3,stdtime" json:"startTs"`
 	EndTs   time.Time `protobuf:"bytes,2,opt,name=endTs,proto3,stdtime" json:"endTs"`
 	Path    string    `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
+	Query   string    `protobuf:"bytes,4,opt,name=query,proto3" json:"query,omitempty"`
 }
 
 func (m *LokiLabelNamesRequest) Reset()      { *m = LokiLabelNamesRequest{} }
@@ -529,6 +530,13 @@ func (m *LokiLabelNamesRequest) GetPath() string {
 	return ""
 }
 
+func (m *LokiLabelNamesRequest) GetQuery() string {
+	if m != nil {
+		return m.Query
+	}
+	return ""
+}
+
 type LokiLabelNamesResponse struct {
 	Status     string                                                                                               `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"`
 	Data       []string                                                                                             `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"`
@@ -748,69 +756,70 @@ func init() {
 }
 
 var fileDescriptor_51b9d53b40d11902 = []byte{
-	// 992 bytes of a gzipped FileDescriptorProto
+	// 999 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xdd, 0x6e, 0x23, 0xb5,
 	0x17, 0x8f, 0xf3, 0x1d, 0xf7, 0xbf, 0xfd, 0x83, 0x5b, 0x76, 0x47, 0x05, 0xcd, 0x44, 0x91, 0x60,
 	0x83, 0x04, 0x13, 0xd1, 0xe5, 0x43, 0x7c, 0x08, 0xb1, 0x43, 0x41, 0x54, 0x5a, 0x21, 0x34, 0x9b,
-	0x17, 0x70, 0x3a, 0xee, 0x64, 0xe8, 0x7c, 0xd5, 0xf6, 0xac, 0xe8, 0x1d, 0x0f, 0x00, 0xd2, 0x3e,
-	0x05, 0x20, 0xc1, 0x13, 0xf0, 0x04, 0xbd, 0xec, 0xe5, 0xaa, 0x12, 0x03, 0x4d, 0x6f, 0x20, 0x57,
-	0x7d, 0x04, 0x64, 0x7b, 0x26, 0x71, 0xba, 0x6d, 0xb7, 0xe9, 0xde, 0xec, 0x05, 0x37, 0xc9, 0x39,
-	0xc7, 0xe7, 0x67, 0xfb, 0xfc, 0xce, 0xef, 0x38, 0x81, 0x77, 0xd3, 0x3d, 0x7f, 0xb0, 0x9f, 0x11,
-	0x1a, 0x10, 0x2a, 0xbf, 0x0f, 0x28, 0x8e, 0x7d, 0xa2, 0x99, 0x76, 0x4a, 0x13, 0x9e, 0x20, 0x38,
-	0x8f, 0x6c, 0xac, 0xfb, 0x89, 0x9f, 0xc8, 0xf0, 0x40, 0x58, 0x2a, 0x63, 0xc3, 0xf2, 0x93, 0xc4,
-	0x0f, 0xc9, 0x40, 0x7a, 0xa3, 0x6c, 0x77, 0xc0, 0x83, 0x88, 0x30, 0x8e, 0xa3, 0xb4, 0x48, 0x78,
-	0x55, 0x9c, 0x15, 0x26, 0xbe, 0x42, 0x96, 0x46, 0xb1, 0xd8, 0x2d, 0x16, 0xf7, 0xc3, 0x28, 0xf1,
-	0x48, 0x38, 0x60, 0x1c, 0x73, 0xa6, 0x3e, 0x8b, 0x8c, 0x35, 0x91, 0x91, 0x66, 0x6c, 0x2c, 0x3f,
-	0x8a, 0xe0, 0xe7, 0xcf, 0xbc, 0xff, 0x08, 0x33, 0x32, 0xf0, 0xc8, 0x6e, 0x10, 0x07, 0x3c, 0x48,
-	0x62, 0xa6, 0xdb, 0xc5, 0x26, 0xef, 0x5f, 0x6f, 0x93, 0xf3, 0x9c, 0xf4, 0x8e, 0xaa, 0x70, 0xe5,
-	0x41, 0xb2, 0x17, 0xb8, 0x64, 0x3f, 0x23, 0x8c, 0xa3, 0x75, 0xd8, 0x90, 0x39, 0x06, 0xe8, 0x82,
-	0x7e, 0xc7, 0x55, 0x8e, 0x88, 0x86, 0x41, 0x14, 0x70, 0xa3, 0xda, 0x05, 0xfd, 0x5b, 0xae, 0x72,
-	0x10, 0x82, 0x75, 0xc6, 0x49, 0x6a, 0xd4, 0xba, 0xa0, 0x5f, 0x73, 0xa5, 0x8d, 0x36, 0x60, 0x3b,
-	0x88, 0x39, 0xa1, 0x8f, 0x70, 0x68, 0x74, 0x64, 0x7c, 0xe6, 0xa3, 0x4f, 0x61, 0x8b, 0x71, 0x4c,
-	0xf9, 0x90, 0x19, 0xf5, 0x2e, 0xe8, 0xaf, 0x6c, 0x6e, 0xd8, 0x8a, 0x6f, 0xbb, 0xe4, 0xdb, 0x1e,
-	0x96, 0x7c, 0x3b, 0xed, 0xc3, 0xdc, 0xaa, 0x3c, 0xfe, 0xd3, 0x02, 0x6e, 0x09, 0x42, 0x1f, 0xc1,
-	0x06, 0x89, 0xbd, 0x21, 0x33, 0x1a, 0x4b, 0xa0, 0x15, 0x04, 0xbd, 0x03, 0x3b, 0x5e, 0x40, 0xc9,
-	0x8e, 0xe0, 0xcc, 0x68, 0x76, 0x41, 0x7f, 0x75, 0x73, 0xcd, 0x9e, 0xf5, 0x6f, 0xab, 0x5c, 0x72,
-	0xe7, 0x59, 0xa2, 0xbc, 0x14, 0xf3, 0xb1, 0xd1, 0x92, 0x4c, 0x48, 0x1b, 0xf5, 0x60, 0x93, 0x8d,
-	0x31, 0xf5, 0x98, 0xd1, 0xee, 0xd6, 0xfa, 0x1d, 0x07, 0x4e, 0x73, 0xab, 0x88, 0xb8, 0xc5, 0x77,
-	0xef, 0x1f, 0x00, 0x91, 0xa0, 0x74, 0x3b, 0x66, 0x1c, 0xc7, 0xfc, 0x26, 0xcc, 0x7e, 0x02, 0x9b,
-	0x42, 0x79, 0x43, 0x26, 0xb9, 0xbd, 0x6e, 0xa9, 0x05, 0x66, 0xb1, 0xd6, 0xfa, 0x52, 0xb5, 0x36,
-	0x2e, 0xac, 0xb5, 0x79, 0x69, 0xad, 0xbf, 0xd6, 0xe1, 0xff, 0x94, 0x7c, 0x58, 0x9a, 0xc4, 0x8c,
-	0x08, 0xd0, 0x43, 0x8e, 0x79, 0xc6, 0x54, 0x99, 0x05, 0x48, 0x46, 0xdc, 0x62, 0x05, 0x7d, 0x06,
-	0xeb, 0x5b, 0x98, 0x63, 0x59, 0xf2, 0xca, 0xe6, 0xba, 0xad, 0x89, 0x52, 0xec, 0x25, 0xd6, 0x9c,
-	0xdb, 0xa2, 0xaa, 0x69, 0x6e, 0xad, 0x7a, 0x98, 0xe3, 0xb7, 0x92, 0x28, 0xe0, 0x24, 0x4a, 0xf9,
-	0x81, 0x2b, 0x91, 0xe8, 0x3d, 0xd8, 0xf9, 0x82, 0xd2, 0x84, 0x0e, 0x0f, 0x52, 0x22, 0x29, 0xea,
-	0x38, 0x77, 0xa6, 0xb9, 0xb5, 0x46, 0xca, 0xa0, 0x86, 0x98, 0x67, 0xa2, 0x37, 0x61, 0x43, 0x3a,
-	0x92, 0x94, 0x8e, 0xb3, 0x36, 0xcd, 0xad, 0xff, 0x4b, 0x88, 0x96, 0xae, 0x32, 0x16, 0x39, 0x6c,
-	0x5c, 0x8b, 0xc3, 0x59, 0x2b, 0x9b, 0x7a, 0x2b, 0x0d, 0xd8, 0x7a, 0x44, 0x28, 0x13, 0xdb, 0xb4,
-	0x64, 0xbc, 0x74, 0xd1, 0x7d, 0x08, 0x05, 0x31, 0x01, 0xe3, 0xc1, 0x8e, 0xd0, 0x93, 0x20, 0xe3,
-	0x96, 0xad, 0x9e, 0x0b, 0x97, 0xb0, 0x2c, 0xe4, 0x0e, 0x2a, 0x58, 0xd0, 0x12, 0x5d, 0xcd, 0x46,
-	0xbf, 0x01, 0xd8, 0xfa, 0x8a, 0x60, 0x8f, 0x50, 0x66, 0x74, 0xba, 0xb5, 0xfe, 0xca, 0xe6, 0xeb,
-	0xb6, 0xfe, 0x36, 0x7c, 0x43, 0x93, 0x88, 0xf0, 0x31, 0xc9, 0x58, 0xd9, 0x20, 0x95, 0xed, 0xec,
-	0x1d, 0xe7, 0xd6, 0xc8, 0x0f, 0xf8, 0x38, 0x1b, 0xd9, 0x3b, 0x49, 0x34, 0xf0, 0x29, 0xde, 0xc5,
-	0x31, 0x1e, 0x84, 0xc9, 0x5e, 0x30, 0x58, 0xfa, 0x3d, 0xba, 0xf4, 0x9c, 0x69, 0x6e, 0x81, 0xb7,
-	0xdd, 0xf2, 0x8a, 0xbd, 0x3f, 0x00, 0x7c, 0x59, 0x74, 0xf8, 0xa1, 0xd8, 0x9b, 0x69, 0x83, 0x11,
-	0x61, 0xbe, 0x33, 0x36, 0x80, 0x90, 0x99, 0xab, 0x1c, 0xfd, 0xb1, 0xa8, 0x3e, 0xd7, 0x63, 0x51,
-	0x5b, 0xfe, 0xb1, 0x28, 0xa7, 0xa1, 0x7e, 0xe1, 0x34, 0x34, 0x2e, 0x9d, 0x86, 0x1f, 0x6a, 0x6a,
-	0xf2, 0xcb, 0xfa, 0x96, 0x98, 0x89, 0x2f, 0x67, 0x33, 0x51, 0x93, 0xb7, 0x9d, 0x49, 0x4d, 0xed,
-	0xb5, 0xed, 0x91, 0x98, 0x07, 0xbb, 0x01, 0xa1, 0xcf, 0x98, 0x0c, 0x4d, 0x6e, 0xb5, 0x45, 0xb9,
-	0xe9, 0x5a, 0xa9, 0xbf, 0xf0, 0x5a, 0x39, 0x37, 0x1d, 0x8d, 0x1b, 0x4c, 0x47, 0xef, 0x67, 0x00,
-	0x5f, 0x11, 0xed, 0x78, 0x80, 0x47, 0x24, 0xfc, 0x1a, 0x47, 0x73, 0xc9, 0x69, 0xe2, 0x02, 0xcf,
-	0x25, 0xae, 0xea, 0xcd, 0xc5, 0x55, 0x9b, 0x8b, 0xab, 0x77, 0x56, 0x85, 0xb7, 0xcf, 0xdf, 0x74,
-	0x09, 0xf1, 0xbc, 0xa1, 0x89, 0xa7, 0xe3, 0xa0, 0xff, 0xc4, 0x71, 0x0d, 0x71, 0xfc, 0x04, 0x60,
-	0xbb, 0xfc, 0xb5, 0x41, 0x36, 0x84, 0x0a, 0x26, 0x7f, 0x50, 0x14, 0xd1, 0xab, 0x02, 0x4c, 0x67,
-	0x51, 0x57, 0xcb, 0x40, 0xdf, 0xc2, 0xa6, 0xf2, 0x8a, 0x79, 0xbd, 0xa3, 0xcd, 0x2b, 0xa7, 0x04,
-	0x47, 0xf7, 0x3d, 0x9c, 0x72, 0x42, 0x9d, 0x0f, 0xc5, 0x2d, 0x8e, 0x73, 0xeb, 0xee, 0x55, 0x14,
-	0xc9, 0xff, 0x82, 0x0a, 0x27, 0x9a, 0xab, 0xce, 0x74, 0x8b, 0x13, 0x7a, 0x3f, 0x02, 0xf8, 0x92,
-	0xb8, 0xa8, 0xa0, 0x66, 0xa6, 0x8a, 0x2d, 0xd8, 0xa6, 0x85, 0x5d, 0x28, 0xb8, 0x67, 0x2f, 0xd2,
-	0x7a, 0x01, 0x95, 0x4e, 0xfd, 0x30, 0xb7, 0x80, 0x3b, 0x43, 0xa2, 0x7b, 0x0b, 0x34, 0x56, 0x2f,
-	0xa2, 0x51, 0x40, 0x2a, 0x0b, 0xc4, 0xfd, 0x5e, 0x85, 0x68, 0x3b, 0xf6, 0xc8, 0x77, 0x42, 0x7c,
-	0x73, 0x9d, 0x66, 0x4f, 0xdd, 0xe8, 0xb5, 0x39, 0x29, 0x4f, 0xe7, 0x3b, 0x1f, 0x1f, 0xe7, 0xd6,
-	0x07, 0x57, 0xb1, 0x72, 0x05, 0x58, 0x2b, 0x41, 0x17, 0x6e, 0xf5, 0x85, 0x17, 0xae, 0xf3, 0xee,
-	0xd1, 0x89, 0x59, 0x79, 0x72, 0x62, 0x56, 0xce, 0x4e, 0x4c, 0xf0, 0xfd, 0xc4, 0x04, 0xbf, 0x4c,
-	0x4c, 0x70, 0x38, 0x31, 0xc1, 0xd1, 0xc4, 0x04, 0x7f, 0x4d, 0x4c, 0xf0, 0xf7, 0xc4, 0xac, 0x9c,
-	0x4d, 0x4c, 0xf0, 0xf8, 0xd4, 0xac, 0x1c, 0x9d, 0x9a, 0x95, 0x27, 0xa7, 0x66, 0x65, 0xd4, 0x94,
-	0x44, 0xdc, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xe6, 0xf4, 0x15, 0xea, 0x0c, 0x00, 0x00,
+	0x17, 0x70, 0x3a, 0x6e, 0x32, 0x74, 0xbe, 0x6a, 0x7b, 0x56, 0xf4, 0x8e, 0x07, 0x00, 0x69, 0x9f,
+	0x02, 0x21, 0xc1, 0x13, 0x20, 0x71, 0xdf, 0xcb, 0x5e, 0xae, 0x2a, 0x31, 0xd0, 0xf4, 0x06, 0x72,
+	0xd5, 0x47, 0x40, 0xb6, 0x67, 0x26, 0x4e, 0xb7, 0xed, 0x36, 0xdd, 0x9b, 0xbd, 0xe0, 0x26, 0x73,
+	0xce, 0xf1, 0xf9, 0xd9, 0x3e, 0x3f, 0xff, 0x8e, 0x1d, 0x78, 0x37, 0xd9, 0x1b, 0x0f, 0xf6, 0x53,
+	0x42, 0x7d, 0x42, 0xe5, 0xf7, 0x80, 0xe2, 0x68, 0x4c, 0x34, 0xd3, 0x4e, 0x68, 0xcc, 0x63, 0x04,
+	0xe7, 0x91, 0x8d, 0xf5, 0x71, 0x3c, 0x8e, 0x65, 0x78, 0x20, 0x2c, 0x95, 0xb1, 0x61, 0x8d, 0xe3,
+	0x78, 0x1c, 0x90, 0x81, 0xf4, 0x46, 0xe9, 0xee, 0x80, 0xfb, 0x21, 0x61, 0x1c, 0x87, 0x49, 0x9e,
+	0xf0, 0xaa, 0x58, 0x2b, 0x88, 0xc7, 0x0a, 0x59, 0x18, 0xf9, 0x60, 0x37, 0x1f, 0xdc, 0x0f, 0xc2,
+	0xd8, 0x23, 0xc1, 0x80, 0x71, 0xcc, 0x99, 0xfa, 0xcd, 0x33, 0xd6, 0x44, 0x46, 0x92, 0xb2, 0x89,
+	0xfc, 0xc9, 0x83, 0x9f, 0x3f, 0x73, 0xff, 0x23, 0xcc, 0xc8, 0xc0, 0x23, 0xbb, 0x7e, 0xe4, 0x73,
+	0x3f, 0x8e, 0x98, 0x6e, 0xe7, 0x93, 0xbc, 0x7f, 0xbd, 0x49, 0xce, 0x73, 0xd2, 0x3b, 0xaa, 0xc2,
+	0x95, 0x07, 0xf1, 0x9e, 0xef, 0x92, 0xfd, 0x94, 0x30, 0x8e, 0xd6, 0x61, 0x43, 0xe6, 0x18, 0xa0,
+	0x0b, 0xfa, 0x1d, 0x57, 0x39, 0x22, 0x1a, 0xf8, 0xa1, 0xcf, 0x8d, 0x6a, 0x17, 0xf4, 0x6f, 0xb9,
+	0xca, 0x41, 0x08, 0xd6, 0x19, 0x27, 0x89, 0x51, 0xeb, 0x82, 0x7e, 0xcd, 0x95, 0x36, 0xda, 0x80,
+	0x6d, 0x3f, 0xe2, 0x84, 0x3e, 0xc2, 0x81, 0xd1, 0x91, 0xf1, 0xd2, 0x47, 0x9f, 0xc2, 0x16, 0xe3,
+	0x98, 0xf2, 0x21, 0x33, 0xea, 0x5d, 0xd0, 0x5f, 0xd9, 0xdc, 0xb0, 0x15, 0xdf, 0x76, 0xc1, 0xb7,
+	0x3d, 0x2c, 0xf8, 0x76, 0xda, 0x87, 0x99, 0x55, 0x79, 0xfc, 0xa7, 0x05, 0xdc, 0x02, 0x84, 0x3e,
+	0x82, 0x0d, 0x12, 0x79, 0x43, 0x66, 0x34, 0x96, 0x40, 0x2b, 0x08, 0x7a, 0x07, 0x76, 0x3c, 0x9f,
+	0x92, 0x1d, 0xc1, 0x99, 0xd1, 0xec, 0x82, 0xfe, 0xea, 0xe6, 0x9a, 0x5d, 0x9e, 0xdf, 0x56, 0x31,
+	0xe4, 0xce, 0xb3, 0x44, 0x79, 0x09, 0xe6, 0x13, 0xa3, 0x25, 0x99, 0x90, 0x36, 0xea, 0xc1, 0x26,
+	0x9b, 0x60, 0xea, 0x31, 0xa3, 0xdd, 0xad, 0xf5, 0x3b, 0x0e, 0x9c, 0x65, 0x56, 0x1e, 0x71, 0xf3,
+	0x6f, 0xef, 0x1f, 0x00, 0x91, 0xa0, 0x74, 0x3b, 0x62, 0x1c, 0x47, 0xfc, 0x26, 0xcc, 0x7e, 0x02,
+	0x9b, 0x42, 0x79, 0x43, 0x26, 0xb9, 0xbd, 0x6e, 0xa9, 0x39, 0x66, 0xb1, 0xd6, 0xfa, 0x52, 0xb5,
+	0x36, 0x2e, 0xac, 0xb5, 0x79, 0x69, 0xad, 0xbf, 0xd4, 0xe1, 0xff, 0x94, 0x7c, 0x58, 0x12, 0x47,
+	0x8c, 0x08, 0xd0, 0x43, 0x8e, 0x79, 0xca, 0x54, 0x99, 0x39, 0x48, 0x46, 0xdc, 0x7c, 0x04, 0x7d,
+	0x06, 0xeb, 0x5b, 0x98, 0x63, 0x59, 0xf2, 0xca, 0xe6, 0xba, 0xad, 0x89, 0x52, 0xcc, 0x25, 0xc6,
+	0x9c, 0xdb, 0xa2, 0xaa, 0x59, 0x66, 0xad, 0x7a, 0x98, 0xe3, 0xb7, 0xe2, 0xd0, 0xe7, 0x24, 0x4c,
+	0xf8, 0x81, 0x2b, 0x91, 0xe8, 0x3d, 0xd8, 0xf9, 0x82, 0xd2, 0x98, 0x0e, 0x0f, 0x12, 0x22, 0x29,
+	0xea, 0x38, 0x77, 0x66, 0x99, 0xb5, 0x46, 0x8a, 0xa0, 0x86, 0x98, 0x67, 0xa2, 0x37, 0x61, 0x43,
+	0x3a, 0x92, 0x94, 0x8e, 0xb3, 0x36, 0xcb, 0xac, 0xff, 0x4b, 0x88, 0x96, 0xae, 0x32, 0x16, 0x39,
+	0x6c, 0x5c, 0x8b, 0xc3, 0xf2, 0x28, 0x9b, 0xfa, 0x51, 0x1a, 0xb0, 0xf5, 0x88, 0x50, 0x26, 0xa6,
+	0x69, 0xc9, 0x78, 0xe1, 0xa2, 0xfb, 0x10, 0x0a, 0x62, 0x7c, 0xc6, 0xfd, 0x1d, 0xa1, 0x27, 0x41,
+	0xc6, 0x2d, 0x5b, 0x5d, 0x17, 0x2e, 0x61, 0x69, 0xc0, 0x1d, 0x94, 0xb3, 0xa0, 0x25, 0xba, 0x9a,
+	0x8d, 0x7e, 0x05, 0xb0, 0xf5, 0x15, 0xc1, 0x1e, 0xa1, 0xcc, 0xe8, 0x74, 0x6b, 0xfd, 0x95, 0xcd,
+	0xd7, 0x6d, 0xfd, 0x6e, 0xf8, 0x86, 0xc6, 0x21, 0xe1, 0x13, 0x92, 0xb2, 0xe2, 0x80, 0x54, 0xb6,
+	0xb3, 0x77, 0x9c, 0x59, 0xa3, 0xb1, 0xcf, 0x27, 0xe9, 0xc8, 0xde, 0x89, 0xc3, 0xc1, 0x98, 0xe2,
+	0x5d, 0x1c, 0xe1, 0x41, 0x10, 0xef, 0xf9, 0x83, 0xa5, 0xef, 0xa3, 0x4b, 0xd7, 0x99, 0x65, 0x16,
+	0x78, 0xdb, 0x2d, 0xb6, 0xd8, 0xfb, 0x03, 0xc0, 0x97, 0xc5, 0x09, 0x3f, 0x14, 0x73, 0x33, 0xad,
+	0x31, 0x42, 0xcc, 0x77, 0x26, 0x06, 0x10, 0x32, 0x73, 0x95, 0xa3, 0x5f, 0x16, 0xd5, 0xe7, 0xba,
+	0x2c, 0x6a, 0xcb, 0x5f, 0x16, 0x45, 0x37, 0xd4, 0x2f, 0xec, 0x86, 0xc6, 0xa5, 0xdd, 0xf0, 0x43,
+	0x4d, 0x75, 0x7e, 0x51, 0xdf, 0x12, 0x3d, 0xf1, 0x65, 0xd9, 0x13, 0x35, 0xb9, 0xdb, 0x52, 0x6a,
+	0x6a, 0xae, 0x6d, 0x8f, 0x44, 0xdc, 0xdf, 0xf5, 0x09, 0x7d, 0x46, 0x67, 0x68, 0x72, 0xab, 0x2d,
+	0xca, 0x4d, 0xd7, 0x4a, 0xfd, 0x85, 0xd7, 0xca, 0xb9, 0xee, 0x68, 0xdc, 0xa0, 0x3b, 0x7a, 0xbf,
+	0x03, 0xf8, 0x8a, 0x38, 0x8e, 0x07, 0x78, 0x44, 0x82, 0xaf, 0x71, 0x38, 0x97, 0x9c, 0x26, 0x2e,
+	0xf0, 0x5c, 0xe2, 0xaa, 0xde, 0x5c, 0x5c, 0x35, 0x4d, 0x5c, 0xe5, 0xdb, 0x50, 0xd7, 0xde, 0x86,
+	0xde, 0x59, 0x15, 0xde, 0x3e, 0xbf, 0xff, 0x25, 0x24, 0xf5, 0x86, 0x26, 0xa9, 0x8e, 0x83, 0xfe,
+	0x93, 0xcc, 0x35, 0x24, 0xf3, 0x13, 0x80, 0xed, 0xe2, 0x0d, 0x42, 0x36, 0x84, 0x0a, 0x26, 0x9f,
+	0x19, 0x45, 0xf4, 0xaa, 0x00, 0xd3, 0x32, 0xea, 0x6a, 0x19, 0xe8, 0x5b, 0xd8, 0x54, 0x5e, 0xde,
+	0xc5, 0x77, 0xb4, 0x2e, 0xe6, 0x94, 0xe0, 0xf0, 0xbe, 0x87, 0x13, 0x4e, 0xa8, 0xf3, 0xa1, 0xd8,
+	0xc5, 0x71, 0x66, 0xdd, 0xbd, 0x8a, 0x22, 0xf9, 0x0f, 0x51, 0xe1, 0xc4, 0xe1, 0xaa, 0x35, 0xdd,
+	0x7c, 0x85, 0xde, 0x8f, 0x00, 0xbe, 0x24, 0x36, 0x2a, 0xa8, 0x29, 0x55, 0xb1, 0x05, 0xdb, 0x34,
+	0xb7, 0x73, 0x5d, 0xf7, 0xec, 0x45, 0x5a, 0x2f, 0xa0, 0xd2, 0xa9, 0x1f, 0x66, 0x16, 0x70, 0x4b,
+	0x24, 0xba, 0xb7, 0x40, 0x63, 0xf5, 0x22, 0x1a, 0x05, 0xa4, 0xb2, 0x40, 0xdc, 0x6f, 0x55, 0x88,
+	0xb6, 0x23, 0x8f, 0x7c, 0x27, 0xc4, 0x37, 0xd7, 0x69, 0xfa, 0xd4, 0x8e, 0x5e, 0x9b, 0x93, 0xf2,
+	0x74, 0xbe, 0xf3, 0xf1, 0x71, 0x66, 0x7d, 0x70, 0x15, 0x2b, 0x57, 0x80, 0xb5, 0x12, 0x74, 0xe1,
+	0x56, 0x5f, 0x78, 0xe1, 0x3a, 0xef, 0x1e, 0x9d, 0x98, 0x95, 0x27, 0x27, 0x66, 0xe5, 0xec, 0xc4,
+	0x04, 0xdf, 0x4f, 0x4d, 0xf0, 0xf3, 0xd4, 0x04, 0x87, 0x53, 0x13, 0x1c, 0x4d, 0x4d, 0xf0, 0xd7,
+	0xd4, 0x04, 0x7f, 0x4f, 0xcd, 0xca, 0xd9, 0xd4, 0x04, 0x8f, 0x4f, 0xcd, 0xca, 0xd1, 0xa9, 0x59,
+	0x79, 0x72, 0x6a, 0x56, 0x46, 0x4d, 0x49, 0xc4, 0xbd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x02,
+	0x7e, 0x3a, 0x1c, 0x00, 0x0d, 0x00, 0x00,
 }
 
 func (this *LokiRequest) Equal(that interface{}) bool {
@@ -1083,6 +1092,9 @@ func (this *LokiLabelNamesRequest) Equal(that interface{}) bool {
 	if this.Path != that1.Path {
 		return false
 	}
+	if this.Query != that1.Query {
+		return false
+	}
 	return true
 }
 func (this *LokiLabelNamesResponse) Equal(that interface{}) bool {
@@ -1315,11 +1327,12 @@ func (this *LokiLabelNamesRequest) GoString() string {
 	if this == nil {
 		return "nil"
 	}
-	s := make([]string, 0, 7)
+	s := make([]string, 0, 8)
 	s = append(s, "&queryrange.LokiLabelNamesRequest{")
 	s = append(s, "StartTs: "+fmt.Sprintf("%#v", this.StartTs)+",\n")
 	s = append(s, "EndTs: "+fmt.Sprintf("%#v", this.EndTs)+",\n")
 	s = append(s, "Path: "+fmt.Sprintf("%#v", this.Path)+",\n")
+	s = append(s, "Query: "+fmt.Sprintf("%#v", this.Query)+",\n")
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
@@ -1776,6 +1789,13 @@ func (m *LokiLabelNamesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Query) > 0 {
+		i -= len(m.Query)
+		copy(dAtA[i:], m.Query)
+		i = encodeVarintQueryrange(dAtA, i, uint64(len(m.Query)))
+		i--
+		dAtA[i] = 0x22
+	}
 	if len(m.Path) > 0 {
 		i -= len(m.Path)
 		copy(dAtA[i:], m.Path)
@@ -2202,6 +2222,10 @@ func (m *LokiLabelNamesRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQueryrange(uint64(l))
 	}
+	l = len(m.Query)
+	if l > 0 {
+		n += 1 + l + sovQueryrange(uint64(l))
+	}
 	return n
 }
 
@@ -2386,6 +2410,7 @@ func (this *LokiLabelNamesRequest) String() string {
 		`StartTs:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.StartTs), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
 		`EndTs:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.EndTs), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
 		`Path:` + fmt.Sprintf("%v", this.Path) + `,`,
+		`Query:` + fmt.Sprintf("%v", this.Query) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -3809,6 +3834,38 @@ func (m *LokiLabelNamesRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Path = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQueryrange
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthQueryrange
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQueryrange
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Query = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQueryrange(dAtA[iNdEx:])

pkg/querier/queryrange/queryrange.proto

@@ -105,6 +105,7 @@ message LokiLabelNamesRequest {
     (gogoproto.nullable) = false
   ];
   string path = 3;
+  string query = 4;
 }
 
 message LokiLabelNamesResponse {

pkg/querier/queryrange/roundtrip.go

@@ -214,7 +214,7 @@ func (r roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 			return nil, httpgrpc.Errorf(http.StatusBadRequest, err.Error())
 		}
 
-		level.Info(logger).Log("msg", "executing query", "type", "labels", "label", lr.Name, "length", lr.End.Sub(*lr.Start))
+		level.Info(logger).Log("msg", "executing query", "type", "labels", "label", lr.Name, "length", lr.End.Sub(*lr.Start), "query", lr.Query)
 
 		return r.labels.RoundTrip(req)
 	case InstantQueryOp:

pkg/querier/queryrange/split_by_interval.go

@@ -276,6 +276,7 @@ func splitByTime(req queryrangebase.Request, interval time.Duration) ([]queryran
 				Path:    r.Path,
 				StartTs: start,
 				EndTs:   end,
+				Query:   r.Query,
 			})
 		})
 	case *logproto.IndexStatsRequest:

pkg/querier/queryrange/stats.go

@@ -50,7 +50,7 @@ func recordQueryMetrics(data *queryData) {
 	case queryTypeLog, queryTypeMetric:
 		logql.RecordRangeAndInstantQueryMetrics(data.ctx, logger, data.params, data.status, *data.statistics, data.result)
 	case queryTypeLabel:
-		logql.RecordLabelQueryMetrics(data.ctx, logger, data.params.Start(), data.params.End(), data.label, data.status, *data.statistics)
+		logql.RecordLabelQueryMetrics(data.ctx, logger, data.params.Start(), data.params.End(), data.label, data.params.Query(), data.status, *data.statistics)
 	case queryTypeSeries:
 		logql.RecordSeriesQueryMetrics(data.ctx, logger, data.params.Start(), data.params.End(), data.match, data.status, *data.statistics)
 	default:

pkg/storage/stores/series/series_store_test.go

@@ -139,26 +139,39 @@ func TestChunkStore_LabelValuesForMetricName(t *testing.T) {
 	for _, tc := range []struct {
 		metricName, labelName string
 		expect                []string
+		matchers              []*labels.Matcher
 	}{
 		{
 			`foo`, `bar`,
 			[]string{"baz", "beep", "bop"},
+			nil,
 		},
 		{
 			`bar`, `toms`,
 			[]string{"code"},
+			nil,
 		},
 		{
 			`bar`, `bar`,
 			[]string{"baz"},
+			nil,
 		},
 		{
 			`foo`, `foo`,
 			nil,
+			nil,
 		},
 		{
 			`foo`, `flip`,
 			[]string{"flap", "flop"},
+			nil,
+		},
+		{
+			`foo`, `toms`,
+			[]string{"code"},
+			[]*labels.Matcher{
+				labels.MustNewMatcher(labels.MatchRegexp, "bar", "baz|beep"),
+			},
 		},
 	} {
 		for _, schema := range schemas {
@@ -180,7 +193,7 @@ func TestChunkStore_LabelValuesForMetricName(t *testing.T) {
 					}
 
 					// Query with ordinary time-range
-					labelValues1, err := store.LabelValuesForMetricName(ctx, userID, now.Add(-time.Hour), now, tc.metricName, tc.labelName)
+					labelValues1, err := store.LabelValuesForMetricName(ctx, userID, now.Add(-time.Hour), now, tc.metricName, tc.labelName, tc.matchers...)
 					require.NoError(t, err)
 
 					if !reflect.DeepEqual(tc.expect, labelValues1) {
@@ -188,7 +201,7 @@ func TestChunkStore_LabelValuesForMetricName(t *testing.T) {
 					}
 
 					// Pushing end of time-range into future should yield exact same resultset
-					labelValues2, err := store.LabelValuesForMetricName(ctx, userID, now.Add(-time.Hour), now.Add(time.Hour*24*10), tc.metricName, tc.labelName)
+					labelValues2, err := store.LabelValuesForMetricName(ctx, userID, now.Add(-time.Hour), now.Add(time.Hour*24*10), tc.metricName, tc.labelName, tc.matchers...)
 					require.NoError(t, err)
 
 					if !reflect.DeepEqual(tc.expect, labelValues2) {
@@ -196,7 +209,7 @@ func TestChunkStore_LabelValuesForMetricName(t *testing.T) {
 					}
 
 					// Query with both begin & end of time-range in future should yield empty resultset
-					labelValues3, err := store.LabelValuesForMetricName(ctx, userID, now.Add(time.Hour), now.Add(time.Hour*2), tc.metricName, tc.labelName)
+					labelValues3, err := store.LabelValuesForMetricName(ctx, userID, now.Add(time.Hour), now.Add(time.Hour*2), tc.metricName, tc.labelName, tc.matchers...)
 					require.NoError(t, err)
 					if len(labelValues3) != 0 {
 						t.Fatalf("%s/%s: future query should yield empty resultset ... actually got %v label values: %#v",
@@ -700,6 +713,13 @@ func TestSeriesStore_LabelValuesForMetricName(t *testing.T) {
 				labels.MustNewMatcher(labels.MatchEqual, "toms", "code"),
 			},
 		},
+		{
+			`foo`, `toms`,
+			[]string{"code"},
+			[]*labels.Matcher{
+				labels.MustNewMatcher(labels.MatchRegexp, "env", "dev|prod"),
+			},
+		},
 	} {
 		for _, schema := range schemas {
 			for _, storeCase := range stores {