From 57aa4277e92f8677bf623ea35c0b0eb9c8b9ddd8 Mon Sep 17 00:00:00 2001
From: Sandeep Sukhani <sandeep.d.sukhani@gmail.com>
Date: Tue, 15 Feb 2022 15:49:17 +0530
Subject: [PATCH 1/3] move boltdb-shipper configs set as compactor args to yaml
 config

---
 production/ksonnet/loki/boltdb_shipper.libsonnet | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/production/ksonnet/loki/boltdb_shipper.libsonnet b/production/ksonnet/loki/boltdb_shipper.libsonnet
index b34f566589144..43946c185c47b 100644
--- a/production/ksonnet/loki/boltdb_shipper.libsonnet
+++ b/production/ksonnet/loki/boltdb_shipper.libsonnet
@@ -27,6 +27,10 @@
           cache_location: '/data/boltdb-cache',
         },
       },
+      compactor+: {
+        working_directory: '/data/compactor',
+        shared_store: $._config.boltdb_shipper_shared_store,
+      },
     } else {},
   },
 
@@ -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 {},
 

From e40d1a4c8702fe2a3547e36f234a08fc3075b91a Mon Sep 17 00:00:00 2001
From: Sandeep Sukhani <sandeep.d.sukhani@gmail.com>
Date: Fri, 18 Feb 2022 14:42:20 +0530
Subject: [PATCH 2/3] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f030b932d1daa..f29872f9b3ff6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
 

From 9dd293731521d8e16f4e7ae262aa630c4ba42b87 Mon Sep 17 00:00:00 2001
From: Sandeep Sukhani <sandeep.d.sukhani@gmail.com>
Date: Fri, 18 Feb 2022 16:30:13 +0530
Subject: [PATCH 3/3] update upgrade guide

---
 docs/sources/upgrading/_index.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/sources/upgrading/_index.md b/docs/sources/upgrading/_index.md
index 9d2faed1072ad..e8e2a8667c9ee 100644
--- a/docs/sources/upgrading/_index.md
+++ b/docs/sources/upgrading/_index.md
@@ -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.