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.

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

Merge upstream improvements #7

Merged
merged 39 commits into from
Aug 2, 2024
Merged

Merge upstream improvements #7

merged 39 commits into from
Aug 2, 2024

Conversation

ankon
Copy link

@ankon ankon commented Aug 2, 2024

Merge the improvements from upstream into our own fork.

Note that this retains the existing build infrastructure (in FramerInfrastructureFunctions), even though there is now an easier logic available here with sam build --use-container NewRelicLogIngestion. Adapting this will happen in another step.

See also https://github.com/framer/company/issues/26513

reclaim0982 and others added 30 commits November 11, 2021 10:24
… be added to all newrelic log messages.

* The ADDITIONAL_ATTRIBUTES environment  variable value is a json encoded map(string,string). Defaults to empty map.
… not valid JSON

* Decode Additional attributes at init instead  of during the payload creation (Fail fast)
…PATTERN, S3_IGNORE_PATTERN env variables

BATCH_SIZE_FACTOR:          affects uncompressed batch size, default: 1.5
S3_CLOUDTRAIL_LOG_PATTERN:  regex pattern to match CloudTrail log file, default: .*CloudTrail.*\.json.gz$
S3_IGNORE_PATTERN:          regex pattern to match log file to be ignored/skipped, default: $^
Incremented version to 1.1.2
This is needed so SAM takes care of the dependency management when packaging
Fix structure for SAM and update version in the template
Added PermissionsBoundary and FunctionRole optional parameters
* Update README.md

Updated to Community Plus header

* Fix typo docume to document

Co-authored-by: Daniel Rodríguez <[email protected]>
* Upgrade dependencies versions because vulnerability issues
* Version bump to v1.1.4
feat: bump Python runtime version to v3.11
jcsobrino and others added 9 commits February 2, 2024 12:17
…issue_fix

Issue with CloudTrail digest fixed
…ents_path_fix

Fix python requirements file path in serverless configuration
This is needed so `sam build` can actually install the dependencies.

See also newrelic/aws_s3_log_ingestion_lambda#eee8ddb
The new `ADDITIONAL_ATTRIBUTES` provides a full replacement, so the logic now is
to use what is configured in that variable, and only if that is unset fall back
to parsing `NR_TAGS` and `NR_ENV_DELIMITER`.

Note that `ADDITIONAL_ATTRIBUTES` is a JSON string, and doesn't contain the logic
to not add `aws:`- and `plugin:`-prefixed properties: If those aren't wanted they
shouldn't be provided.
@ankon ankon changed the title Wip/merge and improve Merge upstream improvements Aug 2, 2024
@ankon ankon merged commit 84791af into master Aug 2, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.