diff --git a/src/content/docs/infrastructure/amazon-integrations/get-started/introduction-aws-integrations.mdx b/src/content/docs/infrastructure/amazon-integrations/get-started/introduction-aws-integrations.mdx
index fef8386f225..4960ab29d4a 100644
--- a/src/content/docs/infrastructure/amazon-integrations/get-started/introduction-aws-integrations.mdx
+++ b/src/content/docs/infrastructure/amazon-integrations/get-started/introduction-aws-integrations.mdx
@@ -23,10 +23,11 @@ redirects:
freshnessValidatedDate: 2024-09-20
---
-New Relic offers several methods to collect performance data about your Amazon Web Services (AWS) environment. Once you've connected New Relic with AWS, you can access your system's AWS telemetry, letting you closely monitor the health of your AWS stack. This doc describes how to get started with AWS monitoring and provides an overview about AWS costs.
+New Relic offers several methods to collect performance data about your Amazon Web Services (AWS) environment. After you've connected New Relic with AWS, you can access your system's AWS telemetry, letting you closely monitor the health of your AWS stack. Our AWS observability solution supports [Amazon CloudWatch Metric Streams integration](/docs/infrastructure/amazon-integrations/get-started/introduction-aws-integrations/#monitor-aws) to get metrics, and [Forward AWS service logs to New Relic](/install/aws-logs/) to get logs into New Relic. This document describes how to get started with AWS monitoring and provides an overview about AWS costs.
## Start with the CloudWatch Metric Streams integration [#monitor-aws]
+
Our AWS observability solution is the Amazon CloudWatch Metric Streams integration, which collects data about your entire AWS stack with [Amazon CloudWatch Metric Streams](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Metric-Streams.html). For the majority of use cases, you begin monitoring your AWS stack by [installing our Amazon CloudWatch Metric Streams integration](/install/aws-cloudwatch).
Our CloudWatch Metric Streams integration provides the best data about your AWS stack, but if you use [integrations not supported by CloudWatch Metric Streams](/docs/infrastructure/amazon-integrations/connect/connect-aws-new-relic-infrastructure-monitoring/#integrations-not-replaced-streams), you may need to use our legacy API polling solution. If you're currently using API polling for supported integrations, we recommend you [migrate your data to Amazon CloudWatch Metric Streams](/install/aws-cloudwatch/?task=migrate).
diff --git a/src/content/docs/logs/forward-logs/guidelines-to-upgrade-to-new-lambda.mdx b/src/content/docs/logs/forward-logs/guidelines-to-upgrade-to-new-lambda.mdx
new file mode 100644
index 00000000000..b54c555f046
--- /dev/null
+++ b/src/content/docs/logs/forward-logs/guidelines-to-upgrade-to-new-lambda.mdx
@@ -0,0 +1,16 @@
+---
+title: Guidelines for upgrading to the new Lambda
+tags:
+ - Logs
+ - Upgrading guidelines
+ - Upgrade to new Lambda
+metaDescription: 'Upgrade to the new Lambda by removing old deployments and avoiding duplicate triggers for consistent data flow to New Relic.'
+freshnessValidatedDate: never
+---
+If you want to upgrade from the old Lambda to the new one, we recommend deleting the previously deployed New Relic S3 Lambda and CloudWatch Lambda. Alternatively, you can delete the previously created triggers before deploying the new one.
+
+If you choose to use both solutions, ensure there are no duplicate triggers to avoid sending duplicate logs from the same resource. We do not recommend this, as it may cause reaching S3 and CloudWatch limits on reading logs, which can lead to inconsistencies in the data reaching New Relic.
+
+
+ To return to AWS integration for log forwarding, [click here](/install/aws-logs/?service=aws_services).
+
diff --git a/src/content/docs/logs/forward-logs/manage-triggers-and-filters-with-cloudformation.mdx b/src/content/docs/logs/forward-logs/manage-triggers-and-filters-with-cloudformation.mdx
new file mode 100644
index 00000000000..803fabdcd9c
--- /dev/null
+++ b/src/content/docs/logs/forward-logs/manage-triggers-and-filters-with-cloudformation.mdx
@@ -0,0 +1,18 @@
+---
+title: Manage triggers and filters with CloudFormation
+tags:
+ - Manage triggers with CloudFormation
+ - Manage filters with CloudFormation
+ - Manage triggers and filters with CloudFormation
+metaDescription: 'Manage S3 triggers and CloudWatch filters with CloudFormation for effective resource management and proper cleanup upon stack deletion.'
+freshnessValidatedDate: never
+---
+When you deploy a CloudFormation stack, it creates triggers on an S3 bucket and filters on a CloudWatch log group. Deleting the stack will remove these triggers and filters.
+
+If you manually create triggers in an S3 bucket or filters on CloudWatch log groups and set the destination as a Lambda function created by New Relic, these are also supported. However, we do not recommend this approach. Deleting the stack will not remove these manually created triggers or filters, as the stack does not have permission to delete them.
+
+This guidance is important to ensure effective resource management and to prevent unintended triggers or filters from remaining after a stack deletion.
+
+
+ To return to AWS integration for log forwarding, [click here](/install/aws-logs/?service=aws_services).
+
\ No newline at end of file
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/custom-attributes-not-appearing.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/custom-attributes-not-appearing.mdx
new file mode 100644
index 00000000000..b05585f1552
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/custom-attributes-not-appearing.mdx
@@ -0,0 +1,22 @@
+---
+title: Custom attributes not appearing in logs
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Troubleshooting
+metaDescription: 'Troubleshooting tips if the custom attributes not appearing in the logs.'
+freshnessValidatedDate: never
+---
+
+## Problem
+
+Logs are not appearing in New Relic for a CloudWatch via Firehose integration setup.
+
+## Solution
+
+Possible reasons and their solutions:
+
+* For S3 via Lambda or CloudWatch via Lambda integrations, the `CUSTOM_META_DATA` environment variable may not be set, or it may not have a valid JSON value. Verify it.
+* For CloudWatch via Firehose, the key-value pairs may not be set correctly. Ensure your key-value pairs are present under **Parameters**.
+* Your key names may overlap with forbidden keywords.
\ No newline at end of file
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/log-forwarding-restrictions.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/log-forwarding-restrictions.mdx
new file mode 100644
index 00000000000..21e0596f59f
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/log-forwarding-restrictions.mdx
@@ -0,0 +1,24 @@
+---
+title: AWS Log forwarding restrictions
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Log forwarding restrictions
+metaDescription: 'Restrictions for log forwarding with New Relic.'
+freshnessValidatedDate: never
+---
+
+
+
+New Relic has the following restrictions with AWS integration for log forwarding when ingesting logs via S3 or Firehose:
+
+### For ingesting AWS logs from S3 [#s3-restrictions]
+* The log file size should be less that 80 MB.
+* The size of a single log line should be less than 8 MB.
+* Log lines between 1mb and 8mb will be split into multiple messages and forwarded to New Relic.
+* New Relic currently doesn't support Client Json or log line parsing.
+* New Relic currently supports only `Gzip` and `Bzip2` compression formats for log files. It processes files in other compressed formats as uncompressed files.
+### For ingesting logs from CloudWatch [#cloudwatch-restrictions]
+* New Relic currently doesn't support client Json or log line parsing.
+* New Relic currently supports only [Lambda layers](https://github.com/newrelic/newrelic-lambda-layers) for parsing logic.
\ No newline at end of file
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-firehose.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-firehose.mdx
new file mode 100644
index 00000000000..9d0423c95a6
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-firehose.mdx
@@ -0,0 +1,22 @@
+---
+title: Logs not appearing from CloudWatch via Firehose
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Troubleshooting
+metaDescription: 'Troubleshooting tips if the Logs are not appearing from CloudWatch via Firehose.'
+freshnessValidatedDate: never
+---
+
+## Problem
+
+Logs are not appearing in New Relic for a CloudWatch via Firehose integration setup.
+
+## Solution
+
+Possible reasons and their solutions:
+
+* The API key may be incorrect. Navigate to **Amazon Data Firehose > Firehose streams > your-stream > Edit destination settings**, and update the API key with the correct ingest license key.
+* The provided endpoint may be wrong. Verify the endpoint.
+* Check the S3 logs or Cloudwatch error logs for any issues.
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-lambda.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-lambda.mdx
new file mode 100644
index 00000000000..abf013cafd2
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-lambda.mdx
@@ -0,0 +1,26 @@
+---
+title: Logs not appearing from CloudWatch via Lambda
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Troubleshooting
+metaDescription: 'Troubleshooting tips if the Logs are not appearing from CloudWatch via Lambda.'
+freshnessValidatedDate: never
+---
+
+## Problem
+
+Logs are not appearing in New Relic for a CloudWatch via Lambda integration setup.
+
+## Solution
+
+Possible reasons and their solutions:
+
+* The New Relic ingest license key may not be valid. In your AWS account, find the resource with Logical Id `NewRelicLogsLicenseKeySecret` from **CloudFormation stack > Resources**, and verify the key.
+* To debug further, navigate to **CloudFormation Stack > Resources > NewRelicServerlessLogForwarder (Lambda Function) > Configuration > Environment Variables** and set the `DEBUG_MODE` parameter to true. Then, check the CloudWatch logs for the Lambda function to get the debug logs.
+* The event may have been a genuine failure. To check, navigate to **CloudFormation Stack > Resources > NewRelicLogForwarderDLQ**, or search for your DLQ in AWS SQS, and examine the DLQ resource.
+* The New Relic region and the ingest license key provided to the Lambda function or Firehose may not match. Verify and match it.
+
+ For example, if the New Relic region is EU, provide a New Relic ingest license key from the EU region.
+* The `NewRelicServerlessLogForwarder` may not have the CloudWatch trigger. Examine the output of the nested CloudFormation stacks.
\ No newline at end of file
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-s3-lambda.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-s3-lambda.mdx
new file mode 100644
index 00000000000..5d154bcffb6
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-s3-lambda.mdx
@@ -0,0 +1,22 @@
+---
+title: Logs not appearing from S3 via Lambda
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Troubleshooting
+metaDescription: 'Troubleshooting tips if the Logs are not appearing from S3 via Lambda.'
+freshnessValidatedDate: never
+---
+
+## Problem
+
+Logs are not appearing in New Relic for a S3 via Lambda integration setup.
+
+## Solution
+
+Possible reasons and their solutions:
+
+* Verify the possible reasons in [Logs not appearing from CloudWatch vai Lambda](/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-lambda).
+* S3 files may not adhere to the [Log forwarding restrictions](/docs/logs/troubleshooting/aws-log-integration-issues/log-forwarding-restrictions) in New Relic.
+* The `NewRelicServerlessLogForwarder` may not have the S3 trigger. Check the output of the nested CloudFormation stacks, and add it.
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/stack-creation-fails.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/stack-creation-fails.mdx
new file mode 100644
index 00000000000..093669be9b0
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/stack-creation-fails.mdx
@@ -0,0 +1,28 @@
+---
+title: Failing to create a Stack
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Troubleshooting
+metaDescription: 'Troubleshooting tips if the stack creation fails.'
+freshnessValidatedDate: never
+---
+
+## Problem
+
+Creating a CloudFormation stack may fail due to various reasons.
+
+## Solution
+
+Possible reasons and their solutions:
+
+* The IAM role you have selected during the CloudFormation stack creation may not have sufficient [permissions](https://docs.aws.amazon.com/ARG/latest/userguide/gettingstarted-prereqs-permissions.html).
+* If you did not select an IAM role, make sure your account has the required [permissions](/docs/accounts/accounts-billing/new-relic-one-user-management/user-permissions/#logs).
+* If the failure message appears as following, delete or rename the existing resources with that name, and retry.
+
+ `Resource type {resource-name} with identifier {resource-identifier-name} already exists.`
+
+* Check the output of the nested CloudFormation stacks to identify potential errors.
+* Ensure the selected S3 buckets don’t have event notifications on any object creation events.
+* Ensure the selected CloudWatch log groups don’t have similar subscription filters.
\ No newline at end of file
diff --git a/src/content/docs/logs/troubleshooting/aws-log-integration-issues/stack-deletion-fails.mdx b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/stack-deletion-fails.mdx
new file mode 100644
index 00000000000..1b5b957f1dd
--- /dev/null
+++ b/src/content/docs/logs/troubleshooting/aws-log-integration-issues/stack-deletion-fails.mdx
@@ -0,0 +1,20 @@
+---
+title: Failing to delete a Stack
+type: troubleshooting
+tags:
+ - Logs
+ - Log management
+ - Troubleshooting
+metaDescription: 'Troubleshooting tips if the stack deletion fails.'
+freshnessValidatedDate: never
+---
+
+## Problem
+
+When deleting a CloudFormation stack, it may fail due to various reasons.
+
+## Solution
+
+Possible reason and its solution:
+
+* If the S3 buckets created by the stack (e.g., for Firehose error logs) is not empty, then it cannot be deleted. archive the contents and then retry deleting the stack.
\ No newline at end of file
diff --git a/src/install/aws-logs/appInfo_service.mdx b/src/install/aws-logs/appInfo_service.mdx
index 26c4c1e0db0..a2524a5e3ab 100644
--- a/src/install/aws-logs/appInfo_service.mdx
+++ b/src/install/aws-logs/appInfo_service.mdx
@@ -1,5 +1,6 @@
---
componentType: appInfoConfigOption
optionType: service
-headingText: What service are you forwarding from?
+headingText: Select an AWS service to instrument
---
+You can send AWS service logs to New Relic using various methods. Select an AWS service to learn how you can collect and forward logs to New Relic.
\ No newline at end of file
diff --git a/src/install/aws-logs/aws_services/before-you-begin.mdx b/src/install/aws-logs/aws_services/before-you-begin.mdx
new file mode 100644
index 00000000000..8a7b473716f
--- /dev/null
+++ b/src/install/aws-logs/aws_services/before-you-begin.mdx
@@ -0,0 +1,13 @@
+---
+headingText: Before you begin
+componentType: default
+---
+
+To set up AWS integration, ensure you have the following:
+* A New Relic [license key](https://one.newrelic.com/api-keys). Don't have one? [Sign up for free!](https://newrelic.com/signup) No credit card required.
+* An AWS account with [permissions](https://docs.aws.amazon.com/ARG/latest/userguide/gettingstarted-prereqs-permissions.html) to deploy new AWS resources and [IAM roles](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html).
+* A New Relic account with [permissions](/docs/accounts/accounts-billing/new-relic-one-user-management/user-permissions/#logs) to set up log forwarding.
+
+
+If you are already using Lambda for S3 or CloudWatch, refer the [Guidelines for upgrading to the new Lambda](/docs/logs/forward-logs/guidelines-to-upgrade-to-new-lambda).
+
\ No newline at end of file
diff --git a/src/install/aws-logs/aws_services/configure-log-forwarding.mdx b/src/install/aws-logs/aws_services/configure-log-forwarding.mdx
new file mode 100644
index 00000000000..7b66d77092a
--- /dev/null
+++ b/src/install/aws-logs/aws_services/configure-log-forwarding.mdx
@@ -0,0 +1,43 @@
+---
+headingText: Configure logs forwarding
+componentType: default
+---
+
+There are multiple ways to send New Relic logs from your AWS services. Choose the path that best suits your needs. Both the integration instructions and the CloudFormation stack will adapt based on your selections.
+
+### Select AWS sink(s) [#select-aws-sinks]
+
+Most AWS service logs are generated in S3 buckets or CloudWatch log groups. Select one or both AWS sinks.
+
+### Select log integration path(s) [#select-log-integration-paths]
+
+Consider using the **Amazon Kinesis Data Firehose** for direct and high-volume data streaming, and the **New Relic Lambda Function** forwarder if you need high control over data transformation before forwarding logs.
+
+
+### Set up triggers(s) [#set-up-triggers]
+Setting up triggers ensures that new logs are sent to New Relic every time an AWS service logs to an S3 bucket or a CloudWatch log group. With a single CloudFormation stack, you can configure up to 40 triggers (S3 buckets and/or CloudWatch log groups).
+
+* For AWS service logs stored in S3 buckets, specify the **S3 bucket name** and **Prefix** (optional).
+* For AWS service logs stored in CloudWatch log groups, specify the **Log Group** name and **Filter** (optional).
+
+
+
+### Select New Relic logs API endpoint [#select-api-endpoint]
+The system automatically sets the endpoint based on the region of your New Relic account.
+* For US account, logs are sent to `https://log-api.newrelic.com/log/v1`
+* For UE account, logs are sent to `https://log-api.eu.newrelic.com/log/v1`
+
+### Add custom attributes [#add-custom-attributes]
+Add custom attributes to organize your logs and make it easier to search, filter, analyze, and parse.
\ No newline at end of file
diff --git a/src/install/aws-logs/aws_services/deploy-cloudformation-stack.mdx b/src/install/aws-logs/aws_services/deploy-cloudformation-stack.mdx
new file mode 100644
index 00000000000..3ad5ec237c8
--- /dev/null
+++ b/src/install/aws-logs/aws_services/deploy-cloudformation-stack.mdx
@@ -0,0 +1,8 @@
+---
+headingText: Deploy CloudFormation stack
+componentType: default
+---
+
+After you customize the CloudFormation stack parameters to meet your requirements, click **Create stack**.
+Creating the stack's resources may take several minutes and may generate multiple stacks, depending on how you configure log and metric forwarding. With a single deployment command, you can create a new stack to forward logs from multiple AWS resources.
+If stack creation fails, refer to the [troubleshooting procedure](/docs/logs/troubleshooting/aws-log-integration-issues/stack-creation-fails).
\ No newline at end of file
diff --git a/src/install/aws-logs/aws_services/launch-cloudformation-template.mdx b/src/install/aws-logs/aws_services/launch-cloudformation-template.mdx
new file mode 100644
index 00000000000..621c1767adb
--- /dev/null
+++ b/src/install/aws-logs/aws_services/launch-cloudformation-template.mdx
@@ -0,0 +1,9 @@
+---
+headingText: Launch CloudFormation template
+componentType: default
+---
+
+1. Click **Launch your CloudFormation in AWS** to navigate to your AWS Console. The CloudFormation stack includes the configured parameters based on your selections in New Relic One, so no additional editing is necessary unless you want to make changes.
+2. Copy and paste your license key into your AWS console.
+
+We recommend you store your New Relic license key in **[AWS Secrets Manager](https://docs.aws.amazon.com/secretsmanager/latest/userguide/intro.html)** by keeping the environment variable set to `true` (default value).
diff --git a/src/install/aws-logs/aws_services/see-your-data.mdx b/src/install/aws-logs/aws_services/see-your-data.mdx
new file mode 100644
index 00000000000..e071094b460
--- /dev/null
+++ b/src/install/aws-logs/aws_services/see-your-data.mdx
@@ -0,0 +1,31 @@
+---
+headingText: See your data
+componentType: default
+---
+
+After the new stack is created, it forwards your collected logs to New Relic One. To see your data:
+
+* Navigate to the [logs UI](https://one.newrelic.com/launcher/logger.log-launcher).
+* OR, navigate to the [New query explorer](/docs/chart-builder/use-chart-builder/choose-data/use-advanced-nrql-mode-specify-data) to query your data.
+
+For logs forwarded via the New Relic Lambda forwarder:
+ ```
+ SELECT * FROM Log WHERE instrumentation.provider = 'aws' AND instrumentation.name = 'lambda'
+ ```
+
+For logs forwarded via the Kinesis Data Firehose integration:
+ ```
+ SELECT * FROM Log WHERE instrumentation.provider = 'aws' AND instrumentation.name = 'firehose'
+ ```
+
+If no data appears after you enable the log management capabilities, or the custom attributes are not appearing in the log, refer to the following troubleshooing procedures:
+* [Logs not appearing from CloudWatch via Firehose](/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-firehose)
+* [Logs not appearing from CloudWatch via Lambda](/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-lambda)
+* [Logs not appearing from S3 via Lambda](/docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-s3-lambda)
+* [Custom attributes not appearing in logs](/docs/logs/troubleshooting/aws-log-integration-issues/custom-attributes-not-appearing)
+* [Failing to delete a Stack](/docs/logs/troubleshooting/aws-log-integration-issues/stack-deletion-fails)
+* [Log forwarding restrictions](/docs/logs/troubleshooting/aws-log-integration-issues/log-forwarding-restrictions)
+
+
+When configuring your CloudFormation integration, it's important to understand how triggers and filters are managed. For guidance on handling S3 triggers and CloudWatch filters, refer to [Manage triggers and filters with CloudFormation](/docs/logs/forward-logs/manage-triggers-and-filters-with-cloudformation).
+
\ No newline at end of file
diff --git a/src/install/aws-logs/aws_services/set-up-aws-integration-with-log-forwarding.mdx b/src/install/aws-logs/aws_services/set-up-aws-integration-with-log-forwarding.mdx
new file mode 100644
index 00000000000..f03368a6741
--- /dev/null
+++ b/src/install/aws-logs/aws_services/set-up-aws-integration-with-log-forwarding.mdx
@@ -0,0 +1,12 @@
+---
+headingText: Set up your AWS integration with log forwarding
+componentType: default
+---
+
+Using a single CloudFormation template, you can easily set up your AWS integration and forward New Relic AWS services [metrics](/install/aws-cloudwatch/), logs, or both.
+1. Log in to your [New Relic](https://one.newrelic.com/) account.
+2. Navigate to ** + Integrations & Agents**.
+3. Search and select **Integrate your AWS account** from the **All** tab.
+3. Select a New Relic account and continue.
+4. Select the telemetry type you want to send to your New Relic account.
+5. Select **Automate AWS with CloudFormation** and continue. This is currently the only setup method available for log integration.
\ No newline at end of file
diff --git a/src/install/aws-logs/intro.mdx b/src/install/aws-logs/intro.mdx
index ad7d5491d95..fefdd139c37 100644
--- a/src/install/aws-logs/intro.mdx
+++ b/src/install/aws-logs/intro.mdx
@@ -3,18 +3,14 @@ headingText: Before we start
componentType: default
---
-New Relic supports forwarding logs from AWS services. Our log management solution provides deeper visibility into application and infrastructure performance data (events, errors, traces, and more) to reduce mean time to resolution (MTTR) and quickly troubleshoot production incidents.
+The New Relic log management solution provides deeper visibility into application and infrastructure performance data, including events, errors, and traces. You can reduce Mean Time to Resolution (MTTR) and facilitate quick troubleshooting of production incidents. By forwarding AWS logs to New Relic, you can achieve comprehensive visibility into system performance, identify issues before they escalate, and make data-driven decisions efficiently. It helps enhance your team's operational efficiency while maintaining security and compliance.
-Want more context? See [Get started with log management](/docs/logs/get-started/get-started-log-management/).
+
+ Want to learn how to get started with New Relic logs management? See [Get started with log management](/docs/logs/get-started/get-started-log-management/).
+
-
-
- **[one.newrelic.com > All capabilities](https://one.newrelic.com/all-capabilities) > Logs**: From the main logs UI page, you can see all your logs and then filter down to logs with specific text, or other attributes.
-
+
-## Installation options [#install]
+
+## Instrumentation options [#install]
\ No newline at end of file
diff --git a/src/install/config/aws-logs.yaml b/src/install/config/aws-logs.yaml
index b94aaa8d6aa..38b430ef837 100644
--- a/src/install/config/aws-logs.yaml
+++ b/src/install/config/aws-logs.yaml
@@ -1,6 +1,6 @@
agentName: aws-logs
agentType: integration
-title: 'Forward AWS logs'
+title: 'Forward AWS services logs to New Relic'
metaDescription: 'Forward logs from AWS'
introFilePath: 'src/install/aws-logs/intro.mdx'
redirects:
@@ -21,15 +21,17 @@ appInfo:
placeholder: 'What type of AWS service are you forwarding logs from?'
options:
- value: 'EC2'
- displayName: 'Amazon EC2'
+ displayName: 'Hosts (Amazon EC2)'
- value: 'EKS'
- displayName: 'Amazon EKS'
+ displayName: 'Kubernetes (Amazon EKS)'
- value: 'ECS'
- displayName: 'Amazon ECS'
- - value: 'security_lake'
- displayName: 'Amazon route 53 logs / VPC Flow logs / AWS Cloudtrail logs/ AWS Security Hub'
- - value: 'other'
- displayName: 'Other log types'
+ displayName: 'Containers (Amazon ECS)'
+ # - value: 'security_lake'
+ # displayName: 'Amazon route 53 logs / VPC Flow logs / AWS Cloudtrail logs/ AWS Security Hub'
+ # - value: 'other'
+ # displayName: 'Other log types'
+ - value: 'aws_services'
+ displayName: 'All other AWS services'
- optionType: forward_EC2
label: ''
placeholder: 'How would you like to forward your EC2 logs?'
@@ -58,14 +60,14 @@ appInfo:
displayName: 'Cloudwatch Lambda Function'
- value: 'sidecar_firelens'
displayName: 'Sidecar container with Firelens'
- - optionType: forward_Other
- label: ''
- placeholder: 'Select logs destination:'
- options:
- - value: 'data_firehose'
- displayName: 'Kinesis Data Firehose'
- - value: 'cloud_lambda'
- displayName: 'Cloudwatch Lambda Function'
+ # - optionType: forward_Other
+ # label: ''
+ # placeholder: 'Select logs destination:'
+ # options:
+ # - value: 'data_firehose'
+ # displayName: 'Kinesis Data Firehose'
+ # - value: 'cloud_lambda'
+ # displayName: 'Cloudwatch Lambda Function'
steps:
- filePath: 'src/install/aws-logs/appInfo_service.mdx'
- filePath: 'src/install/aws-logs/appInfo_EC2.mdx'
@@ -103,6 +105,48 @@ steps:
- optionType: service
options:
- value: 'security_lake'
+ - filePath: 'src/install/aws-logs/aws_services/before-you-begin.mdx'
+ overrides:
+ - isConditionalStep: true
+ selectedOptions:
+ - optionType: service
+ options:
+ - value: 'aws_services'
+ - filePath: 'src/install/aws-logs/aws_services/set-up-aws-integration-with-log-forwarding.mdx'
+ overrides:
+ - isConditionalStep: true
+ selectedOptions:
+ - optionType: service
+ options:
+ - value: 'aws_services'
+ - filePath: 'src/install/aws-logs/aws_services/configure-log-forwarding.mdx'
+ overrides:
+ - isConditionalStep: true
+ selectedOptions:
+ - optionType: service
+ options:
+ - value: 'aws_services'
+ - filePath: 'src/install/aws-logs/aws_services/launch-cloudformation-template.mdx'
+ overrides:
+ - isConditionalStep: true
+ selectedOptions:
+ - optionType: service
+ options:
+ - value: 'aws_services'
+ - filePath: 'src/install/aws-logs/aws_services/deploy-cloudformation-stack.mdx'
+ overrides:
+ - isConditionalStep: true
+ selectedOptions:
+ - optionType: service
+ options:
+ - value: 'aws_services'
+ - filePath: 'src/install/aws-logs/aws_services/see-your-data.mdx'
+ overrides:
+ - isConditionalStep: true
+ selectedOptions:
+ - optionType: service
+ options:
+ - value: 'aws_services'
- filePath: 'src/install/aws-logs/agent/basic-agent.mdx'
overrides:
- isConditionalStep: true
@@ -274,4 +318,4 @@ steps:
- optionType: forward_ECS
options:
- value: 'sidecar_firelens'
-whatsNextFilePath: 'src/install/aws-logs/whatsNext.mdx'
\ No newline at end of file
+whatsNextFilePath: 'src/install/aws-logs/whatsNext.mdx'
\ No newline at end of file
diff --git a/src/nav/logs.yml b/src/nav/logs.yml
index ff44a133533..a112ae109c2 100644
--- a/src/nav/logs.yml
+++ b/src/nav/logs.yml
@@ -23,9 +23,9 @@ pages:
- title: Infrastructure agent logs
path: /docs/logs/forward-logs/forward-your-logs-using-infrastructure-agent
- title: AWS services
- path: /install/aws-logs
+ path: /install/aws-logs
- title: Akamai
- path: /docs/logs/forward-logs/enable-log-management-new-relic#forward-other
+ path: /docs/logs/forward-logs/enable-log-management-new-relic#forward-other
- title: AWS Lambda for Amazon S3
path: /docs/logs/forward-logs/aws-lambda-sending-logs-s3
- title: CircleCI logs
@@ -134,3 +134,17 @@ pages:
path: /docs/logs/troubleshooting/log-message-truncated
- title: Show surrounding logs
path: /docs/logs/troubleshooting/find-issues-cause-or-impact-surrounding-logs
+ - title: Failing to create a Stack
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/stack-creation-fails
+ - title: Logs not appearing from CloudWatch via Lambda
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-lambda
+ - title: Logs not appearing from CloudWatch via Firehose
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-cloudwatch-firehose
+ - title: Logs not appearing from S3 via Lambda
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/logs-not-appearing-from-s3-lambda
+ - title: Custom attributes not appearing in logs
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/custom-attributes-not-appearing
+ - title: Failing to delete a Stack
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/stack-deletion-fails
+ - title: Log forwarding limitations
+ path: /docs/logs/troubleshooting/aws-log-integration-issues/log-forwarding-restrictions
\ No newline at end of file
diff --git a/static/images/select-logs-intgration-path-1.webp b/static/images/select-logs-intgration-path-1.webp
new file mode 100644
index 00000000000..778f9f7f33e
Binary files /dev/null and b/static/images/select-logs-intgration-path-1.webp differ
diff --git a/static/images/select-logs-intgration-path-2.webp b/static/images/select-logs-intgration-path-2.webp
new file mode 100644
index 00000000000..7d808ba8cbf
Binary files /dev/null and b/static/images/select-logs-intgration-path-2.webp differ
diff --git a/static/images/set-up-trigger.webp b/static/images/set-up-trigger.webp
new file mode 100644
index 00000000000..fe741b10c9c
Binary files /dev/null and b/static/images/set-up-trigger.webp differ