Skip to content

Commit

Permalink
Revert "[u] Fix: S3 server access logs are inherently incomplete (#5043
Browse files Browse the repository at this point in the history
…, PR #5230)"

This reverts commit befd490, reversing
changes made to b954f7d.
  • Loading branch information
achave11-ucsc committed May 24, 2023
1 parent befd490 commit 75a01ee
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
10 changes: 0 additions & 10 deletions UPGRADING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,6 @@ a deployment just before pushing the merge commit to the GitLab instance in that
deployment.


#5043 S3 server access logs are inherently incomplete
=====================================================

Operator
~~~~~~~~

Manually deploy the ``shared`` component of any main deployment just before
pushing the merge commit to the GitLab instance in that deployment.


#5133 Trigger an alarm on absence of logs
=========================================

Expand Down
10 changes: 1 addition & 9 deletions terraform/shared/shared.tf.json.template.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,15 +350,7 @@ def conformance_pack(name: str) -> str:
'enable_log_file_validation': True,
'is_multi_region_trail': True,
'cloud_watch_logs_group_arn': '${aws_cloudwatch_log_group.trail.arn}:*',
'cloud_watch_logs_role_arn': '${aws_iam_role.trail.arn}',
'event_selector': {
'read_write_type': 'All',
'include_management_events': True,
'data_resource': {
'type': 'AWS::S3::Object',
'values': ['arn:aws:s3']
}
}
'cloud_watch_logs_role_arn': '${aws_iam_role.trail.arn}'
}
},
'aws_cloudwatch_log_group': {
Expand Down

0 comments on commit 75a01ee

Please sign in to comment.