From 01e29fb82d70f5cf3786c3a79c00c6c6fc4684e5 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 29 Jun 2022 12:38:27 +0200 Subject: [PATCH] ci(relup): delete TODO, check both nodes for metrics data --- scripts/relup-test/check-results.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/relup-test/check-results.sh b/scripts/relup-test/check-results.sh index 446ebeca5..f6e20bda9 100755 --- a/scripts/relup-test/check-results.sh +++ b/scripts/relup-test/check-results.sh @@ -3,13 +3,9 @@ set -euo pipefail matched_node1="$(curl --user admin:public -sf http://localhost:18083/api/v5/rules | jq --raw-output ".[0].node_metrics[] | select(.node==\"emqx@node1.emqx.io\") | .metrics.matched")" -# TODO -matched_node2=0 -#matched_node2="$(curl --user admin:public -sf http://localhost:18084/api/v5/rules | jq --raw-output ".[0].node_metrics[] | select(.node==\"emqx@node2.emqx.io\") | .metrics.matched")" +matched_node2="$(curl --user admin:public -sf http://localhost:18084/api/v5/rules | jq --raw-output ".[0].node_metrics[] | select(.node==\"emqx@node2.emqx.io\") | .metrics.matched")" success_node1="$(curl --user admin:public -sf http://localhost:18083/api/v5/rules | jq --raw-output ".[0].node_metrics[] | select(.node==\"emqx@node1.emqx.io\") | .metrics.\"actions.success\"")" -# TODO -success_node2=0 -#success_node2="$(curl --user admin:public -sf http://localhost:18084/api/v5/rules | jq --raw-output ".[0].node_metrics[] | select(.node==\"emqx@node2.emqx.io\") | .metrics.\"actions.success\"")" +success_node2="$(curl --user admin:public -sf http://localhost:18084/api/v5/rules | jq --raw-output ".[0].node_metrics[] | select(.node==\"emqx@node2.emqx.io\") | .metrics.\"actions.success\"")" webhook="$(curl -sf http://localhost:7077/counter | jq '.data')" MATCHED_TOTAL="$(( matched_node1 + matched_node2 ))"