Adding upstream version 1.18.0.upstream/1.18.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 10 deletions

diff --git a/tests/alarm_repetition/alarm.sh.in b/tests/alarm_repetition/alarm.sh.in
index 8555e0a3c..09d6aaf46 100644
--- a/tests/alarm_repetition/alarm.sh.in
+++ b/tests/alarm_repetition/alarm.sh.in
@@ -7,7 +7,8 @@ HEALTHDIR="@configdir_POST@/health.d/"
 OUTDIR="workdir/"
 
 #url to do download
-MURL="http://localhost:19999/api/v1/alarms?active"
+QUERY="/api/v1/alarms?active"
+MURL="http://localhost:19999$QUERY"
 
 #error messages
 RED='\033[0;31m'
@@ -35,24 +36,26 @@ netdata_test_download() {
   grep "HTTP/1.1 200 OK" "$1" 2>/dev/null 1>/dev/null
   TEST="$?"
   if [ "$TEST" -ne "0" ]; then
-    echo -e "${RED} Error to get the alarms"
-    killall netdata
+    echo -e "${RED} Error to get the alarms. ${NOCOLOR}"
+    kill "$5"
+    rm "$HEALTHDIR/ram.conf"
     exit 1
   fi
 
   COUNT=$(grep -w "\"last_repeat\":" "$2" | grep -c "$OPT" "\"0\"")
   if [ "$COUNT" -eq "0" ]; then
-    echo -e "${RED} Netdata gave an unexpected result when alarm repetition is $4"
-    killall netdata
+    echo -e "${RED} Netdata gave an unexpected result when alarm repetition is $4 ${NOCOLOR}"
+    killall "$5"
+    rm "$HEALTHDIR/ram.conf"
     exit 1
   fi
 
-  echo -e "${GREEN} I got the expected result"
+  echo -e "${GREEN} I got the expected result ${NOCOLOR}"
 }
 
 get_the_logs() {
   curl -v -k --create-dirs -o "$OUTDIR/$1.out" "$MURL" 2> "$OUTDIR/$1.err"
-  netdata_test_download "$OUTDIR/$1.err" "$OUTDIR/$1.out" "$2" "$3"
+  netdata_test_download "$OUTDIR/$1.err" "$OUTDIR/$1.out" "$2" "$3" "$4"
 }
 
 process_data() {
@@ -61,14 +64,14 @@ process_data() {
   NETDATAPID=$!
   echo -e "${NOCOLOR}Sleeping during $SEC seconds to create alarm entries"
   sleep $SEC
-  get_the_logs "$1" "$2" "$3"
+  get_the_logs "$1" "$2" "$3" "$NETDATAPID"
   kill $NETDATAPID
 }
 
 mkdir "$OUTDIR"
 CREATEDIR="$?"
 if [ "$CREATEDIR" -ne "0" ]; then
-  echo  -e "${RED}Cannot create the output directory, it already exists. The test will overwrite previous results."
+  echo  -e "${RED}Cannot create the output directory, it already exists. The test will overwrite previous results. ${NOCOLOR}"
 fi
 
 change_alarm_file "./0" "ram_without_repetition.conf" "$HEALTHDIR/ram.conf"
@@ -81,6 +84,6 @@ cp -a netdata.conf_with_repetition netdata.conf
 process_data "ram_with" "I" "activated."
 rm netdata.conf
 
-echo  -e "${GREEN} all the tests were sucessful"
+echo  -e "${GREEN} all the tests were sucessful ${NOCOLOR}"
 rm "$HEALTHDIR/ram.conf"
 rm -rf $OUTDIR