diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 12b1dc36bb..6f72b274c4 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -50,3 +50,4 @@ The command removes all the Kubernetes components associated with the chart and
 | `server.service.externalIPs`              | External IP addresses               | null                                              |
 | `server.service.type`                     | ClusterIP, NodePort, or LoadBalancer| ClusterIP                                         |
 | `server.setDatasource.enabled`            | Creates grafana datasource with job | false                                             |
+| `server.extraEnv`                          | Extra environment variables to set in the server container | {} |
diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
index 563ca6d130..16d5489b48 100644
--- a/stable/grafana/templates/deployment.yaml
+++ b/stable/grafana/templates/deployment.yaml
@@ -51,6 +51,10 @@ spec:
                   name: {{ template "grafana.server.fullname" . }}-config
                   key: grafana-install-plugins
             {{- end }}
+            {{- range $key, $value := .Values.server.extraEnv }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+            {{- end }}
           ports:
             - containerPort: 3000
           readinessProbe:
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index ec9608472e..6837015a72 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -8,6 +8,7 @@ server:
   ##
   image: "grafana/grafana:latest"
 
+  extraEnv: {}
   nodeSelector: {}
   tolerations: []