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

[myops.git] / web / collect / client / upload.sh

diff --git a/web/collect/client/upload.sh b/web/collect/client/upload.sh
index 064481c..dcff801 100644 (file)
--- a/web/collect/client/upload.sh
+++ b/web/collect/client/upload.sh
@@ -5,8 +5,8 @@ if [ -f /etc/planetlab/plc_config ]; then
 else
        PLC_SLICE_PREFIX='pl'
 fi
-if [ -f /usr/boot/cacert.pem ] ; then
-       CURL_ARGS="$CURL_ARGS --cacert /usr/boot/cacert.pem"
+if [ -f /usr/boot/myops_cacert.pem ] ; then
+       CURL_ARGS="$CURL_ARGS --cacert /usr/boot/myops_cacert.pem"
 else
        CURL_ARGS="$CURL_ARGS --insecure"
 fi
@@ -33,7 +33,7 @@ function upload_log ()
     #comm -1 -3 $old $new > $log
     cp $new $log
     if [ $( stat -c %s $log ) -ne 0 ] ; then
-        curl $CURL_ARGS --max-time 60 --silent https://${MYOPS_SERVER}/upload.php --form "log=@$log"
+        curl $CURL_ARGS --max-time 60 --silent https://${MYOPS_SERVER}/upload.php --form "namespace=${PLC_SLICE_PREFIX}" --form "log=@$log"
         if [ $? -ne 0 ] ; then
             # the upload has failed, so remove new file so no data is lost
             rm -f /tmp/$( basename $file ).new