X-Git-Url: http://git.onelab.eu/?p=myops.git;a=blobdiff_plain;f=web%2Fcollect%2Fserver%2Fsummarize_rpms.sh;fp=web%2Fcollect%2Fserver%2Fsummarize_rpms.sh;h=4d1c8130d7d7d59aaef40316a06f72b11bacd7cd;hp=b3a13e972b7521b3c339ac4dea42e76912f89d3b;hb=3ebc599db4bc491de0dd4195b2e6dc858dbd3d22;hpb=2c16b9ee5acc1b619824df8d4e4fb57c6a02dee7

diff --git a/web/collect/server/summarize_rpms.sh b/web/collect/server/summarize_rpms.sh
index b3a13e9..4d1c813 100755
--- a/web/collect/server/summarize_rpms.sh
+++ b/web/collect/server/summarize_rpms.sh
@@ -1,6 +1,16 @@
 #!/bin/bash
 
-PREFIX=/var/www/html/uploadlogs/raw/old
+if [ -z "$1" ] ; then
+    ns="raw"
+else
+    ns="$1"
+fi
+if [ -z "$2" ] ; then
+	DATE=$( date --date "1 hour ago" +%Y-%m-%dT%H )
+else
+	DATE="$2"
+fi
+PREFIX=/var/www/html/uploadlogs/$ns/old
 
 # get keys
 key_list="NodeManager
@@ -17,14 +27,6 @@ vsys
 vsys-scripts
 "
 
-#grep -E "^rpm_versions " * | \
-#	awk '{  for(o=1;o<=NF;o++){ if ( $o ~ /planetlab/){ print $(o) ; } } }' | \
-#	awk -F. '{printf("%s.%s.%s\n", $1,$2,$3) }' | sort | uniq -c
-
-
-DATE=$( date --date "1 hour ago" +%Y-%m-%dT%H )
-#DATE=$1
-
 # get count of unique values from keys
 echo $START Hours ago == $DATE
 c=`ls $PREFIX/$DATE/*--upload | wc -l`
@@ -38,7 +40,7 @@ if [[ $c -gt 2 ]] ; then
 				    awk -F. '{printf("%s.%s.%s\n", $1,$2,$3) }' | grep $rpm | sort | uniq -c | 
 				sed -e 's/\./_/g' -e 's/\//_/g' | awk 'BEGIN{total=0} { total += $1 ; print $0 } END { print total, "total"}' | \
 				while read value value_name ; do 
-					/root/load-graphite.py --target "myops.rpms.$rpm.$value_name" --date $DATE  --value $value
+					/usr/share/myops/web/collect/server/load-graphite.py --target "myops.rpms.$rpm.$value_name" --date $DATE  --value $value
 					sleep .2
 				done
 		    not_found=`grep -h -E "^rpm_versions .*" $PREFIX/$DATE/*--upload | grep -v "$rpm" | wc -l`