[stable/zed] Upgrade monitoring stack (#1093)
Resolves #1075
Reviewed-by: Mohammed Naser <mnaser@vexxhost.com>
diff --git a/charts/vector/templates/_pod.tpl b/charts/vector/templates/_pod.tpl
index 3d5b64f..51e1fb0 100644
--- a/charts/vector/templates/_pod.tpl
+++ b/charts/vector/templates/_pod.tpl
@@ -13,6 +13,9 @@
{{- with .Values.podPriorityClassName }}
priorityClassName: {{ . }}
{{- end }}
+{{- with .Values.shareProcessNamespace }}
+shareProcessNamespace: {{ . }}
+{{- end }}
{{- with .Values.dnsPolicy }}
dnsPolicy: {{ . }}
{{- end }}
@@ -49,6 +52,8 @@
{{- toYaml . | nindent 6 }}
{{- end }}
env:
+ - name: VECTOR_LOG
+ value: "{{ .Values.logLevel | default "info" }}"
{{- if .Values.env }}
{{- with .Values.env }}
{{- toYaml . | nindent 6 }}
@@ -140,18 +145,9 @@
mountPath: "/etc/vector/"
readOnly: true
{{- if (eq .Values.role "Agent") }}
- - name: var-log
- mountPath: "/var/log/"
- readOnly: true
- - name: var-lib
- mountPath: "/var/lib"
- readOnly: true
- - name: procfs
- mountPath: "/host/proc"
- readOnly: true
- - name: sysfs
- mountPath: "/host/sys"
- readOnly: true
+{{- with .Values.defaultVolumeMounts }}
+{{- toYaml . | nindent 6 }}
+{{- end }}
{{- end }}
{{- with .Values.extraVolumeMounts }}
{{- toYaml . | nindent 6 }}
@@ -201,20 +197,15 @@
{{- end }}
{{- if (eq .Values.role "Agent") }}
- name: data
+ {{- if .Values.persistence.hostPath.enabled }}
hostPath:
path: {{ .Values.persistence.hostPath.path | quote }}
- - name: var-log
- hostPath:
- path: "/var/log/"
- - name: var-lib
- hostPath:
- path: "/var/lib/"
- - name: procfs
- hostPath:
- path: "/proc"
- - name: sysfs
- hostPath:
- path: "/sys"
+ {{- else }}
+ emptyDir: {}
+ {{- end }}
+ {{- with .Values.defaultVolumes }}
+ {{- toYaml . | nindent 2 }}
+ {{- end }}
{{- end }}
{{- with .Values.extraVolumes }}
{{- toYaml . | nindent 2 }}
diff --git a/charts/vector/templates/configmap.yaml b/charts/vector/templates/configmap.yaml
index a4cebbe..a84db9a 100644
--- a/charts/vector/templates/configmap.yaml
+++ b/charts/vector/templates/configmap.yaml
@@ -69,7 +69,7 @@
excludes: [binfmt_misc]
filesystems:
excludes: [binfmt_misc]
- mountPoints:
+ mountpoints:
excludes: ["*/proc/sys/fs/binfmt_misc"]
type: host_metrics
internal_metrics:
diff --git a/charts/vector/templates/daemonset.yaml b/charts/vector/templates/daemonset.yaml
index 51cc017..7c6bbf6 100644
--- a/charts/vector/templates/daemonset.yaml
+++ b/charts/vector/templates/daemonset.yaml
@@ -5,10 +5,13 @@
name: {{ include "vector.fullname" . }}
labels:
{{- include "vector.labels" . | nindent 4 }}
+ annotations:
+ {{- toYaml .Values.workloadResourceAnnotations | nindent 4 }}
spec:
selector:
matchLabels:
{{- include "vector.selectorLabels" . | nindent 6 }}
+ minReadySeconds: {{ .Values.minReadySeconds }}
{{- with .Values.updateStrategy }}
updateStrategy:
{{- toYaml . | nindent 4 }}
diff --git a/charts/vector/templates/deployment.yaml b/charts/vector/templates/deployment.yaml
index 0ff0981..20a39ff 100644
--- a/charts/vector/templates/deployment.yaml
+++ b/charts/vector/templates/deployment.yaml
@@ -5,6 +5,8 @@
name: {{ include "vector.fullname" . }}
labels:
{{- include "vector.labels" . | nindent 4 }}
+ annotations:
+ {{- toYaml .Values.workloadResourceAnnotations | nindent 4 }}
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicas }}
@@ -12,6 +14,7 @@
selector:
matchLabels:
{{- include "vector.selectorLabels" . | nindent 6 }}
+ minReadySeconds: {{ .Values.minReadySeconds }}
{{- with .Values.updateStrategy }}
strategy:
{{- toYaml . | nindent 4 }}
diff --git a/charts/vector/templates/extra-manifests.yaml b/charts/vector/templates/extra-manifests.yaml
new file mode 100644
index 0000000..a9bb3b6
--- /dev/null
+++ b/charts/vector/templates/extra-manifests.yaml
@@ -0,0 +1,4 @@
+{{ range .Values.extraObjects }}
+---
+{{ tpl (toYaml .) $ }}
+{{ end }}
diff --git a/charts/vector/templates/hpa.yaml b/charts/vector/templates/hpa.yaml
index d9c44a6..aa66138 100644
--- a/charts/vector/templates/hpa.yaml
+++ b/charts/vector/templates/hpa.yaml
@@ -6,6 +6,8 @@
name: {{ include "vector.fullname" . }}
labels:
{{- include "vector.labels" . | nindent 4 }}
+ annotations:
+ {{- toYaml .Values.autoscaling.annotations | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
diff --git a/charts/vector/templates/podmonitor.yaml b/charts/vector/templates/podmonitor.yaml
index f82ab37..ceece54 100644
--- a/charts/vector/templates/podmonitor.yaml
+++ b/charts/vector/templates/podmonitor.yaml
@@ -16,9 +16,19 @@
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
+ {{- with .Values.podMonitor.podTargetLabels }}
+ podTargetLabels:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
podMetricsEndpoints:
- port: {{ .Values.podMonitor.port }}
path: {{ .Values.podMonitor.path }}
+ {{- if .Values.podMonitor.interval }}
+ interval: {{ .Values.podMonitor.interval }}
+ {{- end }}
+ {{- if .Values.podMonitor.scrapeTimeout }}
+ scrapeTimeout: {{ .Values.podMonitor.scrapeTimeout }}
+ {{- end }}
honorLabels: {{ .Values.podMonitor.honorLabels }}
honorTimestamps: {{ .Values.podMonitor.honorTimestamps }}
{{- with .Values.podMonitor.relabelings }}
diff --git a/charts/vector/templates/service-headless.yaml b/charts/vector/templates/service-headless.yaml
index f258563..6d0d69f 100644
--- a/charts/vector/templates/service-headless.yaml
+++ b/charts/vector/templates/service-headless.yaml
@@ -18,6 +18,9 @@
{{- if .Values.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
{{- end }}
+{{- if .Values.service.internalTrafficPolicy }}
+ internalTrafficPolicy: {{ .Values.service.internalTrafficPolicy }}
+{{- end }}
{{- if .Values.service.ipFamilies }}
{{- with .Values.service.ipFamilies }}
ipFamilies:
@@ -82,6 +85,9 @@
{{- if .Values.service.ipFamilyPolicy }}
ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
{{- end }}
+{{- if .Values.service.internalTrafficPolicy }}
+ internalTrafficPolicy: {{ .Values.service.internalTrafficPolicy }}
+{{- end }}
{{- if .Values.service.ipFamilies }}
{{- with .Values.service.ipFamilies }}
ipFamilies:
diff --git a/charts/vector/templates/statefulset.yaml b/charts/vector/templates/statefulset.yaml
index 09db5c1..35863c8 100644
--- a/charts/vector/templates/statefulset.yaml
+++ b/charts/vector/templates/statefulset.yaml
@@ -5,6 +5,8 @@
name: {{ include "vector.fullname" . }}
labels:
{{- include "vector.labels" . | nindent 4 }}
+ annotations:
+ {{- toYaml .Values.workloadResourceAnnotations | nindent 4 }}
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicas }}
@@ -13,6 +15,9 @@
selector:
matchLabels:
{{- include "vector.selectorLabels" . | nindent 6 }}
+ {{- if semverCompare ">=1.22-0" .Capabilities.KubeVersion.GitVersion }}
+ minReadySeconds: {{ .Values.minReadySeconds }}
+ {{- end }}
{{- with .Values.updateStrategy }}
updateStrategy:
{{- toYaml . | nindent 4 }}
@@ -48,7 +53,9 @@
name: data
spec:
accessModes: {{ .Values.persistence.accessModes }}
+ {{- if .Values.persistence.storageClassName }}
storageClassName: {{ .Values.persistence.storageClassName }}
+ {{- end }}
resources:
requests:
storage: {{ .Values.persistence.size }}