Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a DeletionMode config variable #5481

Merged
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
929cbbe
Add deletionEnabled setting and remove delete request manager
MichelHollands Feb 25, 2022
42bfebf
Rebase
MichelHollands Feb 25, 2022
a6ed435
Remove deletion handling from delete requests manager
MichelHollands Feb 25, 2022
3ce76d6
change store so it stores a logql statement
MichelHollands Feb 25, 2022
bb2b3eb
Add validation code for logql statement
MichelHollands Feb 25, 2022
9397b50
Run deleteRequestsManager when deletion is enabled
MichelHollands Feb 25, 2022
6f676aa
Remove unused variables
MichelHollands Feb 25, 2022
e1afcc3
Revert "Remove deletion handling from delete requests manager"
MichelHollands Mar 1, 2022
f6eb37e
Re-add IsDeleted method
MichelHollands Mar 1, 2022
0fbdbe1
Re-add tests for IsDeleted
MichelHollands Mar 1, 2022
5495668
Fix delete request store test
MichelHollands Mar 1, 2022
027adfd
Fix linting issue
MichelHollands Mar 1, 2022
587f6d2
Revert compactor changes
MichelHollands Mar 1, 2022
b10e121
Add deletion mode
MichelHollands Mar 1, 2022
b90811a
Add v1 mode
MichelHollands Mar 1, 2022
6a7ca3a
Rename LogQLRequest to Query
MichelHollands Mar 1, 2022
815c617
Fix linting issues
MichelHollands Mar 1, 2022
a9b8f73
Use DeleteMode in compactor module
MichelHollands Mar 1, 2022
65504d0
Rename logql to query
MichelHollands Mar 1, 2022
e75c36b
Put cancel under delete verb
MichelHollands Mar 2, 2022
1a5069b
Update documentation
MichelHollands Mar 2, 2022
dc4ab08
Update changelog
MichelHollands Mar 2, 2022
b00482c
Revert only the API surface area while keeping everything else
MasslessParticle Mar 11, 2022
38d819f
Use moved code in syntax package
MichelHollands Mar 15, 2022
3ae0aea
Remove duplicte import
MichelHollands Mar 15, 2022
b6b4734
Use renamed field in tests
MichelHollands Mar 15, 2022
beddf81
Remove duplicates and empty lines in changelog
MichelHollands Mar 15, 2022
e3dbe38
Update changelog description
MichelHollands Mar 15, 2022
1ba285a
Update pkg/storage/stores/shipper/compactor/deletion/delete_request.go
MichelHollands Mar 17, 2022
8152916
Update pkg/storage/stores/shipper/compactor/deletion/delete_requests_…
MichelHollands Mar 17, 2022
eb46a59
Update pkg/storage/stores/shipper/compactor/deletion/delete_requests_…
MichelHollands Mar 17, 2022
197e08b
Update pkg/storage/stores/shipper/compactor/deletion/delete_requests_…
MichelHollands Mar 17, 2022
ff27a1b
Update CHANGELOG.md
MichelHollands Mar 17, 2022
d249f18
Update pkg/storage/stores/shipper/compactor/deletion/delete_requests_…
MichelHollands Mar 17, 2022
0b35252
Make DeletionMode struct member non public
MichelHollands Mar 17, 2022
0b49512
Revert change to docs re cancellation
MichelHollands Mar 17, 2022
1db21ca
Use same variable names
MichelHollands Mar 17, 2022
92aa117
Add parameter validation to changelog
MichelHollands Mar 17, 2022
a574d62
Rename v1 to WholeStreamDeletion
MichelHollands Mar 17, 2022
8098e1b
Fix default value of deletion mode config setting
MichelHollands Mar 18, 2022
86a2a53
reimplement new api
MasslessParticle Mar 18, 2022
16e9ab2
Add delete request handler when delete mode is set
MichelHollands Apr 4, 2022
9bec8a1
Remove unused variable
MichelHollands Apr 4, 2022
a10466b
Add comment to change the code when other deletion modes are available
MichelHollands Apr 5, 2022
f9addc8
create expirationChecker if deletionMode is set
MichelHollands Apr 5, 2022
85a32ea
Address review comments
MichelHollands Apr 6, 2022
a12b157
Update pkg/storage/stores/shipper/compactor/compactor.go
MichelHollands Apr 6, 2022
9d6dc0d
Rename AddQuery to SetQuery
MichelHollands Apr 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert change to docs re cancellation
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
  • Loading branch information
MichelHollands committed Apr 6, 2022
commit 0b4951240377ccf32aedfe1918666dae4e134495
2 changes: 2 additions & 0 deletions docs/sources/operations/storage/logs-deletion.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ This endpoint returns both processed and unprocessed requests. It does not list

### Request cancellation of a delete request

Loki allows cancellation of delete requests until the requests are picked up for processing. It is controlled by the `delete_request_cancel_period` YAML configuration or the equivalent command line option when invoking Loki.

Cancel a delete request using this Compactor endpoint:

```
Expand Down