diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 19feb66a6e..10bbcfd74e 100644
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 5.5.0
+version: 5.5.1
 appVersion: 7.0.5
 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 a2079520f4..5c16af3445 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -68,6 +68,7 @@ You have to add --force to your helm upgrade command as the labels of the chart
 | `service.loadBalancerSourceRanges`        | list of IP CIDRs allowed access to lb (if supported) | `[]`                                             |
 | `service.externalIPs`                     | service external IP addresses                 | `[]`                                                    |
 | `extraExposePorts`                        | Additional service ports for sidecar containers| `[]`                                                   |
+| `hostAliases`                             | adds rules to the pod's /etc/hosts            | `[]`                                                    |
 | `ingress.enabled`                         | Enables Ingress                               | `false`                                                 |
 | `ingress.annotations`                     | Ingress annotations (values are templated)    | `{}`                                                    |
 | `ingress.labels`                          | Custom labels                                 | `{}`                                                    |
diff --git a/stable/grafana/templates/_pod.tpl b/stable/grafana/templates/_pod.tpl
index 0e81fb8851..3c5986608c 100644
--- a/stable/grafana/templates/_pod.tpl
+++ b/stable/grafana/templates/_pod.tpl
@@ -1,3 +1,4 @@
+
 {{- define "grafana.pod" -}}
 {{- if .Values.schedulerName }}
 schedulerName: "{{ .Values.schedulerName }}"
@@ -7,6 +8,10 @@ serviceAccountName: {{ template "grafana.serviceAccountName" . }}
 securityContext:
 {{ toYaml .Values.securityContext | indent 2 }}
 {{- end }}
+{{- if .Values.hostAliases }}
+hostAliases:
+{{ toYaml .Values.hostAliases | indent 2 }}
+{{- end }}
 {{- if .Values.priorityClassName }}
 priorityClassName: {{ .Values.priorityClassName }}
 {{- end }}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index b7523467d0..0ae9360fa4 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -130,6 +130,12 @@ extraExposePorts: []
  #   targetPort: 8080
  #   type: ClusterIP
 
+# overrides pod.spec.hostAliases in the grafana deployment's pods
+hostAliases: []
+  # - ip: "1.2.3.4"
+  #   hostnames:
+  #     - "my.host.com"
+
 ingress:
   enabled: false
   # Values can be templated