X-Git-Url: http://git.onelab.eu/?p=myops.git;a=blobdiff_plain;f=web%2Fcollect%2Fserver%2Fsummarize_stats.sh;h=ec00497fb7acefd35432c0fba75b8cc63ddd3d0c;hp=7406a084b7e89ada2b1f72afd3f1dbbbd8f012e5;hb=3ebc599db4bc491de0dd4195b2e6dc858dbd3d22;hpb=2c16b9ee5acc1b619824df8d4e4fb57c6a02dee7

diff --git a/web/collect/server/summarize_stats.sh b/web/collect/server/summarize_stats.sh
index 7406a08..ec00497 100755
--- a/web/collect/server/summarize_stats.sh
+++ b/web/collect/server/summarize_stats.sh
@@ -1,23 +1,22 @@
 #!/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="uptime free_disk_root free_disk_vservers fprobe_size"
 extra="
 "
 
-#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
-
-
-if [[ -z "$1" ]] ; then
-    DATE=$( date --date "1 hour ago" +%Y-%m-%dT%H )
-else
- 	DATE=$1
-fi
-
 # get count of unique values from keys
 echo $START Hours ago == $DATE
 c=`ls $PREFIX/$DATE/*--upload | wc -l`
@@ -30,7 +29,7 @@ if [[ $c -gt 2 ]] ; then
 				awk '{print $3}' | sort -n | \
 				/usr/share/myops/web/collect/server/stats.py | \
 				while read value_name value ; do 
-					/usr/share/myops/web/collect/server/load-graphite.py --target "myops.stats.$val.$value_name" --date $DATE  --value $value
+					/usr/share/myops/web/collect/server/load-graphite.py --target "myops.$ns.stats.$val.$value_name" --date $DATE  --value $value
 					sleep .2
 				done
 		fi