diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml index 453eec153c..4032c7c740 100644 --- a/prometheus-alertmanager/templates/statefulset.yaml +++ b/prometheus-alertmanager/templates/statefulset.yaml @@ -170,8 +170,15 @@ spec: defaultMode: 0555 {{ if $mounts_alertmanager.volumes }}{{ toYaml $mounts_alertmanager.volumes | indent 8 }}{{ end }} {{- if not .Values.storage.alertmanager.enabled }} +{{- if .Values.storage.alertmanager.use_local_path.enabled }} + - name: alertmanager-data + hostPath: + path: {{ .Values.storage.alertmanager.use_local_path.host_path }} + type: DirectoryOrCreate +{{- else }} - name: alertmanager-data emptyDir: {} +{{- end }} {{- else }} volumeClaimTemplates: - metadata: diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index 148230363f..c83cc4fc36 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -224,6 +224,9 @@ storage: requests: storage: 5Gi storage_class: general + use_local_path: + enabled: false + host_path: /var/lib/prometheus-alertmanager-data manifests: clusterrolebinding: true diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml index d624dd4571..92df53ff31 100644 --- a/prometheus/templates/statefulset.yaml +++ b/prometheus/templates/statefulset.yaml @@ -245,8 +245,15 @@ spec: {{- end }} {{ if $mounts_prometheus.volumes }}{{ toYaml $mounts_prometheus.volumes | indent 8 }}{{ end }} {{- if not .Values.storage.enabled }} +{{- if .Values.storage.use_local_path.enabled }} + - name: storage + hostPath: + path: {{ .Values.storage.use_local_path.host_path }} + type: DirectoryOrCreate +{{- else }} - name: storage emptyDir: {} +{{- end }} {{- else }} volumeClaimTemplates: - metadata: diff --git a/prometheus/values.yaml b/prometheus/values.yaml index ccac6f12fd..edf2b11615 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -319,6 +319,9 @@ storage: requests: storage: 5Gi storage_class: general + use_local_path: + enabled: false + host_path: /var/lib/prometheus-data manifests: certificates: false diff --git a/tools/deployment/monitoring/alertmanager.sh b/tools/deployment/monitoring/alertmanager.sh index 1446a499d1..569b342c97 100755 --- a/tools/deployment/monitoring/alertmanager.sh +++ b/tools/deployment/monitoring/alertmanager.sh @@ -19,6 +19,7 @@ set -xe #NOTE: Deploy command helm upgrade --install prometheus-alertmanager ${OSH_HELM_REPO}/prometheus-alertmanager \ --namespace=osh-infra \ + ${VOLUME_HELM_ARGS:="--set storage.alertmanager.enabled=false --set storage.alertmanager.use_local_path.enabled=true"} \ --set pod.replicas.alertmanager=1 #NOTE: Wait for deploy diff --git a/tools/deployment/monitoring/prometheus.sh b/tools/deployment/monitoring/prometheus.sh index b70ea1d9d3..58a23eab5e 100755 --- a/tools/deployment/monitoring/prometheus.sh +++ b/tools/deployment/monitoring/prometheus.sh @@ -19,9 +19,11 @@ set -xe FEATURES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor ${FEATURES}" : ${OSH_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_VALUES_OVERRIDES_PATH} -c prometheus ${FEATURES})"} + #NOTE: Deploy command helm upgrade --install prometheus ${OSH_HELM_REPO}/prometheus \ --namespace=osh-infra \ + ${VOLUME_HELM_ARGS:="--set storage.enabled=false --set storage.use_local_path.enabled=true"} \ ${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS_PROMETHEUS}