update influxdb clean-up in tests

tests/automatic/broker/check_monitoring/check_linux.sh

@@ -9,10 +9,10 @@ trap Cleanup EXIT
 Cleanup() {
   set +e
 	echo cleanup
-	influx -execute "drop database ${database_name}"
+  influx -database ${database_name} -execute "drop series from statistics, RequestsRate"
 }
 
-! influx -execute "drop database ${database_name}"
+! influx -database ${database_name} -execute "drop series from statistics, RequestsRate"
 
 
 token=$BT_DATA_TOKEN

tests/automatic/full_chain/simple_chain/check_linux.sh

@@ -25,7 +25,7 @@ Cleanup() {
     rm -rf ${receiver_root_folder}
     rm -rf out
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`

tests/automatic/full_chain/simple_chain_dataset/check_linux.sh

@@ -26,7 +26,7 @@ Cleanup() {
     rm -rf ${receiver_root_folder}
     rm -rf out
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`

tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh

@@ -40,7 +40,7 @@ Cleanup() {
     kill -9 $producerid
     rm -rf /tmp/asapo/test_in
     rm -rf ${receiver_folder}
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     rm out.txt
 }

tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh

@@ -27,7 +27,7 @@ Cleanup() {
     kill -9 $producerid
     rm -rf /tmp/asapo/test_in
     rm -rf ${receiver_folder}
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     rm out.txt
 }

tests/automatic/full_chain/simple_chain_metadata/check_linux.sh

@@ -25,7 +25,7 @@ Cleanup() {
     rm -rf ${receiver_root_folder}
     rm -rf out
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`

tests/automatic/full_chain/simple_chain_raw/check_linux.sh

@@ -19,7 +19,7 @@ Cleanup() {
     echo cleanup
     rm -rf out /tmp/asapo/asap3 /tmp/asapo/beamline
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 echo "db.dropDatabase()" | mongo ${beamtime_id}_detector

tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh

@@ -24,7 +24,7 @@ Cleanup() {
     rm -rf ${receiver_root_folder}
     rm -rf out
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`

tests/automatic/full_chain/two_beamlines/check_linux.sh

@@ -43,7 +43,7 @@ Cleanup() {
     rm -rf ${receiver_root_folder}
     echo "db.dropDatabase()" | mongo ${beamtime_id1}_${data_source}
     echo "db.dropDatabase()" | mongo ${beamtime_id2}_${data_source}
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 if [[ $network_type == "fabric" ]]; then

tests/automatic/high_avail/broker_mongo_restart/check_linux.sh

@@ -52,7 +52,7 @@ Cleanup() {
     kill $producerid
     kill $workerid
     echo "db.dropDatabase()" | mongo --port 27015 ${beamtime_id}_detector || echo "db.dropDatabase()" | mongo --port 27016 ${beamtime_id}_detector
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
     kill_mongo 27015 || kill_mongo 27016
     sed -i 's/27015/27017/g' discovery.json.tpl
     nomad stop discovery

tests/automatic/high_avail/services_restart/check_linux.sh

@@ -26,7 +26,7 @@ Cleanup() {
     rm -rf ${receiver_folder}
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     set +e
-    influx -execute "drop database ${monitor_database_name}"
+    influx -database ${monitor_database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 

tests/automatic/producer_receiver/check_monitoring/check_linux.sh

@@ -14,7 +14,7 @@ trap Cleanup EXIT
 
 Cleanup() {
 	echo cleanup
-	influx -execute "drop database ${database_name}"
+	influx -database ${database_name} -execute "drop series from statistics, RequestsRate"
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     rm -rf ${receiver_root_folder}
 }

tests/automatic/producer_receiver/transfer_datasets/check_linux.sh

@@ -17,7 +17,7 @@ Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${database_name}"
+    influx -database ${database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 mkdir -p ${receiver_folder}

tests/automatic/producer_receiver/transfer_single_file/check_linux.sh

@@ -17,7 +17,7 @@ Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
   echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-  influx -execute "drop database ${database_name}"
+  influx -database ${database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 mkdir -p ${receiver_folder}

tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh

@@ -18,7 +18,7 @@ Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${database_name}"
+    influx -database ${database_name} -execute "drop series from statistics, RequestsRate"
 }
 
 mkdir -p ${receiver_folder}