diff --git a/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/grafana-service.yaml b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/grafana-service.yaml
new file mode 100644
index 00000000000..d85dbaaf624
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/grafana-service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1beta3
+kind: Service
+metadata: 
+  labels: 
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Grafana"
+  name: monitoring-grafana
+spec: 
+  ports: 
+    - port: 80
+      targetPort: 8080
+  selector: 
+    name: influxGrafana
+
diff --git a/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml
new file mode 100644
index 00000000000..f82d7063b68
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -0,0 +1,24 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata: 
+  labels: 
+    name: heapster
+    kubernetes.io/cluster-service: "true"
+  name: monitoring-heapster-controller
+spec: 
+  replicas: 1
+  selector: 
+    name: heapster
+  template: 
+    metadata: 
+      labels: 
+        name: heapster
+        kubernetes.io/cluster-service: "true"
+    spec: 
+      containers: 
+        - image: gcr.io/google_containers/heapster:v0.12.1
+          name: heapster
+          command:
+            - /heapster
+            - --source=kubernetes:http://kubernetes-ro?auth=
+            - --sink=influxdb:http://monitoring-influxdb:8086
diff --git a/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
new file mode 100644
index 00000000000..58d8c1e1e89
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -0,0 +1,35 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata: 
+  labels: 
+    name: influxGrafana
+    kubernetes.io/cluster-service: "true"
+  name: monitoring-influx-grafana-controller
+spec: 
+  replicas: 1
+  selector: 
+    name: influxGrafana
+  template: 
+    metadata: 
+      labels: 
+        name: influxGrafana
+        kubernetes.io/cluster-service: "true"
+    spec: 
+      containers: 
+        - image: gcr.io/google_containers/heapster_influxdb:v0.3
+          name: influxdb
+          ports: 
+            - containerPort: 8083
+              hostPort: 8083
+            - containerPort: 8086
+              hostPort: 8086
+        - image: gcr.io/google_containers/heapster_grafana:v0.7
+          name: grafana
+          env: 
+            - name: INFLUXDB_EXTERNAL_URL
+              value: /api/v1beta3/proxy/namespaces/default/services/monitoring-grafana/db/
+            - name: INFLUXDB_HOST
+              value: monitoring-influxdb
+            - name: INFLUXDB_PORT
+              value: "8086"
+
diff --git a/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/influxdb-service.yaml b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/influxdb-service.yaml
new file mode 100644
index 00000000000..fa7d26ec365
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/influxdb-service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1beta3
+kind: Service
+metadata: 
+  labels: 
+    name: influxGrafana
+  name: monitoring-influxdb
+spec: 
+  ports: 
+    - name: http
+      port: 8083
+      targetPort: 8083
+    - name: api
+      port: 8086
+      targetPort: 8086
+  selector: 
+    name: influxGrafana
+
diff --git a/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml
new file mode 100644
index 00000000000..0b1354be68d
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml
@@ -0,0 +1,37 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  name: elasticsearch-logging-v1
+  namespace: default
+  labels:
+    k8s-app: elasticsearch-logging
+    version: v1
+    kubernetes.io/cluster-service: "true"
+spec:
+  replicas: 2
+  selector:
+    k8s-app: elasticsearch-logging
+    version: v1
+  template:
+    metadata:
+      labels:
+        k8s-app: elasticsearch-logging
+        version: v1
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - image: gcr.io/google_containers/elasticsearch:1.3
+        name: elasticsearch-logging
+        ports:
+        - containerPort: 9200
+          name: es-port
+          protocol: TCP
+        - containerPort: 9300
+          name: es-transport-port
+          protocol: TCP
+        volumeMounts:
+        - name: es-persistent-storage
+          mountPath: /data
+      volumes:
+      - name: es-persistent-storage
+        emptyDir: {}
\ No newline at end of file
diff --git a/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-service.yaml b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-service.yaml
new file mode 100644
index 00000000000..4551b5d6ab6
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1beta3
+kind: Service
+metadata:
+  name: elasticsearch-logging
+  namespace: default
+  labels:
+    k8s-app: elasticsearch-logging
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Elasticsearch"
+spec:
+  ports:
+  - port: 9200
+    protocol: TCP
+    targetPort: es-port
+  selector:
+    k8s-app: elasticsearch-logging
diff --git a/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/kibana-controller.yaml b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/kibana-controller.yaml
new file mode 100644
index 00000000000..8d8ec059c6c
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -0,0 +1,31 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  name: kibana-logging-v1
+  namespace: default
+  labels:
+    k8s-app: kibana-logging
+    version: v1
+    kubernetes.io/cluster-service: "true"
+spec:
+  replicas: 1
+  selector:
+    k8s-app: kibana-logging
+    version: v1
+  template:
+    metadata:
+      labels:
+        k8s-app: kibana-logging
+        version: v1
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - name: kibana-logging
+        image: gcr.io/google_containers/kibana:1.3
+        env:
+          - name: "ELASTICSEARCH_URL"
+            value: "http://elasticsearch-logging:9200"
+        ports:
+        - containerPort: 5601
+          name: kibana-port
+          protocol: TCP
diff --git a/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/kibana-service.yaml b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/kibana-service.yaml
new file mode 100644
index 00000000000..3ae4df0d410
--- /dev/null
+++ b/docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -0,0 +1,17 @@
+
+apiVersion: v1beta3
+kind: Service
+metadata:
+  name: kibana-logging
+  namespace: default
+  labels:
+    k8s-app: kibana-logging
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Kibana"
+spec:
+  ports:
+  - port: 5601
+    protocol: TCP
+    targetPort: kibana-port
+  selector:
+    k8s-app: kibana-logging
diff --git a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
index a27d7800fdf..c9988eea217 100644
--- a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
+++ b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
@@ -37,28 +37,29 @@ write_files:
     permissions: '0755'
     owner: root
     content: |
-      version: v1beta2
-      id: fluentd-to-elasticsearch
-      containers:
-        - name: fluentd-es
-          image: gcr.io/google_containers/fluentd-elasticsearch:1.3
+      apiVersion: v1beta3
+      kind: Pod
+      metadata:
+        name: fluentd-elasticsearch
+      spec:
+        containers:
+        - name: fluentd-elasticsearch
+          image: gcr.io/google_containers/fluentd-elasticsearch:1.5
           env:
-            - name: FLUENTD_ARGS
-              value: -qq
+          - name: "FLUENTD_ARGS"
+            value: "-qq"
           volumeMounts:
-            - name: containers
-              mountPath: /var/lib/docker/containers
-            - name: varlog
-              mountPath: /varlog
-      volumes:
-        - name: containers
-          source:
-            hostDir:
-              path: /var/lib/docker/containers
+          - name: varlog
+            mountPath: /varlog
+          - name: containers
+            mountPath: /var/lib/docker/containers
+        volumes:
         - name: varlog
-          source:
-            hostDir:
-              path: /var/log
+          hostPath:
+            path: /var/log
+        - name: containers
+          hostPath:
+            path: /var/lib/docker/containers
 
 coreos:
   update: