From: Brian Flowers Date: Sun, 18 Sep 2016 21:42:41 +0000 (-0400) Subject: Fixing some error messages on compatibility checks X-Git-Url: http://git.slightlycyberpunk.com%2C%20git.slightlycyberpunk.com/git/?a=commitdiff_plain;h=ff6fb63959860a8a689fa2194baa4f97b613693d;p=bdsm.git Fixing some error messages on compatibility checks --- diff --git a/bdsm.d/df.generic b/bdsm.d/df.generic index ed8e62d..bf78a7c 100755 --- a/bdsm.d/df.generic +++ b/bdsm.d/df.generic @@ -132,19 +132,19 @@ formatConfig() ############################################################################### # Get a list of configured hosts +formatConfig hosts=$(cat /home/bdsm/.bdsm.conf.tmp | cut -d'{' -f1) if [ -z $1 ]; then help elif [ $1 == "start" ]; then - formatConfig start elif [ $1 == "stop" ]; then - formatConfig stop elif [ $1 == "status" ]; then - formatConfig status +elif [ $1 == "compatible" ]; then + compatible elif [ $1 == "help" ]; then help fi diff --git a/bdsm.d/vmstat.generic b/bdsm.d/vmstat.generic index e47df22..d4ad1dd 100755 --- a/bdsm.d/vmstat.generic +++ b/bdsm.d/vmstat.generic @@ -165,21 +165,18 @@ formatConfig() ############################################################################### # Get a list of configured hosts +formatConfig hosts=$(cat /home/bdsm/.bdsm.conf.tmp | cut -d'{' -f1) if [ -z $1 ]; then help elif [ $1 == "start" ]; then - formatConfig start elif [ $1 == "stop" ]; then - formatConfig stop elif [ $1 == "status" ]; then - formatConfig status elif [ $1 == "compatible" ]; then - formatConfig compatible elif [ $1 == "help" ]; then help diff --git a/bdsm.sh b/bdsm.sh index 096f54b..223cd6a 100755 --- a/bdsm.sh +++ b/bdsm.sh @@ -5,12 +5,19 @@ # Bash Daemon for System Monitoring # # TODO: -# 1) Finish configure options -# 2) Finish Deploy -# 3) Review and shakeout stop +# 1) Continuing checks (confirm start/stop/config of all plugins) +# 2) Add 'logger' type and logger plugins +# Logger won't hold an SSH connection open +# A single host can be defined multiple times as different types # ) Plugins: -# 4) iostat -# 5) ram +# o) disk utilization - iostat +# b) ram utilization - free or vmstat +# c) network utilization - natstat and netstat -D +# d) uptime +# e) IP address - ifconfig +# f) updates - native package manager +# g) active users - ps -ef +# h) active processes - ps -ef # ############################################################################### @@ -306,11 +313,7 @@ configure() done header "Configuring $host" - # TODO: - # Make availServices a null array; pass this value to a loop - # Check compatibility, add compatible ones to the array #availServices=$(ls /home/bdsm/bdsm.d | cut -d'.' -f1 | sort -u) - availServices=() ls /home/bdsm/bdsm.d | cut -d'.' -f1 | sort -u | while read service; do svc=`echo $service | sed 's/(.*)$//g'`