diff --git a/contrib/ansible/group_vars/all.yml b/contrib/ansible/group_vars/all.yml
index 413c4d2241..9e8b65d5ef 100644
--- a/contrib/ansible/group_vars/all.yml
+++ b/contrib/ansible/group_vars/all.yml
@@ -43,6 +43,9 @@ flannel_prefix: 12
 # room for 4096 nodes with 254 pods per node.
 flannel_host_prefix: 24
 
+# Turn to false to disable cluster monitoring with heapster and influxdb
+cluster_monitoring: true
+
 # Turn this varable to 'false' to disable whole DNS configuration.
 dns_setup: true
 # How many replicas in the Replication Controller
diff --git a/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml b/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml
new file mode 100644
index 0000000000..71120c7618
--- /dev/null
+++ b/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml
@@ -0,0 +1,15 @@
+---
+- name: MONITORING | Assures {{ kube_config_dir }}/addons/cluster-monitoring dir exists
+  file: path={{ kube_config_dir }}/addons/cluster-monitoring state=directory
+
+- name: MONITORING | Download monitoring files from Kubernetes repo
+  get_url:
+    url=https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/cluster/addons/cluster-monitoring/influxdb/{{ item }}
+    dest="{{ kube_config_dir }}/addons/cluster-monitoring/"
+    force=yes
+  with_items:
+    - grafana-service.yaml
+    - heapster-controller.yaml
+    - heapster-service.yaml
+    - influxdb-grafana-controller.yaml
+    - influxdb-service.yaml
diff --git a/contrib/ansible/roles/kubernetes-addons/tasks/main.yml b/contrib/ansible/roles/kubernetes-addons/tasks/main.yml
index 67802394f3..a319594f86 100644
--- a/contrib/ansible/roles/kubernetes-addons/tasks/main.yml
+++ b/contrib/ansible/roles/kubernetes-addons/tasks/main.yml
@@ -13,7 +13,9 @@
 
 - include: dns.yml
   when: dns_setup
-  tags: dns
+
+- include: cluster-monitoring.yml
+  when: cluster_monitoring
 
 #- name: Get kube-addons script from Kubernetes
 #  get_url:
@@ -39,6 +41,7 @@
     TOKEN_DIR: "{{ kube_token_dir }}"
   with_items:
     - "system:dns"
+    - "system:monitoring"
   register: gentoken
   changed_when: "'Added' in gentoken.stdout"
   notify: