[Qa-jenkins-scm] [jenkins.debian.net] 01/01: configure munin to monitor the armhf hosts via ssh+nc

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 7976b7a967b47a041bff2878c54e7c203a3fa5df
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Aug 31 14:58:11 2015 +0200

    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 f96cffb..3334d3b 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 d15034e..85d421d 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]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git