Merge pull request #9309 from saad-ali/issue9028

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

+apiVersion: v1beta3
+kind: ReplicationController
+metadata: 
+  name: monitoring-heapster-v1
+  namespace: default
+  labels: 
+    k8s-app: heapster
+    version: v1
+    kubernetes.io/cluster-service: "true"
+spec: 
+  replicas: 1
+  selector: 
+    k8s-app: heapster
+    version: v1
+  template: 
+    metadata: 
+      labels: 
+        k8s-app: heapster
+        version: v1
+        kubernetes.io/cluster-service: "true"
+    spec: 
+      containers: 
+        - image: gcr.io/google_containers/heapster:v0.13.0
+          name: heapster
+          command:
+            - /heapster
+            - --source=kubernetes:https://kubernetes
+            - --sink=gcl
+            - --sink=influxdb:http://monitoring-influxdb:8086
+            - --poll_duration=2m
+            - --stats_resolution=1m
+          volumeMounts: 
+            - name: ssl-certs
+              mountPath: /etc/ssl/certs
+              readOnly: true
+            - name: monitoring-token
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+
+      volumes: 
+        - name: ssl-certs
+          hostPath: 
+            path: /etc/ssl/certs
+        - name: monitoring-token
+          secret:
+            secretName: token-system-monitoring
+

cluster/gce/config-default.sh

@@ -54,10 +54,11 @@ ENABLE_DOCKER_REGISTRY_CACHE=true
 ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"
 
 # Optional: Cluster monitoring to setup as part of the cluster bring up:
-#   none     - No cluster monitoring setup 
-#   influxdb - Heapster, InfluxDB, and Grafana 
-#   google   - Heapster, Google Cloud Monitoring, and Google Cloud Logging 
-ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-google}"
+#   none           - No cluster monitoring setup 
+#   influxdb       - Heapster, InfluxDB, and Grafana 
+#   google         - Heapster, Google Cloud Monitoring, and Google Cloud Logging 
+#   googleinfluxdb - Enable influxdb and google (except GCM)
+ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-googleinfluxdb}"
 
 # Optional: Enable node logging.
 ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}"

cluster/saltbase/salt/kube-addons/init.sls

@@ -33,6 +33,18 @@ addon-dir-create:
     - file_mode: 644
 {% endif %}
 
+{% if pillar.get('enable_cluster_monitoring', '').lower() == 'googleinfluxdb' %}
+/etc/kubernetes/addons/cluster-monitoring/googleinfluxdb:
+  file.recurse:
+    - source: salt://kube-addons/cluster-monitoring
+    - include_pat: E@(^.+\.yaml$|^.+\.json$)
+    - exclude_pat: E@(^.+heapster-controller\.yaml$|^.+heapster-controller\.json$)
+    - user: root
+    - group: root
+    - dir_mode: 755
+    - file_mode: 644
+{% endif %}
+
 {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
 /etc/kubernetes/addons/dns/skydns-svc.yaml:
   file.managed: