AAP: setup page improvement

content/en/security/application_security/setup/_index.md

@@ -50,10 +50,10 @@ Learn how to enable App and API Protection on all the following supported platfo
 ## Kubernetes (K8s)
 
 {{< appsec-integrations >}}
-  {{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./kubernetes" >}}
-  {{< appsec-integration name="Istio" avatar="istio" link="./istio" >}}
-  {{< appsec-integration name="Envoy Gateway" avatar="envoy" link="./envoy-gateway" >}}
-  {{< appsec-integration name="Gateway API" src="integrations_logos/gateway-api_avatar.svg" link="./gateway-api" >}}
+  {{< appsec-integration name="Istio" avatar="istio" link="./kubernetes/istio" >}}
+  {{< appsec-integration name="Envoy Gateway" avatar="envoy" link="./kubernetes/envoy-gateway" >}}
+  {{< appsec-integration name="Gateway API" src="integrations_logos/gateway-api_avatar.svg" link="./kubernetes/gateway-api" >}}
+  {{< appsec-integration name="Ingress NGINX Controller" avatar="nginx" link="./nginx/ingress-controller" >}}
 {{< /appsec-integrations >}}
 
 ## Cloud Platforms
@@ -80,4 +80,3 @@ Learn how to enable App and API Protection on all the following supported platfo
 {{< appsec-integrations >}}
   {{< appsec-integration name="Azure App Service" avatar="azure-appserviceenvironment" link="./azure/app-service" >}}
 {{< /appsec-integrations >}}
-

content/en/security/application_security/setup/dotnet/_index.md

@@ -33,9 +33,8 @@ further_reading:
   {{< appsec-integration name="Linux" avatar="linux" link="./linux" >}}
   {{< appsec-integration name="Windows" avatar="windows" link="./windows" >}}
 {{< /appsec-integrations >}}
-## Additional Resources
 
-### Cloud and Container Platforms
+### Container Platforms
 {{< appsec-integrations >}}
 {{< appsec-integration name="Docker" avatar="docker" link="./docker" >}}
 {{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./kubernetes" >}}
@@ -44,14 +43,20 @@ further_reading:
 ### AWS
 {{< appsec-integrations >}}
 {{< appsec-integration name="AWS Fargate" avatar="aws-fargate" link="./aws-fargate" >}}
-{{< appsec-integration name="AWS Lambda" avatar="amazon-lambda" link="/security/application_security/setup/aws/lambda/" >}}
+{{< appsec-integration name="AWS Lambda" avatar="amazon-lambda" link="/security/application_security/setup/aws/lambda/dotnet" >}}
+{{< /appsec-integrations >}}
+
+### Google Cloud Platform
+{{< appsec-integrations >}}
+{{< appsec-integration name="Google Cloud Run" avatar="google-cloud-run" link="/security/application_security/setup/gcp/cloud-run/dotnet" >}}
 {{< /appsec-integrations >}}
 
 ### Microsoft Azure
 {{< appsec-integrations >}}
   {{< appsec-integration name="Azure App Service" avatar="azure-appserviceenvironment" link="/security/application_security/setup/azure/app-service/?tab=nodenetphppython" >}}
 {{< /appsec-integrations >}}
 
+## Additional Resources
 
 - [Troubleshooting Guide][1]
 - [Compatibility Information][2]

content/en/security/application_security/setup/go/_index.md

@@ -17,7 +17,7 @@ further_reading:
 
 ## Overview
 
-App and API Protection (AAP) leverages the [Datadog Go library][5] to monitor and secure your Go service. The library integrates seamlessly into your workflow using [Orchestrion][6], an automatic compile-time instrumentation of Go code that does not require code changes. 
+App and API Protection (AAP) leverages the [Datadog Go library][5] to monitor and secure your Go service. The library integrates seamlessly into your workflow using [Orchestrion][6], an automatic compile-time instrumentation of Go code that does not require code changes.
 
 For detailed compatibility information, including supported Go versions, frameworks, and deployment environments, see [Go Compatibility Requirements][2].
 
@@ -29,15 +29,27 @@ For detailed compatibility information, including supported Go versions, framewo
   {{< appsec-integration name="macOS" avatar="apple" link="./setup?tab=environmentvariable" >}}
 {{< /appsec-integrations >}}
 
-### Cloud and Container Platforms
+### Container Platforms
 {{< appsec-integrations >}}
 {{< appsec-integration name="Docker" avatar="docker" link="./setup?tab=dockercli" >}}
 {{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./setup?tab=kubernetes" >}}
 {{< /appsec-integrations >}}
 
 ### AWS
 {{< appsec-integrations >}}
-{{< appsec-integration name="AWS ECS" avatar="aws-fargate" link="./setup?tab=amazonecs" >}}
+{{< appsec-integration name="AWS Lambda" avatar="amazon-lambda" link="../aws/lambda/go" >}}
+{{< appsec-integration name="AWS Fargate" avatar="aws-fargate" link="../aws/fargate" >}}
+{{< appsec-integration name="AWS ECS" avatar="aws-ecs" link="./setup?tab=amazonecs" >}}
+{{< /appsec-integrations >}}
+
+### Google Cloud Platform
+{{< appsec-integrations >}}
+{{< appsec-integration name="Google Cloud Run" avatar="google-cloud-run" link="../gcp/cloud-run/go >}}
+{{< /appsec-integrations >}}
+
+### Microsoft Azure
+{{< appsec-integrations >}}
+  {{< appsec-integration name="Azure App Service" avatar="azure-appserviceenvironment" link="../azure/app-service" >}}
 {{< /appsec-integrations >}}
 
 ## Additional Resources
@@ -53,4 +65,3 @@ For detailed compatibility information, including supported Go versions, framewo
 [4]: /security/application_security/setup/go/sdk
 [5]: https://github.com/DataDog/dd-trace-go/
 [6]: https://datadoghq.dev/orchestrion/
-

content/en/security/application_security/setup/java/_index.md

@@ -32,7 +32,7 @@ further_reading:
   {{< appsec-integration name="Windows" avatar="windows" link="./windows" >}}
 {{< /appsec-integrations >}}
 
-### Cloud and Container Platforms
+### Container Platforms
 {{< appsec-integrations >}}
 {{< appsec-integration name="Docker" avatar="docker" link="./docker" >}}
 {{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./kubernetes" >}}
@@ -41,7 +41,17 @@ further_reading:
 ### AWS
 {{< appsec-integrations >}}
 {{< appsec-integration name="AWS Fargate" avatar="aws-fargate" link="./aws-fargate" >}}
-{{< appsec-integration name="AWS Lambda" avatar="amazon-lambda" link="/security/application_security/setup/aws/lambda/" >}}
+{{< appsec-integration name="AWS Lambda" avatar="amazon-lambda" link="../aws/lambda/java" >}}
+{{< /appsec-integrations >}}
+
+### Google Cloud Platform
+{{< appsec-integrations >}}
+{{< appsec-integration name="Google Cloud Run" avatar="google-cloud-run" link="../gcp/cloud-run/java" >}}
+{{< /appsec-integrations >}}
+
+### Microsoft Azure
+{{< appsec-integrations >}}
+{{< appsec-integration name="Azure App Service" avatar="azure-appserviceenvironment" link="../azure/app-service/?tab=java" >}}
 {{< /appsec-integrations >}}
 
 ## Additional Resources

content/en/security/application_security/setup/kubernetes/_index.md

@@ -19,40 +19,20 @@ further_reading:
   text: "How Application & API Protection Works in Datadog"
 ---
 
-Learn how to set up App and API Protection (AAP) on your Kubernetes services by selecting the service's programming language.
+Learn how to set up App and API Protection (AAP) on your Kubernetes clusters by selecting the Kubernetes integration that suits you best.
 
 <div class="alert alert-info">
   <p class="fs-bold m-0">Are you missing your environment?</p>
   <span>Send us a request for your missing environment <a href="https://forms.gle/nMGq2Hhe7Z4sCKdy6">here</a>.</span>
 </div>
 
 {{< appsec-integrations >}}
-  {{< appsec-integration name="Istio" avatar="istio" link="/security/application_security/setup/istio" >}}
-  {{< appsec-integration name="Envoy Gateway" avatar="envoy" link="/security/application_security/setup/envoy-gateway" >}}
-  {{< appsec-integration name="Gateway API" src="integrations_logos/gateway-api_avatar.svg" link="/security/application_security/setup/gateway-api" >}}
+  {{< appsec-integration name="Istio" avatar="istio" link="./istio" >}}
+  {{< appsec-integration name="Envoy Gateway" avatar="envoy" link="./envoy-gateway" >}}
+  {{< appsec-integration name="Gateway API" src="integrations_logos/gateway-api_avatar.svg" link="./gateway-api" >}}
+  {{< appsec-integration name="Ingress NGINX Controller" avatar="nginx" link="../nginx/ingress-controller" >}}
 {{< /appsec-integrations >}}
 
-## Languages
-
-{{< appsec-integrations >}}
-  {{< appsec-integration name="Python" avatar="python" link="/security/application_security/setup/python/kubernetes" >}}
-  {{< appsec-integration name="Node.js" avatar="node" link="/security/application_security/setup/nodejs/kubernetes" >}}
-  {{< appsec-integration name="Java" avatar="java" link="/security/application_security/setup/java/kubernetes" >}}
-  {{< appsec-integration name="Go" avatar="go" link="/security/application_security/setup/go" >}}
-  {{< appsec-integration name="Ruby" avatar="ruby" link="/security/application_security/setup/ruby/kubernetes" >}}
-  {{< appsec-integration name=".NET" avatar="dotnet" link="/security/application_security/setup/dotnet/kubernetes" >}}
-  {{< appsec-integration name="PHP" avatar="php" link="/security/application_security/setup/php/kubernetes" >}}
-{{< /appsec-integrations >}}
-
-## Proxies
-
-{{< appsec-integrations >}}
-  {{< appsec-integration name="NGINX" avatar="nginx" link="/security/application_security/setup/nginx/kubernetes" >}}
-  {{< appsec-integration name="Envoy" avatar="envoy" link="/security/application_security/setup/envoy" >}}
-{{< /appsec-integrations >}}
-
-
-
 ## Further Reading
 
 {{< partial name="whats-next/whats-next.html" >}}

content/en/security/application_security/setup/envoy-gateway.md → content/en/security/application_security/setup/kubernetes/envoy-gateway.md

@@ -188,7 +188,7 @@ spec:
     # with body processing enabled.
     # Note: This timeout also includes the data communication between Envoy and the external processor.
     # The timeout should be adjusted to accommodate the additional possible processing time.
-    # Larger payloads will require a longer timeout. 
+    # Larger payloads will require a longer timeout.
     messageTimeout: 200ms
 
     processingMode:

content/en/security/application_security/setup/nginx/_index.md

@@ -14,7 +14,7 @@ further_reading:
 {{< partial name="app_and_api_protection/callout.html" >}}
 
 ## Overview
-App and API Protection leverages the [Datadog Nginx Integration][1] to monitor and secure your reverse proxy.
+Learn how to set up App and API Protection (AAP) on your NGINX proxy by selecting the integration that suits you best.
 
 ## Environments
 
@@ -23,9 +23,9 @@ App and API Protection leverages the [Datadog Nginx Integration][1] to monitor a
   {{< appsec-integration name="Linux" avatar="linux" link="./linux" >}}
 {{< /appsec-integrations >}}
 
-### Cloud and Container Platforms
+### Kubernetes
 {{< appsec-integrations >}}
-{{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./kubernetes" >}}
+{{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./ingress-controller" >}}
 {{< /appsec-integrations >}}
 
 ## Additional Resources
@@ -35,4 +35,4 @@ App and API Protection leverages the [Datadog Nginx Integration][1] to monitor a
 
 [1]: https://github.com/DataDog/nginx-datadog/
 [2]: /security/application_security/setup/php/troubleshooting
-[3]: /security/application_security/setup/php/compatibility
+[3]: /security/application_security/setup/php/compatibility

content/en/security/application_security/setup/nginx/kubernetes.md → content/en/security/application_security/setup/nginx/ingress-controller.md

@@ -1,6 +1,8 @@
 ---
 title: Set up App and API Protection for Nginx in Kubernetes
 type: multi-code-lang
+aliases:
+  - /security/application_security/setup/nginx/kubernetes/
 further_reading:
   - link: "/security/application_security/how-it-works/"
     tag: "Documentation"
@@ -76,4 +78,4 @@ To disable OpenTelemetry, set `enable-opentelemetry: false`.
 [3]: https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/
 [4]: https://hub.docker.com/r/datadog/ingress-nginx-injection
 [5]: https://github.com/DataDog/nginx-datadog/tree/master/example/ingress-nginx
-[6]: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#enable-opentelemetry
+[6]: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#enable-opentelemetry

content/en/security/application_security/setup/nodejs/_index.md

@@ -34,17 +34,28 @@ further_reading:
 {{< appsec-integration name="Windows" avatar="windows" link="./windows" >}}
 {{< /appsec-integrations >}}
 
-### Cloud and Container Platforms
+### Container Platforms
 {{< appsec-integrations >}}
 {{< appsec-integration name="Docker" avatar="docker" link="./docker" >}}
 {{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./kubernetes" >}}
 {{< /appsec-integrations >}}
 
 ### AWS
 {{< appsec-integrations >}}
+{{< appsec-integration name="AWS Lambda" avatar="amazon-lambda" link="../aws/lambda/nodejs" >}}
 {{< appsec-integration name="AWS Fargate" avatar="aws-fargate" link="./aws-fargate" >}}
 {{< /appsec-integrations >}}
 
+### Google Cloud Platform
+{{< appsec-integrations >}}
+{{< appsec-integration name="Google Cloud Run" avatar="google-cloud-run" link="../gcp/cloud-run/nodejs" >}}
+{{< /appsec-integrations >}}
+
+### Microsoft Azure
+{{< appsec-integrations >}}
+{{< appsec-integration name="Azure App Service" avatar="azure-appserviceenvironment" link="/security/application_security/setup/azure/app-service/?tab=nodenetphppython" >}}
+{{< /appsec-integrations >}}
+
 ## Additional Resources
 
 - [Troubleshooting Guide](./troubleshooting)

content/en/security/application_security/setup/php/_index.md

@@ -18,12 +18,22 @@ aliases:
   {{< appsec-integration name="Linux" avatar="linux" link="./linux" >}}
 {{< /appsec-integrations >}}
 
-### Cloud and Container Platforms
+### Container Platforms
 {{< appsec-integrations >}}
 {{< appsec-integration name="Docker" avatar="docker" link="./docker" >}}
 {{< appsec-integration name="Kubernetes" avatar="kubernetes" link="./kubernetes" >}}
 {{< /appsec-integrations >}}
 
+### Google Cloud Platform
+{{< appsec-integrations >}}
+{{< appsec-integration name="Google Cloud Run" avatar="google-cloud-run" link="../gcp/cloud-run/php" >}}
+{{< /appsec-integrations >}}
+
+### Microsoft Azure
+{{< appsec-integrations >}}
+{{< appsec-integration name="Azure App Service" avatar="azure-appserviceenvironment" link="../azure/app-service/?tab=nodenetphppython" >}}
+{{< /appsec-integrations >}}
+
 ## Additional Resources
 
 - [Troubleshooting Guide](/security/application_security/setup/php/troubleshooting)