Skip to content

Commit cca89c3

Browse files
authored
Upload Opensource 1.0.2 alpha (#13)
## What type of PR is this? * [x] Feature * [ ] BUG * [ ] Alerts * [ ] Improvement * [ ] Documentation * [ ] Test and CI ## Which issue(s) this PR related: issue #matrixorigin/MO-Cloud#3134 ## What this PR does / why we need it: changes: 1. 去掉values.yaml 不兼容 loki 3.0.0 的配置项, `limits_config:enforce_metric_name` 2. reset `limits_config: max_label_names_per_series = 30` 3. 去掉 storage_config 不兼容的配置: tsdb_shiper 和 boltdb_shipper 4. 补充 svc/loki-gateway 创建 link - loki 3.0 default 更新 https://grafana.com/docs/loki/latest/setup/upgrade/#changes-to-default-configuration-values-in-30 - schema v13, https://grafana.com/docs/loki/latest/operations/storage/schema/ error info ``` failed parsing config: /etc/loki/config/config.yaml: yaml: unmarshal errors: line 27: field enforce_metric_name not found in type validation.plain line 84: field shared_store not found in type boltdb.IndexCfg line 101: field shared_store not found in type indexshipper.Config. Use `-config.expand-env=true` flag if you want to expand environment variables in your config file ```
1 parent 40d83c4 commit cca89c3

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

charts/mo-ob-opensource/Chart.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: mo-ob-opensource
33
description: mo-ob-opensource's Helm chart for Kubernetes
44
type: application
5-
version: 1.0.2
5+
version: 1.0.2-alpha
66
appVersion: 0.9.0
77
dependencies:
88
- condition: kube-prometheus-stack.enabled
@@ -17,4 +17,3 @@ dependencies:
1717
name: promtail
1818
repository: https://grafana.github.io/helm-charts
1919
version: 6.15.1
20-

charts/mo-ob-opensource/values.yaml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,12 @@ loki:
106106
http_server_write_timeout: 300s
107107
# -- Limits config
108108
limits_config:
109-
enforce_metric_name: false
109+
#enforce_metric_name: false ### removed in loki 3.0.0
110110
reject_old_samples: true
111111
reject_old_samples_max_age: 168h
112112
max_cache_freshness_per_query: 10m
113113
split_queries_by_interval: 15m
114+
max_label_names_per_series: 30
114115
query_scheduler:
115116
max_outstanding_requests_per_tenant: 10000
116117
frontend:
@@ -135,6 +136,13 @@ loki:
135136
# -- Check https://grafana.com/docs/loki/latest/configuration/#schema_config for more info on how to configure schemas
136137
schemaConfig:
137138
configs:
139+
- from: 2024-04-01
140+
object_store: s3
141+
store: tsdb
142+
schema: v13
143+
index:
144+
prefix: index_
145+
period: 24h
138146
# -- Check https://grafana.com/docs/loki/latest/configuration/#ruler for more info on configuring ruler
139147
rulerConfig:
140148
evaluation_interval: 1m
@@ -145,21 +153,22 @@ loki:
145153
directory: /rules
146154
alertmanager_url: http://mo-ob-alertmanager.mo-ob:9093
147155
# -- Additional query scheduler config
148-
storage_config:
149-
boltdb_shipper:
150-
active_index_directory: /var/loki/data/loki/boltdb-shipper-active
151-
cache_location: /var/loki/data/loki/boltdb-shipper-cache
152-
cache_ttl: 24h # Can be increased for faster performance over longer query periods, uses more disk space
153-
shared_store: s3
154-
tsdb_shipper:
155-
active_index_directory: /var/loki/data/loki/tsdb-index
156-
cache_location: /var/loki/data/loki/tsdb-cache
157-
shared_store: s3
158-
# alibabacloud:
159-
# bucket: <bucket>
160-
# endpoint: <endpoint>
161-
# access_key_id: <access_key_id>
162-
# secret_access_key: <secret_access_key>
156+
### use default config, old config not work in loki 3.0.0
157+
#storage_config:
158+
# boltdb_shipper:
159+
# active_index_directory: /var/loki/data/loki/boltdb-shipper-active
160+
# cache_location: /var/loki/data/loki/boltdb-shipper-cache
161+
# cache_ttl: 24h # Can be increased for faster performance over longer query periods, uses more disk space
162+
# shared_store: s3
163+
# tsdb_shipper:
164+
# active_index_directory: /var/loki/data/loki/tsdb-index
165+
# cache_location: /var/loki/data/loki/tsdb-cache
166+
# shared_store: s3
167+
# # alibabacloud:
168+
# # bucket: <bucket>
169+
# # endpoint: <endpoint>
170+
# # access_key_id: <access_key_id>
171+
# # secret_access_key: <secret_access_key>
163172
sidecar:
164173
rules:
165174
label: loki_rule

0 commit comments

Comments
 (0)