Skip to content

Commit 3224f35

Browse files
Update Helm release loki to v6.46.0
1 parent 0b359ca commit 3224f35

File tree

4 files changed

+127
-13
lines changed

4 files changed

+127
-13
lines changed

charts/charts.k

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ charts: helm.Charts = {
121121
loki: {
122122
chart = "loki"
123123
repoURL = "https://grafana.github.io/helm-charts"
124-
targetRevision = "6.45.2"
124+
targetRevision = "6.46.0"
125125
schemaGenerator = "VALUE-INFERENCE"
126126
crdGenerator = "NONE"
127127
}

charts/loki/chart.k

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ schema Chart(helm.Chart):
1414
values : Values | any, optional
1515
chart : str, required, default is "loki"
1616
repoURL : str, required, default is "https://grafana.github.io/helm-charts"
17-
targetRevision : str, optional, default is "6.45.2"
17+
targetRevision : str, optional, default is "6.46.0"
1818
"""
1919
values?: Values | any
2020
chart: str = "loki"
2121
repoURL: str = "https://grafana.github.io/helm-charts"
22-
targetRevision?: str = "6.45.2"
22+
targetRevision?: str = "6.46.0"
2323

charts/loki/values.schema.json

Lines changed: 70 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@
20912091
"additionalProperties": true,
20922092
"properties": {
20932093
"addresses": {
2094-
"default": "dnssrvnoa+_memcached-client._tcp.{{ include \"loki.resourceName\" (dict \"ctx\" $ \"component\" \"chunks-cache\" \"suffix\" $.Values.chunksCache.suffix ) }}.{{ include \"loki.namespace\" $ }}.svc",
2094+
"default": "dnssrvnoa+_memcached-client._tcp.{{ include \"loki.resourceName\" (dict \"ctx\" $ \"component\" \"chunks-cache\" \"suffix\" $.Values.chunksCache.suffix ) }}.{{ include \"loki.namespace\" $ }}.svc.{{ .Values.global.clusterDomain }}",
20952095
"description": "Comma separated addresses list in DNS Service Discovery format",
20962096
"required": [],
20972097
"title": "addresses",
@@ -2215,7 +2215,7 @@
22152215
"description": "l2 memcache configuration",
22162216
"properties": {
22172217
"addresses": {
2218-
"default": "dnssrvnoa+_memcached-client._tcp.{{ include \"loki.resourceName\" (dict \"ctx\" $ \"component\" \"chunks-cache\" \"suffix\" $.Values.chunksCache.l2.suffix ) }}.{{ include \"loki.namespace\" $ }}.svc",
2218+
"default": "dnssrvnoa+_memcached-client._tcp.{{ include \"loki.resourceName\" (dict \"ctx\" $ \"component\" \"chunks-cache\" \"suffix\" $.Values.chunksCache.l2.suffix ) }}.{{ include \"loki.namespace\" $ }}.svc.{{ .Values.global.clusterDomain }}",
22192219
"description": "Comma separated addresses list in DNS Service Discovery format",
22202220
"required": [],
22212221
"title": "addresses",
@@ -7157,7 +7157,7 @@
71577157
"type": "object"
71587158
},
71597159
"config": {
7160-
"default": "{{- if .Values.enterprise.enabled}}\n{{- tpl .Values.enterprise.config . }}\n{{- else }}\nauth_enabled: {{ .Values.loki.auth_enabled }}\n{{- end }}\n\n{{- with .Values.loki.server }}\nserver:\n {{- toYaml . | nindent 2}}\n{{- end}}\n\n{{- with .Values.loki.pattern_ingester }}\npattern_ingester:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\nmemberlist:\n{{- if .Values.loki.memberlistConfig }}\n {{- toYaml .Values.loki.memberlistConfig | nindent 2 }}\n{{- else }}\n{{- if .Values.loki.extraMemberlistConfig}}\n{{- toYaml .Values.loki.extraMemberlistConfig | nindent 2}}\n{{- end }}\n join_members:\n - {{ include \"loki.memberlist\" . }}\n {{- with .Values.migrate.fromDistributed }}\n {{- if .enabled }}\n - {{ .memberlistService }}\n {{- end }}\n {{- end }}\n{{- end }}\n\n{{- with .Values.loki.ingester }}\ningester:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.ingester_client }}\ningester_client:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.block_builder }}\nblock_builder:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- if .Values.loki.commonConfig}}\ncommon:\n{{- toYaml .Values.loki.commonConfig | nindent 2}}\n storage:\n {{- include \"loki.commonStorageConfig\" . | nindent 4}}\n{{- end}}\n\n{{- with .Values.loki.limits_config }}\nlimits_config:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\nruntime_config:\n file: /etc/loki/runtime-config/runtime-config.yaml\n\n{{- if .Values.chunksCache.enabled }}\n{{- with .Values.chunksCache }}\nchunk_store_config:\n chunk_cache_config:\n default_validity: {{ .defaultValidity }}\n background:\n writeback_goroutines: {{ .writebackParallelism }}\n writeback_buffer: {{ .writebackBuffer }}\n writeback_size_limit: {{ .writebackSizeLimit }}\n memcached:\n batch_size: {{ .batchSize }}\n parallelism: {{ .parallelism }}\n memcached_client:\n addresses: {{ .addresses }}\n consistent_hash: true\n timeout: {{ .timeout }}\n max_idle_conns: 72\n {{- end }}\n {{- with .Values.chunksCache.l2 }}\n {{- if .enabled }}\n l2_chunk_cache_handoff: {{ .l2ChunkCacheHandoff }}\n chunk_cache_config_l2:\n default_validity: {{ .defaultValidity }}\n background:\n writeback_goroutines: {{ .writebackParallelism }}\n writeback_buffer: {{ .writebackBuffer }}\n writeback_size_limit: {{ .writebackSizeLimit }}\n memcached:\n batch_size: {{ .batchSize }}\n parallelism: {{ .parallelism }}\n memcached_client:\n addresses: {{ .addresses }}\n consistent_hash: true\n timeout: {{ .timeout }}\n max_idle_conns: 72\n {{- end }}\n {{- end }}\n{{- end }}\n\n{{- if .Values.loki.schemaConfig }}\nschema_config:\n{{- toYaml .Values.loki.schemaConfig | nindent 2}}\n{{- end }}\n\n{{- if .Values.loki.useTestSchema }}\nschema_config:\n{{- toYaml .Values.loki.testSchemaConfig | nindent 2}}\n{{- end }}\n\n{{- if .Values.ruler.enabled }}\n{{ include \"loki.rulerConfig\" . }}\n{{- end }}\n\n{{- if and .Values.loki.storage.use_thanos_objstore .Values.ruler.enabled}}\nruler_storage:\n {{- include \"loki.rulerThanosStorageConfig\" . | nindent 2 }}\n{{- end }}\n\n{{- if or .Values.tableManager.retention_deletes_enabled .Values.tableManager.retention_period }}\ntable_manager:\n retention_deletes_enabled: {{ .Values.tableManager.retention_deletes_enabled }}\n retention_period: {{ .Values.tableManager.retention_period }}\n{{- end }}\n\nquery_range:\n align_queries_with_step: true\n {{- with .Values.loki.query_range }}\n {{- tpl (. | toYaml) $ | nindent 2 }}\n {{- end }}\n {{- if .Values.resultsCache.enabled }}\n {{- with .Values.resultsCache }}\n cache_results: true\n results_cache:\n cache:\n default_validity: {{ .defaultValidity }}\n background:\n writeback_goroutines: {{ .writebackParallelism }}\n writeback_buffer: {{ .writebackBuffer }}\n writeback_size_limit: {{ .writebackSizeLimit }}\n memcached_client:\n addresses: {{ .addresses }}\n consistent_hash: true\n timeout: {{ .timeout }}\n update_interval: 1m\n {{- end }}\n {{- end }}\n\n{{- with .Values.loki.storage_config }}\nstorage_config:\n {{- if not (hasKey $.Values.loki.storage_config \"use_thanos_objstore\") }}\n use_thanos_objstore: {{ $.Values.loki.storage.use_thanos_objstore }}\n {{- end }}\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.query_scheduler }}\nquery_scheduler:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.compactor }}\ncompactor:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.compactor_grpc_client }}\ncompactor_grpc_client:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.analytics }}\nanalytics:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- if .Values.loki.ui.enabled }}\nui:\n enabled: true\n{{- end }}\n{{- with .Values.loki.querier }}\nquerier:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.index_gateway }}\nindex_gateway:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.frontend }}\nfrontend:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.frontend_worker }}\nfrontend_worker:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.distributor }}\ndistributor:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\ntracing:\n enabled: {{ .Values.loki.tracing.enabled }}\n\n{{- with .Values.loki.bloom_build }}\nbloom_build:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.bloom_gateway }}\nbloom_gateway:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.operational_config }}\noperational_config:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n",
7160+
"default": "{{- if .Values.enterprise.enabled}}\n{{- tpl .Values.enterprise.config . }}\n{{- else }}\nauth_enabled: {{ .Values.loki.auth_enabled }}\n{{- end }}\n\n{{- with .Values.loki.server }}\nserver:\n {{- toYaml . | nindent 2}}\n{{- end}}\n\n{{- with .Values.loki.pattern_ingester }}\npattern_ingester:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\nmemberlist:\n{{- if .Values.loki.memberlistConfig }}\n {{- toYaml .Values.loki.memberlistConfig | nindent 2 }}\n{{- else }}\n{{- if .Values.loki.extraMemberlistConfig}}\n{{- toYaml .Values.loki.extraMemberlistConfig | nindent 2}}\n{{- end }}\n join_members:\n - {{ include \"loki.memberlist\" . }}.{{ include \"loki.namespace\" $ }}.svc.{{ .Values.global.clusterDomain }}\n {{- with .Values.migrate.fromDistributed }}\n {{- if .enabled }}\n - {{ .memberlistService }}\n {{- end }}\n {{- end }}\n{{- end }}\n\n{{- with .Values.loki.ingester }}\ningester:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.ingester_client }}\ningester_client:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.block_builder }}\nblock_builder:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- if .Values.loki.commonConfig}}\ncommon:\n{{- toYaml .Values.loki.commonConfig | nindent 2}}\n storage:\n {{- include \"loki.commonStorageConfig\" . | nindent 4}}\n{{- end}}\n\n{{- with .Values.loki.limits_config }}\nlimits_config:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\nruntime_config:\n file: /etc/loki/runtime-config/runtime-config.yaml\n\n{{- if .Values.chunksCache.enabled }}\n{{- with .Values.chunksCache }}\nchunk_store_config:\n chunk_cache_config:\n default_validity: {{ .defaultValidity }}\n background:\n writeback_goroutines: {{ .writebackParallelism }}\n writeback_buffer: {{ .writebackBuffer }}\n writeback_size_limit: {{ .writebackSizeLimit }}\n memcached:\n batch_size: {{ .batchSize }}\n parallelism: {{ .parallelism }}\n memcached_client:\n addresses: {{ .addresses }}\n consistent_hash: true\n timeout: {{ .timeout }}\n max_idle_conns: 72\n {{- end }}\n {{- with .Values.chunksCache.l2 }}\n {{- if .enabled }}\n l2_chunk_cache_handoff: {{ .l2ChunkCacheHandoff }}\n chunk_cache_config_l2:\n default_validity: {{ .defaultValidity }}\n background:\n writeback_goroutines: {{ .writebackParallelism }}\n writeback_buffer: {{ .writebackBuffer }}\n writeback_size_limit: {{ .writebackSizeLimit }}\n memcached:\n batch_size: {{ .batchSize }}\n parallelism: {{ .parallelism }}\n memcached_client:\n addresses: {{ .addresses }}\n consistent_hash: true\n timeout: {{ .timeout }}\n max_idle_conns: 72\n {{- end }}\n {{- end }}\n{{- end }}\n\n{{- if .Values.loki.schemaConfig }}\nschema_config:\n{{- toYaml .Values.loki.schemaConfig | nindent 2}}\n{{- end }}\n\n{{- if .Values.loki.useTestSchema }}\nschema_config:\n{{- toYaml .Values.loki.testSchemaConfig | nindent 2}}\n{{- end }}\n\n{{- if .Values.ruler.enabled }}\n{{ include \"loki.rulerConfig\" . }}\n{{- end }}\n\n{{- if and .Values.loki.storage.use_thanos_objstore .Values.ruler.enabled}}\nruler_storage:\n {{- include \"loki.rulerThanosStorageConfig\" . | nindent 2 }}\n{{- end }}\n\n{{- if or .Values.tableManager.retention_deletes_enabled .Values.tableManager.retention_period }}\ntable_manager:\n retention_deletes_enabled: {{ .Values.tableManager.retention_deletes_enabled }}\n retention_period: {{ .Values.tableManager.retention_period }}\n{{- end }}\n\nquery_range:\n align_queries_with_step: true\n {{- with .Values.loki.query_range }}\n {{- tpl (. | toYaml) $ | nindent 2 }}\n {{- end }}\n {{- if .Values.resultsCache.enabled }}\n {{- with .Values.resultsCache }}\n cache_results: true\n results_cache:\n cache:\n default_validity: {{ .defaultValidity }}\n background:\n writeback_goroutines: {{ .writebackParallelism }}\n writeback_buffer: {{ .writebackBuffer }}\n writeback_size_limit: {{ .writebackSizeLimit }}\n memcached_client:\n addresses: {{ .addresses }}\n consistent_hash: true\n timeout: {{ .timeout }}\n update_interval: 1m\n {{- end }}\n {{- end }}\n\n{{- with .Values.loki.storage_config }}\nstorage_config:\n {{- if not (hasKey $.Values.loki.storage_config \"use_thanos_objstore\") }}\n use_thanos_objstore: {{ $.Values.loki.storage.use_thanos_objstore }}\n {{- end }}\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.query_scheduler }}\nquery_scheduler:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.compactor }}\ncompactor:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.compactor_grpc_client }}\ncompactor_grpc_client:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.analytics }}\nanalytics:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- if .Values.loki.ui.enabled }}\nui:\n enabled: true\n{{- end }}\n{{- with .Values.loki.querier }}\nquerier:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.index_gateway }}\nindex_gateway:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.frontend }}\nfrontend:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.frontend_worker }}\nfrontend_worker:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.distributor }}\ndistributor:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\ntracing:\n enabled: {{ .Values.loki.tracing.enabled }}\n\n{{- with .Values.loki.bloom_build }}\nbloom_build:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.bloom_gateway }}\nbloom_gateway:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n\n{{- with .Values.loki.operational_config }}\noperational_config:\n {{- tpl (. | toYaml) $ | nindent 4 }}\n{{- end }}\n",
71617161
"description": "Config file contents for Loki",
71627162
"required": [],
71637163
"title": "config",
@@ -8660,6 +8660,47 @@
86608660
"title": "push",
86618661
"type": "boolean"
86628662
},
8663+
"readinessProbe": {
8664+
"additionalProperties": true,
8665+
"description": "Readiness probe",
8666+
"properties": {
8667+
"httpGet": {
8668+
"additionalProperties": true,
8669+
"properties": {
8670+
"path": {
8671+
"default": "/metrics",
8672+
"required": [],
8673+
"title": "path",
8674+
"type": "string"
8675+
},
8676+
"port": {
8677+
"default": "http-metrics",
8678+
"required": [],
8679+
"title": "port",
8680+
"type": "string"
8681+
}
8682+
},
8683+
"required": [],
8684+
"title": "httpGet",
8685+
"type": "object"
8686+
},
8687+
"initialDelaySeconds": {
8688+
"default": 15,
8689+
"required": [],
8690+
"title": "initialDelaySeconds",
8691+
"type": "integer"
8692+
},
8693+
"timeoutSeconds": {
8694+
"default": 1,
8695+
"required": [],
8696+
"title": "timeoutSeconds",
8697+
"type": "integer"
8698+
}
8699+
},
8700+
"required": [],
8701+
"title": "readinessProbe",
8702+
"type": "object"
8703+
},
86638704
"replicas": {
86648705
"default": 1,
86658706
"description": "Replicas for `loki-canary` when using a Deployment",
@@ -12464,6 +12505,21 @@
1246412505
"title": "initContainers",
1246512506
"type": "array"
1246612507
},
12508+
"loadBalancer": {
12509+
"additionalProperties": true,
12510+
"description": "Enable load balancer port for query-frontend",
12511+
"properties": {
12512+
"enabled": {
12513+
"default": true,
12514+
"required": [],
12515+
"title": "enabled",
12516+
"type": "boolean"
12517+
}
12518+
},
12519+
"required": [],
12520+
"title": "loadBalancer",
12521+
"type": "object"
12522+
},
1246712523
"maxUnavailable": {
1246812524
"default": "null",
1246912525
"description": "Pod Disruption Budget maxUnavailable",
@@ -13413,7 +13469,7 @@
1341313469
"additionalProperties": true,
1341413470
"properties": {
1341513471
"addresses": {
13416-
"default": "dnssrvnoa+_memcached-client._tcp.{{ include \"loki.resourceName\" (dict \"ctx\" $ \"component\" \"results-cache\") }}.{{ include \"loki.namespace\" $ }}.svc",
13472+
"default": "dnssrvnoa+_memcached-client._tcp.{{ include \"loki.resourceName\" (dict \"ctx\" $ \"component\" \"results-cache\") }}.{{ include \"loki.namespace\" $ }}.svc.{{ .Values.global.clusterDomain }}",
1341713473
"description": "Comma separated addresses list in DNS Service Discovery format",
1341813474
"required": [],
1341913475
"title": "addresses",
@@ -15168,6 +15224,15 @@
1516815224
"required": [],
1516915225
"title": "tolerations",
1517015226
"type": "array"
15227+
},
15228+
"topologySpreadConstraints": {
15229+
"description": "Topology Spread Constraints for single binary pods\nThe value will be passed through tpl.",
15230+
"items": {
15231+
"required": []
15232+
},
15233+
"required": [],
15234+
"title": "topologySpreadConstraints",
15235+
"type": "array"
1517115236
}
1517215237
},
1517315238
"required": [],
@@ -15493,7 +15558,7 @@
1549315558
"type": "object"
1549415559
},
1549515560
"canaryServiceAddress": {
15496-
"default": "http://loki-canary:3500/metrics",
15561+
"default": "http://{{ include \"loki-canary.fullname\" $ }}.{{ include \"loki.namespace\" $ }}.svc.{{ .Values.global.clusterDomain }}:3500/metrics",
1549715562
"description": "Used to directly query the metrics endpoint of the canary for testing, this approach avoids needing prometheus for testing.\nThis in a newer approach to using prometheusAddress such that tests do not have a dependency on prometheus",
1549815563
"required": [],
1549915564
"title": "canaryServiceAddress",

0 commit comments

Comments
 (0)