summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-12-24 11:54:14 +0100
committerHolger Levsen <holger@layer-acht.org>2016-12-24 11:54:14 +0100
commit9ba5feaf043d50d3290512dbc5c2e838065f0b71 (patch)
tree6a87f5b3815b94aaebf821e67717658f2b130244
parent80cdb3bebcc4e9dee9f4bc39961126a19725755c (diff)
downloadjenkins.debian.net-9ba5feaf043d50d3290512dbc5c2e838065f0b71.tar.xz
don't monitor ntp
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--TODO1
-rwxr-xr-xupdate_jdn.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/TODO b/TODO
index 5a8b4a9d..9a398f81 100644
--- a/TODO
+++ b/TODO
@@ -230,7 +230,6 @@ The idea is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
* squid is not used, we copy a /etc/squid3/squid3.conf but ubuntu uses /etc/squid/squid.conf
* vary the time, run half the nodes in the future
* fix regular munin warnings
-* remove ntp munin plugins
* remove unwanted users from buildnodes (accidently created due to buggy update_jdn)
* update variations table
* add arm64 to THANKS+README
diff --git a/update_jdn.sh b/update_jdn.sh
index 9a5522df..9ad34077 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -539,7 +539,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* iostat_ios 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 ntp* 2>/dev/null
case $HOSTNAME in
jenkins|profitbricks-build*) [ -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 ;;
*) ;;