diff --git a/charts/kubezero/templates/metrics.yaml b/charts/kubezero/templates/metrics.yaml index 02c3409..c8ef51b 100644 --- a/charts/kubezero/templates/metrics.yaml +++ b/charts/kubezero/templates/metrics.yaml @@ -4,17 +4,17 @@ istio: {{- toYaml . | nindent 2 }} {{- end }} -{{- if index .Values "metrics" "kube-prometheus-stack" }} +{{- with index .Values "metrics" "kube-prometheus-stack" }} kube-prometheus-stack: - {{- with index .Values "metrics" "kube-prometheus-stack" }} {{- toYaml . | nindent 2 }} - {{- end }} {{- end }} -{{- if index .Values "metrics" "prometheus-adapter" }} +{{- with index .Values "metrics" "prometheus-adapter" }} prometheus-adapter: - {{- with index .Values "metrics" "prometheus-adapter" }} {{- toYaml . | nindent 2 }} - {{- end }} +{{- end }} +{{- with index .Values "metrics" "prometheus-pushgateway" }} +prometheus-pushgateway: + {{- toYaml . | nindent 2 }} {{- end }} {{- end }} diff --git a/docs/Upgrade-2.20.md b/docs/Upgrade-2.20.md index 187aa7e..2312d0d 100644 --- a/docs/Upgrade-2.20.md +++ b/docs/Upgrade-2.20.md @@ -38,9 +38,10 @@ Scheduled snapshots for EBS backed PVCs incl. custom retention and restore. - hardened and optimized settings for Envoy gateway proxies - improved deployment strategy to reduce errors during upgrades - Added various Grafana Dashboards -- version bump to 1.10.2 +- version bump to 1.10.3 ### Metrics +- Added support for Prometheus PushGateway (optional) - Added various dashboards for KubeZero modules - Updated / improved dashboard organization incl. folders and tags - Grafana Dashboards are now all provided via configmaps, no more state required, also no more manual changes persisted