diff --git a/.github/actions/prometheus-metrics-calc/action.yml b/.github/actions/prometheus-metrics-calc/action.yml index 36fc02bcf..a0a54781c 100644 --- a/.github/actions/prometheus-metrics-calc/action.yml +++ b/.github/actions/prometheus-metrics-calc/action.yml @@ -89,9 +89,9 @@ runs: description="${{ inputs.calculatedMetricName }} per Pod in ${{ inputs.replicas }} Pod cluster" if [ -f ${{ inputs.output }} ]; then cat ${{ inputs.output }} | jq --arg testName "${{ inputs.performedTestName }}" --arg key "${description}" \ - --arg val ${CALCULATED_METRIC_VALUE} '. + {($testName): {($ARGS.named["key"]):($ARGS.named["val"])}}' \ + --arg val ${CALCULATED_METRIC_VALUE} '. + {($testName): {($key):($val|tonumber)}}' \ | tee ${{ inputs.output }} else jq -n --arg testName "${{ inputs.performedTestName }}" --arg key "${description}" \ - --arg val ${CALCULATED_METRIC_VALUE} '{($testName): {($ARGS.named["key"]):($ARGS.named["val"])}}' > ${{ inputs.output }} + --arg val ${CALCULATED_METRIC_VALUE} '{($testName): {($key):($val|tonumber)}}' > ${{ inputs.output }} fi diff --git a/.github/actions/prometheus-run-queries/action.yml b/.github/actions/prometheus-run-queries/action.yml index 4a6c2e140..8f8844fb3 100644 --- a/.github/actions/prometheus-run-queries/action.yml +++ b/.github/actions/prometheus-run-queries/action.yml @@ -25,6 +25,7 @@ runs: host=$(oc -n openshift-monitoring get route thanos-querier -ojsonpath='{.spec.host}') token=$(oc whoami -t) echo "THANOS_HOST=$host" >> $GITHUB_ENV + echo "::add-mask::$token" echo "OC_TOKEN=$token" >> $GITHUB_ENV - id: cpu-sec-util-query diff --git a/ansible/aws_ec2.sh b/ansible/aws_ec2.sh index 57dd8ea56..ca03a57f4 100755 --- a/ansible/aws_ec2.sh +++ b/ansible/aws_ec2.sh @@ -1,5 +1,6 @@ #!/bin/bash +x set -e +set -x cd $(dirname "${BASH_SOURCE[0]}") OPERATION=$1