Add query filtering to the tailer (#5969)

* Add some comments

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Use deletes in tail

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Change error message

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

pkg/querier/querier.go

@@ -369,13 +369,19 @@ func (q *SingleTenantQuerier) Tail(ctx context.Context, req *logproto.TailReques
 		return nil, err
 	}
 
+	deletes, err := q.deletesForUser(ctx, req.Start, time.Now())
+	if err != nil {
+		return nil, err
+	}
+
 	histReq := logql.SelectLogParams{
 		QueryRequest: &logproto.QueryRequest{
 			Selector:  req.Query,
 			Start:     req.Start,
 			End:       time.Now(),
 			Limit:     req.Limit,
 			Direction: logproto.BACKWARD,
+			Deletes:   deletes,
 		},
 	}
 

pkg/storage/stores/shipper/compactor/deletion/request_handler.go

@@ -77,7 +77,7 @@ func (dm *DeleteRequestHandler) AddDeleteRequestHandler(w http.ResponseWriter, r
 		}
 
 		if endTime > int64(model.Now()) {
-			http.Error(w, "deletes in future not allowed", http.StatusBadRequest)
+			http.Error(w, "deletes in the future are not allowed", http.StatusBadRequest)
 			return
 		}
 	}