Serverless configuration in a single page

tianchu · tianchu · commit ddfdc3a44e8d · 2022-04-01T12:50:11.000-04:00
diff --git a/config/_default/menus/menus.en.yaml b/config/_default/menus/menus.en.yaml
@@ -812,89 +812,94 @@ main:
     parent: serverless_installation
     identifier: serverless_installation_dotnet
     weight: 106
+  - name: Configuration
+    url: serverless/configuration
+    parent: serverless
+    identifier: serverless_configuration
+    weight: 2
   - name: Libraries & Integrations
     url: serverless/libraries_integrations
     parent: serverless
     identifier: libraries_integrations
-    weight: 2
+    weight: 3
   - name: Datadog Lambda Extension
     url: serverless/libraries_integrations/extension/
     parent: libraries_integrations
-    weight: 201
+    weight: 301
   - name: Datadog Lambda Library
     url: serverless/libraries_integrations/library/
     parent: libraries_integrations
-    weight: 202
+    weight: 302
   - name: Datadog Forwarder
     url: serverless/libraries_integrations/forwarder/
     parent: libraries_integrations
-    weight: 203
+    weight: 303
   - name: Datadog Serverless Plugin
     url: serverless/libraries_integrations/plugin/
     parent: libraries_integrations
-    weight: 204
+    weight: 304
   - name: Datadog Serverless Macro
     url: serverless/libraries_integrations/macro/
     parent: libraries_integrations
-    weight: 205
+    weight: 305
   - name: Datadog Serverless CLI
     url: serverless/libraries_integrations/cli/
     parent: libraries_integrations
-    weight: 206
+    weight: 306
   - name: Lambda Code Signing
     url: serverless/libraries_integrations/lambda_code_signing/
     parent: libraries_integrations
-    weight: 207
+    weight: 307
   - name: Distributed Tracing
     url: serverless/distributed_tracing
     identifier: serverless_distributed_tracing
     parent: serverless
-    weight: 3
+    weight: 4
   - name: Collect Lambda Payloads
     url: serverless/distributed_tracing/collect_lambda_payloads
     parent: serverless_distributed_tracing
-    weight: 301
+    weight: 401
   - name: Trace Merging (Advanced)
     url: serverless/distributed_tracing/serverless_trace_merging
     parent: serverless_distributed_tracing
-    weight: 302
+    weight: 402
   - name: Trace Propagation (Advanced)
     url: serverless/distributed_tracing/serverless_trace_propagation
     parent: serverless_distributed_tracing
-    weight: 303
+    weight: 403
   - name: Custom Metrics
     url: serverless/custom_metrics
     parent: serverless
     identifier: custom_metrics
-    weight: 4
+    weight: 5
   - name: Enhanced Lambda Metrics
     url: serverless/enhanced_lambda_metrics
     parent: serverless
-    weight: 5
+    weight: 6
   - name: Deployment Tracking
     url: serverless/deployment_tracking
     parent: serverless
-    weight: 6
+    weight: 7
   - name: Troubleshooting
     url: serverless/troubleshooting
     parent: serverless
     identifier: serverless_troubleshooting
-    weight: 7
+    weight: 8
   - name: Azure App Service Extension
     url: serverless/azure_app_services
     parent: serverless
     identifier: serverless_app_services
-    weight: 8
+    weight: 9
   - name: Glossary
     url: serverless/glossary
     parent: serverless
     identifier: serverless_glossary
-    weight: 9
+    weight: 10
   - name: Guides
     url: serverless/guide/
     identifier: serverless_guides
     parent: serverless
-    weight: 10
+    weight: 11
   - name: Metrics
     url: metrics/
     identifier: metrics_top_level
diff --git a/content/en/serverless/_index.md b/content/en/serverless/_index.md
@@ -12,9 +12,12 @@ further_reading:
 - link: "https://www.datadoghq.com/state-of-serverless"
   tag: "Blog"
   text: "The State of Serverless"
