diff --git a/packages/extra/monitoring/templates/vm/vmcluster.yaml b/packages/extra/monitoring/templates/vm/vmcluster.yaml index 19e2f610..db92118f 100644 --- a/packages/extra/monitoring/templates/vm/vmcluster.yaml +++ b/packages/extra/monitoring/templates/vm/vmcluster.yaml @@ -10,27 +10,26 @@ spec: vminsert: replicaCount: 2 resources: - {{- if and (hasKey . "vminsert") (hasKey .vminsert "resources") }} - {{- toYaml .vminsert.resources | nindent 6 }} - {{- else }} limits: - memory: 1000Mi + {{- with . | dig "vminsert" "resources" "limits" "cpu" nil }} + cpu: {{ . | quote }} + {{- end }} + memory: {{ . | dig "vminsert" "resources" "limits" "memory" "1000Mi" }} requests: - cpu: 100m - memory: 500Mi - {{- end }} + cpu: {{ . | dig "vminsert" "resources" "requests" "cpu" "500m" }} + memory: {{ . | dig "vminsert" "resources" "requests" "memory" "500Mi" }} vmselect: replicaCount: 2 resources: - {{- if and (hasKey . "vmselect") (hasKey .vmselect "resources") }} - {{- toYaml .vmselect.resources | nindent 6 }} - {{- else }} limits: - memory: 1000Mi + # if we don't set the cpu limit, victoriametrics-operator will set 500m here, which is ridiculous small + # see internal/config/config.go in victoriametrics-operator + # 2 vcpu is the bare minimum for **single** Grafana user + cpu: {{ . | dig "vmselect" "resources" "limits" "cpu" "2000m" }} + memory: {{ . | dig "vmselect" "resources" "limits" "memory" "1000Mi" }} requests: - cpu: 100m - memory: 500Mi - {{- end }} + cpu: {{ . | dig "vmselect" "resources" "requests" "cpu" "500m" }} + memory: {{ . | dig "vmselect" "resources" "requests" "memory" "500Mi" }} extraArgs: search.maxUniqueTimeseries: "600000" vmalert.proxyURL: http://vmalert-{{ .name }}.{{ $.Release.Namespace }}.svc:8080 @@ -48,15 +47,14 @@ spec: vmstorage: replicaCount: 2 resources: - {{- if and (hasKey . "vmstorage") (hasKey .vmstorage "resources") }} - {{- toYaml .vmstorage.resources | nindent 6 }} - {{- else }} limits: - memory: 2048Mi + {{- with . | dig "vmstorage" "resources" "limits" "cpu" nil }} + cpu: {{ . | quote }} + {{- end }} + memory: {{ . | dig "vmstorage" "resources" "limits" "memory" "2048Mi" }} requests: - cpu: 100m - memory: 500Mi - {{- end }} + cpu: {{ . | dig "vmstorage" "resources" "requests" "cpu" "100m" }} + memory: {{ . | dig "vmstorage" "resources" "requests" "memory" "500Mi" }} storage: volumeClaimTemplate: spec: