diff --git a/stable/elasticsearch-exporter/Chart.yaml b/stable/elasticsearch-exporter/Chart.yaml
index 0bdd2fdf1a..6c14bb59e9 100644
--- a/stable/elasticsearch-exporter/Chart.yaml
+++ b/stable/elasticsearch-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: elasticsearch-exporter
-version: 1.7.0
-appVersion: 1.0.2
+version: 1.8.0
+appVersion: 1.1.0
 home: https://github.com/justwatchcom/elasticsearch_exporter
 sources:
   - https://github.com/justwatchcom/elasticsearch_exporter
diff --git a/stable/elasticsearch-exporter/README.md b/stable/elasticsearch-exporter/README.md
index 4b4314706e..25c52fcd97 100644
--- a/stable/elasticsearch-exporter/README.md
+++ b/stable/elasticsearch-exporter/README.md
@@ -47,7 +47,7 @@ Parameter | Description | Default
 `replicaCount` | desired number of pods | `1`
 `restartPolicy` | container restart policy | `Always`
 `image.repository` | container image repository | `justwatch/elasticsearch_exporter`
-`image.tag` | container image tag | `1.0.2`
+`image.tag` | container image tag | `1.1.0`
 `image.pullPolicy` | container image pull policy | `IfNotPresent`
 `image.pullSecret` | container image pull secret | `""`
 `resources` | resource requests & limits | `{}`
@@ -64,6 +64,9 @@ Parameter | Description | Default
 `es.uri` | address of the Elasticsearch node to connect to | `localhost:9200`
 `es.all` | if `true`, query stats for all nodes in the cluster, rather than just the node we connect to | `true`
 `es.indices` | if true, query stats for all indices in the cluster | `true`
+`es.shards` | if true, query stats for shards in the cluster | `true`
+`es.cluster_settings` | if true, query stats for cluster settings | `true`
+`es.snapshots` | if true, query stats for snapshots in the cluster | `true`
 `es.timeout` | timeout for trying to get stats from Elasticsearch | `30s`
 `es.ssl.enabled` | If true, a secure connection to E cluster is used | `false`
 `es.ssl.client.ca.pem` | PEM that contains trusted CAs used for setting up secure Elasticsearch connection |
diff --git a/stable/elasticsearch-exporter/templates/deployment.yaml b/stable/elasticsearch-exporter/templates/deployment.yaml
index 01d459eb6c..fbdf095566 100644
--- a/stable/elasticsearch-exporter/templates/deployment.yaml
+++ b/stable/elasticsearch-exporter/templates/deployment.yaml
@@ -53,20 +53,33 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["elasticsearch_exporter",
-                    "-es.uri={{ .Values.es.uri }}",
-                    "-es.all={{ .Values.es.all }}",
-                    "-es.indices={{ .Values.es.indices }}",
-                    "-es.timeout={{ .Values.es.timeout }}",
+                    "--es.uri={{ .Values.es.uri }}",
+                    {{- if .Values.es.all }}
+                    "--es.all",
+                    {{- end }}
+                    {{- if .Values.es.indices }}
+                    "--es.indices",
+                    {{- end }}
+                    {{- if .Values.es.shards }}
+                    "--es.shards",
+                    {{- end }}
+                    {{- if .Values.es.snapshots }}
+                    "--es.snapshots",
+                    {{- end }}
+                    {{- if .Values.es.cluster_settings }}
+                    "--es.cluster_settings",
+                    {{- end }}
+                    "--es.timeout={{ .Values.es.timeout }}",
                     {{- if .Values.es.sslSkipVerify }}
-                    "-es.ssl-skip-verify=true",
+                    "--es.ssl-skip-verify",
                     {{- end }}
                     {{- if .Values.es.ssl.enabled }}
-                    "-es.ca=/ssl/ca.pem",
-                    "-es.client-cert=/ssl/client.pem",
-                    "-es.client-private-key=/ssl/client.key",
+                    "--es.ca=/ssl/ca.pem",
+                    "--es.client-cert=/ssl/client.pem",
+                    "--es.client-private-key=/ssl/client.key",
                     {{- end }}
-                    "-web.listen-address=:{{ .Values.service.httpPort }}",
-                    "-web.telemetry-path={{ .Values.web.path }}"]
+                    "--web.listen-address=:{{ .Values.service.httpPort }}",
+                    "--web.telemetry-path={{ .Values.web.path }}"]
           securityContext:
             capabilities:
               drop:
diff --git a/stable/elasticsearch-exporter/values.yaml b/stable/elasticsearch-exporter/values.yaml
index 4a1ebdca68..3231d088d8 100644
--- a/stable/elasticsearch-exporter/values.yaml
+++ b/stable/elasticsearch-exporter/values.yaml
@@ -8,7 +8,7 @@ restartPolicy: Always
 
 image:
   repository: justwatch/elasticsearch_exporter
-  tag: 1.0.2
+  tag: 1.1.0
   pullPolicy: IfNotPresent
   pullSecret: ""
 
@@ -68,6 +68,18 @@ es:
   ##
   indices: true
 
+  ## If true, query stats for shards in the cluster.
+  ##
+  shards: true
+
+  ## If true, query stats for snapshots in the cluster.
+  ##
+  snapshots: true
+
+  ## If true, query stats for cluster settings.
+  ##
+  cluster_settings: false
+
   ## Timeout for trying to get stats from Elasticsearch. (ex: 20s)
   ##
   timeout: 30s