Skip to content

Add aws_account tag to enhanced metrics and Lambda logs #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 17, 2020
Merged

Add aws_account tag to enhanced metrics and Lambda logs #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33a5b01
Add aws_account tag to logs and enhanced metrics
swfunc Mar 17, 2020
4fa6698
Update snapshots for new tags
swfunc Mar 17, 2020
91c156c
Remove unused kwarg
swfunc Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion aws/logs_monitoring/enhanced_lambda_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]

Expand Down Expand Up @@ -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
6 changes: 5 additions & 1 deletion aws/logs_monitoring/lambda_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0",
"ddsource": "cloudwatch",
"service": "cloudwatch",
"host": "testLogGroup"
Expand All @@ -38,7 +38,7 @@
"invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0",
"ddsource": "cloudwatch",
"service": "cloudwatch",
"host": "testLogGroup"
Expand Down
32 changes: 16 additions & 16 deletions aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -44,7 +44,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -66,7 +66,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -88,7 +88,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -110,7 +110,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -132,7 +132,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -154,7 +154,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -176,7 +176,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -198,7 +198,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -220,7 +220,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -242,7 +242,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -264,7 +264,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -286,7 +286,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -308,7 +308,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -330,7 +330,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand All @@ -352,7 +352,7 @@
"arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
},
"ddsourcecategory": "aws",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.2.0,env:none,account_id:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
"ddsource": "lambda",
"service": "hello-dog-node-dev-hello12x",
"host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
Expand Down