Commit 16300803 authored by Jérome Perrin's avatar Jérome Perrin

software/grafana: version up loki v2.4.2

This contain the fix for go 1.16 that we backported, so we can use
upstream repository again.

No effort has been made to keep data compatibility, updating instance
probably does not work
parent 8c8da003
......@@ -15,7 +15,7 @@
[instance-profile]
filename = instance.cfg.in
md5sum = 09a24413839d930420f0ac0298ef3297
md5sum = 60aad3c9b3b8c2668e865671d4146183
[influxdb-config-file]
filename = influxdb-config-file.cfg.in
......@@ -39,4 +39,4 @@ md5sum = 5616679a9c5c2757540175ead3f5500a
[loki-config-file]
filename = loki-config-file.cfg.in
md5sum = ad2baf4599a937d7352034a41fa24814
md5sum = d2608afd806701b7dcd89e825afcd49e
......@@ -45,8 +45,6 @@ grafana-dashboards-dir = ${:grafana-dir}/dashboards
telegraf-dir = ${:srv}/telegraf
telegraf-extra-config-dir = ${:telegraf-dir}/extra-config
loki-dir = ${:srv}/loki
loki-storage-boltdb-dir = ${:loki-dir}/index/
loki-storage-filesystem-dir = ${:loki-dir}/chunks/
promtail-dir = ${:srv}/promtail
# macros
......@@ -437,8 +435,7 @@ command-line =
bash -c 'nice -19 chrt --idle 0 ionice -c3 {{ loki_bin }} -config.file=${loki-config-file:rendered}'
wrapper-path = ${directory:service}/loki
storage-boltdb-dir = ${directory:loki-storage-boltdb-dir}
storage-filesystem-dir = ${directory:loki-storage-filesystem-dir}
dir = ${directory:loki-dir}
ip = ${instance-parameter:ipv4-random}
port = 3100
grpc-port = 9095
......
......@@ -6,50 +6,27 @@ server:
grpc_listen_address: {{ loki['ip'] }}
grpc_listen_port: {{ loki['grpc-port'] }}
ingester:
lifecycler:
address: {{ loki['ip'] }}
frontend_worker:
frontend_address: {{ loki['ip'] }}:{{ loki['grpc-port'] }}
common:
path_prefix: {{ loki['dir'] }}
storage:
filesystem:
chunks_directory: {{ loki['dir'] }}/chunks
rules_directory: {{ loki['dir'] }}/rules
replication_factor: 1
ring:
instance_addr: {{ loki['ip'] }}
kvstore:
store: inmemory
replication_factor: 1
chunk_idle_period: 15m
schema_config:
configs:
- from: 2018-04-15
store: boltdb
- from: 2020-10-24
store: boltdb-shipper
object_store: filesystem
schema: v9
schema: v11
index:
prefix: index_
period: 168h
storage_config:
boltdb:
directory: {{ loki['storage-boltdb-dir'] }}
filesystem:
directory: {{ loki['storage-filesystem-dir'] }}
limits_config:
enforce_metric_name: false
reject_old_samples: true
reject_old_samples_max_age: 168h
chunk_store_config:
max_look_back_period: 0
table_manager:
chunk_tables_provisioning:
inactive_read_throughput: 0
inactive_write_throughput: 0
provisioned_read_throughput: 0
provisioned_write_throughput: 0
index_tables_provisioning:
inactive_read_throughput: 0
inactive_write_throughput: 0
provisioned_read_throughput: 0
provisioned_write_throughput: 0
retention_deletes_enabled: false
retention_period: 0
period: 24h
......@@ -39,8 +39,8 @@ revision = v7.5.2-0-gca413c612f
[go_github.com_grafana_loki]
<= go-git-package
go.importpath = github.com/grafana/loki
repository = https://github.com/perrinjerome/loki
revision = v2.2.1-1-gda6d45f2
repository = https://github.com/grafana/loki
revision = v2.4.2-0-g525040a32
[go_github.com_influxdata_influxdb]
<= go-git-package
......@@ -63,7 +63,7 @@ revision = v0.0.1-0-gf8981f3
[gowork]
install =
${go_github.com_grafana_loki:location}:./cmd/loki
${go_github.com_grafana_loki:location}:./cmd/promtail
${go_github.com_grafana_loki:location}:./clients/cmd/promtail
${go_github.com_grafana_loki:location}:./cmd/logcli
${go_github.com_influxdata_telegraf:location}:./cmd/...
${go_github.com_influxdata_influxdb:location}:./cmd/...
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment