diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 175122a591..87c5411bb3 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 4.6.1 +version: 4.6.2 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png @@ -9,6 +9,6 @@ sources: - https://github.com/prometheus/pushgateway - https://github.com/kubernetes/kube-state-metrics maintainers: - - name: Michael Goodness + - name: mgoodness email: mgoodness@gmail.com engine: gotpl diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index 74a26fbb2f..5c8aefeda2 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -176,6 +176,7 @@ Parameter | Description | Default `server.service.servicePort` | Prometheus server service port | `80` `server.service.type` | type of Prometheus server service to create | `ClusterIP` `server.terminationGracePeriodSeconds` | Prometheus server Pod termination grace period | `300` +`server.retention` | (optional) Prometheus data retention | `""` `serverFiles.alerts` | Prometheus server alerts configuration | `""` `serverFiles.rules` | Prometheus server rules configuration | `""` `serverFiles.prometheus.yml` | Prometheus server scrape configuration | example configuration diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml index ca6433c7d2..b3d2d1e8af 100644 --- a/stable/prometheus/templates/server-deployment.yaml +++ b/stable/prometheus/templates/server-deployment.yaml @@ -42,6 +42,9 @@ spec: args: {{- if or .Values.alertmanager.enabled .Values.server.alertmanagerURL }} - --alertmanager.url={{- if .Values.alertmanager.enabled }}http://{{ template "prometheus.alertmanager.fullname" . }}:{{ .Values.alertmanager.service.servicePort }}{{ .Values.alertmanager.baseURL }}{{- else }}{{ .Values.server.alertmanagerURL }}{{- end }} + {{- end }} + {{- if .Values.server.retention }} + - --storage.local.retention = {{ .Values.server.retention }} {{- end }} - --config.file=/etc/config/prometheus.yml - --storage.local.path={{ .Values.server.persistentVolume.mountPath }} diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index c0b3a8e9ee..757ec71e69 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -464,6 +464,10 @@ server: ## terminationGracePeriodSeconds: 300 + ## Prometheus data retention period (i.e 360h) + ## + retention: "" + pushgateway: ## If false, pushgateway will not be installed ##