diff --git a/tests/automatic/broker/check_monitoring/check_linux.sh b/tests/automatic/broker/check_monitoring/check_linux.sh index 734ffd75b0e3a3595a93d8f7262f71e85f2da10b..d0b81c6ee5bfeaaf635fa83be46c8238ba98a7e2 100644 --- a/tests/automatic/broker/check_monitoring/check_linux.sh +++ b/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 diff --git a/tests/automatic/full_chain/simple_chain/check_linux.sh b/tests/automatic/full_chain/simple_chain/check_linux.sh index a442e63f4227d6554285670167db9ab334e8c850..ac9a737c668eb860c96eb2f3234b8d5e76d45a85 100755 --- a/tests/automatic/full_chain/simple_chain/check_linux.sh +++ b/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` diff --git a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh b/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh index 165f48f54a0dbeb636017751b44967b1fb209b34..15964cc6e2b423dcb190e40704591badbe4d713b 100644 --- a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh +++ b/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` diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh index 7c22a733b5cb10e57e9f004b82951b63decd339f..00391dff42752e43ee8ee50eaec14060486c4f7c 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh +++ b/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 } diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh index e3f49565c663a9e7cb61283ff932abf0e0165414..36e82adc9cdb5761f3c47f6e80ff0f1f9e85a1f7 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh +++ b/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 } diff --git a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh b/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh index c0707599e13490f1e27acca4b5a2d241570729ff..b7594898e3a9a70412da154ae9b5aebb9609d937 100644 --- a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh +++ b/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` diff --git a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh index 109485d11a69321dfeb78938c64114722f50a96b..50214fb8142196677507e532e26f33bc11a8c643 100644 --- a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh +++ b/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 diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh index 53a8e3485a0bd5e016653b430aedf0890e004e9d..4054fef2804ddf41f3bf024f7ec467cfaa3daad4 100644 --- a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh +++ b/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` diff --git a/tests/automatic/full_chain/two_beamlines/check_linux.sh b/tests/automatic/full_chain/two_beamlines/check_linux.sh index 057dd44c055fd9359f18e312078b51ba722b7c16..75be4ed22026e9719d0e328dfda1218e3ab16c87 100644 --- a/tests/automatic/full_chain/two_beamlines/check_linux.sh +++ b/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 diff --git a/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh b/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh index fc8a1a4869bfab4e436535145bbd3d6249c59d0b..a3a9895ec010fbec8dd0afe573e7c6950571fca5 100755 --- a/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh +++ b/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 diff --git a/tests/automatic/high_avail/services_restart/check_linux.sh b/tests/automatic/high_avail/services_restart/check_linux.sh index fa784e08b6aa1692d79b0cd82c39ea9e86bdc4f2..840d3e97cc89d16712fe52314efe13947d94ab4f 100644 --- a/tests/automatic/high_avail/services_restart/check_linux.sh +++ b/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" } diff --git a/tests/automatic/producer_receiver/check_monitoring/check_linux.sh b/tests/automatic/producer_receiver/check_monitoring/check_linux.sh index cf0863c9b152382e380a7f0c2d0ef1dc7a0d072a..8c08a2f3d30873a9bda0e608f6ac2fe9c4e43462 100644 --- a/tests/automatic/producer_receiver/check_monitoring/check_linux.sh +++ b/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} } diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh index 2207d5a305ee1b0fa8e1288672bbfe7619ab5c16..1adb4357351474943a6a5ff3406617e31c0c409b 100644 --- a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh +++ b/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} diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh index 90d116c91ce60bbb7c9a4a4a2ab1b84119ab6477..a02c953d9add44aa540f961e8487fef1a80be9bc 100644 --- a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh +++ b/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} diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh index 1da3b56b61ce312af68c19ec582e0c2cc6e056c5..357c9185d353de2cb697ca5cb3ad998d3781730d 100644 --- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh +++ b/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}