Skip to content

Commit f47e5e5

Browse files
EZ4BRUCEEZ4BRUCE
authored
chore(): update private ob to 1.0.1 (#24)
1. 升级 mo-ob-opensource chart 至1.0.7 （最新） 2. 修改默认配置，添加 mo.yaml 便于用户使用 & 简单修改
1 parent 4cd090b commit f47e5e5

File tree

8 files changed

+441
-111
lines changed

8 files changed

+441
-111
lines changed

‎Tiltfile

Lines changed: 70 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,74 @@
1+
2+
command = os.getenv('TILT_COMMAND', 'default')
13
load('ext://helm_remote', 'helm_remote')
2-
helm_remote(
3-
'operator',
4-
repo_url='https://operator.min.io',
5-
release_name='minio-operator',
6-
namespace='minio-operator',
7-
version='6.0.2',
8-
create_namespace=True,
9-
)
10-
11-
helm_remote(
12-
'tenant',
13-
repo_url='https://operator.min.io',
14-
release_name='loki-tenant',
15-
namespace='loki-tenant',
16-
version='6.0.2',
17-
values=['./dev/loki-tenant.yaml'],
18-
create_namespace=True,
19-
)
20-
21-
# 设置 Helm Chart 的本地路径
22-
mo_ob_opensource_chart = './charts/mo-ob-opensource'
23-
mo_ruler_stack_chart = './charts/mo-ruler-stack'
24-
25-
local('kubectl get ns mo-ob || kubectl create ns mo-ob')
26-
27-
k8s_yaml(
28-
helm(
29-
mo_ruler_stack_chart,
30-
name='mo-ruler-stack',
31-
namespace='mo-ob',
32-
values=['./dev/mo-ruler-stack.dev.yaml'],
4+
5+
def deploy_minio():
6+
helm_remote(
7+
'operator',
8+
repo_url='https://operator.min.io',
9+
release_name='minio-operator',
10+
namespace='minio-operator',
11+
version='6.0.2',
12+
create_namespace=True,
13+
)
14+
15+
helm_remote(
16+
'tenant',
17+
repo_url='https://operator.min.io',
18+
release_name='loki-tenant',
19+
namespace='loki-tenant',
20+
version='6.0.2',
21+
values=['./dev/loki-tenant.yaml'],
22+
create_namespace=True,
3323
)
34-
)
35-
36-
k8s_yaml(
37-
helm(
38-
mo_ob_opensource_chart,
39-
name='mo-ob-opensource',
40-
namespace='mo-ob',
41-
values=['./dev/mo-ob-opensource.dev.yaml'],
24+
25+
def deploy_moc_ob():
26+
# 设置 Helm Chart 的本地路径
27+
mo_ob_opensource_chart = './charts/mo-ob-opensource'
28+
mo_ruler_stack_chart = './charts/mo-ruler-stack'
29+
30+
local('kubectl get ns mo-ob || kubectl create ns mo-ob')
31+
32+
k8s_yaml(
33+
helm(
34+
mo_ruler_stack_chart,
35+
name='mo-ruler-stack',
36+
namespace='mo-ob',
37+
values=['./dev/mo-ruler-stack.dev.yaml'],
38+
)
39+
)
40+
41+
k8s_yaml(
42+
helm(
43+
mo_ob_opensource_chart,
44+
name='mo-ob-opensource',
45+
namespace='mo-ob',
46+
values=['./dev/mo-ob-opensource.dev.yaml'],
47+
)
48+
)
49+
50+
k8s_yaml("./dev/loki_test_rule.yaml")
51+
52+
def deploy_ob_private():
53+
local('kubectl get ns mo-ob || kubectl create ns mo-ob')
54+
mo_ob_private_chart = './charts/mo-ob-private'
55+
56+
k8s_yaml(
57+
helm(
58+
mo_ob_private_chart,
59+
name='mo-ob-private',
60+
namespace='mo-ob',
61+
values=['./dev/mo-ob-private.dev.yaml'],
62+
)
4263
)
43-
)
4464

45-
k8s_yaml("./dev/loki_test_rule.yaml")
65+
if command == 'moc':
66+
deploy_minio()
67+
deploy_moc_ob()
68+
elif command == 'private':
69+
deploy_minio()
70+
deploy_ob_private()
71+
elif command == 'minio':
72+
deploy_minio()
73+
else:
74+
print('Unknown command, please use TILT_COMMAND=moc or TILT_COMMAND=private')

‎charts/mo-ob-opensource/values.yaml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,20 +168,14 @@ loki:
168168
# -- Storage config. Providing this will automatically populate all necessary storage configs in the templated config.
169169
storage:
170170
bucketNames:
171-
# use same bucket
172171
chunks: test-bucket
173-
ruler: test-bucket
174172
type: s3
175173
s3:
176-
# s3: null
177-
# e.g. s3.us-west-2.amazonaws.com
178-
endpoint: null
179-
# e.g. us-west-2
180-
region: null
181-
secretAccessKey: null
182-
accessKeyId: null
183-
s3ForcePathStyle: false
184-
insecure: false
174+
endpoint: minio.loki-tenant
175+
accessKeyId: obtest-access
176+
secretAccessKey: obtest-secret
177+
s3ForcePathStyle: true
178+
insecure: true
185179
# -- Check https://grafana.com/docs/loki/latest/configuration/#schema_config for more info on how to configure schemas
186180
schemaConfig:
187181
configs:

‎charts/mo-ob-private/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apiVersion: v2
22
name: mo-ob-private
33
description: mo-ob-private's Helm chart for Kubernetes
44
type: application
5-
version: 1.0.0-alpha.3
5+
version: 1.0.1
66
appVersion: 0.9.0
77
dependencies:
88
- condition: mo-ob-opensource.enabled
99
name: mo-ob-opensource
10-
repository: https://matrixone-cloud.github.io/observability-charts
11-
version: 1.0.0-alpha.16
10+
repository: https://matrixorigin.github.io/observability-charts
11+
version: 1.0.7
1212
- condition: mo-ruler-stack.enabled
1313
name: mo-ruler-stack
14-
repository: https://matrixone-cloud.github.io/observability-charts
15-
version: 1.0.2
14+
repository: https://matrixorigin.github.io/observability-charts
15+
version: 1.0.4
1616

‎charts/mo-ob-private/mo.yaml

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
mo-ob-opensource:
2+
3+
alloy:
4+
image:
5+
registry: "docker.io"
6+
repository: grafana/alloy
7+
tag: v1.3.1
8+
alloy:
9+
resources:
10+
limits:
11+
cpu: 500m
12+
memory: 512Mi
13+
requests:
14+
cpu: 200m
15+
memory: 200Mi
16+
17+
promtail:
18+
image:
19+
registry: docker.io
20+
repository: grafana/promtail
21+
tag: "2.8.4"
22+
resources:
23+
limits:
24+
cpu: "200m"
25+
memory: "200Mi"
26+
requests:
27+
cpu: "100m"
28+
memory: "200Mi"
29+
loki:
30+
sidecar:
31+
image:
32+
repository: kiwigrid/k8s-sidecar
33+
tag: 1.27.5
34+
image:
35+
registry: docker.io
36+
repository: grafana/loki
37+
tag: "3.2.0"
38+
enabled: true
39+
tableManager:
40+
enabled: true
41+
retention_deletes_enabled: true
42+
retention_period: 720h
43+
44+
loki:
45+
# disable log alert in paivate env
46+
rulerConfig:
47+
storage:
48+
type: ""
49+
# commonConfig:
50+
# replication_factor: 1
51+
storage_config:
52+
object_prefix: loki-controlplane
53+
storage:
54+
bucketNames:
55+
chunks: test-bucket
56+
type: s3
57+
s3:
58+
endpoint: minio.loki-tenant
59+
accessKeyId: obtest-access
60+
secretAccessKey: obtest-secret
61+
s3ForcePathStyle: true
62+
insecure: true
63+
64+
write:
65+
# -- Number of replicas for the write
66+
replicas: 3
67+
persistence:
68+
enableStatefulSetAutoDeletePVC: false
69+
size: 20Gi
70+
storageClass:
71+
resources:
72+
requests:
73+
memory: "2Gi"
74+
cpu: "500m"
75+
limits:
76+
memory: "2Gi"
77+
cpu: "1000m"
78+
79+
read:
80+
replicas: 3
81+
persistence:
82+
enableStatefulSetAutoDeletePVC: true
83+
size: 20Gi
84+
storageClass:
85+
resources:
86+
requests:
87+
memory: "2Gi"
88+
cpu: "500m"
89+
limits:
90+
memory: "2Gi"
91+
cpu: "1000m"
92+
93+
backend:
94+
replicas: 1
95+
persistence:
96+
enableStatefulSetAutoDeletePVC: true
97+
size: 20Gi
98+
storageClass:
99+
resources:
100+
requests:
101+
memory: "2Gi"
102+
cpu: "500m"
103+
limits:
104+
memory: "2Gi"
105+
cpu: "1000m"
106+
107+
# Configuration for the gateway
108+
gateway:
109+
image:
110+
registry: docker.io
111+
repository: nginxinc/nginx-unprivileged
112+
tag: 1.27-alpine
113+
enabled: true
114+
replicas: 1
115+
resources:
116+
requests:
117+
memory: "500Mi"
118+
cpu: "500m"
119+
limits:
120+
memory: "1Gi"
121+
cpu: "1000m"
122+
123+
kube-prometheus-stack:
124+
prometheus-node-exporter:
125+
image:
126+
registry: quay.io
127+
repository: prometheus/node-exporter
128+
tag: v1.5.0
129+
130+
prometheusOperator:
131+
image:
132+
registry: quay.io
133+
repository: prometheus-operator/prometheus-operator
134+
tag: v0.63.0
135+
prometheusConfigReloader:
136+
image:
137+
registry: quay.io
138+
repository: prometheus-operator/prometheus-config-reloader
139+
# if not set appVersion field from Chart.yaml is used
140+
tag: v0.63.0
141+
142+
prometheus:
143+
prometheusSpec:
144+
image:
145+
registry: quay.io
146+
repository: prometheus/prometheus
147+
tag: v2.42.0
148+
retention: 14d
149+
externalLabels:
150+
clusterDetail: mo-ob-private-cluster
151+
resources:
152+
limits:
153+
cpu: 2000m
154+
memory: "6Gi"
155+
requests:
156+
cpu: 2000m
157+
memory: "6Gi"
158+
# [必要]根据部署的云厂商选择存储配置
159+
storageSpec:
160+
volumeClaimTemplate:
161+
spec:
162+
storageClassName: ""
163+
accessModes: ["ReadWriteOnce"]
164+
resources:
165+
requests:
166+
storage: 100Gi
167+
168+
kube-state-metrics:
169+
enabled: true
170+
image:
171+
registry: registry.k8s.io
172+
repository: kube-state-metrics/kube-state-metrics
173+
tag: v2.8.2
174+
175+
176+
mo-ruler-stack:
177+
178+
alertmanager:
179+
image:
180+
repository: quay.io/prometheus/alertmanager
181+
pullPolicy: IfNotPresent
182+
tag: v0.27.0
183+
184+
grafana:
185+
image:
186+
repository: docker.io/grafana/grafana
187+
tag: 10.1.6
188+
initChownData:
189+
image:
190+
repository: docker.io/library/busybox
191+
tag: 1.31.1
192+
sidecar:
193+
image:
194+
repository: quay.io/kiwigrid/k8s-sidecar
195+
tag: 1.25.1
196+
197+
persistence:
198+
enabled: true
199+
type: "statefulset"
200+
storageClassName:
201+
size: "5Gi"
202+
resources:
203+
limits:
204+
cpu: "1000m"
205+
memory: "2Gi"
206+
requests:
207+
cpu: "1000m"
208+
memory: "2Gi"
209+
service:
210+
enabled: true
211+
type: NodePort
212+
targetPort: 3000
213+
portName: service

0 commit comments

Comments
 (0)