Make replication delay monitoring more reliable

[chef.git] / cookbooks / munin / files / default / plugins / replication_delay

diff --git a/cookbooks/munin/files/default/plugins/replication_delay b/cookbooks/munin/files/default/plugins/replication_delay
index f1761e84d34143fd947ceba93349fe3776e9ae80..27dd1080944e7f06103f90c3db770f69b480fa7b 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/replication_delay
+++ b/cookbooks/munin/files/default/plugins/replication_delay
@@ -1,31 +1,29 @@
-#!/bin/sh 
-# 
-# Plugin to monitor the age of the imported data in the rendering db 
-# 
-# Parameters:  
-# 
-#       config   (required) 
-#       autoconf (optional - used by munin-config) 
-# 
- 
-if [ "$1" = "config" ]; then 
- 
-        echo 'graph_title Data import lag' 
-        echo 'graph_args --base 1000 -l 0' 
-        echo 'graph_vlabel minutes' 
-        echo 'graph_category renderd' 
-        echo 'age.label DB import age' 
-        echo 'age.type GAUGE' 
-       echo 'age.cdef age,60,/'
-       echo 'age.warning :600'
-       echo 'age.critical :3600'
-        exit 0 
-fi 
+#!/bin/sh
+#
+# Plugin to monitor the age of the imported data in the rendering db
+#
+# Parameters:
+#
+#       config   (required)
+#       autoconf (optional - used by munin-config)
+#
+
+if [ "$1" = "config" ]; then
+
+        echo 'graph_title Data import lag'
+        echo 'graph_args --base 1000 -l 0'
+        echo 'graph_vlabel minutes'
+        echo 'graph_category renderd'
+        echo 'age.label DB import age'
+        echo 'age.type GAUGE'
+        echo 'age.cdef age,60,/'
+        echo 'age.warning :600'
+        echo 'age.critical :3600'
+        exit 0
+fi
+
+tstamp=$(osmium fileinfo --extended --get=data.timestamp.last /var/lib/replicate/changes-latest.osc.gz)
+tstampsec=$(date --date=${tstamp} +%s)
+nowsec=$(date +%s)

 
 

-state=${state:-/home/jburgess/replicate/state.txt}
-tstamp=`sed -e '/^timestamp=/!d' -e 's/.*=//' -e 's/Z//' -e 's/T/Z/' -e 's/\\\\//' -e 's/\\\\//' -e q ${state}` 
-tstampsec=`date --date=$tstamp +%s` 
-nowsec=`date +%s` 
- 
- 

 echo "age.value " `expr $nowsec - $tstampsec`
 echo "age.value " `expr $nowsec - $tstampsec`