Revert "Adding a replication controller for all monitoring pods."

cluster/addons/cluster-monitoring/grafana-service.yaml

@@ -1,7 +0,0 @@
-apiVersion: "v1beta1"
-kind: "Service"
-id: "monitoring-grafana"
-port: 8087
-containerPort: 80
-selector: 
-  name: "influxGrafana"

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

@@ -1,20 +0,0 @@
-apiVersion: "v1beta1"
-id: "monitoring-heapsterController"
-kind: "ReplicationController"
-desiredState: 
-  replicas: 1
-  replicaSelector:    
-    name: "heapster"
-  podTemplate:
-    desiredState:
-      manifest:
-        version: "v1beta1"
-        id: "monitoring-heapsterController"
-        containers:
-          - name: "heapster"
-            image: "kubernetes/heapster:v0.5"
-    labels: 
-      name: "heapster"
-      uses: "monitoring-influxdb"
-labels: 
-  name: "heapster"

cluster/addons/cluster-monitoring/heapster-pod.json

@@ -0,0 +1,20 @@
+{
+  "id": "heapster",
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
+  "desiredState": {
+    "manifest": {
+      "version": "v1beta1",
+      "id": "heapster",
+      "containers": [
+        {
+          "name": "heapster",
+          "image": "kubernetes/heapster"
+        }
+      ]
+    }
+  },
+  "labels": {
+    "name": "heapster"
+  }
+}

cluster/addons/cluster-monitoring/influx-grafana-pod.json

@@ -0,0 +1,71 @@
+{
+  "id": "influx-grafana",
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
+  "desiredState": {
+    "manifest": {
+      "version": "v1beta1",
+      "id": "influx-grafana",
+      "containers": [
+        {
+          "name": "influxdb",
+          "image": "kubernetes/heapster_influxdb",
+          "ports": [
+            {
+              "containerPort": 8083,
+              "hostPort": 8083
+            },
+            {
+              "containerPort": 8086,
+              "hostPort": 8086
+            },
+            {
+              "containerPort": 8090,
+              "hostPort": 8090
+            },
+            {
+              "containerPort": 8099,
+              "hostPort": 8099
+            }
+          ]
+        },
+        {
+          "name": "grafana",
+          "image": "kubernetes/heapster_grafana",
+          "ports": [
+            {
+              "containerPort": 80,
+              "hostPort": 80
+            }
+          ],
+          "env": [
+            {
+              "name": "HTTP_USER",
+              "value": "{KUBE_USER}"
+            },
+            {
+              "name": "HTTP_PASS",
+              "value": "{KUBE_PASSWORD}"
+            }
+          ]
+        },
+        {
+          "name": "elasticsearch",
+          "image": "dockerfile/elasticsearch",
+          "ports": [
+            {
+              "containerPort": 9200,
+              "hostPort": 9200
+            },
+            {
+              "containerPort": 9300
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "labels": {
+    "name": "influxdb"
+  }
+}

cluster/addons/cluster-monitoring/influx-grafana-service.json

@@ -0,0 +1,12 @@
+{
+  "id": "influx-master",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
+  "port": 8085,
+  "containerPort": 8086,
+  "provider": "kubernetes-default",
+  "component": "influxdb",
+  "selector": {
+    "name": "influxdb"
+  }
+}

cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml

@@ -1,34 +0,0 @@
-apiVersion: "v1beta1"
-kind: "ReplicationController"
-id: "monitoring-influxGrafanaController"
-desiredState: 
-  replicas: 1
-  replicaSelector:
-    name: "influxGrafana"
-  podTemplate:
-    labels:
-      name: "influxGrafana"
-    desiredState:
-      manifest:
-        version: "v1beta1"
-        id: "monitoring-influxGrafanaController"
-        containers: 
-          - name: "influxdb"
-            image: "kubernetes/heapster_influxdb:v0.2"
-            ports: 
-              - containerPort: 8083
-                hostPort: 8083
-              - containerPort: 8086
-                hostPort: 8086
-          - name: "grafana"
-            image: "kubernetes/heapster_grafana:v0.2"
-            ports: 
-              - containerPort: 80
-                hostPort: 80
-            env: 
-              - name: "HTTP_USER"
-                value: "admin"
-              - name: "HTTP_PASS"
-                value: "**None**"
-labels:
-  name: "influxGrafana"

cluster/addons/cluster-monitoring/influxdb-service.yaml

@@ -1,7 +0,0 @@
-apiVersion: "v1beta1"
-kind: "Service"
-id: "monitoring-influxdb"
-port: 8085
-containerPort: 8086
-selector: 
-  name: "influxGrafana"