summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-16 18:41:30 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-16 18:41:30 +0100
commit12e461735d0b829c2393d7adaa6cc31eeb3ded71 (patch)
tree8ecb8a8dc4544ef46d44f73dc7e9adc8f65bf5bc
parent8a7367846f881069f31988c04d31733aa2fb9145 (diff)
downloadjenkins.debian.net-12e461735d0b829c2393d7adaa6cc31eeb3ded71.tar.xz
whitespace cleanup
-rwxr-xr-xetc/munin/plugins/jenkins_builds31
-rwxr-xr-xetc/munin/plugins/jenkins_builds_results33
-rwxr-xr-xetc/munin/plugins/jenkins_builds_results_summary49
-rwxr-xr-xetc/munin/plugins/jenkins_builds_running21
-rwxr-xr-xetc/munin/plugins/jenkins_jobs31
5 files changed, 80 insertions, 85 deletions
diff --git a/etc/munin/plugins/jenkins_builds b/etc/munin/plugins/jenkins_builds
index d2363a69..3010e393 100755
--- a/etc/munin/plugins/jenkins_builds
+++ b/etc/munin/plugins/jenkins_builds
@@ -25,8 +25,8 @@ GPLv2
. $MUNIN_LIBDIR/plugins/plugin.sh
if [ "$1" = "autoconf" ]; then
- echo yes
- exit 0
+ echo yes
+ exit 0
fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
@@ -43,23 +43,22 @@ fi
JOB_PREFIXES=$(ls -1 /var/lib/jenkins/jobs/|cut -d "_" -f1|sort -f -u)
if [ "$1" = "config" ]; then
-
- echo 'graph_title Jenkins Builds in the last 24h'
- echo 'graph_args --base 1000 -l 0 '
- echo 'graph_scale no'
- echo 'graph_total total'
- echo 'graph_vlabel Jenkins Builds per category in the last 24h'
- echo 'graph_category jenkins'
- draw=AREA
- for PREFIX in $JOB_PREFIXES ; do
- echo "jenkins_builds_$PREFIX.label $PREFIX builds"
- echo "jenkins_builds_$PREFIX.draw $draw"
+ echo 'graph_title Jenkins Builds in the last 24h'
+ echo 'graph_args --base 1000 -l 0 '
+ echo 'graph_scale no'
+ echo 'graph_total total'
+ echo 'graph_vlabel Jenkins Builds per category in the last 24h'
+ echo 'graph_category jenkins'
+ draw=AREA
+ for PREFIX in $JOB_PREFIXES ; do
+ echo "jenkins_builds_$PREFIX.label $PREFIX builds"
+ echo "jenkins_builds_$PREFIX.draw $draw"
if [ "$draw" = "AREA" ] ; then draw=STACK ; fi
- done
- exit 0
+ done
+ exit 0
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 -name "*_*"| wc -l)
echo "jenkins_builds_$PREFIX.value $NR" | tee -a $STATEFILE
done
diff --git a/etc/munin/plugins/jenkins_builds_results b/etc/munin/plugins/jenkins_builds_results
index 5361eded..596281ff 100755
--- a/etc/munin/plugins/jenkins_builds_results
+++ b/etc/munin/plugins/jenkins_builds_results
@@ -25,8 +25,8 @@ GPLv2
. $MUNIN_LIBDIR/plugins/plugin.sh
if [ "$1" = "autoconf" ]; then
- echo yes
- exit 0
+ echo yes
+ exit 0
fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
@@ -43,27 +43,26 @@ fi
JOB_PREFIXES=$(ls -1 /var/lib/jenkins/jobs/|cut -d "_" -f1|sort -f -u)
if [ "$1" = "config" ]; then
-
- echo 'graph_title Jenkins Builds results'
- echo 'graph_args --base 1000 -l 0 '
- echo 'graph_scale no'
- echo 'graph_total total'
- echo 'graph_vlabel Jenkins Builds results per category'
- echo 'graph_category jenkins'
- draw=AREA
- for PREFIX in $JOB_PREFIXES ; do
- for STATE in success unstable failure ; do
- echo "jenkins_builds_results_${PREFIX}_${STATE}.label ${PREFIX} ${STATE}"
- echo "jenkins_builds_results_${PREFIX}_${STATE}.draw $draw"
+ echo 'graph_title Jenkins Builds results'
+ echo 'graph_args --base 1000 -l 0 '
+ echo 'graph_scale no'
+ echo 'graph_total total'
+ echo 'graph_vlabel Jenkins Builds results per category'
+ echo 'graph_category jenkins'
+ draw=AREA
+ for PREFIX in $JOB_PREFIXES ; do
+ for STATE in success unstable failure ; do
+ echo "jenkins_builds_results_${PREFIX}_${STATE}.label ${PREFIX} ${STATE}"
+ echo "jenkins_builds_results_${PREFIX}_${STATE}.draw $draw"
if [ "$draw" = "AREA" ] ; then draw=STACK ; fi
done
- done
- exit 0
+ done
+ exit 0
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 )
- for STATE in success unstable failure ; do
+ for STATE in success unstable failure ; do
NR=0
if [ "$STATE" = "failure" ] ; then
# count aborted as failed
diff --git a/etc/munin/plugins/jenkins_builds_results_summary b/etc/munin/plugins/jenkins_builds_results_summary
index 5a067d3c..b4f5b540 100755
--- a/etc/munin/plugins/jenkins_builds_results_summary
+++ b/etc/munin/plugins/jenkins_builds_results_summary
@@ -25,8 +25,8 @@ GPLv2
. $MUNIN_LIBDIR/plugins/plugin.sh
if [ "$1" = "autoconf" ]; then
- echo yes
- exit 0
+ echo yes
+ exit 0
fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
@@ -42,30 +42,29 @@ if [ -f $STATEFILE ] && [ "$1" = "" ] ; then
fi
if [ "$1" = "config" ]; then
-
- echo 'graph_title Jenkins Builds results summary'
- echo 'graph_args --base 1000 -l 0 '
- echo 'graph_scale no'
- echo 'graph_total total'
- echo 'graph_vlabel Jenkins Builds results summary'
- echo 'graph_category jenkins'
- draw=AREA
- for STATE in success unstable failure ; do
- echo "jenkins_builds_results_all_${STATE}.label ${PREFIX} ${STATE}"
- echo "jenkins_builds_results_all_${STATE}.draw $draw"
+ echo 'graph_title Jenkins Builds results summary'
+ echo 'graph_args --base 1000 -l 0 '
+ echo 'graph_scale no'
+ echo 'graph_total total'
+ echo 'graph_vlabel Jenkins Builds results summary'
+ echo 'graph_category jenkins'
+ draw=AREA
+ for STATE in success unstable failure ; do
+ echo "jenkins_builds_results_all_${STATE}.label ${PREFIX} ${STATE}"
+ echo "jenkins_builds_results_all_${STATE}.draw $draw"
if [ "$draw" = "AREA" ] ; then draw=STACK ; fi
done
- exit 0
+ exit 0
fi
- 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
- # count aborted as failed
- NR=$(echo -e "$RESULTS" | egrep -i -c "($STATE|aborted)")
- else
- NR=$(echo -e "$RESULTS" | grep -i -c $STATE)
- fi
- echo "jenkins_builds_results_all_${STATE}.value $NR" | tee -a $STATEFILE
- 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
+ # count aborted as failed
+ NR=$(echo -e "$RESULTS" | egrep -i -c "($STATE|aborted)")
+ else
+ NR=$(echo -e "$RESULTS" | grep -i -c $STATE)
+ fi
+ echo "jenkins_builds_results_all_${STATE}.value $NR" | tee -a $STATEFILE
+done
diff --git a/etc/munin/plugins/jenkins_builds_running b/etc/munin/plugins/jenkins_builds_running
index 4a211e79..24084f10 100755
--- a/etc/munin/plugins/jenkins_builds_running
+++ b/etc/munin/plugins/jenkins_builds_running
@@ -25,20 +25,19 @@ GPLv2
. $MUNIN_LIBDIR/plugins/plugin.sh
if [ "$1" = "autoconf" ]; then
- echo yes
- exit 0
+ echo yes
+ exit 0
fi
if [ "$1" = "config" ]; then
-
- echo 'graph_title Jenkins Builds running'
- echo 'graph_args --base 1000 -l 0 '
- echo 'graph_scale no'
- echo 'graph_vlabel Jenkins Builds currently running'
- echo 'graph_category jenkins'
- echo "jenkins_builds_running.label $PREFIX builds_running"
- echo "jenkins_builds_running.draw AREA"
- exit 0
+ echo 'graph_title Jenkins Builds running'
+ echo 'graph_args --base 1000 -l 0 '
+ echo 'graph_scale no'
+ echo 'graph_vlabel Jenkins Builds currently running'
+ echo 'graph_category jenkins'
+ echo "jenkins_builds_running.label $PREFIX builds_running"
+ echo "jenkins_builds_running.draw AREA"
+ exit 0
fi
echo "jenkins_builds_running.value $(ps fax|grep /tmp/hudson|grep -v grep|wc -l)"
diff --git a/etc/munin/plugins/jenkins_jobs b/etc/munin/plugins/jenkins_jobs
index 86a70e61..e7f8e219 100755
--- a/etc/munin/plugins/jenkins_jobs
+++ b/etc/munin/plugins/jenkins_jobs
@@ -25,8 +25,8 @@ GPLv2
. $MUNIN_LIBDIR/plugins/plugin.sh
if [ "$1" = "autoconf" ]; then
- echo yes
- exit 0
+ echo yes
+ exit 0
fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
@@ -43,23 +43,22 @@ fi
JOB_PREFIXES=$(ls -1 /var/lib/jenkins/jobs/|cut -d "_" -f1|sort -f -u)
if [ "$1" = "config" ]; then
-
- echo 'graph_title Jenkins Jobs'
- echo 'graph_args --base 1000 -l 0 '
- echo 'graph_scale no'
- echo 'graph_total total'
- echo 'graph_vlabel Jenkins Jobs per category'
- echo 'graph_category jenkins'
+ echo 'graph_title Jenkins Jobs'
+ echo 'graph_args --base 1000 -l 0 '
+ echo 'graph_scale no'
+ echo 'graph_total total'
+ echo 'graph_vlabel Jenkins Jobs per category'
+ echo 'graph_category jenkins'
draw=AREA
- for PREFIX in $JOB_PREFIXES ; do
- echo "jenkins_jobs_$PREFIX.label $PREFIX jobs"
- echo "jenkins_jobs_$PREFIX.draw $draw"
+ for PREFIX in $JOB_PREFIXES ; do
+ echo "jenkins_jobs_$PREFIX.label $PREFIX jobs"
+ echo "jenkins_jobs_$PREFIX.draw $draw"
if [ "$draw" = "AREA" ] ; then draw=STACK ; fi
- done
- exit 0
+ done
+ exit 0
fi
for PREFIX in $JOB_PREFIXES ; do
- NR=$(find /var/lib/jenkins/jobs/ -maxdepth 1 -name "$PREFIX*" -type d | wc -l)
- echo "jenkins_jobs_$PREFIX.value $NR" | tee -a $STATEFILE
+ NR=$(find /var/lib/jenkins/jobs/ -maxdepth 1 -name "$PREFIX*" -type d | wc -l)
+ echo "jenkins_jobs_$PREFIX.value $NR" | tee -a $STATEFILE
done