Skip to content

Commit

Permalink
Update helm and jsonnet to new release (grafana#2809)
Browse files Browse the repository at this point in the history
* helm and ksonnet to use boltdb-shipper

* updating image versions and chart versions

* update the chart deps

* updating reference to new version

* fix helm config for boltdb-shipper
  • Loading branch information
slim-bean authored Oct 26, 2020
1 parent f605f7b commit 5beb1ab
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 19 deletions.
4 changes: 2 additions & 2 deletions production/helm/fluent-bit/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "v1"
name: fluent-bit
version: 0.3.2
appVersion: v1.6.0
version: 2.0.0
appVersion: v2.0.0
kubeVersion: "^1.10.0-0"
description: "Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki"
home: https://grafana.com/loki
Expand Down
4 changes: 2 additions & 2 deletions production/helm/loki-stack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "v1"
name: loki-stack
version: 0.41.2
appVersion: v1.6.0
version: 2.0.0
appVersion: v2.0.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
home: https://grafana.com/loki
Expand Down
6 changes: 3 additions & 3 deletions production/helm/loki-stack/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ dependencies:
- name: "loki"
condition: loki.enabled
repository: "file://../loki"
version: "^0.31.1"
version: "^2.0.0"
- name: "promtail"
condition: promtail.enabled
repository: "file://../promtail"
version: "^0.25.1"
version: "^2.0.0"
- name: "fluent-bit"
condition: fluent-bit.enabled
repository: "file://../fluent-bit"
version: "^0.3.1"
version: "^2.0.0"
- name: "grafana"
condition: grafana.enabled
version: "~5.7.0"
Expand Down
4 changes: 2 additions & 2 deletions production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "v1"
name: loki
version: 0.31.1
appVersion: v1.6.0
version: 2.0.0
appVersion: v2.0.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
home: https://grafana.com/loki
Expand Down
20 changes: 13 additions & 7 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: grafana/loki
tag: 1.6.0
tag: 2.0.0
pullPolicy: IfNotPresent

## Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -71,25 +71,31 @@ config:
reject_old_samples_max_age: 168h
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
period: 24h
server:
http_listen_port: 3100
storage_config:
boltdb:
directory: /data/loki/index
boltdb_shipper:
active_index_directory: /data/loki/boltdb-shipper-active
cache_location: /data/loki/boltdb-shipper-cache
cache_ttl: 24h # Can be increased for faster performance over longer query periods, uses more disk space
shared_store: filesystem
filesystem:
directory: /data/loki/chunks
chunk_store_config:
max_look_back_period: 0s
table_manager:
retention_deletes_enabled: false
retention_period: 0s
compactor:
working_directory: /data/loki/boltdb-shipper-compactor
shared_store: filesystem

## Additional Loki container arguments, e.g. log level (debug, info, warn, error)
extraArgs: {}
Expand Down
4 changes: 2 additions & 2 deletions production/helm/promtail/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "v1"
name: promtail
version: 0.25.1
appVersion: v1.6.0
version: 2.0.0
appVersion: v2.0.0
kubeVersion: "^1.10.0-0"
description: "Responsible for gathering logs and sending them to Loki"
home: https://grafana.com/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/promtail/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ initContainer:

image:
repository: grafana/promtail
tag: 1.6.0
tag: 2.0.0
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
Expand Down

0 comments on commit 5beb1ab

Please sign in to comment.