-- link: "/integrations/amazon_xray/"
+- link: "/serverless/installation/"
   tag: "Documentation"
-  text: "AWS X-Ray Integration"
+  text: "Installing Serverless Monitoring"
+- link: '/serverless/configuration/'
+  tag: 'Documentation'
+  text: 'Configure Serverless Monitoring'
 - link: "/integrations/amazon_lambda/"
   tag: "Documentation"
   text: "AWS Lambda Integration"
@@ -45,18 +48,6 @@ further_reading:
 
 The following section outlines Datadog's solution for monitoring AWS serverless applications and Lambda functions. You can also learn more about support for monitoring [Azure serverless][2] and [Google serverless][3] applications.
 
-## Quick start
-
-If you are new to Datadog, you can get started by [signing up for a Datadog account][4], then following the instructions for [installing Datadog's Lambda Extension][5]. These steps configure your Lambda functions to send real-time metrics, logs, and traces to Datadog:
-
-{{< img src="serverless/aws-fully-managed-services-serverless-monitoring-hero.png" alt="Datadog Serverless Monitoring"  style="width:100%;" >}}
-
-## Installation instructions
-
-For more detailed installation instructions, select the Lambda runtime below for instructions to instrument your serverless application:
-
-{{< partial name="serverless/getting-started-languages.html" >}}
-
 ## Explore Datadog Serverless Monitoring
 
 ### Monitor your entire serverless stack in the Serverless view
@@ -87,13 +78,17 @@ Easily correlate serverless code, configuration, and deployment changes with met
 
 {{< img src="serverless/serverless_deployment_tracking.jpeg" alt="Datadog Serverless Monitoring"  style="width:100%;" >}}
 
+## Getting Started
+
+Getting started to monitor your serverless application is quick and easy. See the [installation instructions][4].
+
 ## Other serverless clouds
 
 ### Azure App Service
 
 The Datadog extension for Azure App Service provides tracing capabilities for Azure Web Apps. 
 
-Use the [Azure App Service view][6] to:
+Use the [Azure App Service view][5] to:
 
 - Quickly identify apps with high latency or errors
 
@@ -103,11 +98,11 @@ Use the [Azure App Service view][6] to:
 
 - Map the apps running on your App Service Plans to identify apps that may be impacting costs or performance
 
-The Datadog extension for Azure App Service provides tracing capabilities for Azure Web Apps. For more information about setting up tracing in Azure, see the [Azure App Service Extension documentation][7].
+The Datadog extension for Azure App Service provides tracing capabilities for Azure Web Apps. For more information about setting up tracing in Azure, see the [Azure App Service Extension documentation][6].
 
 ### Google Cloud Functions
 
-Google Cloud Functions is a lightweight, event-based, asynchronous compute solution that allows you to create small, single-purpose functions. To monitor serverless functions running on Google Cloud Platform, enable the [Google Cloud Platform integration][8].
+Google Cloud Functions is a lightweight, event-based, asynchronous compute solution that allows you to create small, single-purpose functions. To monitor serverless functions running on Google Cloud Platform, enable the [Google Cloud Platform integration][7].
 
 ## Further Reading
 
@@ -116,8 +111,7 @@ Google Cloud Functions is a lightweight, event-based, asynchronous compute solut
 [1]: http://app.datadoghq.com/functions
 [2]: /serverless/#azure-app-service
 [3]: /serverless/#google-cloud-functions
-[4]: https://app.datadoghq.com/signup/
-[5]: https://app.datadoghq.com/signup/agent#lambda
-[6]: https://app.datadoghq.com/functions?cloud=azure&config_serverless-azure-app=true&group=service
-[7]: /infrastructure/serverless/azure_app_services/#overview
-[8]: /integrations/google_cloud_platform/
+[4]: /serverless/installation
+[5]: https://app.datadoghq.com/functions?cloud=azure&config_serverless-azure-app=true&group=service
+[6]: /infrastructure/serverless/azure_app_services/#overview
+[7]: /integrations/google_cloud_platform/
diff --git a/content/en/serverless/guide/extension_motivation.md b/content/en/serverless/guide/extension_motivation.md
@@ -1,6 +1,10 @@
 ---
 title: Deciding to migrate to the Datadog Lambda extension
 kind: guide
+further_reading:
+  - link: '/serverless/guide/forwarder_extension_migration'
+    tag: 'Documentation'
+    text: 'Migrating from the Datadog Forwarder to the Datadog Lambda Extension'
 ---
 
 ## Should I migrate to the Datadog Lambda extension?
@@ -15,34 +19,28 @@ There are some key differences between the Lambda extension and the Forwarder, a
 
 {{< img src="serverless/serverless_monitoring_installation_instructions.png" alt="Instrument AWS Serverless Applications"  style="width:100%;">}}
 
-The Lambda extension only supports sending Lambda function telemetry for specific runtimes. The Forwarder is required to collect and add metadata to other AWS service logs, including those from API Gateway, AppSync, and Lambda@Edge.
-
-| Runtime | Extension support | Forwarder support |
-| ------- | ----------------- | ----------------- |
-| Python  | {{< X >}}         | {{< X >}}         |
-| Node.js | {{< X >}}         | {{< X >}}         |
-| Go      | {{< X >}}         | {{< X >}}         |
-| Java    | {{< X >}}         | {{< X >}}         |
-| .NET    | {{< X >}}         |                   |
-| Ruby    |                   | {{< X >}}         |
-| PHP     |                   |                   |
-
-The Lambda extension can submit Lambda logs, Lambda traces generated by `dd-trace` (not X-Ray), real-time enhanced Lambda metrics, and custom metrics generated by Lambda functions.
+Although Lambda extension replaces the Forwarder as the recommended way to collect telemetry from Lambda functions. The Forwarder is required to collect and add metadata to other AWS service logs, including those from API Gateway, AppSync, and Lambda@Edge.
 
 ### Advantages
 
 The Datadog Lambda Extension offers the following advantages over the Datadog Forwarder:
 
-- **Simple to set up**: The Forwarder requires triggers to be set up for every new Lambda function. The Datadog Lambda extension can be added as a Lambda layer. Unlike with the Forwarder, configuring the Lambda extension does not require permissions to install third-party AWS CloudFormation stacks. Also, the Lambda extension sends telemetry directly to Datadog, so you do not need to manage CloudWatch Log group subscriptions for your Lambda functions.
-- **Less infrastructure to manage**: The simpler configuration of the Lambda extension saves time on infrastructure management. For non-Lambda AWS integrations, the Forwarder is still required.
-- **Skip CloudWatch Logs**: The Forwarder converts logs to metrics and traces, which are then sent to Datadog. The Datadog Lambda Extension sends traces, metrics, and logs directly to Datadog, enabling you to reduce the cost associated with CloudWatch Logs.
+- **Skip CloudWatch Logs**: The Forwarder extracts telemetry from logs, which are then sent to Datadog. The Datadog Lambda Extension sends telemetry directly to Datadog, enabling you to reduce the cost associated with CloudWatch Logs.
+- **Simple to set up**: The Datadog Lambda extension can be added as a Lambda layer and sends telemetry directly to Datadog, so you do not need to set up a subscription filter for every new Lambda function's CloudWatch log group.
 
 ### Trade-offs
 
 The extension [adds overhead to your Lambda functions][4], compared to functions that have zero instrumentation. The added overhead affects your AWS bill and Lambda concurrency, and could cause worse cold starts. The majority of the added duration **does not** affect your function's performance. Based on Datadog's latest benchmarking results, the cost overhead is always lower (or about the same when reporting data from remote regions) when using the Lambda extension versus the Forwarder.
 
+## Migrate to the Datadog Lambda Extension
+
+To migrate from the the Datadog Forwarder to the Datadog Lambda Extension, follow these [instructions][5].
+## Further Reading
+
+{{< partial name="whats-next/whats-next.html" >}}
 
 [1]: /serverless/libraries_integrations/extension/
 [2]: /serverless
 [3]: /serverless/libraries_integrations/forwarder/
 [4]: /serverless/libraries_integrations/extension/#overhead
+[5]: /serverless/guide/forwarder_extension_migration
diff --git a/content/en/serverless/installation/_index.md b/content/en/serverless/installation/_index.md
@@ -4,25 +4,31 @@ kind: documentation
 aliases:
     - /serverless/installation/installing_the_library/
 further_reading:
-    - link: 'serverless/installation/node'
+    - link: '/serverless/configuration/'
       tag: 'Documentation'
-      text: 'Installing Node.js Serverless Monitoring'
-    - link: 'serverless/installation/ruby'
-      tag: 'Documentation'
-      text: 'Installing Ruby Serverless Monitoring'
+      text: 'Configure Serverless Monitoring'
+    - link: "/integrations/amazon_lambda/"
+      tag: "Documentation"
+      text: "AWS Lambda Integration"
 ---
 
 ## Quick start
 
-If you are new to Datadog, you can get started by [signing up for a Datadog account][5], then following the instructions for [installing Datadog's Lambda Extension][6]. Completing these steps will configure your Lambda functions to send real-time metrics, logs, and traces to Datadog:
-
-{{< img src="serverless/aws-fully-managed-services-serverless-monitoring-hero.png" alt="Datadog Serverless Monitoring"  style="width:100%;" >}}
+If you are new to Datadog, [sign up for a Datadog account][1], then follow the Datadog Agent installation instructions for _AWS Lambda_. Completing the steps will configure your Lambda functions to send real-time metrics, logs, and traces to Datadog.
 
 ## Installation instructions
 
-For more detailed installation instructions, select the Lambda runtime below for instructions to instrument your serverless application:
+For more detailed installation instructions, select the Lambda runtime below:
 
 {{< partial name="serverless/getting-started-languages.html" >}}
 
-[5]: https://app.datadoghq.com/signup/
-[6]: https://app.datadoghq.com/signup/agent#lambda
+## Configurations
+
+Once installed, you can [configure your installation parameters][2] to meet your specific business requirements, such as tagging and scrubbing the collected data.
+
+## Further Reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: https://app.datadoghq.com/signup/
+[2]: /serverless/configuration/
diff --git a/content/en/serverless/installation/configuration.md b/content/en/serverless/installation/configuration.md
@@ -0,0 +1,55 @@
+---
+title: Configure Serverless Monitoring
+kind: documentation
+further_reading:
+  - link: '/serverless/installation/'
+    tag: 'Documentation'
+    text: 'Installing Serverless Monitoring'
+  - link: '/serverless/troubleshooting/'
+    tag: 'Documentation'
+    text: 'Troubleshoot Serverless Monitoring'
+---
+
+Once the Datadog serverless monitoring is [installed][1], you can configure it easily to suit your specific business requirements.
+
+## Data Collection Method
+
+Datadog can collect the monitoring data from your Lambda functions either using the [Forwarder Lambda function][2] or the [Lambda extension][3]. Lambda extension is recommended for new installations. For existing installations using the Forwarder, see [Deciding to migrate to the Datadog Lambda extension][4] for why you should migrate, and follow the [instructions][5] to migrate.
+
+## Datadog Site
+
+If you are 
+
+## Datadog API Key
+
+## Unified Service Tagging
+
+TODO: Update samples https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/?tab=kubernetes#aws-lambda-functions
+
+## Lambda Layer Versions
+
+## Metric Collection
+
+## Trace Collection
+
+## Log Collection
+
+## Source Code Integration
+
+## Monitors
+
+## AWS PrivateLink
+
+## Proxy
+
+## Troubleshooting
+
+## Further Reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: /serverless/installation/
+[2]: /serverless/libraries_integrations/forwarder/
+[3]: /serverless/libraries_integrations/extension/
+[4]: /serverless/guide/extension_motivation/
+[5]: /serverless/guide/forwarder_extension_migration
