Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix/monitoring add nil checker #587

Merged
merged 3 commits into from
Jan 17, 2025
Merged

bugfix/monitoring add nil checker #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9de782e
fix
klinch0 Jan 16, 2025
191c8b4
Merge branch 'aenix-io:main' into main
klinch0 Jan 16, 2025
4101a12
fix nil pointer
klinch0 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/extra/monitoring/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ name: monitoring
description: Monitoring and observability stack
icon: /logos/monitoring.svg
type: application
version: 1.6.1
version: 1.6.2
18 changes: 9 additions & 9 deletions packages/extra/monitoring/templates/vm/vmcluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ spec:
vminsert:
replicaCount: 2
resources:
{{- if empty .vminsert.resources }}
{{- if and (hasKey . "vminsert") (hasKey .vminsert "resources") }}
{{- toYaml .vminsert.resources | nindent 6 }}
{{- else }}
limits:
memory: 1000Mi
requests:
cpu: 100m
memory: 500Mi
{{- else }}
{{- toYaml .vminsert.resources | nindent 6 }}
{{- end }}
vmselect:
replicaCount: 2
resources:
{{- if empty .vmselect.resources }}
{{- if and (hasKey . "vmselect") (hasKey .vmselect "resources") }}
{{- toYaml .vmselect.resources | nindent 6 }}
{{- else }}
limits:
memory: 1000Mi
requests:
cpu: 100m
memory: 500Mi
{{- else }}
{{- toYaml .vmselect.resources | nindent 6 }}
{{- end }}
extraArgs:
search.maxUniqueTimeseries: "600000"
Expand All @@ -48,14 +48,14 @@ spec:
vmstorage:
replicaCount: 2
resources:
{{- if empty .vmstorage.resources }}
{{- if and (hasKey . "vmstorage") (hasKey .vmstorage "resources") }}
{{- toYaml .vmstorage.resources | nindent 6 }}
{{- else }}
limits:
memory: 2048Mi
requests:
cpu: 100m
memory: 500Mi
{{- else }}
{{- toYaml .vmstorage.resources | nindent 6 }}
{{- end }}
storage:
volumeClaimTemplate:
Expand Down
3 changes: 2 additions & 1 deletion packages/extra/versions_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ monitoring 1.5.2 898374b5
monitoring 1.5.3 c1ca19dc
monitoring 1.5.4 d4634797
monitoring 1.6.0 cb7b8158
monitoring 1.6.1 HEAD
monitoring 1.6.1 3bb97596
monitoring 1.6.2 HEAD
seaweedfs 0.1.0 5ca8823
seaweedfs 0.2.0 9e33dc0
seaweedfs 0.2.1 249bf35
Expand Down