diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 4c7772f13e..dd2076ff48 100644 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 10.5.3 +version: 10.6.0 appVersion: 2.16.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index 0820616193..c364422c6d 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -179,14 +179,24 @@ Parameter | Description | Default `alertmanager.service.sessionAffinity` | Session Affinity for alertmanager service, can be `None` or `ClientIP` | `None` `alertmanager.service.type` | type of alertmanager service to create | `ClusterIP` `alertmanagerFiles.alertmanager.yml` | Prometheus alertmanager configuration | example configuration -`configmapReload.name` | configmap-reload container name | `configmap-reload` -`configmapReload.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` -`configmapReload.image.tag` | configmap-reload container image tag | `v0.3.0` -`configmapReload.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` -`configmapReload.extraArgs` | Additional configmap-reload container arguments | `{}` -`configmapReload.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` -`configmapReload.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]` -`configmapReload.resources` | configmap-reload pod resource requests & limits | `{}` +`configmapReload.prometheus.enabled` | If false, the configmap-reload container for Prometheus will not be deployed | `true` +`configmapReload.prometheus.name` | configmap-reload container name | `configmap-reload` +`configmapReload.prometheus.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` +`configmapReload.prometheus.image.tag` | configmap-reload container image tag | `v0.3.0` +`configmapReload.prometheus.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` +`configmapReload.prometheus.extraArgs` | Additional configmap-reload container arguments | `{}` +`configmapReload.prometheus.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` +`configmapReload.prometheus.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]` +`configmapReload.prometheus.resources` | configmap-reload pod resource requests & limits | `{}` +`configmapReload.alertmanager.enabled` | If false, the configmap-reload container for AlertManager will not be deployed | `true` +`configmapReload.alertmanager.name` | configmap-reload container name | `configmap-reload` +`configmapReload.alertmanager.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` +`configmapReload.alertmanager.image.tag` | configmap-reload container image tag | `v0.3.0` +`configmapReload.alertmanager.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` +`configmapReload.alertmanager.extraArgs` | Additional configmap-reload container arguments | `{}` +`configmapReload.alertmanager.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` +`configmapReload.alertmanager.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]` +`configmapReload.alertmanager.resources` | configmap-reload pod resource requests & limits | `{}` `initChownData.enabled` | If false, don't reset data ownership at startup | true `initChownData.name` | init-chown-data container name | `init-chown-data` `initChownData.image.repository` | init-chown-data container image repository | `busybox` diff --git a/stable/prometheus/templates/alertmanager-deployment.yaml b/stable/prometheus/templates/alertmanager-deployment.yaml index b17d225ab1..4c68aece24 100644 --- a/stable/prometheus/templates/alertmanager-deployment.yaml +++ b/stable/prometheus/templates/alertmanager-deployment.yaml @@ -81,18 +81,20 @@ spec: readOnly: {{ .readOnly }} {{- end }} - - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.name }} - image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}" - imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}" + {{- if .Values.configmapReload.alertmanager.enabled }} + - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.alertmanager.name }} + image: "{{ .Values.configmapReload.alertmanager.image.repository }}:{{ .Values.configmapReload.alertmanager.image.tag }}" + imagePullPolicy: "{{ .Values.configmapReload.alertmanager.image.pullPolicy }}" args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9093{{ .Values.alertmanager.prefixURL }}/-/reload resources: -{{ toYaml .Values.configmapReload.resources | indent 12 }} +{{ toYaml .Values.configmapReload.alertmanager.resources | indent 12 }} volumeMounts: - name: config-volume mountPath: /etc/config readOnly: true + {{- end }} {{- if .Values.imagePullSecrets }} imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 2 }} diff --git a/stable/prometheus/templates/alertmanager-statefulset.yaml b/stable/prometheus/templates/alertmanager-statefulset.yaml index 811d6783ca..1f8272dcfa 100644 --- a/stable/prometheus/templates/alertmanager-statefulset.yaml +++ b/stable/prometheus/templates/alertmanager-statefulset.yaml @@ -85,18 +85,20 @@ spec: subPath: {{ .subPath }} readOnly: {{ .readOnly }} {{- end }} - - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.name }} - image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}" - imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}" + {{- if .Values.configmapReload.alertmanager.enabled }} + - name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.alertmanager.name }} + image: "{{ .Values.configmapReload.alertmanager.image.repository }}:{{ .Values.configmapReload.alertmanager.image.tag }}" + imagePullPolicy: "{{ .Values.configmapReload.alertmanager.image.pullPolicy }}" args: - --volume-dir=/etc/config - --webhook-url=http://localhost:9093{{ .Values.alertmanager.prefixURL }}/-/reload resources: -{{ toYaml .Values.configmapReload.resources | indent 12 }} +{{ toYaml .Values.configmapReload.alertmanager.resources | indent 12 }} volumeMounts: - name: config-volume mountPath: /etc/config readOnly: true + {{- end }} {{- if .Values.imagePullSecrets }} imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 2 }} diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml index 54404616bb..a5542fcbad 100644 --- a/stable/prometheus/templates/server-deployment.yaml +++ b/stable/prometheus/templates/server-deployment.yaml @@ -43,30 +43,32 @@ spec: {{ toYaml .Values.server.extraInitContainers | indent 8 }} {{- end }} containers: - - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }} - image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}" - imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}" + {{- if .Values.configmapReload.prometheus.enabled }} + - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.prometheus.name }} + image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}" + imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}" args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload - {{- range $key, $value := .Values.configmapReload.extraArgs }} + {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} - {{- range .Values.configmapReload.extraVolumeDirs }} + {{- range .Values.configmapReload.prometheus.extraVolumeDirs }} - --volume-dir={{ . }} {{- end }} resources: -{{ toYaml .Values.configmapReload.resources | indent 12 }} +{{ toYaml .Values.configmapReload.prometheus.resources | indent 12 }} volumeMounts: - name: config-volume mountPath: /etc/config readOnly: true - {{- range .Values.configmapReload.extraConfigmapMounts }} - - name: {{ $.Values.configmapReload.name }}-{{ .name }} + {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }} + - name: {{ $.Values.configmapReload.prometheus.name }}-{{ .name }} mountPath: {{ .mountPath }} subPath: {{ .subPath }} readOnly: {{ .readOnly }} {{- end }} + {{- end }} - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }} image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}" @@ -188,8 +190,8 @@ spec: hostPath: path: {{ .hostPath }} {{- end }} - {{- range .Values.configmapReload.extraConfigmapMounts }} - - name: {{ $.Values.configmapReload.name }}-{{ .name }} + {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }} + - name: {{ $.Values.configmapReload.prometheus.name }}-{{ .name }} configMap: name: {{ .configMap }} {{- end }} @@ -203,7 +205,7 @@ spec: secret: secretName: {{ .secretName }} {{- end }} - {{- range .Values.configmapReload.extraConfigmapMounts }} + {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }} - name: {{ .name }} configMap: name: {{ .configMap }} diff --git a/stable/prometheus/templates/server-statefulset.yaml b/stable/prometheus/templates/server-statefulset.yaml index 4569fefb2d..ea6ae550f4 100644 --- a/stable/prometheus/templates/server-statefulset.yaml +++ b/stable/prometheus/templates/server-statefulset.yaml @@ -44,30 +44,32 @@ spec: {{- end }} serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }} containers: - - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }} - image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}" - imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}" + {{- if .Values.configmapReload.prometheus.enabled }} + - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.prometheus.name }} + image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}" + imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}" args: - --volume-dir=/etc/config - --webhook-url=http://127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload - {{- range $key, $value := .Values.configmapReload.extraArgs }} + {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} - {{- range .Values.configmapReload.extraVolumeDirs }} + {{- range .Values.configmapReload.prometheus.extraVolumeDirs }} - --volume-dir={{ . }} {{- end }} resources: -{{ toYaml .Values.configmapReload.resources | indent 12 }} +{{ toYaml .Values.configmapReload.prometheus.resources | indent 12 }} volumeMounts: - name: config-volume mountPath: /etc/config readOnly: true - {{- range .Values.configmapReload.extraConfigmapMounts }} - - name: {{ $.Values.configmapReload.name }}-{{ .name }} + {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }} + - name: {{ $.Values.configmapReload.prometheus.name }}-{{ .name }} mountPath: {{ .mountPath }} subPath: {{ .subPath }} readOnly: {{ .readOnly }} {{- end }} + {{- end }} - name: {{ template "prometheus.name" . }}-{{ .Values.server.name }} image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}" imagePullPolicy: "{{ .Values.server.image.pullPolicy }}" @@ -168,8 +170,8 @@ spec: hostPath: path: {{ .hostPath }} {{- end }} - {{- range .Values.configmapReload.extraConfigmapMounts }} - - name: {{ $.Values.configmapReload.name }}-{{ .name }} + {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }} + - name: {{ $.Values.configmapReload.prometheus.name }}-{{ .name }} configMap: name: {{ .configMap }} {{- end }} @@ -183,7 +185,7 @@ spec: secret: secretName: {{ .secretName }} {{- end }} - {{- range .Values.configmapReload.extraConfigmapMounts }} + {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }} - name: {{ .name }} configMap: name: {{ .configMap }} diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index 0f5ba46cb9..c6d8d9c847 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -306,39 +306,83 @@ alertmanager: ## Ref: https://github.com/jimmidyson/configmap-reload ## configmapReload: - ## configmap-reload container name - ## - name: configmap-reload + prometheus: + ## If false, the configmap-reload container will not be deployed + ## + enabled: true - ## configmap-reload container image - ## - image: - repository: jimmidyson/configmap-reload - tag: v0.3.0 - pullPolicy: IfNotPresent + ## configmap-reload container name + ## + name: configmap-reload - ## Additional configmap-reload container arguments - ## - extraArgs: {} - ## Additional configmap-reload volume directories - ## - extraVolumeDirs: [] + ## configmap-reload container image + ## + image: + repository: jimmidyson/configmap-reload + tag: v0.3.0 + pullPolicy: IfNotPresent + + ## Additional configmap-reload container arguments + ## + extraArgs: {} + ## Additional configmap-reload volume directories + ## + extraVolumeDirs: [] - ## Additional configmap-reload mounts - ## - extraConfigmapMounts: [] - # - name: prometheus-alerts - # mountPath: /etc/alerts.d - # subPath: "" - # configMap: prometheus-alerts - # readOnly: true + ## Additional configmap-reload mounts + ## + extraConfigmapMounts: [] + # - name: prometheus-alerts + # mountPath: /etc/alerts.d + # subPath: "" + # configMap: prometheus-alerts + # readOnly: true - ## configmap-reload resource requests and limits - ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: {} + ## configmap-reload resource requests and limits + ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: {} + alertmanager: + ## If false, the configmap-reload container will not be deployed + ## + enabled: true + + ## configmap-reload container name + ## + name: configmap-reload + + ## configmap-reload container image + ## + image: + repository: jimmidyson/configmap-reload + tag: v0.3.0 + pullPolicy: IfNotPresent + + ## Additional configmap-reload container arguments + ## + extraArgs: {} + ## Additional configmap-reload volume directories + ## + extraVolumeDirs: [] + + + ## Additional configmap-reload mounts + ## + extraConfigmapMounts: [] + # - name: prometheus-alerts + # mountPath: /etc/alerts.d + # subPath: "" + # configMap: prometheus-alerts + # readOnly: true + + + ## configmap-reload resource requests and limits + ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: {} + kubeStateMetrics: ## If false, kube-state-metrics will not be installed