Skip to content

Commit 5d2e429

Browse files
sircthulhuclaude
authored andcommitted
feat(monitoring): migrate VictoriaLogs from VLogs to VLCluster
Replace deprecated single-node VLogs CR with VLCluster (cluster mode) for reliability and horizontal scalability. Changes: - Replace VLogs (v1beta1) with VLCluster (v1) using vlinsert/vlselect/vlstorage - Update fluent-bit outputs to vlinsert-generic:9481 - Update Grafana datasource to vlselect:9471 - Update ExternalName service from vlogs-generic to vlinsert-generic - Add VPA for all VLCluster components - Update WorkloadMonitors for three-component architecture - Add migration 35 to preserve old VLogs resources with keep annotation Co-Authored-By: Claude <[email protected]> Signed-off-by: Kirill Ilin <[email protected]>
1 parent 59152ff commit 5d2e429

11 files changed

Lines changed: 182 additions & 30 deletions

File tree

‎packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ spec:
7373
[OUTPUT]
7474
Name http
7575
Match kube.*
76-
Host vlogs-generic.{{ $targetTenant }}.svc.{{ $clusterDomain }}
77-
port 9428
76+
Host vlinsert-generic.{{ $targetTenant }}.svc.{{ $clusterDomain }}
77+
port 9481
7878
compress gzip
7979
uri /insert/jsonline?_stream_fields=stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
8080
format json_lines
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/sh
2+
# Migration 35 --> 36
3+
# Add helm.sh/resource-policy=keep annotation to existing VLogs resources
4+
# so they are preserved when the monitoring helm release upgrades to VLCluster.
5+
# Users will need to manually verify the new cluster is working, then optionally
6+
# migrate historical data and delete old VLogs resources.
7+
8+
set -euo pipefail
9+
10+
VLOGS=$(kubectl get vlogs.operator.victoriametrics.com --all-namespaces --output jsonpath='{range .items[*]}{.metadata.namespace}/{.metadata.name}{"\n"}{end}' 2>/dev/null || true)
11+
for resource in $VLOGS; do
12+
NS="${resource%%/*}"
13+
NAME="${resource##*/}"
14+
echo "Adding keep annotation to VLogs/$NAME in $NS"
15+
kubectl annotate vlogs.operator.victoriametrics.com --namespace "$NS" "$NAME" \
16+
helm.sh/resource-policy=keep \
17+
--overwrite
18+
done
19+
20+
kubectl create configmap --namespace cozy-system cozystack-version \
21+
--from-literal=version=36 --dry-run=client --output yaml | kubectl apply --filename -

‎packages/core/platform/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sourceRef:
66
migrations:
77
enabled: false
88
image: ghcr.io/cozystack/cozystack/platform-migrations:v1.1.0@sha256:d7e8955c1ad8c8fbd4ce42b014c0f849d73d0c3faf0cedaac8e15d647fb2f663
9-
targetVersion: 35
9+
targetVersion: 36
1010
# Bundle deployment configuration
1111
bundles:
1212
system:

‎packages/extra/monitoring/templates/dashboard-resourcemap.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ rules:
4242
- {{ .name }}-vminsert
4343
{{- end }}
4444
{{- range .Values.logsStorages }}
45-
- {{ $.Release.Name }}-vlogs-{{ .name }}
45+
- {{ .name }}-vlstorage
46+
- {{ .name }}-vlselect
47+
- {{ .name }}-vlinsert
4648
{{- end }}
4749
{{- range .Values.metricsStorages }}
4850
- vmalert-{{ .name }}

