From 6a907b1135278f9eaef8983fda754002fedfa54c Mon Sep 17 00:00:00 2001
From: saadali <saadali@google.com>
Date: Mon, 4 May 2015 16:49:28 -0700
Subject: [PATCH] Enable Google Cloud Monitoring and Google Cloud Logging
 instead of Influxdb for Google Compute Engine deployments.

---
 init.sls       | 19 +++++++++++++++----
 kube-addons.sh |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/init.sls b/init.sls
index 9ff1b7530d..a129666b43 100644
--- a/init.sls
+++ b/init.sls
@@ -1,8 +1,19 @@
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'true' %}
-/etc/kubernetes/addons/cluster-monitoring:
+{% if pillar.get('enable_cluster_monitoring', '').lower() == 'influxdb' %}
+/etc/kubernetes/addons/cluster-monitoring/influxdb:
   file.recurse:
-    - source: salt://kube-addons/cluster-monitoring
-    - include_pat: E@^.+\.yaml$
+    - source: salt://kube-addons/cluster-monitoring/influxdb
+    - include_pat: E@(^.+\.yaml$|^.+\.json$)
+    - user: root
+    - group: root
+    - dir_mode: 755
+    - file_mode: 644
+{% endif %}
+
+{% if pillar.get('enable_cluster_monitoring', '').lower() == 'google' %}
+/etc/kubernetes/addons/cluster-monitoring/google:
+  file.recurse:
+    - source: salt://kube-addons/cluster-monitoring/google
+    - include_pat: E@(^.+\.yaml$|^.+\.json$)
     - user: root
     - group: root
     - dir_mode: 755
diff --git a/kube-addons.sh b/kube-addons.sh
index a649c058e1..c6131c89ec 100644
--- a/kube-addons.sh
+++ b/kube-addons.sh
@@ -110,7 +110,7 @@ while read line; do
   create-kubeconfig-secret "${token}" "${username}"
 done < /srv/kubernetes/known_tokens.csv
 
-for obj in $(find /etc/kubernetes/addons -name \*.yaml); do
+for obj in $(find /etc/kubernetes/addons \( -name \*.yaml -o -name \*.json \)); do
   start_addon ${obj} 100 10 &
   echo "++ addon ${obj} starting in pid $! ++"
 done