Skip to content

Commit c482eeb

Browse files
default compactor deletion mode to filter only (#7877)
**What this PR does / why we need it**: We need to default deletion mode to `filter-only` for 2.7.1 because of the bug.
1 parent ba17f6a commit c482eeb

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pkg/validation/limits.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) {
230230
_ = l.QuerySplitDuration.Set("30m")
231231
f.Var(&l.QuerySplitDuration, "querier.split-queries-by-interval", "Split queries by an interval and execute in parallel, 0 disables it. This also determines how cache keys are chosen when result caching is enabled")
232232

233-
f.StringVar(&l.DeletionMode, "compactor.deletion-mode", "filter-and-delete", "Set the deletion mode for the user. Options are: disabled, filter-only, and filter-and-delete")
233+
f.StringVar(&l.DeletionMode, "compactor.deletion-mode", "filter-only", "Set the deletion mode for the user. Options are: disabled, filter-only, and filter-and-delete")
234234

235235
// Deprecated
236236
dskit_flagext.DeprecatedFlag(f, "compactor.allow-deletes", "Deprecated. Instead, see compactor.deletion-mode which is another per tenant configuration", util_log.Logger)

production/loki-mixin/jsonnetfile.lock.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": "grafonnet"
99
}
1010
},
11-
"version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
12-
"sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
11+
"version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
12+
"sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
1313
},
1414
{
1515
"source": {
@@ -18,8 +18,8 @@
1818
"subdir": "grafana-builder"
1919
}
2020
},
21-
"version": "3f71e00a64810075b5d5f969cc6d0e419cbdebc4",
22-
"sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
21+
"version": "e6a0083d9cc0f0ec79507397ce0e156d558f6efb",
22+
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
2323
},
2424
{
2525
"source": {
@@ -28,8 +28,8 @@
2828
"subdir": "mixin-utils"
2929
}
3030
},
31-
"version": "3f71e00a64810075b5d5f969cc6d0e419cbdebc4",
32-
"sum": "v6fuqqQp9rHZbsxN9o79QzOpUlwYZEJ84DxTCZMCYeU="
31+
"version": "e6a0083d9cc0f0ec79507397ce0e156d558f6efb",
32+
"sum": "N1Uz6AJpnQXv4w8F6lxDqMwoT7azPVrpuhJ4N7Oqzcw="
3333
},
3434
{
3535
"source": {
@@ -38,8 +38,8 @@
3838
"subdir": "operations/mimir-mixin"
3939
}
4040
},
41-
"version": "91986521f324c84a9cf869529bd901f077ddf8bc",
42-
"sum": "eBp1Oo3j0YiI5hv9YrZb0lJQxEOC17rP3pZiKM/R3Zo="
41+
"version": "c44a07dd4c4e38a19ba01d676555c3c84d30b461",
42+
"sum": "E+LFcQFJ+hrJKNntpx27RzS0kOa5pn4V7ODeMwhnEy0="
4343
},
4444
{
4545
"source": {
@@ -48,8 +48,8 @@
4848
"subdir": "jsonnet/kube-prometheus/lib"
4949
}
5050
},
51-
"version": "b1c474d8a1d7cd73df9bf4efe1680f1e6d9f5c17",
52-
"sum": "2KXEfdW5YJem19w1VjQNvaTIOhdl8KFi4dvmUdWJtro="
51+
"version": "f4618411fddf8b0647ae9666050a12753f33dce0",
52+
"sum": "QKRgrgEZ3k9nLmLCrDBaeIGVqQZf+AvZTcnhdLk3TrA="
5353
}
5454
],
5555
"legacyImports": false

0 commit comments

Comments
 (0)