diff options
| -rw-r--r-- | hosts/jenkins/etc/munin/munin.conf | 40 | ||||
| -rwxr-xr-x | update_jdn.sh | 2 |
2 files changed, 41 insertions, 1 deletions
diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf index 258d8453..a97d0882 100644 --- a/hosts/jenkins/etc/munin/munin.conf +++ b/hosts/jenkins/etc/munin/munin.conf @@ -107,6 +107,10 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists diskstats_latency.vdb.avgwrwait.warning 0:20 diskstats_latency.vda.avgrdwait.warning 0:10 diskstats_latency.vdb.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [profitbricks-build1-amd64.debian.net] address 78.137.99.97 @@ -117,6 +121,10 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists diskstats_latency.vdb.avgwrwait.warning 0:20 diskstats_latency.vda.avgrdwait.warning 0:10 diskstats_latency.vdb.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [profitbricks-build2-amd64.debian.net] address 78.137.96.192 @@ -127,6 +135,10 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists diskstats_latency.vdb.avgwrwait.warning 0:20 diskstats_latency.vda.avgrdwait.warning 0:10 diskstats_latency.vdb.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [profitbricks-build3-amd64.debian.net] address 185.48.117.167 @@ -137,6 +149,10 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists diskstats_latency.vdb.avgwrwait.warning 0:20 diskstats_latency.vda.avgrdwait.warning 0:10 diskstats_latency.vdb.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [profitbricks-build4-amd64.debian.net] address 46.16.78.222 @@ -147,34 +163,58 @@ contact.me.command mail -s "Munin notification ${var:host}" qa-jenkins-scm@lists diskstats_latency.vdb.avgwrwait.warning 0:20 diskstats_latency.vda.avgrdwait.warning 0:10 diskstats_latency.vdb.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [bpi0-armhf-rb.debian.net] address ssh://jenkins@bpi0-armhf-rb.debian.net:2222/bin/nc localhost 4949 use_node_name yes diskstats_latency.sda.avgwrwait.warning 0:20 diskstats_latency.sda.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [hb0-armhf-rb.debian.net] address ssh://jenkins@hb0-armhf-rb.debian.net:2224/bin/nc localhost 4949 use_node_name yes diskstats_latency.sda.avgwrwait.warning 0:20 diskstats_latency.sda.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [wbq0-armhf-rb.debian.net] address ssh://jenkins@wbq0-armhf-rb.debian.net:2225/bin/nc localhost 4949 use_node_name yes diskstats_latency.sda.avgwrwait.warning 0:20 diskstats_latency.sda.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [cbxi4pro0-armhf-rb.debian.net] address ssh://jenkins@cbxi4pro0-armhf-rb.debian.net:2226/bin/nc localhost 4949 use_node_name yes diskstats_latency.sda.avgwrwait.warning 0:20 diskstats_latency.sda.avgrdwait.warning 0:10 + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no [freebsd-jenkins.debian.net] address 46.16.73.236 use_node_name yes + diskstats_latency.graph no + diskstats_throughput.graph no + diskstats_utilization.graph no + diskstats_iops.graph no # # A more complex example of a host tree diff --git a/update_jdn.sh b/update_jdn.sh index 9d534589..1c380618 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -284,7 +284,7 @@ fi if [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] || [ ! -f $STAMP ] ; then cd /etc/munin/plugins - sudo rm -f postfix_* open_inodes interrupts irqstats threads proc_pri vmstat if_err_* exim_* netstat fw_forwarded_local fw_packets forks open_files users nfs* 2>/dev/null + sudo rm -f postfix_* open_inodes interrupts irqstats threads proc_pri vmstat if_err_* exim_* netstat fw_forwarded_local fw_packets forks open_files users nfs* iostat_ios 2>/dev/null case $HOSTNAME in jenkins|profitbricks-build?-amd64) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;; *) ;; |