From 43f516696b0a7667c8fd2f2658640971df5c92a4 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 2 Sep 2015 03:01:54 +0200 Subject: adopt for newer jenkins LTS --- hosts/jenkins/etc/munin/plugins/jenkins_builds | 2 +- hosts/jenkins/etc/munin/plugins/jenkins_builds_results | 2 +- hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'hosts/jenkins/etc/munin') diff --git a/hosts/jenkins/etc/munin/plugins/jenkins_builds b/hosts/jenkins/etc/munin/plugins/jenkins_builds index 3010e393..f861b87c 100755 --- a/hosts/jenkins/etc/munin/plugins/jenkins_builds +++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds @@ -59,6 +59,6 @@ if [ "$1" = "config" ]; then fi for PREFIX in $JOB_PREFIXES ; do - NR=$(find /var/lib/jenkins/jobs/$PREFIX*/builds/ -type d -mtime -1 -name "*_*"| wc -l) + NR=$(find /var/lib/jenkins/jobs/$PREFIX*/builds/* -type d -mtime -1| wc -l) echo "jenkins_builds_$PREFIX.value $NR" | tee -a $STATEFILE done diff --git a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results index 596281ff..2169affd 100755 --- a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results +++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results @@ -61,7 +61,7 @@ if [ "$1" = "config" ]; then fi for PREFIX in $JOB_PREFIXES ; do - PREFIX_RESULTS=$(for i in /var/lib/jenkins/jobs/${PREFIX}*/builds/*_*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done ) + PREFIX_RESULTS=$(for i in /var/lib/jenkins/jobs/${PREFIX}*/builds/*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done ) for STATE in success unstable failure ; do NR=0 if [ "$STATE" = "failure" ] ; then diff --git a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary index b4f5b540..8dff6b31 100755 --- a/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary +++ b/hosts/jenkins/etc/munin/plugins/jenkins_builds_results_summary @@ -57,7 +57,7 @@ if [ "$1" = "config" ]; then exit 0 fi -RESULTS=$(for i in /var/lib/jenkins/jobs/*/builds/*_*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done ) +RESULTS=$(for i in /var/lib/jenkins/jobs/*/builds/*/log ; do tail -1 $i 2>/dev/null; echo " \n"; done ) for STATE in success unstable failure ; do NR=0 if [ "$STATE" = "failure" ] ; then -- cgit v1.2.3-54-g00ecf