From fa88dfdb304940757f4bc3add8dbc6e63150ce88 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 28 Nov 2011 23:42:29 +0000 Subject: [PATCH] Never miss an old file --- .../server/cron.hourly/load_all_couchdb.sh | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/web/collect/server/cron.hourly/load_all_couchdb.sh b/web/collect/server/cron.hourly/load_all_couchdb.sh index 0fa1925..5b43fd4 100755 --- a/web/collect/server/cron.hourly/load_all_couchdb.sh +++ b/web/collect/server/cron.hourly/load_all_couchdb.sh @@ -1,23 +1,25 @@ #!/bin/bash -PREFIX=/var/www/html/uploadlogs + +PREFIX=/var/www/html/uploadlogs/ EXEC_PREFIX=/usr/share/myops/web/collect/server cd $PREFIX NS_LIST=`ls` +for ns in $NS_LIST ; do + # NOTE: look at all uploaded files, and find unique oldhours. + for oldhour in `ls | awk -F: '{print $1}' | sort | uniq | grep T`; do + + mkdir -p $PREFIX/$ns/old/$oldhour + for file in `ls $PREFIX/$ns/$oldhour*--upload`; do + $EXEC_PREFIX/load_couch.py $file && mv $file $PREFIX/$ns/old/$oldhour + done -for ns in $NS_LIST; do + $EXEC_PREFIX/summarize_logs.sh $ns $oldhour || : + $EXEC_PREFIX/summarize_rpms.sh $ns $oldhour || : + $EXEC_PREFIX/summarize_stats.sh $ns $oldhour || : - lasthour=`date +%Y-%m-%dT%H -d "1 hour ago"` - mkdir -p $PREFIX/$ns/old/$lasthour - for file in `ls $PREFIX/$ns/$lasthour*--upload`; do - $EXEC_PREFIX/load_couch.py $file && mv $file $PREFIX/$ns/old/$lasthour done - - $EXEC_PREFIX/summarize_logs.sh $ns || : - $EXEC_PREFIX/summarize_rpms.sh $ns || : - $EXEC_PREFIX/summarize_stats.sh $ns || : - done curl -s 'http://HOSTNAME:5984/myops/_design/myops/_list/nodelist/node-status?fields=hostname&skip_header' | wc -l &> /dev/null -- 2.43.0