From 0db97d5a24be4f1fdee07b31a8ac4c20938a9058 Mon Sep 17 00:00:00 2001 From: gabrielsoltz Date: Tue, 11 Jun 2019 20:36:40 +0200 Subject: [PATCH] improve AWS CLI parameters order, same as other checks --- checks/check_extra757 | 4 ++-- checks/check_extra758 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/check_extra757 b/checks/check_extra757 index 6cc8e175..162c7fc5 100644 --- a/checks/check_extra757 +++ b/checks/check_extra757 @@ -20,9 +20,9 @@ extra757(){ OLDAGE="$(get_date_previous_than_months 6)" textInfo "Looking for EC2 instances in all regions..." for regx in $REGIONS; do - EC2_RUNNING="$($AWSCLI ec2 describe-instances $PROFILE_OPT --region $regx --query "Reservations[*].Instances[*].[InstanceId]" --output text)" + EC2_RUNNING="$($AWSCLI ec2 describe-instances --query "Reservations[*].Instances[*].[InstanceId]" $PROFILE_OPT --region $regx --output text)" if [[ $EC2_RUNNING ]]; then - INSTACES_OLD_THAN_AGE=$($AWSCLI $PROFILE_OPT --region $regx ec2 describe-instances --query "Reservations[].Instances[?LaunchTime<='$OLDAGE'][].{id: InstanceId, launched: LaunchTime}" --output text) + INSTACES_OLD_THAN_AGE=$($AWSCLI ec2 describe-instances --query "Reservations[].Instances[?LaunchTime<='$OLDAGE'][].{id: InstanceId, launched: LaunchTime}" $PROFILE_OPT --region $regx --output text) if [[ $INSTACES_OLD_THAN_AGE ]]; then while IFS= read -r ec2_instace do diff --git a/checks/check_extra758 b/checks/check_extra758 index 48a04a4c..93f1d16e 100644 --- a/checks/check_extra758 +++ b/checks/check_extra758 @@ -20,9 +20,9 @@ extra758(){ OLDAGE="$(get_date_previous_than_months 12)" textInfo "Looking for EC2 instances in all regions..." for regx in $REGIONS; do - EC2_RUNNING="$($AWSCLI ec2 describe-instances $PROFILE_OPT --region $regx --query "Reservations[*].Instances[*].[InstanceId]" --output text)" + EC2_RUNNING="$($AWSCLI ec2 describe-instances --query "Reservations[*].Instances[*].[InstanceId]" $PROFILE_OPT --region $regx --output text)" if [[ $EC2_RUNNING ]]; then - INSTACES_OLD_THAN_AGE=$($AWSCLI $PROFILE_OPT --region $regx ec2 describe-instances --query "Reservations[].Instances[?LaunchTime<='$OLDAGE'][].{id: InstanceId, launched: LaunchTime}" --output text) + INSTACES_OLD_THAN_AGE=$($AWSCLI ec2 describe-instances --query "Reservations[].Instances[?LaunchTime<='$OLDAGE'][].{id: InstanceId, launched: LaunchTime}" $PROFILE_OPT --region $regx --output text) if [[ $INSTACES_OLD_THAN_AGE ]]; then while IFS= read -r ec2_instace do