[WIP] Serverless configuration in a single page

.gitignore

@@ -105,6 +105,8 @@ content/en/synthetics/cicd_integrations/circleci_orb.md
 content/en/serverless/libraries_integrations/plugin.md
 content/en/serverless/libraries_integrations/macro.md
 content/en/serverless/libraries_integrations/cli.md
+content/en/serverless/libraries_integrations/cdk.md
+content/en/serverless/libraries_integrations/extension.md
 
 # Runtime data
 pids

Makefile

@@ -113,6 +113,10 @@ clean-auto-doc: ##Remove all doc automatically created
 	rm -f content/en/serverless/libraries_integrations/macro.md ;fi
 	@if [ content/en/serverless/libraries_integrations/cli.md ]; then \
 	rm -f content/en/serverless/libraries_integrations/cli.md ;fi
+	@if [ content/en/serverless/libraries_integrations/extension.md ]; then \
+	rm -f content/en/serverless/libraries_integrations/extension.md ;fi
+	@if [ content/en/serverless/libraries_integrations/cdk.md ]; then \
+	rm -f content/en/serverless/libraries_integrations/cdk.md ;fi
 	@if [ content/en/synthetics/cicd_integrations/circleci_orb.md ]; then \
 	rm -f content/en/synthetics/cicd_integrations/circleci_orb.md ;fi
 	@if [ content/en/synthetics/cicd_integrations/github_actions.md ]; then \

config/_default/menus/menus.en.yaml

@@ -837,85 +837,82 @@ main:
     parent: serverless_installation
     identifier: serverless_installation_dotnet
     weight: 106
+  - name: Advanced Configurations
+    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
-  - name: Datadog Lambda Library
-    url: serverless/libraries_integrations/library/
-    parent: libraries_integrations
-    weight: 202
+    weight: 301
   - name: Datadog Serverless Plugin
     url: serverless/libraries_integrations/plugin/
     parent: libraries_integrations
-    weight: 203
+    weight: 302
   - name: Datadog Serverless Macro
     url: serverless/libraries_integrations/macro/
     parent: libraries_integrations
-    weight: 204
+    weight: 303
   - name: Datadog Serverless CLI
     url: serverless/libraries_integrations/cli/
     parent: libraries_integrations
-    weight: 205
-  - name: Lambda Code Signing
-    url: serverless/libraries_integrations/lambda_code_signing/
+    weight: 304
+  - name: Datadog CDK Construct
+    url: serverless/libraries_integrations/cdk/
     parent: libraries_integrations
-    weight: 206
+    weight: 305
+  - name: Enhanced Lambda Metrics
+    url: serverless/enhanced_lambda_metrics
+    parent: serverless
+    weight: 4
   - name: Distributed Tracing
     url: serverless/distributed_tracing
     identifier: serverless_distributed_tracing
     parent: serverless
-    weight: 3
-  - name: Collect Lambda Payloads
-    url: serverless/distributed_tracing/collect_lambda_payloads
-    parent: serverless_distributed_tracing
-    weight: 301
+    weight: 5
   - name: Trace Merging (Advanced)
     url: serverless/distributed_tracing/serverless_trace_merging
     parent: serverless_distributed_tracing
-    weight: 302
+    weight: 502
   - name: Trace Propagation (Advanced)
     url: serverless/distributed_tracing/serverless_trace_propagation
     parent: serverless_distributed_tracing
-    weight: 303
+    weight: 503
   - name: Custom Metrics
     url: serverless/custom_metrics
     parent: serverless
     identifier: custom_metrics
-    weight: 4
-  - 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

content/en/continuous_integration/setup_tests/dotnet.md

@@ -154,7 +154,7 @@ To instrument your test suite without requiring an Agent, configure the followin
 **Default**: `false`
 
 `DD_API_KEY` (Required)
-: The [Datadog API key][6] used to upload the test results.<br/>
+: The [Datadog API key][5] used to upload the test results.<br/>
 **Default**: `(empty)`
 
 Then, prefix your test command with `dd-trace ci run`. Use the `--dd-service` parameter to provide the name of the service or library. Use the `--dd-env` parameter to provide the environment where tests are being run (`local` when running tests on a developer workstation, `ci` when running them on a CI provider, etc.) For example:
@@ -163,18 +163,18 @@ Then, prefix your test command with `dd-trace ci run`. Use the `--dd-service` pa
 dd-trace ci run --dd-service=my-dotnet-app --dd-env=ci -- dotnet test
 {{< /code-block >}}
 
-Alternatively, you can provide the [Datadog API key][6] using the `--api-key` parameter, for example:
+Alternatively, you can provide the [Datadog API key][5] using the `--api-key` parameter, for example:
 
 {{< code-block lang="bash" >}}
 dd-trace ci run --api-key <API KEY> --dd-service=my-dotnet-app --dd-env=ci -- dotnet test
 {{< /code-block >}}
 
 When the `--api-key` is set, Agentless mode is automatically enabled.
 
-Additionally, configure which [Datadog site][7] to which you want to send data. Your Datadog site is: {{< region-param key="dd_site" >}}.
+Additionally, configure which [Datadog site][6] to which you want to send data. Your Datadog site is: {{< region-param key="dd_site" >}}.
 
 `DD_SITE` (Required)
-: The [Datadog site][7] to upload results to.<br/>
+: The [Datadog site][6] to upload results to.<br/>
 **Default**: `datadoghq.com`<br/>
 **Selected site**: {{< region-param key="dd_site" code="true" >}}
 
