From 7976b7a967b47a041bff2878c54e7c203a3fa5df Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 31 Aug 2015 14:58:11 +0200 Subject: configure munin to monitor the armhf hosts via ssh+nc --- bin/jenkins_node_wrapper.sh | 4 +++- hosts/jenkins/etc/munin/munin.conf | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index f96cffbe..3334d3bf 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -59,7 +59,9 @@ info "remote_host called with $*" allowed_cmds=() -if [[ "$*" =~ rebootstrap_.* ]] ; then +if [[ "$*" =~ /bin/nc\ -q\ 0\ localhost\ 4949 ]] ; then + exec nc -q 0 localhost 4949 ; croak "Exec failed"; +elif [[ "$*" =~ rebootstrap_.* ]] ; then REBOOTSTRAPSH="/srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh" REBOOTSTRAPSH="$REBOOTSTRAPSH HOST_ARCH=$(echo $1 | cut -d "_" -f2)" if [[ "$*" =~ .*_debbindiff.* ]] ; then diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf index d15034e6..85d421df 100644 --- a/hosts/jenkins/etc/munin/munin.conf +++ b/hosts/jenkins/etc/munin/munin.conf @@ -122,19 +122,19 @@ contact.me.command mail -s "Munin notification ${var:host}" root use_node_name yes [bpi0-armhf-rb.debian.net] - address 71.236.158.44 + address ssh://bpi0-armhf-rb.debian.net/usr/bin/nc localhost 4949 use_node_name yes [hb0-armhf-rb.debian.net] - address 71.236.158.44 + address ssh://hb0-armhf-rb.debian.net/usr/bin/nc localhost 4949 use_node_name yes [wbq0-armhf-rb.debian.net] - address 71.236.158.44 + address ssh://wbq0-armhf-rb.debian.net/usr/bin/nc localhost 4949 use_node_name yes [cbxi4pro0-armhf-rb.debian.net] - address 71.236.158.44 + address ssh://cbxi4pro0-armhf-rb.debian.net/usr/bin/nc localhost 4949 use_node_name yes [freebsd-jenkins.debian.net] -- cgit v1.2.3-70-g09d2