Skip to content

Commit 5c2b76d

Browse files
fix: loki storage config without OBJ (#1680)
Co-authored-by: ElderMatt <[email protected]>
1 parent 9401913 commit 5c2b76d

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

tests/fixtures/env/secrets.settings.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ smtp:
2626
auth_password: somesecretvalue
2727
obj:
2828
provider:
29-
# s3:
30-
# secretAccessKey: somesecretvalue
3129
linode:
3230
secretAccessKey: somesecretvalue
33-
# azureBlob:
34-
# aadClientSecret: somesecretvalue
3531
platformBackups:
3632
persistentVolumes:
3733
linodeApiToken: justanapitokenhere

values/loki/loki.gotmpl

+14-3
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,26 @@ loki:
2929
configs:
3030
- from: 2020-09-07
3131
store: boltdb-shipper
32+
{{- if $useObjectStorage }}
3233
object_store: s3
34+
{{- else }}
35+
object_store: filesystem
36+
{{- end }}
3337
schema: v11
3438
index:
3539
prefix: loki_index_
3640
period: 24h
37-
{{- if $useObjectStorage }}
3841
storageConfig:
3942
boltdb_shipper:
4043
active_index_directory: /var/loki/index
4144
cache_location: /var/loki/index_cache
4245
resync_interval: 5s
46+
{{- if $useObjectStorage }}
4347
shared_store: s3
48+
{{- else }}
49+
shared_store: filesystem
50+
{{- end }}
51+
{{- if $useObjectStorage }}
4452
aws:
4553
{{- if eq $obj.type "minioLocal" }}
4654
s3: http://otomi-admin:{{ $v.otomi.adminPassword }}@minio.minio.svc.cluster.local.:9000/{{ $bu.loki }}
@@ -56,8 +64,11 @@ loki:
5664
backoff_config:
5765
min_period: 2s
5866
max_period: 5s
59-
{{- end }}
60-
{{- end }}
67+
{{- end }}
68+
{{- else }}
69+
filesystem:
70+
directory: "/var/loki/chunks"
71+
{{- end }}
6172

6273
structuredConfig:
6374
auth_enabled: true

0 commit comments

Comments
 (0)