Merge branch 'clientReporting' into 'integration'

Client reporting

See merge request FLAME/flame-clmc!16

test/streaming/report.sh

+#!/bin/bash
+
+# This script reads stdin and expects the output of cvlc.
+# It is used by the run.sh script and receives the output of the cvlc client.
+# It counts the number of times the frame "dropping" error is seen and every 10 times it sends a message to telegraf reporting "another 10" errors.
+
+if [ "$#" -ne 1 ]; then
+    echo "Error: illegal number of arguments: "$#
+    echo "Usage: report.sh <client number>"
+    exit 
+fi
+
+COUNTER=$1
+TELEGRAF=http://localhost:8186
+
+ERR_COUNT=0
+while read line; do
+  if [[ $line = *"dropping"* ]]; then
+    ERR_COUNT=$(($ERR_COUNT + 1))
+  fi
+  TEN=$((ERR_COUNT % 10))
+  if [ $TEN -eq 0 ]; then
+    curl -i -XPOST "${TELEGRAF}/write?precision=s" --data-binary "vlc,client=${COUNTER} drop_error=10 $(date +%s)" >& /dev/null
+  fi
+done
\ No newline at end of file

test/streaming/run.sh

@@ -31,7 +31,7 @@ if [ "$#" -ne 3 ]; then
 fi
 
 # create test directories
-TEST_FOLDER=$(date +%Y%m%d%H%M%S)
+TEST_FOLDER=$(date +%Y%m%d%H%M%S) 
 TEST_RUN_DIR=$1
 TEST_DIR=$TEST_RUN_DIR"/streaming/"$TEST_FOLDER
 echo "Test directory: "$TEST_DIR
@@ -47,8 +47,8 @@ STREAM_URI=$2
 COUNTER=0
 MAX_CLIENTS=$3
 while [  $COUNTER -lt $MAX_CLIENTS ]; do
-  cvlc -Vdummy --no-audio $STREAM_URI &>$TEST_DIR/stdout$COUNTER &
- # cvlc -Vdummy --no-audio --verbose=0 --file-logging --logfile=$TEST_DIR/vlc-log$COUNTER.txt $STREAM_URI &
+  # run cvlc headless, redirect stderr into stdout, pipe that into the report.sh script
+  cvlc -Vdummy --no-audio $STREAM_URI 2>&1 | /home/ubuntu/flame-clmc/test/streaming/report.sh ${COUNTER} &
   sleep 1
   let COUNTER=COUNTER+1 
 done

test/streaming/stop.sh

 #!/bin/bash
 
-for pid in $(ps -ef | grep "/usr/bin/vlc" | awk '{print $2}'); do kill -9 $pid; done
\ No newline at end of file
+for pid in $(ps -ef | grep "/usr/bin/vlc" | awk '{print $2}'); do kill -9 $pid; done
+# TODO: 'killall vlc' should work: need to test though
\ No newline at end of file