Skip to content

Commit 0fb58a9

Browse files
committed
feat(logs): AWSX-1592 Move dms, docdb, fsx and opensearch to logs-backend
Signed-off-by: Vincent Boutour <vincent.boutour@datadoghq.com>
1 parent 69a47d0 commit 0fb58a9

5 files changed

Lines changed: 0 additions & 223 deletions

File tree

aws/logs_monitoring/steps/enums.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ class AwsEventSource(Enum):
77
CLOUDFRONT = "cloudfront"
88
CLOUDTRAIL = "cloudtrail"
99
CLOUDWATCH = "cloudwatch"
10-
DMS = "dms"
11-
DOCDB = "docdb"
1210
EKS = "eks"
1311
ELASTICSEARCH = "elasticsearch"
1412
ELB = "elb"
1513
FARGATE = "fargate"
16-
FSX = "aws.fsx"
1714
GUARDDUTY = "guardduty"
1815
IAMAUTHENTICATOR = "aws-iam-authenticator"
1916
KINESIS = "kinesis"
@@ -26,7 +23,6 @@ class AwsEventSource(Enum):
2623
MSK = "msk"
2724
MYSQL = "mysql"
2825
NETWORKFIREWALL = "network-firewall"
29-
OPENSEARCH = "opensearch"
3026
POSTGRESQL = "postgresql"
3127
ROUTE53 = "route53"
3228
S3 = "s3"
@@ -68,8 +64,6 @@ def __init__(self, string, event_source):
6864

6965
# e.g. carbon-black-cloud-forwarder/alerts/org_key=*****/year=2021/month=7/day=19/hour=18/minute=15/second=41/8436e850-7e78-40e4-b3cd-6ebbc854d0a2.jsonl.gz
7066
CARBONBLACK = ("carbon-black", AwsEventSource.CARBONBLACK)
71-
DMS = ("amazon_dms", AwsEventSource.DMS)
72-
DOCDB = ("amazon_documentdb", AwsEventSource.DOCDB)
7367
# e.g. AWSLogs/123456779121/elasticloadbalancing/us-east-1/2020/10/02/123456779121_elasticloadbalancing_us-east-1_app.alb.xxxxx.xx.xxx.xxx_x.log.gz
7468
ELB = ("elasticloadbalancing", AwsEventSource.ELB)
7569
GUARDDUTY = ("guardduty", AwsEventSource.GUARDDUTY)
@@ -94,20 +88,12 @@ def __init__(self, string, event_source):
9488

9589
# e.g. /aws/codebuild/my-project
9690
CLOUDTRAIL = ("_CloudTrail_", AwsEventSource.CLOUDTRAIL)
97-
# e.g. dms-tasks-test-instance
98-
DMS = ("dms-tasks", AwsEventSource.DMS)
99-
# e.g. /aws/docdb/yourClusterName/profile
100-
DOCDB = ("/aws/docdb", AwsEventSource.DOCDB)
10191
# e.g. /aws/eks/yourClusterName/profile
10292
EKS = ("/aws/eks", AwsEventSource.EKS)
103-
# e.g. /aws/fsx/windows/xxx
104-
FSX = ("/aws/fsx/windows", AwsEventSource.FSX)
10593
# e.g. /aws/kinesisfirehose/dev
10694
KINESIS = ("/aws/kinesis", AwsEventSource.KINESIS)
10795
# e.g. /aws/lambda/helloDatadog
10896
LAMBDA = ("/aws/lambda", AwsEventSource.LAMBDA)
109-
# e.g. /aws/opensearchservice/domains/my-cluster
110-
OPENSEARCH = ("/aws/opensearchservice/domains/", AwsEventSource.OPENSEARCH)
11197
# e.g. sns/us-east-1/123456779121/SnsTopicX
11298
SNS = ("sns/", AwsEventSource.SNS)
11399
SSM = ("/aws/ssm/", AwsEventSource.SSM)

aws/logs_monitoring/tests/test_parsing.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,6 @@ def test_lambda_event(self):
7878
str(AwsEventSource.LAMBDA),
7979
)
8080

81-
def test_dms_event(self):
82-
self.assertEqual(
83-
parse_event_source({"awslogs": "logs"}, "dms-tasks-test-instance"),
84-
str(AwsEventSource.DMS),
85-
)
86-
self.assertEqual(
87-
parse_event_source(
88-
{"Records": ["logs-from-s3"]}, "AWSLogs/amazon_dms/my-s3.json.gz"
89-
),
90-
str(AwsEventSource.DMS),
91-
)
92-
9381
def test_sns_event(self):
9482
self.assertEqual(
9583
parse_event_source(
@@ -110,18 +98,6 @@ def test_kinesis_event(self):
11098
str(AwsEventSource.KINESIS),
11199
)
112100

113-
def test_docdb_event(self):
114-
self.assertEqual(
115-
parse_event_source({"awslogs": "logs"}, "/aws/docdb/testCluster/profile"),
116-
str(AwsEventSource.DOCDB),
117-
)
118-
self.assertEqual(
119-
parse_event_source(
120-
{"Records": ["logs-from-s3"]}, "/amazon_documentdb/dev/123abc.zip"
121-
),
122-
str(AwsEventSource.DOCDB),
123-
)
124-
125101
def test_vpc_event(self):
126102
self.assertEqual(
127103
parse_event_source({"awslogs": "logs"}, "abc123_my_vpc_loggroup"),
@@ -256,15 +232,6 @@ def test_carbon_black_event(self):
256232
str(AwsEventSource.CARBONBLACK),
257233
)
258234

259-
def test_opensearch_event(self):
260-
self.assertEqual(
261-
parse_event_source(
262-
{"awslogs": "logs"},
263-
"/aws/OpenSearchService/domains/my-opensearch-cluster/ES_APPLICATION_LOGS",
264-
),
265-
str(AwsEventSource.OPENSEARCH),
266-
)
267-
268235
def test_cloudwatch_source_if_none_found(self):
269236
self.assertEqual(
270237
parse_event_source({"awslogs": "logs"}, ""), str(AwsEventSource.CLOUDWATCH)

aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_fsx_windows.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_fsx_windows.json~snapshot

Lines changed: 0 additions & 155 deletions
This file was deleted.

aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,6 @@ def test_cloudwatch_log_custom_tags(self):
154154
snapshot_filename = f"{input_filename}~snapshot"
155155
self.compare_snapshot(input_filename, snapshot_filename)
156156

157-
def test_cloudwatch_log_fsx_windows(self):
158-
input_filename = f"{snapshot_dir}/cloudwatch_log_fsx_windows.json"
159-
snapshot_filename = f"{input_filename}~snapshot"
160-
self.compare_snapshot(input_filename, snapshot_filename)
161-
162157
def test_cloudwatch_log_lambda_invocation(self):
163158
input_filename = f"{snapshot_dir}/cloudwatch_log_lambda_invocation.json"
164159
snapshot_filename = f"{input_filename}~snapshot"

0 commit comments

Comments
 (0)