Skip to content

Darcy.rayner/fix metrics api key whitespace #197

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
Jan 28, 2020
Merged

Darcy.rayner/fix metrics api key whitespace #197

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
dc6c54a
Make sure log forwarder and lambda layer use identical api key
DarcyRaynerDD Jan 28, 2020
22d5f50
Make layer explicitly use same api key as forwarder
DarcyRaynerDD Jan 28, 2020
1365530
Upgrade trace forwarder version
DarcyRaynerDD Jan 28, 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
6 changes: 6 additions & 0 deletions aws/logs_monitoring/lambda_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ def compileRegex(rule, pattern):

# Strip any trailing and leading whitespace from the API key
DD_API_KEY = DD_API_KEY.strip()
os.environ["DD_API_KEY"] = DD_API_KEY

# Force the layer to use the exact same API key as the forwarder
if DD_FORWARD_METRIC:
from datadog import api
api._api_key = DD_API_KEY

# DD_API_KEY must be set
if DD_API_KEY == "<YOUR_DATADOG_API_KEY>" or DD_API_KEY == "":
Expand Down
2 changes: 1 addition & 1 deletion aws/logs_monitoring/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Resources:
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
Layers:
- Fn::Sub: arn:aws:lambda:${AWS::Region}:464622532012:layer:Datadog-Python37:11
- Fn::Sub: arn:aws:lambda:${AWS::Region}:464622532012:layer:Datadog-Trace-Forwarder-Python37:3
- Fn::Sub: arn:aws:lambda:${AWS::Region}:464622532012:layer:Datadog-Trace-Forwarder-Python37:4
Tags:
dd_forwarder_version: !FindInMap [Constants, DdForwarder, Version]
Environment:
Expand Down