diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-08-31 14:58:11 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-08-31 14:58:11 +0200 |
| commit | 7976b7a967b47a041bff2878c54e7c203a3fa5df (patch) | |
| tree | 56646e8dd1f8c58a0d4b26b2c699e8cfcfbdb70f | |
| parent | a36e86495081e22cf8eb6f8a23f84df2a2f280b6 (diff) | |
| download | jenkins.debian.net-7976b7a967b47a041bff2878c54e7c203a3fa5df.tar.xz | |
configure munin to monitor the armhf hosts via ssh+nc
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 4 | ||||
| -rw-r--r-- | 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] |