Commit d52663f
operations/mimir: Upstream Jsonnet changes from r334 (#11602)
* dskit: Don't depend on Memcached on startup
* operations/mimir: Set max buffered bytes in the Kafka client used by the ruler
---------
Signed-off-by: Arve Knudsen <[email protected]>
Co-authored-by: Taylor C <[email protected]>1 parent 3bbf3fe commit d52663f
File tree
18 files changed
+32
-17
lines changed- cmd/mimir
- docs/sources/mimir/configure/configuration-parameters
- operations
- mimir-tests
- mimir
- vendor
- github.com/grafana/dskit/cache
18 files changed
+32
-17
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
97 | 98 | | |
98 | 99 | | |
99 | 100 | | |
| 101 | + | |
100 | 102 | | |
101 | 103 | | |
102 | 104 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7044 | 7044 | | |
7045 | 7045 | | |
7046 | 7046 | | |
7047 | | - | |
| 7047 | + | |
7048 | 7048 | | |
7049 | 7049 | | |
7050 | 7050 | | |
| |||
9249 | 9249 | | |
9250 | 9250 | | |
9251 | 9251 | | |
9252 | | - | |
| 9252 | + | |
9253 | 9253 | | |
9254 | 9254 | | |
9255 | 9255 | | |
| |||
9812 | 9812 | | |
9813 | 9813 | | |
9814 | 9814 | | |
9815 | | - | |
| 9815 | + | |
9816 | 9816 | | |
9817 | 9817 | | |
9818 | 9818 | | |
| |||
10399 | 10399 | | |
10400 | 10400 | | |
10401 | 10401 | | |
10402 | | - | |
| 10402 | + | |
10403 | 10403 | | |
10404 | 10404 | | |
10405 | 10405 | | |
| |||
15721 | 15721 | | |
15722 | 15722 | | |
15723 | 15723 | | |
15724 | | - | |
| 15724 | + | |
15725 | 15725 | | |
15726 | 15726 | | |
15727 | 15727 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
448 | 448 | | |
449 | 449 | | |
450 | 450 | | |
451 | | - | |
| 451 | + | |
452 | 452 | | |
453 | 453 | | |
454 | 454 | | |
| |||
552 | 552 | | |
553 | 553 | | |
554 | 554 | | |
555 | | - | |
| 555 | + | |
556 | 556 | | |
557 | 557 | | |
558 | 558 | | |
| |||
674 | 674 | | |
675 | 675 | | |
676 | 676 | | |
677 | | - | |
| 677 | + | |
678 | 678 | | |
679 | 679 | | |
680 | 680 | | |
| |||
2452 | 2452 | | |
2453 | 2453 | | |
2454 | 2454 | | |
2455 | | - | |
| 2455 | + | |
2456 | 2456 | | |
2457 | 2457 | | |
2458 | 2458 | | |
| |||
2722 | 2722 | | |
2723 | 2723 | | |
2724 | 2724 | | |
2725 | | - | |
| 2725 | + | |
2726 | 2726 | | |
2727 | 2727 | | |
2728 | 2728 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5345 | 5345 | | |
5346 | 5346 | | |
5347 | 5347 | | |
5348 | | - | |
| 5348 | + | |
5349 | 5349 | | |
5350 | 5350 | | |
5351 | 5351 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
559 | 559 | | |
560 | 560 | | |
561 | 561 | | |
562 | | - | |
563 | | - | |
| 562 | + | |
| 563 | + | |
564 | 564 | | |
565 | 565 | | |
566 | 566 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1289 | 1289 | | |
1290 | 1290 | | |
1291 | 1291 | | |
| 1292 | + | |
1292 | 1293 | | |
1293 | 1294 | | |
1294 | 1295 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1289 | 1289 | | |
1290 | 1290 | | |
1291 | 1291 | | |
| 1292 | + | |
1292 | 1293 | | |
1293 | 1294 | | |
1294 | 1295 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1289 | 1289 | | |
1290 | 1290 | | |
1291 | 1291 | | |
| 1292 | + | |
1292 | 1293 | | |
1293 | 1294 | | |
1294 | 1295 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1266 | 1266 | | |
1267 | 1267 | | |
1268 | 1268 | | |
| 1269 | + | |
1269 | 1270 | | |
1270 | 1271 | | |
1271 | 1272 | | |
| |||
0 commit comments