diff options
| -rwxr-xr-x | abs/core/xymon/PKGBUILD | 165 | ||||
| -rw-r--r-- | abs/core/xymon/hbnotes.py | 16 | ||||
| -rw-r--r-- | abs/core/xymon/hobbit-myth-orphan.sh | 26 |
3 files changed, 103 insertions, 104 deletions
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 7293814..69507d4 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,22 +1,24 @@ pkgbase=xymon -pkgname=(xymonserver xymonclient) -pkgver=4.3.5 -pkgrel=56 -pkgdesc="Hobbit is a system for monitoring servers and networks. " +pkgname=('xymonserver' 'xymonclient') +pkgver=4.3.17 +pkgrel=1 +pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') - url="http://www.xymon.com/" - -source=(http://hivelocity.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh login_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch) - +source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz" + 'hobbitadd.py' 'xymon_ghost_check' 'graph.cfg.diff' 'xymonserver.cfg.diff' + 'tasks.d.mv' 'clientlaunch.cfg.patch' 'hobbitstorage.py' 'hbnotes.py' + 'hobbit-myth-orphan.sh' 'analysis.cfg' 'hbfunc.py' 'be.png' 'tuner.png' + 'tv.png' 'hobbit-mem-myth.sh' 'hobbit_notify.sh' 'login_notify.sh' + 'alerts.cfg' 'hobbit_myth_data.py' 'logrotate-server.xymon' + 'logrotate-client.xymon' 'log_list.sh' 'client-local.cfg.patch' + 'led_themes.tar.gz' 'xymon-server.rules' 'hosts.cfg.patch') depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'LinHES-system>=8.0-5') - install=xymon.install build() { - - cd $startdir/src/xymon-$pkgver + cd ${srcdir}/xymon-$pkgver ENABLESSL=n \ ENABLELDAP=n \ ENABLELDAPSSL=n \ @@ -45,72 +47,69 @@ build() { ./configure make PKGBUILD=1|| return 1 - } package_xymonserver(){ - backup=('data/srv/xymon/etc/hosts.cfg') - cd $startdir/src/xymon-$pkgver - make PKGBUILD=1 INSTALLROOT=$startdir/pkg/xymonserver install - cd $startdir/src - install -D -m400 $startdir/src/xymon-server.rules $startdir/pkg/xymonserver/etc/sudoers.d/xymon_server - install -D -m755 $startdir/src/hobbitadd.py $startdir/pkg/xymonserver/home/xymon/server/bin/hobbitadd.py - install -D -m755 $startdir/src/hobbitstorage.py $startdir/pkg/xymonserver/home/xymon/server/ext/hobbitstorage.py - install -D -m755 $startdir/src/hobbit-myth-orphan.sh $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit-myth-orphan.sh - install -D -m755 $startdir/src/hbfunc.py $startdir/pkg/xymonserver/home/xymon/server/ext/hbfunc.py - install -D -m755 $startdir/src/hbnotes.py $startdir/pkg/xymonserver/home/xymon/server/ext/hbnotes.py - install -D -m755 $startdir/src/hobbit_myth_data.py $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit_myth_data.py - install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit-mem-myth.sh - install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonserver/home/xymon/client/bin/log_list.sh - - install -m755 analysis.cfg $startdir/pkg/xymonserver/home/xymon/etc/analysis.cfg - cat alerts.cfg >> $startdir/pkg/xymonserver/home/xymon/etc/alerts.cfg - - install -m755 hobbit_notify.sh $startdir/pkg/xymonserver/home/xymon/server/bin/hobbit_notify.sh - install -m755 login_notify.sh $startdir/pkg/xymonserver/home/xymon/server/bin/login_notify.sh - install -m755 $startdir/src/tv.png $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/tv.png - install -m755 $startdir/src/tuner.png $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/tuner.png - install -m755 $startdir/src/be.png $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/be.png - - install -D -m644 $startdir/src/logrotate-server.xymon $startdir/pkg/xymonserver/etc/logrotate.d/xymon-server - - # fix env for mythtb bindingds - echo "MYTHCONFDIR=/usr/share/mythtv" >> $startdir/pkg/xymonserver/home/xymon/etc/xymonserver.cfg - - - #copy in replacment icon set - DOCDIR=$startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon - cp -rp $DOCDIR/gifs $DOCDIR/gifs.orig - cd $startdir/src/themes - cp -fp Common/* $DOCDIR/gifs/ - cp -fp ModernLED/* $DOCDIR/gifs/ - #apply patches to conf file - install -D -m775 $startdir/src/tasks.d.mv $startdir/pkg/xymonserver/home/xymon/etc/tasks.d/mv.cfg - cd $startdir/pkg/xymonserver/home/xymon/etc - patch -p0 < $startdir/src/graph.cfg.diff || return 1 - patch -p0 < $startdir/src/xymonserver.cfg.diff || return 1 - patch -p3 < $startdir/src/client-local.cfg.patch || return 1 - patch -p3 < $startdir/src/hosts.cfg.patch || return 1 - - #make dir for login alerts - mkdir $startdir/pkg/xymonserver/home/xymon/var/login_alerts - - #add custom module descriptions - COLDOC=$pkgdir/home/xymon/etc/columndoc.csv - echo "myth_mtc;The <b>myth_mtc</b> column shows the status of the MythTV maintenance script.;" >> $COLDOC - echo "orphan;The <b>orphan</b> column shows the status of the find_orphans.py script.;" >> $COLDOC - - #fix permissions - chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/ - chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/ - chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/notes/ - chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/ - chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/snap/ - chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/rep/ - chmod 750 $startdir/pkg/xymonserver/etc/sudoers.d - chmod 775 $startdir/pkg/xymonserver/home/xymon/var/login_alerts - - + backup=('data/srv/xymon/etc/hosts.cfg') + cd ${srcdir}/xymon-$pkgver + make PKGBUILD=1 INSTALLROOT=${pkgdir} install + cd ${srcdir} + install -D -m400 ${srcdir}/xymon-server.rules ${pkgdir}/etc/sudoers.d/xymon_server + install -D -m755 ${srcdir}/hobbitadd.py ${pkgdir}/home/xymon/server/bin/hobbitadd.py + install -D -m755 ${srcdir}/hobbitstorage.py ${pkgdir}/home/xymon/server/ext/hobbitstorage.py + install -D -m755 ${srcdir}/hobbit-myth-orphan.sh ${pkgdir}/home/xymon/server/ext/hobbit-myth-orphan.sh + install -D -m755 ${srcdir}/hbfunc.py ${pkgdir}/home/xymon/server/ext/hbfunc.py + install -D -m755 ${srcdir}/hbnotes.py ${pkgdir}/home/xymon/server/ext/hbnotes.py + install -D -m755 ${srcdir}/hobbit_myth_data.py ${pkgdir}/home/xymon/server/ext/hobbit_myth_data.py + install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/server/ext/hobbit-mem-myth.sh + install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh + + install -m755 analysis.cfg ${pkgdir}/home/xymon/etc/analysis.cfg + cat alerts.cfg >> ${pkgdir}/home/xymon/etc/alerts.cfg + + install -m755 hobbit_notify.sh ${pkgdir}/home/xymon/server/bin/hobbit_notify.sh + install -m755 login_notify.sh ${pkgdir}/home/xymon/server/bin/login_notify.sh + install -m755 ${srcdir}/tv.png ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/tv.png + install -m755 ${srcdir}/tuner.png ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/tuner.png + install -m755 ${srcdir}/be.png ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/be.png + + install -D -m644 ${srcdir}/logrotate-server.xymon ${pkgdir}/etc/logrotate.d/xymon-server + + # fix env for mythtb bindingds + echo "MYTHCONFDIR=/usr/share/mythtv" >> ${pkgdir}/home/xymon/etc/xymonserver.cfg + + #copy in replacment icon set + DOCDIR=${pkgdir}/data/srv/httpd/htdocs/xymon + cp -rp ${DOCDIR}/gifs ${DOCDIR}/gifs.orig + cd ${srcdir}/themes + cp -fp Common/* ${DOCDIR}/gifs/ + cp -fp ModernLED/* ${DOCDIR}/gifs/ + + #apply patches to conf file + install -D -m775 ${srcdir}/tasks.d.mv ${pkgdir}/home/xymon/etc/tasks.d/mv.cfg + cd ${pkgdir}/home/xymon/etc + patch -p0 < ${srcdir}/graph.cfg.diff || return 1 + patch -p0 < ${srcdir}/xymonserver.cfg.diff || return 1 + patch -p3 < ${srcdir}/client-local.cfg.patch || return 1 + patch -p3 < ${srcdir}/hosts.cfg.patch || return 1 + + #make dir for login alerts + mkdir ${pkgdir}/home/xymon/var/login_alerts + + #add custom module descriptions + COLDOC=$pkgdir/home/xymon/etc/columndoc.csv + echo "myth_mtc;The <b>myth_mtc</b> column shows the status of the MythTV maintenance script.;" >> $COLDOC + echo "orphan;The <b>orphan</b> column shows the status of the find_orphans.py script.;" >> $COLDOC + + #fix permissions + chmod 775 ${pkgdir}/data/srv/httpd/htdocs/ + chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/ + chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/notes/ + chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/ + chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/snap/ + chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/rep/ + chmod 750 ${pkgdir}/etc/sudoers.d + chmod 775 ${pkgdir}/home/xymon/var/login_alerts } @@ -120,18 +119,18 @@ package_xymonclient(){ backup=('data/srv/xymon/client/etc/xymonclient.cfg') install=xymon-client.install - install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonclient/home/xymon/client/bin/log_list.sh - install -D -m644 $startdir/src/logrotate-client.xymon $startdir/pkg/xymonclient/etc/logrotate.d/xymon-client - install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonclient/home/xymon/client/ext/hobbit-mem-myth.sh - cp -rp /$startdir/pkg/xymonserver/home/xymon/client/ $startdir/pkg/xymonclient/home/xymon/ + install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh + install -D -m644 ${srcdir}/logrotate-client.xymon ${pkgdir}/etc/logrotate.d/xymon-client + install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/client/ext/hobbit-mem-myth.sh + cp -rp ${pkgdir}/../xymonserver/home/xymon/client/ ${pkgdir}/home/xymon/ cd - - cd $startdir/pkg/xymonclient/home/xymon/client/etc - patch -p0 < $startdir/src/clientlaunch.cfg.patch + cd ${pkgdir}/home/xymon/client/etc + patch -p0 < ${srcdir}/clientlaunch.cfg.patch cd - } -md5sums=('31923ec126fe1c264fceb459d2175161' +md5sums=('d8d119a777e7b7204d1292fb27314312' 'a0fbb9cbeb3600a40943e6205790f22f' 'c60b0d59bb39505ee3d62c6dd65429c5' 'a45dd4cdb84817bcf3e51b25cc713799' @@ -139,8 +138,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161' '758cdd9f1ba5ae3e1b42e811172806f3' 'ee608dcafc050d790e28647a670f6b60' 'b2f98ac0df013332deedc1efae0a270d' - '1141fc6f846e91f380bbcdb212b44f7d' - '0f70e76a164f648f0a4a01110137cb20' + '9610356bd8c1f0b6d9f4a7a33b385e16' + '526c169e020b570b5b02661a831aa4e6' '166279c006c3ef7bf0c21537cf89fc83' '80d9cfac86c6d96836e6f406e35e7cf5' 'd210c43fb9ee9ad6cd7648e0c2e0efea' diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py index b5ad72a..6967aa4 100644 --- a/abs/core/xymon/hbnotes.py +++ b/abs/core/xymon/hbnotes.py @@ -176,7 +176,7 @@ def createdropdown(currenthostype): dir = "/data/storage/disk0/backup/system_backups" dropdown=''' </br> - <input name="param2" type="radio" value="Restore" />Restore database </> + <input name="param2" type="radio" value="Restore" />Restore Database: </> <select name="param1">\n''' os.chdir(dir) if os.path.exists(dir): @@ -195,18 +195,18 @@ def createdropdown(currenthostype): <input type="checkbox" name="param8" >Partial Restore<br> <br> - <input name="param2" type="radio" value="Upload" />Upload file to restore </> + <input name="param2" type="radio" value="Upload" />Upload File to Restore: </> <input name="uFile" type="file" size="40"> <br><br> - <input name="param2" type="radio" value="Backup" checked="checked" />Backup database<br /> + <input name="param2" type="radio" value="Backup" checked="checked" />Backup System<br /> ''' #This is for the d/l backup option dropdown+=''' - <input name="param2" type="radio" value="Dbackup" />Download backup </> + <input name="param2" type="radio" value="Dbackup" />Download Backup: </> <select name="param7">\n\n </br>''' for file in files: @@ -217,7 +217,7 @@ def createdropdown(currenthostype): </select> <br> - <input name="param2" type="radio" value="Optimize" />Optimize database<br /> + <input name="param2" type="radio" value="Optimize" />Optimize Database<br /> ''' if currenthostype == "Master_backend": dropdown+='<input name="param2" type="radio" value="ShutdownAll" />Shutdown All Systems (except master backend)<br /> \n' @@ -403,14 +403,14 @@ function Do_it () buttonform_bottom=''' - <input name="param2" type="radio" value="Update" />Update System </> + <input name="param2" type="radio" value="Update" />Update System: </> <select name="param3"> <option value="Myth_only">Myth only</option> <option value="All"> Full System</option> </select> </br> - <input name="param2" type="radio" value="Kill" />Restart interface: </> + <input name="param2" type="radio" value="Kill" />Restart Interface: </> <select name="param6"> <option value="killX">Full UI</option> <option value="killmyth">MythFrontend</option> @@ -419,7 +419,7 @@ function Do_it () <input name="param2" type="radio" value="Shutdown" />Shutdown System<br /> <input name="param2" type="radio" value="Reboot" />Reboot System<br /> - <input name="param2" type="radio" value="WOL" />Wake on Lan<br /> + <input name="param2" type="radio" value="WOL" />Wake on LAN<br /> <input name="hiddenparam" type="hidden" value=" ''' diff --git a/abs/core/xymon/hobbit-myth-orphan.sh b/abs/core/xymon/hobbit-myth-orphan.sh index 5cba136..cc4ca30 100644 --- a/abs/core/xymon/hobbit-myth-orphan.sh +++ b/abs/core/xymon/hobbit-myth-orphan.sh @@ -5,34 +5,34 @@ MYTHCONFDIR=/usr/share/mythtv /usr/LH/bin/find_orphans.py --printonly > $TMPFILE COLUMN=orphan # Name of the column COLOR=green # By default, everything is OK -MSG="All OK" +MSG="No Orphans Found." #yellow -for i in "Orphaned video files" "Orphaned snapshots" "Database backups" "Other files" +for i in "Orphaned video files" "Orphaned snapshots" "Database backups" "Other files" "Recordings with missing files" "Zero byte recordings" do grep -q "$i" $TMPFILE status=$? if [ $status -eq 0 ] then COLOR="yellow" - MSG="Problems found" + MSG="Problems with $i" fi done #red -for i in "Recordings with missing files" "Zero byte recordings" -do - grep -q "$i" $TMPFILE - status=$? - if [ $status -eq 0 ] - then - COLOR="red" - MSG="Problems found" - fi -done +#for i in "Recordings with missing files" "Zero byte recordings" +#do +# grep -q "$i" $TMPFILE +# status=$? +# if [ $status -eq 0 ] +# then +# COLOR="red" +# MSG="Problems with $i" +# fi +#done MSG=" ${MSG} |