Add aws_account tag to logs and enhanced metrics

Author: swfunc

aws/logs_monitoring/enhanced_lambda_metrics.py

@@ -341,7 +341,7 @@ def generate_enhanced_lambda_metrics(log, tags_cache):
  return parsed_metrics
 
 
-def parse_lambda_tags_from_arn(arn):
+def parse_lambda_tags_from_arn(arn, aws_account_tag=False):
  """Generate the list of lambda tags based on the data in the arn
 
  Args:
@@ -360,6 +360,8 @@ def parse_lambda_tags_from_arn(arn):
  return [
  "region:{}".format(region),
  "account_id:{}".format(account_id),
+ # Include the aws_account tag to match the aws.lambda CloudWatch metrics
+ "aws_account:{}".format(account_id),
  "functionname:{}".format(function_name),
  ]
 
@@ -435,5 +437,4 @@ def get_enriched_lambda_log_tags(log):
  lambda_custom_tags = account_lambda_tags_cache.get(log_function_arn)
  # Combine and dedup tags
  tags = list(set(tags_from_arn + lambda_custom_tags))
- tags.sort()
  return tags

aws/logs_monitoring/lambda_function.py

@@ -645,7 +645,11 @@ def enrich(events):
 
 
 def add_metadata_to_lambda_log(event):
- """Mutate log dict to add functionname tag, host, and service from the existing Lambda attribute
+ """Mutate log dict to add tags, host, and service metadata
+
+ * tags for functionname, aws_account, region
+ * host from the Lambda ARN
+ * service from the Lambda name
 
  If the event arg is not a Lambda log then this returns without doing anything