X-Git-Url: http://git.onelab.eu/?p=myops.git;a=blobdiff_plain;f=web%2Fcollect%2Fserver%2Fcron.hourly%2Fload_all_couchdb.sh;fp=web%2Fcollect%2Fserver%2Fcron.hourly%2Fload_all_couchdb.sh;h=0fa1925ca4ae5fc15d6c431ad1379f83b850e284;hp=40d76dd42eaab3248514a7cf82bfecaaa96d4d4b;hb=3ebc599db4bc491de0dd4195b2e6dc858dbd3d22;hpb=2c16b9ee5acc1b619824df8d4e4fb57c6a02dee7

diff --git a/web/collect/server/cron.hourly/load_all_couchdb.sh b/web/collect/server/cron.hourly/load_all_couchdb.sh
index 40d76dd..0fa1925 100755
--- a/web/collect/server/cron.hourly/load_all_couchdb.sh
+++ b/web/collect/server/cron.hourly/load_all_couchdb.sh
@@ -1,28 +1,23 @@
 #!/bin/bash
 
-PREFIX=/var/www/html/uploadlogs/raw
+PREFIX=/var/www/html/uploadlogs
 EXEC_PREFIX=/usr/share/myops/web/collect/server
 
-lasthour=`date +%Y-%m-%dT%H -d "1 hour ago"`
-mkdir -p $PREFIX/old/$lasthour
-for file in `ls $PREFIX/$lasthour*--upload`; do 
-	$EXEC_PREFIX/load_couch.py $file && mv $file $PREFIX/old/$lasthour
-done
+cd $PREFIX
+NS_LIST=`ls`
 
-#NOTE: temporary; catch any stragglers still being sent to monitor and copied here
-for file in `ls /root/$lasthour*--upload`; do 
-	$EXEC_PREFIX/load_couch.py $file && mv $file $PREFIX/old/$lasthour
-done
+for ns in $NS_LIST; do 
+
+	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 || :
-$EXEC_PREFIX/summarize_rpms.sh || :
-$EXEC_PREFIX/summarize_stats.sh || :
+	$EXEC_PREFIX/summarize_logs.sh $ns || :
+	$EXEC_PREFIX/summarize_rpms.sh $ns || :
+	$EXEC_PREFIX/summarize_stats.sh $ns || :
 
-thishour=`date +%Y-%m-%dT%H`
-mkdir -p $PREFIX/old/$thishour
-# NOTE: do it twice for all the files that were uploaded while the above was running.
-for file in `ls $PREFIX/$thishour*--upload`; do 
-	$EXEC_PREFIX/load_couch.py $file && mv $file $PREFIX/old/$thishour
 done
 
 curl -s 'http://HOSTNAME:5984/myops/_design/myops/_list/nodelist/node-status?fields=hostname&skip_header' | wc -l &> /dev/null