diff --git a/argocd-helm-charts/prometheus-linuxaid/templates/alertmanager.yaml b/argocd-helm-charts/prometheus-linuxaid/templates/alertmanager.yaml index 7c32bcb73..60a599991 100644 --- a/argocd-helm-charts/prometheus-linuxaid/templates/alertmanager.yaml +++ b/argocd-helm-charts/prometheus-linuxaid/templates/alertmanager.yaml @@ -17,7 +17,7 @@ spec: runAsUser: 1000 serviceAccountName: alertmanager-main portName: web - version: v0.26.0 + version: {{ .Values.alertmanager.version }} configSecret: alertmanager-config-{{ .Values.customerid }} secrets: - puppet-agent-tls-auth diff --git a/argocd-helm-charts/prometheus-linuxaid/templates/grafana.yaml b/argocd-helm-charts/prometheus-linuxaid/templates/grafana.yaml index 4d30f6ad8..03c764c54 100644 --- a/argocd-helm-charts/prometheus-linuxaid/templates/grafana.yaml +++ b/argocd-helm-charts/prometheus-linuxaid/templates/grafana.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: grafana - image: grafana/grafana:9.5.3 + image: grafana/grafana:{{ .Values.grafana.version }} persistentVolumeClaim: spec: accessModes: diff --git a/argocd-helm-charts/prometheus-linuxaid/templates/prometheus.yaml b/argocd-helm-charts/prometheus-linuxaid/templates/prometheus.yaml index 434a49de6..7c358ff98 100644 --- a/argocd-helm-charts/prometheus-linuxaid/templates/prometheus.yaml +++ b/argocd-helm-charts/prometheus-linuxaid/templates/prometheus.yaml @@ -47,5 +47,5 @@ spec: requests: storage: {{ .Values.prometheus.storage.size }} storageClassName: {{ .Values.prometheus.storage.className }} - version: v2.48.1 + version: {{ .Values.prometheus.version }} enableRemoteWriteReceiver: true diff --git a/argocd-helm-charts/prometheus-linuxaid/values.yaml b/argocd-helm-charts/prometheus-linuxaid/values.yaml index ced39848c..de6c2063c 100644 --- a/argocd-helm-charts/prometheus-linuxaid/values.yaml +++ b/argocd-helm-charts/prometheus-linuxaid/values.yaml @@ -1,4 +1,5 @@ prometheus: + version: v2.53.2 server: prometheus.obmondo.com ingress: enable: false @@ -13,6 +14,7 @@ prometheus: memory: 2Gi grafana: server: graphs.obmondo.com + version: 11.1.4 prometheusRule: backup: true btrfs: true @@ -44,6 +46,7 @@ prometheusRule: ssacli: true zfsExporter: true alertmanager: + version: v0.27.0 config: global: resolve_timeout: 5m