Skip to content

Commit

Permalink
bugfix/monitoring add nil checker (#587)
Browse files Browse the repository at this point in the history
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Version Update**
  - Monitoring application version updated from 1.6.1 to 1.6.2
- **Configuration Improvements**
  - Enhanced resource configuration checks for VM cluster components
- Improved handling of resource definitions to prevent potential errors

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
  • Loading branch information
klinch0 authored Jan 17, 2025
1 parent 4e68e65 commit 59b4a0f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion packages/extra/monitoring/Chart.yaml
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
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
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

0 comments on commit 59b4a0f

Please sign in to comment.