Support metrics from build ami.

util/jenkins/build-ami.sh

@@ -93,6 +93,11 @@ if [[ ! -z "$hipchat_room_id" ]] && [[ ! -z "$hipchat_api_token"  ]]; then
   hipchat_params="--hipchat-room-id $hipchat_room_id --hipchat-api-token $hipchat_api_token"
 fi
 
+datadog_params=""
+if [[ ! -z "$DATADOG_API_KEY" ]]; then
+  datadog_params="--datadog-api-key $DATADOG_API_KEY"
+fi
+
 cleanup_params=""
 if [[ "$cleanup" == "false" ]]; then
   cleanup_params="--no-cleanup"
@@ -112,4 +117,4 @@ cd util/vpc-tools/
 
 echo "$vars" > /var/tmp/$BUILD_ID-extra-vars.yml
 cat /var/tmp/$BUILD_ID-extra-vars.yml
-python -u abbey.py -p $play -t m3.large -d $deployment -e $environment -i /edx/var/jenkins/.ssh/id_rsa $base_params $blessed_params $playbookdir_params --vars /var/tmp/$BUILD_ID-extra-vars.yml -c $BUILD_NUMBER --configuration-version $configuration --configuration-secure-version $configuration_secure -k $jenkins_admin_ec2_key --configuration-secure-repo $jenkins_admin_configuration_secure_repo $configurationprivate_params $hipchat_params $cleanup_params $notification_params
+python -u abbey.py -p $play -t m3.large -d $deployment -e $environment -i /edx/var/jenkins/.ssh/id_rsa $base_params $blessed_params $playbookdir_params --vars /var/tmp/$BUILD_ID-extra-vars.yml -c $BUILD_NUMBER --configuration-version $configuration --configuration-secure-version $configuration_secure -k $jenkins_admin_ec2_key --configuration-secure-repo $jenkins_admin_configuration_secure_repo $configurationprivate_params $hipchat_params $cleanup_params $notification_params $datdog_params

util/vpc-tools/abbey.py

@@ -132,6 +132,10 @@ def parse_args():
                         default=50,
                         help="The size of the root volume to use for the "
                              "abbey instance.")
+    parser.add_argument("--datadog-api-key", required=False,
+                        default="",
+                        help="The datadog api key used for capturing task"
+                             "and playbook metrics abbey instance.")
 
     group = parser.add_mutually_exclusive_group()
     group.add_argument('-b', '--base-ami', required=False,
@@ -268,9 +272,11 @@ HIPCHAT_ROOM={hipchat_room}
 HIPCHAT_MSG_PREFIX="$environment-$deployment-$play: "
 HIPCHAT_FROM="ansible-$instance_id"
 HIPCHAT_MSG_COLOR=$(echo -e "yellow\\ngreen\\npurple\\ngray" | shuf | head -1)
+DATADOG_API_KEY={datadog_api_key}
 # environment for ansible
 export ANSIBLE_ENABLE_SQS SQS_NAME SQS_REGION SQS_MSG_PREFIX PYTHONUNBUFFERED
-export HIPCHAT_TOKEN HIPCHAT_ROOM HIPCHAT_MSG_PREFIX HIPCHAT_FROM HIPCHAT_MSG_COLOR
+export HIPCHAT_TOKEN HIPCHAT_ROOM HIPCHAT_MSG_PREFIX HIPCHAT_FROM
+export HIPCHAT_MSG_COLOR DATADOG_API_KEY
 
 if [[ ! -x /usr/bin/git || ! -x /usr/bin/pip ]]; then
     echo "Installing pkg dependencies"
@@ -384,7 +390,8 @@ rm -rf $base_dir
                 queue_name=run_id,
                 extra_vars_yml=extra_vars_yml,
                 secure_vars_file=secure_vars_file,
-                cache_id=args.cache_id)
+                cache_id=args.cache_id,
+                datadog_api_key=args.datadog_api_key)
 
     mapping = BlockDeviceMapping()
     root_vol = BlockDeviceType(size=args.root_vol_size,