Added capacity information.

Author: kcantrel

Management-Utilities/fsx-ontap-aws-cli-scripts/list_fsxn_filesystems

@@ -49,7 +49,7 @@ Usage $(basename $0) [-r region] [-a] [-n] [-c] [-s] [-b] [-i fileSystemId] [-f
          -c means to display a hierarchical view of each filesystem including svms and volumes.
          -i allows you to limit the display to the file system with the id provided.
          -f allows you to limit the display to the file system with the name provided.
-         -b means to display the backup retenion period. Not compoatible with the -x or -c options.
+         -b means to display the backup retenion period. Not compatible with the -x or -c options.
          -s means to display the current status of a volume. Only relative with the -c option.
          -n means to show the AWS ARN for the file system. Not compatible with -x or -c options.
          -x means include additional information: vpc, subnet, Size, Deployement Type, Throughput, provisioned IOPS, usage.
@@ -69,7 +69,7 @@ cloudwatchQueryFile=/tmp/list_fss-cloudwatch-query.$$
 fsCapacityFile=/tmp/list_fss-fscapacity.$$
 trap 'rm -f $tmpout $fileSystemsFile $svmsFile $volumesFile $cloudwatchOutputFile $cloudwatchQueryFile $fsCapacityFile' exit
 #
-# Ensure all the required ultilities are installed.
+# Ensure all the required utilities are installed.
 if which aws jq > /dev/null 2>&1; then
   :
 else
@@ -299,7 +299,7 @@ EOF
       aws cloudwatch get-metric-data --region=$region --metric-data-queries file://$cloudwatchQueryFile --start-time=$(date -u -d '5 minutes ago' +"%Y-%m-%dT%H:%M:%SZ") --end-time=$(date -u +"%Y-%m-%dT%H:%M:%SZ") --output=json > $cloudwatchOutputFile 2>&1
       for fsid in $fsxIds; do
         fsid2=$(echo $fsid | sed -e 's/-/_/g')
-        storageUsed=$(jq -r '.MetricDataResults[] | if(.Id == "'${fsid2}_StorageUsed'") then .Values[0] else empty end' $cloudwatchOutputFile)
+        storageUsed=$(jq -r '.MetricDataResults[] | if(.Id == "'${fsid2}_StorageUsed'") then .Values[0] // 0 else empty end' $cloudwatchOutputFile)
         echo "$fsid,$storageUsed" >> $fsCapacityFile
       done
 

Management-Utilities/fsx-ontap-aws-cli-scripts/list_fsxn_volumes

@@ -17,13 +17,13 @@
 # It will list:
 #   o Region
 #   o File System ID
-#   o File System Name - optional with -n option
+#   o File System Name - optional. Comes with -n option
 #   o Storage Virtual Machine ID
-#   o Storage Virtual Machine Name - optional with -n option
+#   o Storage Virtual Machine Name - optional. Comes with -n option
 #   o Volume ID
 #   o Volume Status
-#   o Volume Size in MB - optional - optional with -x option
-#   o Volume Used in MB - optional - optional with -x option
+#   o Volume Size in MB - optional. Comes with -x option
+#   o Volume Used in MB - optional. Comes with -x option
 #   o Volume Name
 #
 ################################################################################
@@ -37,12 +37,12 @@ Usage $(basename $0) [-r region] [-a] [-o] [-f fileSystemName] [-i fileSystemId]
   Where: volume_pattern - Only volumes that match the egrep pattern will be included.
          -r region allows you to specify the region you want the list from.
          -a means all regions.
-         -n means include the file system ans SVM names. Not capable with the -x option.
+         -n means include the file system ans SVM names. Not compatible with the -x option.
          -f fileSystemName means to only include volumes that are under the named file system.
          -i fileSystemId means to only include volumes that are under the file system with the specified file system ID.
          -s svmID - Only show volumes that are under the specified SVM ID.
          -o means to exclude svm root volumes. Only works in conjunction with the -s option.
-         -x means to provide capacity information. Not capable with the -n option.
+         -x means to provide capacity information. Not compatible with the -n option.
 EOF
   exit 1
 }
@@ -105,8 +105,8 @@ if [ ! -z "$1" ]; then
   volumePattern="$1"
 fi
 
-if [ ! -z "$fileSystenName" -a ! -z "$fsid" ]; then
-  echo "Error, you can't provide both -f and -n options." 1>&2
+if [ ! -z "$fileSystemName" -a ! -z "$fsid" ]; then
+  echo "Error, you can't provide both -f and -i options." 1>&2
   exit 1
 fi
 
@@ -154,7 +154,6 @@ fi
 jqFields='\(.FileSystemId),\(.Name),\(.VolumeId),\(.Lifecycle),\(.OntapConfiguration.SizeInMegabytes),\(.OntapConfiguration.StorageVirtualMachineId)'
 #
 # Loop on all the regions.
-fields='\(.FileSystemId),\(.Name),\(.VolumeId),\(.Lifecycle),\(.OntapConfiguration.StorageVirtualMachineId)'
 for region in ${regions[*]}; do
   #
   # Check that the fsx service is supported in thie region
@@ -217,7 +216,7 @@ EOF
           aws cloudwatch get-metric-data --region $region --metric-data-queries file://$cloudwatchQueryFile --start-time=$(date -u -d '5 minutes ago' +"%Y-%m-%dT%H:%M:%SZ") --end-time=$(date -u +"%Y-%m-%dT%H:%M:%SZ") --output=json > $cloudwatchOutputFile 2>&1
           for volId in $volIds; do
             volId2=$(echo $volId | sed -e 's/-/_/g')
-            capacity=$(jq -r '.MetricDataResults[] | select(.Id == "m'$volId2'") | .Values[0]' < $cloudwatchOutputFile)
+            capacity=$(jq -r '.MetricDataResults[] | select(.Id == "m'$volId2'") | .Values[0] // 0' < $cloudwatchOutputFile)
             echo "$volId,$capacity" >> $volCapacityFile
           done
           awk -F, -v region=$region -v volCapacityFile=$volCapacityFile 'BEGIN {first=1; formatStr="%12s %21s %21s %24s %10s %16s %15s %s\n"; while (getline < volCapacityFile) {volidCapacities[$1]=sprintf("%10.0f",$2/1024/1024)}}; {if(first) {printf "\n"; printf formatStr, "Region", "FileSystem ID", "SVM", "Volume ID", "State", "Volume Size (MB)", "Used (MB)", "Volume Name"; first=0}; printf formatStr, region, $1, $6, $3, $4, $5, volidCapacities[$3], $2}' < $volumeList