From ea9439283390f632e4fcfee13f2340034ee23988 Mon Sep 17 00:00:00 2001
From: Owen Barton <drupal@owenbarton.com>
Date: Mon, 21 Jul 2014 00:12:50 -0700
Subject: [PATCH] Adding a --disk-metric-suffix option, so you can add separate
 metrics for additional disks.

---
 README.md  |  1 +
 aws-mon.sh | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 332506c..d41257d 100644
--- a/README.md
+++ b/README.md
@@ -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.
+--disk-metric-suffix       | Suffix to add to disk metrics.
 --all-items                | Reports all items.
 
 ### Examples
diff --git a/aws-mon.sh b/aws-mon.sh
index d6c3e90..588ac1d 100755
--- a/aws-mon.sh
+++ b/aws-mon.sh
@@ -71,6 +71,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" "--disk-metric-suffix" "Suffix to add to disk metrics."
     printf "    %-28s %s\n" "--all-items" "Reports all items."
 }
 
@@ -79,7 +80,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,disk-metric-suffix:,all-items" 
 
 ARGS=$(getopt -s bash --options $SHORT_OPTS --longoptions $LONG_OPTS --name $SCRIPT_NAME -- "$@" ) 
 
@@ -113,6 +114,7 @@ DISK_SPACE_UNIT_DIV=1
 DISK_SPACE_UTIL=0
 DISK_SPACE_USED=0
 DISK_SPACE_AVAIL=0
+DISK_METRIC_SUFFIX=""
 
 eval set -- "$ARGS" 
 while true; do 
@@ -218,6 +220,11 @@ while true; do
         --disk-space-avail)
             DISK_SPACE_AVAIL=1
             ;;
+        --disk-metric-suffix)
+            shift
+            DISK_METRIC_SUFFIX=$1
+            ;;
+
         --all-items)
             LOAD_AVE1=1
             LOAD_AVE5=1
@@ -539,9 +546,9 @@ disk_avail=`echo "$df_output" | tail -1 | tr -s ' ' | cut -d ' ' -f 4`
 disk_avail=`expr $disk_avail \* $KILO`
 
 if [ $DEBUG -eq 1 ]; then
-    echo "DiskTotal:$disk_total"
-    echo "DiskUsed:$disk_used"
-    echo "DiskAvailable:$disk_avail"
+    echo "DiskTotal$DISK_METRIC_SUFFIX:$disk_total"
+    echo "DiskUsed$DISK_METRIC_SUFFIX:$disk_used"
+    echo "DiskAvailable$DISK_METRIC_SUFFIX:$disk_avail"
 fi
 
 if [ $DISK_SPACE_UTIL -eq 1 -a -n "$DISK_PATH" -a $disk_total -gt 0 ]; then
@@ -550,7 +557,7 @@ if [ $DISK_SPACE_UTIL -eq 1 -a -n "$DISK_PATH" -a $disk_total -gt 0 ]; then
         echo "disk_util:$disk_util"
     fi
     if [ $VERIFY -eq 0 ]; then
-        aws cloudwatch put-metric-data --metric-name "DiskSpaceUtilization" --value "$disk_util" --unit "Percent" $CLOUDWATCH_OPTS
+        aws cloudwatch put-metric-data --metric-name "DiskSpaceUtilization$DISK_METRIC_SUFFIX" --value "$disk_util" --unit "Percent" $CLOUDWATCH_OPTS
     fi
 fi
 
@@ -560,7 +567,7 @@ if [ $DISK_SPACE_USED -eq 1 -a -n "$DISK_PATH" ]; then
         echo "disk_used:$disk_used"
     fi
     if [ $VERIFY -eq 0 ]; then
-        aws cloudwatch put-metric-data --metric-name "DiskSpaceUsed" --value "$disk_used" --unit "$DISK_SPACE_UNITS" $CLOUDWATCH_OPTS
+        aws cloudwatch put-metric-data --metric-name "DiskSpaceUsed$DISK_METRIC_SUFFIX" --value "$disk_used" --unit "$DISK_SPACE_UNITS" $CLOUDWATCH_OPTS
     fi
 fi
 
@@ -570,7 +577,7 @@ if [ $DISK_SPACE_AVAIL -eq 1 -a -n "$DISK_PATH" ]; then
         echo "disk_avail:$disk_avail"
     fi
     if [ $VERIFY -eq 0 ]; then
-        aws cloudwatch put-metric-data --metric-name "DiskSpaceAvailable" --value "$disk_avail" --unit "$DISK_SPACE_UNITS" $CLOUDWATCH_OPTS
+        aws cloudwatch put-metric-data --metric-name "DiskSpaceAvailable$DISK_METRIC_SUFFIX" --value "$disk_avail" --unit "$DISK_SPACE_UNITS" $CLOUDWATCH_OPTS
     fi
 fi