From 83c279ebc4568913810e401b3d7d57bb11cfcfc0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 17 Dec 2012 14:13:45 -0600
Subject: xymon: add check for remote backup copies that are pending.
refs # 885
---
abs/core/xymon/PKGBUILD | 4 ++--
abs/core/xymon/hobbit_myth_data.py | 21 +++++++++++++++++----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index e902f26..91fdb49 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=42
+pkgrel=43
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
@@ -135,7 +135,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'0757294eec13771f8e63da23cf066796'
'622f400fd098cbc43c203e3210a6694e'
'84442377c6e914b65519076bda4e17a4'
- 'cd6e52b17f8582614bb52a8157d486c6'
+ 'd7116dc59319b893e90a26e6beb83994'
'67621b6c5a766ac03c5f407bdbdca810'
'7ad4871af35f82c7824bb682b9325dba'
'98e9242ae346f729b14cb195786571f2'
diff --git a/abs/core/xymon/hobbit_myth_data.py b/abs/core/xymon/hobbit_myth_data.py
index e870754..8b38fc6 100644
--- a/abs/core/xymon/hobbit_myth_data.py
+++ b/abs/core/xymon/hobbit_myth_data.py
@@ -71,28 +71,41 @@ mtc_file = "/var/log/%s/myth_mtc.log" %date
mtc=check_mtc(mtc_file)
num_days=find_data_left()
+
+
+
if mtc:
BBCOLOR="green"
msg="\n Maintenance script ran ok \n %s \n " %mtc_file
else:
BBCOLOR ="yellow"
- msg="\n Maintenance script didn't run. \n %s \n" %mtc_file
+ msg="\n * Maintenance script didn't run. \n %s \n" %mtc_file
if num_days == 1 :
BBCOLOR="yellow"
- msg+="\nOnly 1 day of guide data left"
+ msg+="\n * Only 1 day of guide data left"
elif num_days == 0 :
BBCOLOR="red "
- msg+="\nNo guide data available"
+ msg+="\n * No guide data available"
elif num_days == -100 :
BBCOLOR="red"
- msg+="\nCould not connect to database"
+ msg+="\n ** Could not connect to database!"
else:
data_check = True
BBCOLOR="green"
msg+="\n %s days of guide data" %(num_days)
+if os.path.isfile("/data/storage/disk0/backup/system_backups/remote_backup_failed.txt"):
+ if BBCOLOR == "green":
+ BBCOLOR="yellow"
+ msg+="\n\n * Remote backup jobs are queued"
+else:
+ msg+="\n\n No remote backup jobs queued"
+
+
+
+
BBLINE=msg
LINE = "status " + MACHINE + ".myth_mtc" + " " + BBCOLOR + " " + DATE + " " + BBLINE
cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
--
cgit v0.12