Skip to content

Commit

Permalink
[stable/prometheus] extra environment variable for alert manager (hel…
Browse files Browse the repository at this point in the history
…m#1237)

* Added a map of extra environment variable for the alertmanager, this is needed to add the http_proxy so alert manager can connect to external applications if behind a proxy

* Update Chart.yaml
  • Loading branch information
joosthofman authored and Vic Iglesias committed Jul 5, 2017
1 parent 7bc37ac commit 5220a9a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion stable/prometheus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: prometheus
version: 3.0.2
version: 3.0.3
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
Expand Down
5 changes: 5 additions & 0 deletions stable/prometheus/templates/alertmanager-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ spec:
- name: {{ template "prometheus.name" . }}-{{ .Values.alertmanager.name }}
image: "{{ .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}"
imagePullPolicy: "{{ .Values.alertmanager.image.pullPolicy }}"
env:
{{- range $key, $value := .Values.alertmanager.extraEnv }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
args:
- --config.file=/etc/config/alertmanager.yml
- --storage.path={{ .Values.alertmanager.persistentVolume.mountPath }}
Expand Down
5 changes: 5 additions & 0 deletions stable/prometheus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ alertmanager:
##
extraArgs: {}

## Additional alertmanager container environment variable
## For instance to add a http_proxy
##
extraEnv: {}

ingress:
## If true, alertmanager Ingress will be created
##
Expand Down

0 comments on commit 5220a9a

Please sign in to comment.