‎packages/extra/monitoring/templates/workloadmonitors.yaml‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,46 @@ spec:
6767
apiVersion: cozystack.io/v1alpha1
6868
kind: WorkloadMonitor
6969
metadata:
70-
name: vlogs-{{ .name }}
70+
name: {{ .name }}-vlstorage
7171
spec:
72-
replicas: 1
72+
replicas: 2
73+
minReplicas: 1
74+
kind: monitoring
75+
type: vlstorage
76+
selector:
77+
app.kubernetes.io/component: monitoring
78+
app.kubernetes.io/instance: {{ .name }}
79+
app.kubernetes.io/name: vlstorage
80+
version: {{ $.Chart.Version }}
81+
---
82+
apiVersion: cozystack.io/v1alpha1
83+
kind: WorkloadMonitor
84+
metadata:
85+
name: {{ .name }}-vlselect
86+
spec:
87+
replicas: 2
88+
minReplicas: 1
89+
kind: monitoring
90+
type: vlselect
91+
selector:
92+
app.kubernetes.io/component: monitoring
93+
app.kubernetes.io/instance: {{ .name }}
94+
app.kubernetes.io/name: vlselect
95+
version: {{ $.Chart.Version }}
96+
---
97+
apiVersion: cozystack.io/v1alpha1
98+
kind: WorkloadMonitor
99+
metadata:
100+
name: {{ .name }}-vlinsert
101+
spec:
102+
replicas: 2
73103
minReplicas: 1
74104
kind: monitoring
75-
type: vlogs
105+
type: vlinsert
76106
selector:
77107
app.kubernetes.io/component: monitoring
78108
app.kubernetes.io/instance: {{ .name }}
79-
app.kubernetes.io/name: vlogs
109+
app.kubernetes.io/name: vlinsert
80110
version: {{ $.Chart.Version }}
81111
{{- end }}
82112
---

‎packages/system/cozystack-basics/templates/monitoring-external-services.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: vlogs-generic
5+
name: vlinsert-generic
66
namespace: cozy-monitoring
77
spec:
88
type: ExternalName
9-
externalName: vlogs-generic.tenant-root.svc.cluster.local
9+
externalName: vlinsert-generic.tenant-root.svc.cluster.local
1010
---
1111
apiVersion: v1
1212
kind: Service

‎packages/system/monitoring-agents/values.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ fluent-bit:
344344
[OUTPUT]
345345
Name http
346346
Match kube.*
347-
Host vlogs-generic.{{ .Values.global.target }}.svc
348-
port 9428
347+
Host vlinsert-generic.{{ .Values.global.target }}.svc
348+
port 9481
349349
compress gzip
350350
uri /insert/jsonline?_stream_fields=log_source,stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
351351
format json_lines
@@ -355,8 +355,8 @@ fluent-bit:
355355
[OUTPUT]
356356
Name http
357357
Match events.*
358-
Host vlogs-generic.{{ .Values.global.target }}.svc
359-
port 9428
358+
Host vlinsert-generic.{{ .Values.global.target }}.svc
359+
port 9481
360360
compress gzip
361361
uri /insert/jsonline?_stream_fields=log_source,reason,meatdata_namespace,metadata_name&_msg_field=message&_time_field=date
362362
format json_lines
@@ -366,8 +366,8 @@ fluent-bit:
366366
[OUTPUT]
367367
Name http
368368
Match audit.*
369-
Host vlogs-generic.{{ .Values.global.target }}.svc
370-
port 9428
369+
Host vlinsert-generic.{{ .Values.global.target }}.svc
370+
port 9481
371371
compress gzip
372372
uri /insert/jsonline?_stream_fields=log_source,stage,user_username,verb,requestUri&_msg_field=requestURI&_time_field=date
373373
format json_lines

‎packages/system/monitoring/templates/vlogs/grafana-datasource.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
access: proxy
99
type: victoriametrics-logs-datasource
1010
name: vlogs-{{ .name }}
11-
url: http://vlogs-{{ .name }}.{{ $.Release.Namespace }}.svc:9428
11+
url: http://vlselect-{{ .name }}.{{ $.Release.Namespace }}.svc:9471
1212
instanceSelector:
1313
matchLabels:
1414
dashboards: grafana
Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{- range .Values.logsStorages }}
2-
apiVersion: operator.victoriametrics.com/v1beta1
3-
kind: VLogs
2+
---
3+
apiVersion: operator.victoriametrics.com/v1
4+
kind: VLCluster
45
metadata:
56
name: {{ .name }}
67
spec:
@@ -9,14 +10,23 @@ spec:
910
apps.cozystack.io/application.group: apps.cozystack.io
1011
apps.cozystack.io/application.kind: Monitoring
1112
apps.cozystack.io/application.name: {{ $.Release.Name }}
12-
image:
13-
tag: v1.17.0-victorialogs
14-
storage:
15-
resources:
16-
requests:
17-
storage: {{ .storage }}
18-
storageClassName: {{ .storageClassName }}
19-
accessModes: [ReadWriteOnce]
20-
retentionPeriod: "{{ .retentionPeriod }}"
21-
removePvcAfterDelete: true
13+
vlinsert:
14+
replicaCount: 2
15+
resources: {}
16+
vlselect:
17+
replicaCount: 2
18+
resources: {}
19+
vlstorage:
20+
retentionPeriod: {{ .retentionPeriod | quote }}
21+
replicaCount: 2
22+
resources: {}
23+
storage:
24+
volumeClaimTemplate:
25+
spec:
26+
{{- with .storageClassName }}
27+
storageClassName: {{ . }}
28+
{{- end }}
29+
resources:
30+
requests:
31+
storage: {{ .storage }}
2232
{{- end }}

