Skip to content

Some changes around ASG support and namespaces #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
callum-p wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Some changes around ASG support and namespaces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
69a82cc
Fixed namespace to be the same as the AWS scripts and added ASG support
May 23, 2016
5aa40eb
Updated readme
May 23, 2016
8fd1330
Commented out line used for testing asg reporting
May 23, 2016
c5b21c6
Commented out line used for testing asg reporting
May 23, 2016
32f8d1c
Removed lines used for testing
May 23, 2016
f7d05f7
Removed instance-id dummy file
May 23, 2016
9df021d
fix typo
mschuett Jun 17, 2016
c448b23
Merge pull request #1 from mschuett/master
callum-p Jun 17, 2016
d1bf6bd
fix typo
mschuett Jul 5, 2016
eb582fe
Merge pull request #2 from mschuett/master
callum-p Jul 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Name | Description
--disk-space-util | Reports disk space utilization in percentages.
--disk-space-used | Reports allocated disk space in gigabytes.
--disk-space-avail | Reports available disk space in gigabytes.
--autoscaling | Use this option when reporting metrics for an auto-scaling group
--all-items | Reports all items.

### Examples
Expand Down
18 changes: 15 additions & 3 deletions aws-mon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ SCRIPT_VERSION=1.1
instanceid=`wget -q -O - http://169.254.169.254/latest/meta-data/instance-id`
azone=`wget -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone`
region=${azone/%?/}
asg=`aws autoscaling describe-auto-scaling-instances --region $region --instance-ids $instanceid --query "AutoScalingInstances[*].AutoScalingGroupName" --output text`
export EC2_REGION=$region
export AWS_DEFAULT_REGION=$region


########################################
#######################################
# Constants
########################################
KILO=1024
Expand Down Expand Up @@ -71,6 +73,7 @@ usage()
printf " %-28s %s\n" "--disk-space-util" "Reports disk space utilization in percentages."
printf " %-28s %s\n" "--disk-space-used" "Reports allocated disk space in gigabytes."
printf " %-28s %s\n" "--disk-space-avail" "Reports available disk space in gigabytes."
printf " %-28s %s\n" "--autoscaling" "Reports auto-scaling metrics only."
printf " %-28s %s\n" "--all-items" "Reports all items."
}

Expand All @@ -79,7 +82,7 @@ usage()
# Options
########################################
SHORT_OPTS="h"
LONG_OPTS="help,version,verify,verbose,debug,from-cron,profile:,load-ave1,load-ave5,load-ave15,interrupt,context-switch,cpu-us,cpu-sy,cpu-id,cpu-wa,cpu-st,memory-units:,mem-used-incl-cache-buff,mem-util,mem-used,mem-avail,swap-util,swap-used,swap-avail,disk-path:,disk-space-units:,disk-space-util,disk-space-used,disk-space-avail,all-items"
LONG_OPTS="help,version,verify,verbose,debug,from-cron,profile:,load-ave1,load-ave5,load-ave15,interrupt,context-switch,cpu-us,cpu-sy,cpu-id,cpu-wa,cpu-st,memory-units:,mem-used-incl-cache-buff,mem-util,mem-used,mem-avail,swap-util,swap-used,swap-avail,disk-path:,disk-space-units:,disk-space-util,disk-space-used,disk-space-avail,autoscaling,all-items"

ARGS=$(getopt -s bash --options $SHORT_OPTS --longoptions $LONG_OPTS --name $SCRIPT_NAME -- "$@" )

Expand Down Expand Up @@ -113,6 +116,7 @@ DISK_SPACE_UNIT_DIV=1
DISK_SPACE_UTIL=0
DISK_SPACE_USED=0
DISK_SPACE_AVAIL=0
ASG_ONLY=0

eval set -- "$ARGS"
while true; do
Expand All @@ -137,6 +141,9 @@ while true; do
--from-cron)
FROM_CRON=1
;;
--autoscaling)
ASG_ONLY=1
;;
# Profile
--profile)
shift
Expand Down Expand Up @@ -317,10 +324,15 @@ if [ $FROM_CRON -eq 1 ]; then
fi

# CloudWatch Command Line Interface Option
CLOUDWATCH_OPTS="--namespace System/Detail/Linux --dimensions InstanceId=$instanceid"
CLOUDWATCH_OPTS="--namespace System/Linux"
if [ -n "$PROFILE" ]; then
CLOUDWATCH_OPTS="$CLOUDWATCH_OPTS --profile $PROFILE"
fi
if [ -n "$asg" ] && [ $ASG_ONLY -eq 1 ]; then
CLOUDWATCH_OPTS="$CLOUDWATCH_OPTS --dimensions AutoScalingGroupName=$asg"
else
CLOUDWATCH_OPTS="$CLOUDWATCH_OPTS --dimensions InstanceId=$instanceid"
fi

# Command Output
if [ $DEBUG -eq 1 ]; then
Expand Down