patched for pcluster 2.11.1 and external fsx

Author: bollig

custom-metrics/1h-cost-metrics.sh

@@ -11,6 +11,7 @@
 
 export AWS_DEFAULT_REGION=$cfn_region
 aws_region_long_name=$(python /usr/local/bin/aws-region.py $cfn_region)
+aws_region_long_name=${aws_region_long_name/Europe/EU}
 
 masterInstanceType=$(ec2-metadata -t | awk '{print $2}')
 masterInstanceId=$(ec2-metadata -i | awk '{print $2}')
@@ -58,18 +59,26 @@ echo "master_node_cost $master_node_h_price" | curl --data-binary @- http://127.
 
 
 ####################### FSX #########################
-fsx_size_gb=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
+#fsx_size_gb=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
+#              | jq -r '.Stacks[0].Parameters | map(select(.ParameterKey == "FSXOptions"))[0].ParameterValue' \
+#              | awk -F "," '{print $3}')
+#
+#fsx_type=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
+#              | jq -r '.Stacks[0].Parameters | map(select(.ParameterKey == "FSXOptions"))[0].ParameterValue' \
+#              | awk -F "," '{print $9}')
+#            
+#fsx_throughput=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
+#              | jq -r '.Stacks[0].Parameters | map(select(.ParameterKey == "FSXOptions"))[0].ParameterValue' \
+#              | awk -F "," '{print $10}')
+
+fsx_id=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
               | jq -r '.Stacks[0].Parameters | map(select(.ParameterKey == "FSXOptions"))[0].ParameterValue' \
-              | awk -F "," '{print $3}')
+              | awk -F "," '{print $2}')
+fsx_summary=$(aws fsx describe-file-systems --region $cfn_region --file-system-ids $fsx_id)
+fsx_size_gb=$(echo $fsx_summary | jq -r '.FileSystems[0].StorageCapacity')
+fsx_type=$(echo $fsx_summary | jq -r '.FileSystems[0].LustreConfiguration.DeploymentType')
+fsx_throughput=$(echo $fsx_summary | jq -r '.FileSystems[0].LustreConfiguration.PerUnitStorageThroughput')
 
-fsx_type=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
-              | jq -r '.Stacks[0].Parameters | map(select(.ParameterKey == "FSXOptions"))[0].ParameterValue' \
-              | awk -F "," '{print $9}')
-            
-fsx_throughput=$(aws cloudformation describe-stacks --stack-name $stack_name --region $cfn_region \
-              | jq -r '.Stacks[0].Parameters | map(select(.ParameterKey == "FSXOptions"))[0].ParameterValue' \
-              | awk -F "," '{print $10}')
-
 if [[ $fsx_type = "SCRATCH_2" ]] || [[ $fsx_type = "SCRATCH_1" ]]; then
   fsx_cost_gb_month=$(aws pricing get-products \
                       --region us-east-1 \
@@ -124,4 +133,4 @@ do
   ebs_volume_total_cost=$(echo "scale=2; $ebs_volume_total_cost + $ebs_volume_cost" | bc)
 done
 
-echo "ebs_master_cost $ebs_volume_total_cost" | curl --data-binary @- http://127.0.0.1:9091/metrics/job/cost
+echo "ebs_master_cost $ebs_volume_total_cost" | curl --data-binary @- http://127.0.0.1:9091/metrics/job/cost

custom-metrics/1m-cost-metrics.sh

@@ -11,6 +11,7 @@
 
 export AWS_DEFAULT_REGION=$cfn_region
 aws_region_long_name=$(python /usr/local/bin/aws-region.py $cfn_region)
+aws_region_long_name=${aws_region_long_name/Europe/EU}
 
 monitoring_dir_name=$(echo ${cfn_postinstall_args}| cut -d ',' -f 2 )
 monitoring_home="/home/${cfn_cluster_user}/${monitoring_dir_name}"
@@ -57,4 +58,4 @@ for queue in $queues; do
 done 
 
 echo "ebs_compute_cost $compute_ebs_volume_cost"    | curl --data-binary @- http://127.0.0.1:9091/metrics/job/cost
-echo "compute_nodes_cost $compute_nodes_total_cost" | curl --data-binary @- http://127.0.0.1:9091/metrics/job/cost
+echo "compute_nodes_cost $compute_nodes_total_cost" | curl --data-binary @- http://127.0.0.1:9091/metrics/job/cost