From f50f42aab7771c3f1411b5b31598270584f15b17 Mon Sep 17 00:00:00 2001 From: Matthieu Cuny Date: Mon, 24 Oct 2022 16:08:17 +0200 Subject: [PATCH] feat: Support pattern /aws/vendedlogs for API GATEWAY logs groups --- aws/logs_monitoring/parsing.py | 6 ++++++ aws/logs_monitoring/tests/test_parsing.py | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/aws/logs_monitoring/parsing.py b/aws/logs_monitoring/parsing.py index cd57a8e55..5bc3717a1 100644 --- a/aws/logs_monitoring/parsing.py +++ b/aws/logs_monitoring/parsing.py @@ -280,8 +280,14 @@ def find_cloudwatch_source(log_group): "api-gateway", # e.g. Api-Gateway-Execution-Logs_xxxxxx/dev # default location set by serverless framework for rest api access logs "/aws/api-gateway", # e.g. /aws/api-gateway/my-project + # Avoid touching the size limit of the log group resource policy + # https://docs.aws.amazon.com/fr_fr/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html#AWS-logs-infrastructure-CWL + "/aws/vendedlogs/api-gateway", # default location set by serverless framework for http api logs "/aws/http-api", # e.g. /aws/http-api/my-project + # Avoid touching the size limit of the log group resource policy + # https://docs.aws.amazon.com/fr_fr/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html#AWS-logs-infrastructure-CWL + "/aws/vendedlogs/http-api", ) ): return "apigateway" diff --git a/aws/logs_monitoring/tests/test_parsing.py b/aws/logs_monitoring/tests/test_parsing.py index 9b5228fe9..dcf6b3dc3 100644 --- a/aws/logs_monitoring/tests/test_parsing.py +++ b/aws/logs_monitoring/tests/test_parsing.py @@ -122,6 +122,16 @@ def test_apigateway_event(self): parse_event_source({"awslogs": "logs"}, "/aws/http-api/my-project"), "apigateway", ) + self.assertEqual( + parse_event_source({"awslogs": "logs"}, + "/aws/vendedlogs/http-api/my-project"), + "apigateway", + ) + self.assertEqual( + parse_event_source({"awslogs": "logs"}, + "/aws/vendedlogs/http-api/my-project"), + "apigateway", + ) def test_dms_event(self): self.assertEqual(