diff --git a/execute-cerberus-lifecycle-cli-command-signalfx.sh b/execute-cerberus-lifecycle-cli-command-signalfx.sh index 01569f7..e902d93 100755 --- a/execute-cerberus-lifecycle-cli-command-signalfx.sh +++ b/execute-cerberus-lifecycle-cli-command-signalfx.sh @@ -3,17 +3,23 @@ set -e echo "ENVIRONMENT=${ENVIRONMENT}" +echo "REGION=${REGION}" + +if [ -z ${REGION} ]; then + REGION="us-west-2" +fi IP_ADDRESS=$(curl -s http://checkip.amazonaws.com/) echo "" echo "-----------------------------------------------------------------------------------------------------------------" echo "" -echo "Executing command: '${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS}' in environment: '${ENVIRONMENT}' with the following external IP address: ${IP_ADDRESS}" +echo "Executing command: '${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS}' in environment: '${ENVIRONMENT}' and region '${REGION} + with the following external IP address: ${IP_ADDRESS}" echo "" echo "-----------------------------------------------------------------------------------------------------------------" echo "" -cerberus -e ${ENVIRONMENT} --no-tty ${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS} +cerberus -e ${ENVIRONMENT} -r ${REGION} --no-tty ${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS} curl -s -X POST \ https://ingest.signalfx.com/v2/datapoint \ diff --git a/execute-cerberus-lifecycle-cli-command.sh b/execute-cerberus-lifecycle-cli-command.sh index a2ebbc8..c2a2085 100755 --- a/execute-cerberus-lifecycle-cli-command.sh +++ b/execute-cerberus-lifecycle-cli-command.sh @@ -2,14 +2,20 @@ # execute-backup-command.sh echo "ENVIRONMENT=${ENVIRONMENT}" +echo "REGION=${REGION}" + +if [ -z ${REGION} ]; then + REGION="us-west-2" +fi IP_ADDRESS=$(curl -s http://checkip.amazonaws.com/) echo "" echo "-----------------------------------------------------------------------------------------------------------------" echo "" -echo "Executing command: '${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS}' in environment: '${ENVIRONMENT}' with the following external IP address: ${IP_ADDRESS}" +echo "Executing command: '${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS}' in environment: '${ENVIRONMENT}' and region '${REGION} + with the following external IP address: ${IP_ADDRESS}" echo "" echo "-----------------------------------------------------------------------------------------------------------------" echo "" -cerberus -e ${ENVIRONMENT} --no-tty ${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS} \ No newline at end of file +cerberus -e ${ENVIRONMENT} -r ${REGION} --no-tty ${COMMAND} ${ADDITIONAL_COMMAND_OPTIONS} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8d8ec52..92bffa1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,4 @@ group=com.nike artifactId=cerberus-lifecycle-cli -version=4.14.0 +version=4.15.0