Various updates; Add logAxis patch for graphite; Add namespaces to summary scripts.

[myops.git] / web / collect / server / summarize_stats.sh

diff --git a/web/collect/server/summarize_stats.sh b/web/collect/server/summarize_stats.sh
index 7406a08..ec00497 100755 (executable)
--- 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