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

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

diff --git a/web/collect/server/summarize_logs.sh b/web/collect/server/summarize_logs.sh
index c18b1a6..1867c03 100755 (executable)
--- a/web/collect/server/summarize_logs.sh
+++ b/web/collect/server/summarize_logs.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="bootcd_version
@@ -16,7 +26,6 @@ real_bootcd_kernel_version
 real_bootcd_version
 "
 
-DATE=$( date --date "1 hour ago" +%Y-%m-%dT%H )
 #DATE=$1
 
 # get count of unique values from keys
@@ -42,7 +51,7 @@ if [[ $c -gt 2 ]] ; then
                                while read value value_name ; do 
                                        #echo -e "\tmyops.$key.$value_name $value $DATE" 
                                        #echo -e "\t"/root/load-graphite.py --target "myops.$key.$value_name" --date $DATE  --value $value
-                                       /usr/share/myops/web/collect/server/load-graphite.py --target "myops.$key.$value_name" --date $DATE  --value $value
+                                       /usr/share/myops/web/collect/server/load-graphite.py --target "myops.$ns.$key.$value_name" --date $DATE  --value $value
                                        sleep .2
                                done
                fi