Skip to content

Commit

Permalink
Merge pull request #122 from AkhilReddyS-NR/NR-303954
Browse files Browse the repository at this point in the history
Set default value of `NRLoggingEnabled` Parameter to True
  • Loading branch information
AkhilReddyS-NR authored Sep 9, 2024
2 parents e0f511a + 136559b commit 020955f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 10 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ to deploy the log ingestion function manually.
4. Build the SAM application (if on Linux `-u` can be omitted): `sam build -u --parameter-overrides 'ParameterKey=NRLicenseKey,ParameterValue=your-license-key-here'`
5. Deploy the SAM application: `sam deploy --guided`

Additional notes:

* To set `LOGGING_ENABLED`: `sam build ... --parameter-overrides 'ParameterKey=NRLoggingEnabled,ParameterValue=True'`

### Serverless

Expand All @@ -44,9 +42,7 @@ Additional notes:
6. Set the LICENSE_KEY environment variable: `export LICENSE_KEY=your-license-key-here`
7. Deploy the function: `sls deploy`

Additional notes:

* To set `LOGGING_ENABLED`: `export LOGGING_ENABLED=True` (prior to deploy)

### Terraform

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "aws-log-ingestion"
version = "2.9.3"
version = "2.9.4"
description = ""
authors = ["New Relic <[email protected]>"]
license = "Apache 2.0"
Expand Down
2 changes: 1 addition & 1 deletion serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ provider:
# Your NewRelic license key
LICENSE_KEY: ${env:LICENSE_KEY}
# Determines if logs are forwarded to New Relic Logging
LOGGING_ENABLED: ${env:LOGGING_ENABLED, "False"}
LOGGING_ENABLED: ${env:LOGGING_ENABLED, "True"}
# A boolean to determine if you want to output debug messages in the CloudWatch console
DEBUG_LOGGING_ENABLED: ${env:DEBUG_LOGGING_ENABLED, "False"}

Expand Down
2 changes: 1 addition & 1 deletion src/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class EntryType(Enum):
r"(?P<request_id>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})"
)

LOGGING_LAMBDA_VERSION = "2.9.3"
LOGGING_LAMBDA_VERSION = "2.9.4"
LOGGING_PLUGIN_METADATA = {"type": "lambda", "version": LOGGING_LAMBDA_VERSION}


Expand Down
4 changes: 2 additions & 2 deletions template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Parameters:
NRLoggingEnabled:
Type: String
Description: Determines if logs are forwarded to New Relic Logging
Default: 'False'
Default: 'True'
AllowedValues:
- 'True'
- 'False'
Expand Down Expand Up @@ -62,7 +62,7 @@ Metadata:
LicenseUrl: LICENSE
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-log-ingestion
SemanticVersion: 2.9.3
SemanticVersion: 2.9.4
SourceCodeUrl: https://github.com/newrelic/aws-log-ingestion

Resources:
Expand Down
2 changes: 1 addition & 1 deletion terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ variable "nr_license_key" {
variable "nr_logging_enabled" {
type = bool
description = "Determines if logs are forwarded to New Relic Logging"
default = false
default = true
}

variable "nr_infra_logging" {
Expand Down

0 comments on commit 020955f

Please sign in to comment.