diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml
index 60beb1ce20..db945b4a5c 100644
--- a/stable/kibana/Chart.yaml
+++ b/stable/kibana/Chart.yaml
@@ -1,5 +1,5 @@
 name: kibana
-version: 1.1.2
+version: 1.2.0
 appVersion: 6.5.4
 description: Kibana is an open source data visualization plugin for Elasticsearch
 icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg
diff --git a/stable/kibana/README.md b/stable/kibana/README.md
index acb7a07c03..43a1f439e2 100644
--- a/stable/kibana/README.md
+++ b/stable/kibana/README.md
@@ -64,9 +64,12 @@ The following table lists the configurable parameters of the kibana chart and th
 | `serviceAccount.name`                         | name of the serviceAccount to create       | `kibana.fullname`                      |
 | `authProxyEnabled`                            | enables authproxy. Create container in extracontainers   | `false`                  |
 | `extraContainers`                             | Sidecar containers to add to the kibana pod| `{}`                                   |
+| `extraVolumeMounts`                           | additional volumemounts for the kibana pod | `[]`                                   |
+| `extraVolumes`                                | additional volumes to add to the kibana pod| `[]`                                   |
 | `resources`                                   | pod resource requests & limits             | `{}`                                   |
 | `priorityClassName`                           | priorityClassName                          | `nil`                                  |
 | `service.externalPort`                        | external port for the service              | `443`                                  |
+| `service.disableInternalPort`                 | disable internal port when using sidecar   | `false`                                |
 | `service.internalPort`                        | internal port for the service              | `4180`                                 |
 | `service.authProxyPort`                       | port to use when using sidecar authProxy   | None:                                  |
 | `service.externalIPs`                         | external IP addresses                      | None:                                  |
diff --git a/stable/kibana/ci/dashboard-values.yaml b/stable/kibana/ci/dashboard-values.yaml
index 7123f00f46..864139155c 100644
--- a/stable/kibana/ci/dashboard-values.yaml
+++ b/stable/kibana/ci/dashboard-values.yaml
@@ -18,4 +18,3 @@ dashboardImport:
           }
         ]
       }
-
diff --git a/stable/kibana/ci/disabled-internal-port.yaml b/stable/kibana/ci/disabled-internal-port.yaml
new file mode 100644
index 0000000000..51e49a736f
--- /dev/null
+++ b/stable/kibana/ci/disabled-internal-port.yaml
@@ -0,0 +1,4 @@
+---
+# disable internal service
+service:
+  disableInternalPort: true
diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml
index 8b6fa6758e..ac227bc0e6 100644
--- a/stable/kibana/templates/deployment.yaml
+++ b/stable/kibana/templates/deployment.yaml
@@ -106,10 +106,12 @@ spec:
         - name: "{{ $key }}"
           value: "{{ $value }}"
         {{- end }}
+{{- if .Values.service.disableInternalPort }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
           name: {{ template "kibana.name" . }}
           protocol: TCP
+{{- end }}
         volumeMounts:
         - name: plugins
           mountPath: /usr/share/kibana/plugins
@@ -171,6 +173,9 @@ spec:
           mountPath: "/usr/share/kibana/config/{{ $configFile }}"
           subPath: {{ $configFile }}
         {{- end }}
+{{- if .Values.extraVolumeMounts }}
+{{ toYaml .Values.extraVolumeMounts | indent 10 }}
+{{- end }}
 {{- if .Values.plugins.enabled}}
         - name: plugins
           mountPath: /usr/share/kibana/plugins
@@ -229,3 +234,6 @@ spec:
           configMap:
             name: {{ .configMap }}
 {{- end }}
+{{- if .Values.extraVolumes }}
+{{ toYaml .Values.extraVolumes | indent 8 }}
+{{- end }}
diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
index 9cb181eb25..f763130085 100644
--- a/stable/kibana/values.yaml
+++ b/stable/kibana/values.yaml
@@ -35,6 +35,8 @@ deployment:
 service:
   type: ClusterIP
   externalPort: 443
+  # disables the internal port if set to true; to be used with a sidecar
+  disableInternalPort: false
   internalPort: 5601
   # authProxyPort: 5602 To be used with authProxyEnabled and a proxy extraContainer
   ## External IP addresses of service
@@ -105,6 +107,11 @@ extraContainers: |
 #   ports:
 #     - name: web
 #       containerPort: 9090
+
+extraVolumeMounts: []
+
+extraVolumes: []
+
 resources: {}
   # limits:
   #   cpu: 100m