fix jsonnet for memcached-writes when using boltdb-shipper (#2677)

grafana · Sep 25, 2020 · 0254070 · 0254070
1 parent 0c9f7a5
commit 0254070
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/production/ksonnet/loki/boltdb_shipper.libsonnet b/production/ksonnet/loki/boltdb_shipper.libsonnet
@@ -40,7 +40,7 @@
   } else {},
 
   // we don't dedupe index writes when using boltdb-shipper so don't deploy a cache for it.
-  memcached_index_writes:: if $._config.using_boltdb_shipper then {} else self.memcached_index_writes,
+  memcached_index_writes: if $._config.using_boltdb_shipper then {} else super.memcached_index_writes,
 
   // Use PVC for compactor instead of node disk.
   compactor_data_pvc:: if $._config.using_boltdb_shipper then

diff --git a/production/ksonnet/loki/loki.libsonnet b/production/ksonnet/loki/loki.libsonnet
@@ -14,8 +14,8 @@
 (import 'query-frontend.libsonnet') +
 (import 'ruler.libsonnet') +
 
-// BoltDB Shipper support
-(import 'boltdb_shipper.libsonnet') +
-
 // Supporting services
-(import 'memcached.libsonnet')
+(import 'memcached.libsonnet') +
+
+// BoltDB Shipper support. This should be the last one to get imported.
+(import 'boltdb_shipper.libsonnet')