Query label values and names are now fetched from the store. (#521)

* Query label values and names are now fetched from the store. A time range is now required by the /api/prom/label with a sane default (6 hours from now). * fix http querystring and update doc * update vendor * rebased
grafana · Jul 8, 2019 · 86bc3c0 · 86bc3c0
1 parent d3ab486
commit 86bc3c0
Show file tree

Hide file tree

Showing 10 changed files with 352 additions and 86 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/docs/api.md b/docs/api.md
@@ -39,7 +39,7 @@ The Loki server has the following API endpoints (_Note:_ Authentication is out o
 
   Responses looks like this:
 
-  ```
+  ```json
   {
     "streams": [
       {
@@ -59,11 +59,14 @@ The Loki server has the following API endpoints (_Note:_ Authentication is out o
 
 - `GET /api/prom/label`
 
-  For retrieving the names of the labels one can query on.
+  For doing label name queries, accepts the following parameters in the query-string:
+
+  - `start`: the start time for the query, as a nanosecond Unix epoch (nanoseconds since 1970). Default is always 6 hour ago.
+  - `end`: the end time for the query, as a nanosecond Unix epoch (nanoseconds since 1970). Default is current time.
 
   Responses looks like this:
 
-  ```
+  ```json
   {
     "values": [
       "instance",
@@ -74,11 +77,15 @@ The Loki server has the following API endpoints (_Note:_ Authentication is out o
   ```
 
 - `GET /api/prom/label/<name>/values`
-  For retrieving the label values one can query on.
+
+  For doing label values queries, accepts the following parameters in the query-string:
+
+  - `start`: the start time for the query, as a nanosecond Unix epoch (nanoseconds since 1970). Default is always 6 hour ago.
+  - `end`: the end time for the query, as a nanosecond Unix epoch (nanoseconds since 1970). Default is current time.
 
   Responses looks like this:
 
-  ```
+  ```json
   {
     "values": [
       "default",

diff --git a/pkg/logproto/logproto.pb.go b/pkg/logproto/logproto.pb.go
diff --git a/pkg/logproto/logproto.proto b/pkg/logproto/logproto.proto
@@ -43,6 +43,8 @@ message QueryResponse {
 message LabelRequest {
   string name = 1;
   bool values = 2; // True to fetch label values, false for fetch labels names.
+  google.protobuf.Timestamp start = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true];
+  google.protobuf.Timestamp end = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true];
 }
 
 message LabelResponse {