From 9debafb905b939017c7c01fad20d97b34aad5e0b Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Wed, 7 Jan 2015 17:19:54 +0100 Subject: [PATCH] Improve script options --- README | 8 +++-- check_git_config | 89 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 32 deletions(-) diff --git a/README b/README index 9198f6e..8b8656c 100644 --- a/README +++ b/README @@ -4,9 +4,11 @@ Nagios plugin to check Git Repository status Usage ----- - Usage : ./check_git_config [directory] [-d] - [directory] Git root directory (default : /srv/common) - [-d] Enable debug mode + Usage : ./check_git_config -g [directory] [-c|-r remote] [-d] + -g [directory] Specify Git root directory (default : /srv/common) + -c Check Git remote state + -r [remote] Specify Git remote to check (default : origin) + -d Enable debug mode Copyright --------- diff --git a/check_git_config b/check_git_config index ae5db09..40d83f6 100755 --- a/check_git_config +++ b/check_git_config @@ -1,40 +1,59 @@ #!/bin/bash # -# Nagios plugin to check Postgresql streamin replication state -# -# Could be use on Master or on standby node -# -# Requirement : -# -# On master node : Slaves must be able to connect with user PG_USER -# to database postgres as trust -# -# On standby node : PG_USER must be able to connect localy as trust +# Nagios plugin to check Git repository status # # Author : Benjamin Renard # Date : Wed, 14 Mar 2012 14:45:55 +0000 -# Source : http://git.zionetrix.net/check_pg_streaming_replication +# Source : http://git.zionetrix.net/check_git_config # GIT_ROOT=/srv/common +GIT_REMOTE=origin +DEBUG=0 +CHECK_REMOTE=0 -if [ "$1" == "-h" ] -then - echo "Usage : $0 [directory] [-d] - [directory] Git root directory (default : $GIT_ROOT) - [-d] Enable debug mode" - exit 0 -fi +function usage() { + echo "Usage : $0 -g [directory] [-c|-r remote] [-d] + -g [directory] Specify Git root directory (default : $GIT_ROOT) + -c Check Git remote state + -r [remote] Specify Git remote to check (default : $GIT_REMOTE) + -d Enable debug mode" +} + +while getopts "g:r:cdh-:" OPTION +do + case "$OPTION" in + c) + CHECK_REMOTE=1 + ;; + g) + GIT_ROOT="${OPTARG}" + ;; + r) + CHECK_REMOTE=1 + GIT_REMOTE="${OPTARG}" + ;; + d) + DEBUG=1 + ;; + h) + usage + exit 0 + ;; + *) + echo "Invalid parameter -$OPTION" + echo + usage + exit 1 + ;; + esac +done -[ -n "$1" -a "$1" != "-d" ] && GIT_ROOT="$1" [ ! -d "$GIT_ROOT" ] && echo "UNKNOWN : Git root directory does not exists !" && exit 3 [ ! -d "$GIT_ROOT/.git" ] && echo "UNKNOWN : Git root directory seem to not being a git repository." && exit 3 cd $GIT_ROOT -DEBUG=0 -[ "$1" == "-d" -o "$2" == "-d" ] && DEBUG=1 - STATUS=$( git status -s ) [ $DEBUG -eq 1 ] && echo -e "Status : $STATUS" @@ -43,11 +62,24 @@ if [ -n "$STATUS" ] then echo "WARNING : Git config repo on $( hostname ) not clean" exit 1 -else - [ $DEBUG -eq 1 ] && echo -n "Fecth : " - git fetch > /dev/null 2>&1 +elif [ $CHECK_REMOTE -eq 1 ] +then + # Check remote exists + [ $DEBUG -eq 1 ] && echo -n "Check remote '$GIT_REMOTE' exist : " + git remote show "$GIT_REMOTE" > /dev/null 2>&1 res=$? - [ $DEBUG -eq 1 ] && echo "done. (Return $?)" + [ $DEBUG -eq 1 ] && echo "done. (Return $res)" + + if [ $res -ne 0 ] + then + echo "UNKNOWN : Unkown remote '$GIT_REMOTE'" + exit 3 + fi + + [ $DEBUG -eq 1 ] && echo -n "Fecth : " + git fetch "$GIT_REMOTE" > /dev/null 2>&1 + res=$? + [ $DEBUG -eq 1 ] && echo "done. (Return $res)" if [ $res -ne 0 ] then @@ -65,8 +97,7 @@ else then echo "CRITICAL : Git config not uptodate" exit 2 - else - echo "OK" - exit 0 fi fi +echo "OK" +exit 0