Add node monitoring and logging facilities to libvirt-coreos

Deploy cadvisor and fluentd on each minion.
satnam6502 · Mar 2, 2015 · a25f2ad · a25f2ad
1 parent 9077c23
commit a25f2ad
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/cluster/libvirt-coreos/config-default.sh b/cluster/libvirt-coreos/config-default.sh
@@ -47,3 +47,10 @@ done
 MINION_CONTAINER_SUBNETS[$NUM_MINIONS]=$MASTER_CONTAINER_SUBNET
 
 PORTAL_NET=10.11.0.0/16
+
+# Optional: Install node monitoring.
+ENABLE_NODE_MONITORING=true
+
+# Optional: Enable node logging.
+ENABLE_NODE_LOGGING=false
+LOGGING_DESTINATION=elasticsearch
diff --git a/cluster/libvirt-coreos/user_data_minion.yml b/cluster/libvirt-coreos/user_data_minion.yml
@@ -16,7 +16,8 @@ coreos:
         ExecStart=/opt/kubernetes/bin/kubelet \
         --address=0.0.0.0 \
         --hostname_override=${MINION_IPS[$i]} \
-        --etcd_servers=http://127.0.0.1:4001
+        --etcd_servers=http://127.0.0.1:4001 \
+        --config=/opt/kubernetes/manifests
         Restart=always
         RestartSec=2
 

diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh
@@ -124,6 +124,19 @@ function initialize-pool {
 
   mkdir -p "$POOL_PATH/kubernetes"
   kube-push
+
+  mkdir -p "$POOL_PATH/kubernetes/manifests"
+  if [[ "$ENABLE_NODE_MONITORING" == "true" ]]; then
+      cp "$KUBE_ROOT/cluster/saltbase/salt/cadvisor/cadvisor.manifest" "$POOL_PATH/kubernetes/manifests"
+  fi
+  if [[ "$ENABLE_NODE_LOGGING" == "true" ]]; then
+      if [[ "$LOGGING_DESTINATION" == "elasticsearch" ]]; then
+          cp "$KUBE_ROOT/cluster/saltbase/salt/fluentd-es/fluentd-es.manifest" "$POOL_PATH/kubernetes/manifests"
+      elif [[ "$LOGGING_DESTINATION" == "gcp" ]]; then
+          cp "$KUBE_ROOT/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest" "$POOL_PATH/kubernetes/manifests"
+      fi
+  fi
+
   virsh pool-refresh $POOL
 }