@@ -187,6 +187,5 @@ Additionally, configure which [Datadog site][7] to which you want to send data.
 [2]: /tracing/setup_overview/setup/dotnet-core/?tab=windows#configuration
 [3]: https://www.nuget.org/packages/Datadog.Trace
 [4]: /tracing/setup_overview/custom_instrumentation/dotnet/
-[5]: /continuous_integration/setup_tests/dotnet/#agentless-beta
-[6]: https://app.datadoghq.com/organization-settings/api-keys
-[7]: /getting_started/site/
+[5]: https://app.datadoghq.com/organization-settings/api-keys
+[6]: /getting_started/site/

content/en/data_security/guide/tls_deprecation_1_2.md

@@ -119,7 +119,7 @@ On a 64 bit .Net Framework (version 4 and above):
 [3]: https://caniuse.com/tls1-2
 [4]: https://github.com/DataDog/dd-agent/blob/5.32.8/packaging/datadog-agent/source/setup_agent.sh
 [5]: https://www.openssl.org/news/changelog.html#openssl-101.
-[6]: https://docs.microsoft.com/en-us/dotnet/framework/network-programming/tls#%23configuring-security-via-appcontext-switches-for-net-framework-46-or-later-versions
+[6]: https://docs.microsoft.com/en-us/dotnet/framework/network-programming/tls#configuring-security-via-appcontext-switches-for-net-framework-46-or-later-versions
 [7]: https://docs.microsoft.com/en-us/dotnet/framework/network-programming/tls
 [8]: https://github.com/markekraus/BetterTls
 [9]: https://docs.microsoft.com/en-us/officeonlineserver/enable-tls-1-1-and-tls-1-2-support-in-office-online-server

content/en/getting_started/tagging/unified_service_tagging.md

@@ -379,120 +379,7 @@ instances:
 
 #### AWS Lambda functions
 
-Depending on how you build and deploy your AWS Lambda-based serverless applications, you may have several options available for applying the `env`, `service` and `version` tags to metrics, traces and logs.
-
-*Note*: These tags are specified through AWS resource tags instead of environment variables.
-
-{{< tabs >}}
-
-{{% tab "Serverless Framework" %}}
-
-Tag your Lambda functions using the [tags][1] option:
-
-```yaml
-# serverless.yml
-service: service-name
-provider:
-  name: aws
-  # to apply the tags to all functions
-  tags:
-    env: "<ENV>"
-    service: "<SERVICE>"
-    version: "<VERSION>"
-
-functions:
-  hello:
-    # this function will inherit the service level tags config above
-    handler: handler.hello
-  world:
-    # this function will overwrite the tags
-    handler: handler.users
-    tags:
-      env: "<ENV>"
-      service: "<SERVICE>"
-      version: "<VERSION>"
-```
-
-If you have installed the [Datadog serverless plugin][2], the plugin automatically tags the Lambda functions with the `service` and `env` tags using the `service` and `stage` values from the serverless application definition, unless a `service` or `env` tag already exists.
-
-[1]: https://www.serverless.com/framework/docs/providers/aws/guide/functions#tags
-[2]: https://docs.datadoghq.com/serverless/serverless_integrations/plugin
-{{% /tab %}}
-
-{{% tab "AWS SAM" %}}
-
-Tag your Lambda functions using the [Tags][1] option:
-
-```yaml
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Resources:
-  MyLambdaFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Tags:
-        env: "<ENV>"
-        service: "<SERVICE>"
-        version: "<VERSION>"
-```
-
-If you have installed the [Datadog serverless macro][2], you can also specify a `service` and `env` tag as parameters:
-
-```yaml
-Transform:
-  - AWS::Serverless-2016-10-31
-  - Name: DatadogServerless
-    Parameters:
-      service: "<SERVICE>"
-      env: "<ENV>"
-```
-
-
-[1]: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html#sam-function-tags
-[2]: https://docs.datadoghq.com/serverless/serverless_integrations/macro
-{{% /tab %}}
-
-{{% tab "AWS CDK" %}}
-
-Tag your app, stack, or individual Lambda functions using the [Tags class][1]. If you have installed the [Datadog serverless macro][2], you can also specify a `service` and `env` tag as parameters:
-
-```javascript
-import * as cdk from "@aws-cdk/core";
-
-class CdkStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
-    super(scope, id, props);
-    this.addTransform("DatadogServerless");
-
-    new cdk.CfnMapping(this, "Datadog", {
-      mapping: {
-        Parameters: {
-          service: "<SERVICE>",
-          env: "<ENV>",
-        },
-      },
-    });
-  }
-}
-```
-
-
-[1]: https://docs.aws.amazon.com/cdk/latest/guide/tagging.html
-[2]: https://docs.datadoghq.com/serverless/serverless_integrations/macro
-{{% /tab %}}
-
-{{% tab "Custom" %}}
-
-Apply the `env`, `service` and `version` tags following the AWS instructions for [Tagging Lambda Functions][1].
-
-
-[1]: https://docs.aws.amazon.com/lambda/latest/dg/configuration-tags.html
-{{% /tab %}}
-
-{{< /tabs >}}
-
-Ensure the `DdFetchLambdaTags` option is set to `true` on the CloudFormation stack for your [Datadog Forwarder][13]. This option defaults to `true` since version `3.19.0`.
-
+See [how to connect your Lambda telemetry using tags][13].
 ## Further Reading
 
 {{< partial name="whats-next/whats-next.html" >}}
@@ -510,4 +397,4 @@ Ensure the `DdFetchLambdaTags` option is set to `true` on the CloudFormation sta
 [10]: /integrations/statsd/
 [11]: https://www.chef.io/
 [12]: https://www.ansible.com/
-[13]: /serverless/forwarder/
+[13]: /serverless/configuration/#connect-telemetry-using-tags