diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 87325a5c4d..48b533ce5d 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 1.20.1
+version: 1.21.0
 appVersion: 5.4.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index 51d7709ad6..67144abb2e 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -63,6 +63,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `env`                                     | Extra environment variables passed to pods    | `{}`                                                    |
 | `envFromSecret`                           | Name of a Kubenretes secret (must be manually created in the same namespace) containing values to be added to the environment | `""` |
 | `extraSecretMounts`                       | Additional grafana server secret mounts       | `[]`                                                    |
+| `extraVolumeMounts`                       | Additional grafana server volume mounts       | `[]`                                                    |
 | `plugins`                                 | Plugins to be loaded along with Grafana       | `[]`                                                    |
 | `datasources`                             | Configure grafana datasources                 | `{}`                                                    |
 | `dashboardProviders`                      | Configure grafana dashboard providers         | `{}`                                                    |
diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
index 780bae7e7a..f3a7ebeed4 100644
--- a/stable/grafana/templates/deployment.yaml
+++ b/stable/grafana/templates/deployment.yaml
@@ -163,6 +163,11 @@ spec:
               mountPath: {{ .mountPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
+          {{- range .Values.extraVolumeMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              readOnly: {{ .readOnly }}
+          {{- end }}
           ports:
             - name: service
               containerPort: {{ .Values.service.port }}
@@ -279,3 +284,8 @@ spec:
             secretName: {{ .secretName }}
             defaultMode: {{ .defaultMode }}
       {{- end }}
+      {{- range .Values.extraVolumeMounts }}
+        - name: {{ .name }}
+          persistentVolumeClaim:
+            claimName: {{ .existingClaim }}
+      {{- end }}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index c22f132785..be54dcb534 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -135,6 +135,14 @@ extraSecretMounts: []
   #   secretName: grafana-secret-files
   #   readOnly: true
 
+## Additional grafana server volume mounts
+# Defines additional volume mounts.
+extraVolumeMounts: []
+  # - name: extra-volume
+  #   mountPath: /mnt/volume
+  #   readOnly: true
+  #   existingClaim: volume-claim
+
 ## Pass the plugins you want installed as a list.
 ##
 plugins: []