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.

Sign up for GitHub

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

Jump to bottom

jsonnet: move boltdb-shipper configs set as compactor args to yaml config #5393

Merged
merged 4 commits into from
Feb 21, 2022
Merged

jsonnet: move boltdb-shipper configs set as compactor args to yaml config #5393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57aa427
move boltdb-shipper configs set as compactor args to yaml config
sandeepsukhani Feb 15, 2022
49c81dc
Merge remote-tracking branch 'upstream/main' into move-compactor-args…
sandeepsukhani Feb 18, 2022
e40d1a4
update changelog
sandeepsukhani Feb 18, 2022
9dd2937
update upgrade guide
sandeepsukhani Feb 18, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
* [5204](https://github.com/grafana/loki/pull/5204) **trevorwhitney**: Default `max_outstanding_per_tenant` to `2048`
* [5253](https://github.com/grafana/loki/pull/5253) **Juneezee**: refactor: use `T.TempDir` to create temporary test directory
* [5315](https://github.com/grafana/loki/pull/5315) **bboreham**: filters: use faster regexp package
* [5393](https://github.com/grafana/loki/pull/5393) **sandeepsukhani**: jsonnet: move boltdb-shipper configs set as compactor args to yaml config

# 2.4.1 (2021/11/07)

Expand Down
17 changes: 17 additions & 0 deletions docs/sources/upgrading/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,23 @@ This creates a lot of series and we don't think this metric has enough value to

While this isn't a direct replacement, two metrics we find more useful are size and line counters configured via pipeline stages, an example of how to configure these metrics can be found in the [metrics pipeline stage docs](https://grafana.com/docs/loki/latest/clients/promtail/stages/metrics/#counter)

### Jsonnet

#### Compactor config defined as command line args moved to yaml config

Following 2 compactor configs that were defined as command line arguments in jsonnet are now moved to yaml config:

```yaml
# Directory where files can be downloaded for compaction.
# CLI flag: -boltdb.shipper.compactor.working-directory
[working_directory: <string>]

# The shared store used for storing boltdb files.
# Supported types: gcs, s3, azure, swift, filesystem.
# CLI flag: -boltdb.shipper.compactor.shared-store
[shared_store: <string>]
```
## 2.4.0
The following are important changes which should be reviewed and understood prior to upgrading Loki.
Expand Down
6 changes: 4 additions & 2 deletions production/ksonnet/loki/boltdb_shipper.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
cache_location: '/data/boltdb-cache',
},
},
compactor+: {
working_directory: '/data/compactor',
shared_store: $._config.boltdb_shipper_shared_store,
},
} else {},
},

Expand All @@ -42,8 +46,6 @@
else {},

compactor_args:: if $._config.using_boltdb_shipper then $._config.commonArgs {
'boltdb.shipper.compactor.working-directory': '/data/compactor',
'boltdb.shipper.compactor.shared-store': $._config.boltdb_shipper_shared_store,
target: 'compactor',
} else {},

Expand Down