‎packages/system/monitoring/templates/vpa.yaml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,92 @@ spec:
8787
memory: 8Gi
8888
{{- end }}
8989
{{- end }}
90+
{{- range .Values.logsStorages }}
91+
---
92+
apiVersion: autoscaling.k8s.io/v1
93+
kind: VerticalPodAutoscaler
94+
metadata:
95+
name: vpa-vlinsert-{{ .name }}
96+
spec:
97+
targetRef:
98+
apiVersion: apps/v1
99+
kind: Deployment
100+
name: vlinsert-{{ .name }}
101+
updatePolicy:
102+
updateMode: Auto
103+
resourcePolicy:
104+
containerPolicies:
105+
- containerName: vlinsert
106+
minAllowed:
107+
{{- if and .vlinsert .vlinsert.minAllowed }}
108+
{{- toYaml .vlinsert.minAllowed | nindent 10 }}
109+
{{- else }}
110+
cpu: 25m
111+
memory: 64Mi
112+
{{- end }}
113+
maxAllowed:
114+
{{- if and .vlinsert .vlinsert.maxAllowed }}
115+
{{- toYaml .vlinsert.maxAllowed | nindent 10 }}
116+
{{- else }}
117+
cpu: 2000m
118+
memory: 4Gi
119+
{{- end }}
120+
---
121+
apiVersion: autoscaling.k8s.io/v1
122+
kind: VerticalPodAutoscaler
123+
metadata:
124+
name: vpa-vlselect-{{ .name }}
125+
spec:
126+
targetRef:
127+
apiVersion: apps/v1
128+
kind: Deployment
129+
name: vlselect-{{ .name }}
130+
updatePolicy:
131+
updateMode: Auto
132+
resourcePolicy:
133+
containerPolicies:
134+
- containerName: vlselect
135+
minAllowed:
136+
{{- if and .vlselect .vlselect.minAllowed }}
137+
{{- toYaml .vlselect.minAllowed | nindent 10 }}
138+
{{- else }}
139+
cpu: 25m
140+
memory: 64Mi
141+
{{- end }}
142+
maxAllowed:
143+
{{- if and .vlselect .vlselect.maxAllowed }}
144+
{{- toYaml .vlselect.maxAllowed | nindent 10 }}
145+
{{- else }}
146+
cpu: 4000m
147+
memory: 8Gi
148+
{{- end }}
149+
---
150+
apiVersion: autoscaling.k8s.io/v1
151+
kind: VerticalPodAutoscaler
152+
metadata:
153+
name: vpa-vlstorage-{{ .name }}
154+
spec:
155+
targetRef:
156+
apiVersion: apps/v1
157+
kind: StatefulSet
158+
name: vlstorage-{{ .name }}
159+
updatePolicy:
160+
updateMode: Auto
161+
resourcePolicy:
162+
containerPolicies:
163+
- containerName: vlstorage
164+
minAllowed:
165+
{{- if and .vlstorage .vlstorage.minAllowed }}
166+
{{- toYaml .vlstorage.minAllowed | nindent 10 }}
167+
{{- else }}
168+
cpu: 25m
169+
memory: 64Mi
170+
{{- end }}
171+
maxAllowed:
172+
{{- if and .vlstorage .vlstorage.maxAllowed }}
173+
{{- toYaml .vlstorage.maxAllowed | nindent 10 }}
174+
{{- else }}
175+
cpu: 4000m
176+
memory: 8Gi
177+
{{- end }}
178+
{{- end }}

0 commit comments

Comments
 (0)