From a25f2ad28d5d65a3c043a8a1b9e9bd103ac799ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Fri, 27 Feb 2015 17:05:00 +0100 Subject: [PATCH] Add node monitoring and logging facilities to libvirt-coreos Deploy cadvisor and fluentd on each minion. --- cluster/libvirt-coreos/config-default.sh | 7 +++++++ cluster/libvirt-coreos/user_data_minion.yml | 3 ++- cluster/libvirt-coreos/util.sh | 13 +++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cluster/libvirt-coreos/config-default.sh b/cluster/libvirt-coreos/config-default.sh index 76b9c9aedde..90efad88d33 100644 --- 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 index d16abd09017..3c75b16dd59 100644 --- 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 index d29737f9f27..05a65325e3b 100644 --- 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 }