Skip to content
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

Jump to bottom

Update lambda manager code to add permission for each log group [CDS-1136] #147

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Update lambda manager code to add permission for each log group [CDS-1136] #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa0b61
Update lambda manager code to add permission for each log group
guyrenny Apr 2, 2024
08d1850
update python version
guyrenny Apr 2, 2024
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
4 changes: 4 additions & 0 deletions src/lambda-manager/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## lambda-manager

## 2.0.1 / 04-2-2024
### 💡 Enhancements 💡
- Update lambda code so it will not require the allow all policy

## 2.0.0 🎉 / 02-20-2024
### 🛑 Breaking changes 🛑
- New CloudFormation Template does not deploy firehose stream as part of the deployment.
Expand Down
21 changes: 0 additions & 21 deletions src/lambda-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,6 @@ Trust relationships
}
```

### Lamba

Lambda destination does not need a specific role, but please check that the execution role of the destination lambda has the following resource based policy.

```
{
"Sid": "lsdmvpsdf",
"Effect": "Allow",
"Principal": {
Service": "logs.amazonaws.com"
},
"Action": "lambda:InvokeFunction",
"Resource": "arn:aws:lambda:us-east-1:771039649440:function:coralogix-aws-shipper",
"Condition": {
"ArnLike": {
"AWS:SourceArn": "arn:aws:logs:us-east-1:771039649440:*:*:*"
}
}
}
```

## License

This project is licensed under the Apache-2.0 License.
40 changes: 35 additions & 5 deletions src/lambda-manager/lambda_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def identify_arn_service(arn):
else:
return "Unknown AWS Service"

def list_log_groups_and_subscriptions(cloudwatch_logs, regex_pattern, logs_filter, destination_arn, role_arn, filter_name):
def list_log_groups_and_subscriptions(cloudwatch_logs, regex_pattern, logs_filter, destination_arn, role_arn, filter_name, context):
log_groups = []
response = {'nextToken': None} # Initialize with a dict containing nextToken as None
print("Scanning all log groups")
Expand Down Expand Up @@ -51,9 +51,19 @@ def list_log_groups_and_subscriptions(cloudwatch_logs, regex_pattern, logs_filte
continue
elif destination_type == 'lambda':
try:
lambda_client = boto3.client('lambda')
region = context.invoked_function_arn.split(":")[3]
account_id = context.invoked_function_arn.split(":")[4]
lambda_client.add_permission(
FunctionName=destination_arn,
StatementId=f'allow-trigger-from-{log_group_name}',
Action='lambda:InvokeFunction',
Principal='logs.amazonaws.com',
SourceArn=f'arn:aws:logs:{region}:{account_id}:log-group:{log_group_name}:*',
)
cloudwatch_logs.put_subscription_filter(
destinationArn=destination_arn,
filterName= filter_name,
filterName= "coralogix-aws-shipper-cloudwatch-trigger",
filterPattern=logs_filter,
logGroupName=log_group_name,
)
Expand Down Expand Up @@ -89,9 +99,19 @@ def list_log_groups_and_subscriptions(cloudwatch_logs, regex_pattern, logs_filte
continue
elif destination_type == 'lambda':
try:
lambda_client = boto3.client('lambda')
region = context.invoked_function_arn.split(":")[3]
account_id = context.invoked_function_arn.split(":")[4]
lambda_client.add_permission(
FunctionName=destination_arn,
StatementId=f'allow-trigger-from-{log_group_name}',
Action='lambda:InvokeFunction',
Principal='logs.amazonaws.com',
SourceArn=f'arn:aws:logs:{region}:{account_id}:log-group:{log_group_name}:*',
)
cloudwatch_logs.put_subscription_filter(
destinationArn=destination_arn,
filterName= filter_name,
filterName= "coralogix-aws-shipper-cloudwatch-trigger",
filterPattern=logs_filter,
logGroupName=log_group_name,
)
Expand All @@ -114,7 +134,7 @@ def lambda_handler(event, context):
filter_name = 'Coralogix_Filter_' + str(uuid.uuid4())
print(f"Scanning all log groups: {scan_all_log_groups}")
if scan_all_log_groups == 'true':
list_log_groups_and_subscriptions(cloudwatch_logs, regex_pattern, logs_filter, destination_arn, role_arn, filter_name)
list_log_groups_and_subscriptions(cloudwatch_logs, regex_pattern, logs_filter, destination_arn, role_arn, filter_name, context)
lambda_client = boto3.client('lambda')
function_name = context.function_name

Expand Down Expand Up @@ -151,9 +171,19 @@ def lambda_handler(event, context):
print(f"Failed to put subscription filter for {log_group_to_subscribe}: {e}")
elif destination_type == 'lambda':
try:
lambda_client = boto3.client('lambda')
region = context.invoked_function_arn.split(":")[3]
account_id = context.invoked_function_arn.split(":")[4]
lambda_client.add_permission(
FunctionName=destination_arn,
StatementId=f'allow-trigger-from-{log_group_to_subscribe}',
Action='lambda:InvokeFunction',
Principal='logs.amazonaws.com',
SourceArn=f'arn:aws:logs:{region}:{account_id}:log-group:{log_group_to_subscribe}:*',
)
cloudwatch_logs.put_subscription_filter(
destinationArn=destination_arn,
filterName= filter_name,
filterName= "coralogix-aws-shipper-cloudwatch-trigger",
filterPattern=logs_filter,
logGroupName=log_group_to_subscribe,
)
Expand Down
5 changes: 3 additions & 2 deletions src/lambda-manager/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Metadata:
- cloudwatch
- lambda
HomePageUrl: https://coralogix.com
SemanticVersion: 2.0.0
SemanticVersion: 2.0.1
SourceCodeUrl: https://github.com/coralogix/coralogix-aws-serverless
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -139,6 +139,7 @@ Resources:
Action:
- lambda:UpdateFunctionConfiguration
- lambda:GetFunctionConfiguration
- lambda:AddPermission
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:*"
- Sid: CWSubscriptionPolicy
Effect: Allow
Expand All @@ -153,7 +154,7 @@ Resources:
Action:
- iam:PassRole
Resource:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/*"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/*"
EventInvokeConfig:
DestinationConfig:
OnFailure:
Expand Down
Loading