containers reorg

config/_default/menus/main.en.yaml

@@ -3066,52 +3066,47 @@ menu:
       parent: infrastructure_heading
       weight: 50000
       pre: container
-    - name: Monitoring Containers
-      url: infrastructure/containers/
+    - name: Container Monitoring
+      url: containers/monitoring
       parent: containers
       identifier: infrastructure_livecontainers
       weight: 1
-    - name: Configuration
-      url: infrastructure/containers/configuration
+    - name: Containers Explorer
+      url: containers/monitoring/containers
       parent: infrastructure_livecontainers
       identifier: infrastructure_livecontainers_configuration
       weight: 101
-    - name: Container Images View
-      url: infrastructure/containers/container_images
+    - name: Container Images Explorer
+      url: containers/monitoring/container_images
       parent: infrastructure_livecontainers
       identifier: infrastructure_livecontainers_container_images
       weight: 102
-    - name: Orchestrator Explorer
-      url: infrastructure/containers/orchestrator_explorer
+    - name: Kubernetes Explorer
+      url: containers/monitoring/kubernetes_explorer
       parent: infrastructure_livecontainers
       identifier: infrastructure_livecontainers_explorer
       weight: 103
-    - name: Kubernetes Resource Utilization
-      url: infrastructure/containers/kubernetes_resource_utilization
-      parent: infrastructure_livecontainers
+    - name: Resource Utilization
+      url: containers/monitoring/kubernetes_resource_utilization
+      parent: infrastructure_livecontainers_explorer
       identifier: infrastructure_livecontainers_resource_utilization
-      weight: 104
-    - name: Kubernetes Autoscaling
-      url: containers/monitoring/autoscaling
-      parent: infrastructure_livecontainers
-      identifier: infrastructure_livecontainers_autoscaling
-      weight: 105
-    - name: Amazon Elastic Container Explorer
-      url: infrastructure/containers/amazon_elastic_container_explorer
-      parent: infrastructure_livecontainers
-      identifier: infrastructure_livecontainers_amazon_elastic_container_explorer
-      weight: 106
+      weight: 10301
     - name: Autoscaling
       url: containers/autoscaling
-      parent: containers
-      identifier: containers_autoscaling
-      weight: 2
+      parent: infrastructure_livecontainers_explorer
+      identifier: infrastructure_livecontainers_autoscaling
+      weight: 10302
     - name: Remediation
       url: containers/bits_ai_kubernetes_remediation
-      parent: containers
+      parent: infrastructure_livecontainers_explorer
       identifier: containers_autoscaling
-      weight: 3
-    - name: Docker and other runtimes
+      weight: 30303
+    - name: ECS Explorer
+      url: containers/monitoring/amazon_elastic_container_explorer
+      parent: infrastructure_livecontainers
+      identifier: infrastructure_livecontainers_amazon_elastic_container_explorer
+      weight: 106
+    - name: Docker-based
       url: containers/docker/
       parent: containers
       identifier: containers_docker
@@ -3266,11 +3261,11 @@ menu:
       parent: containers_amazon_ecs
       identifier: containers_amazon_ecs_data_collected
       weight: 704
-    - name: AWS Fargate
+    - name: AWS Fargate on ECS
       url: integrations/ecs_fargate/
-      parent: containers
+      parent: containers_amazon_ecs
       identifier: ecs_fargate
-      weight: 8
+      weight: 705
     - name: Datadog Operator
       url: containers/datadog_operator
       identifier: containers_datadog_operator

content/en/containers/_index.md

@@ -1,5 +1,5 @@
 ---
-title: Container Monitoring
+title: Containers
 description: Install & configure the Agent to collect data on containerized infrastructures
 further_reading:
     - link: "https://www.datadoghq.com/container-report/"
@@ -12,18 +12,46 @@ cascade:
         rank: 70
 ---
 
-## Overview
+To maintain the health, performance, and security of your containerized environments, you can install the Datadog Agent and use [Datadog Container Monitoring][1].
 
-Container Monitoring provides real-time visibility into the health and performance of containerized environments.
+## Get started
 
-{{< whatsnext desc="This section includes the following topics:">}}
-  {{< nextlink href="/containers/docker">}}<u>Docker</u>: Install and configure the Datadog Agent on Docker.{{< /nextlink >}}
-  {{< nextlink href="/containers/kubernetes">}}<u>Kubernetes</u>: Install and configure the Datadog Agent on Kubernetes. {{< /nextlink >}}
-  {{< nextlink href="/containers/cluster_agent">}}<u>Cluster Agent</u>: Install and configure the Cluster Agent for Kubernetes, a version of the Datadog Agent built to efficiently gather monitoring data from across an orchestrated cluster.{{< /nextlink >}}
-  {{< nextlink href="/containers/amazon_ecs">}}<u>Amazon ECS</u>: Install and configure the Datadog Agent on Amazon ECS.{{< /nextlink >}}
-  {{< nextlink href="integrations/ecs_fargate/">}}<u>AWS Fargate</u>: Install and configure the Datadog Agent with Amazon ECS on AWS Fargate{{< /nextlink >}}
+Log into Datadog and use the [Install Agents][2] page to install the Datadog Agent on your selected platform.
+
+## Datadog Container Monitoring
+
+{{< whatsnext desc="These pages discuss using Datadog's UI to monitor containers and clusters, track resource utilization, autoscale workloads, and remediate issues:">}}
+  {{< nextlink href="/containers/monitoring/explorer">}}<u>Containers Explorer</u>: Use and configure Containers Explorer for real-time visibility into your containers. {{< /nextlink >}}
+  {{< nextlink href="/containers/monitoring/container_images">}}<u>Container Images Explorer</u>: Use and configure Containers Images Explorer to monitor the container {{< /nextlink >}}
+  {{< nextlink href="/containers/monitoring/kubernetes_explorer">}}<u>Kubernetes Explorer</u>: Using and configuring the Kubernetes Explorer page {{< /nextlink >}}
+  {{< nextlink href="/containers/monitoring/kubernetes_resource_utilization">}}<u>Kubernetes Resource Utilization</u>: Using and configuring the Kubernetes Resource Utilization page {{< /nextlink >}}
+  {{< nextlink href="/containers/autoscaling">}}<u>Kubernetes Autoscaling</u>: Using and configuring the Kubernetes Autoscaling page {{< /nextlink >}}
+  {{< nextlink href="/containers/bits_ai_kubernetes_remediation">}}<u>Kubernetes Remediation</u>: Using and configuring the Kubernetes Remediation page {{< /nextlink >}}
+  {{< nextlink href="/containers/monitoring/amazon_elastic_container_explorer">}}<u>ECS Explorer</u>: Using and configuring the ECS Explorer page {{< /nextlink >}}
+{{< /whatsnext >}}
+
+## Docker-based environments
+
+{{< whatsnext desc="These pages discuss installing and configuring the Datadog Agent in a Docker-based environment (Docker, containerd, Podman):">}}
+  {{< nextlink href="/containers/docker">}}<u>Datadog Docker Agent</u>: Install and configure the Datadog Docker Agent for Docker, containerd, and Podman runtimes {{< /nextlink >}}
+{{< /whatsnext >}}
+
+## Kubernetes environments
+
+{{< whatsnext desc="These pages discuss installing and configuring the Datadog Agent in a Kubernetes environment:">}}
+  {{< nextlink href="/infrastructure/containers/explorer">}}<u>Containers Explorer</u>: Use and configure Containers Explorer for real-time visibility into your containers. {{< /nextlink >}}
+{{< /whatsnext >}}
+
+## Amazon ECS
+
+{{< whatsnext desc="These pages discuss installing and configuring the Datadog Agent on Amazon ECS:">}}
+  {{< nextlink href="/infrastructure/containers/explorer">}}<u>Containers Explorer</u>: Use and configure Containers Explorer for real-time visibility into your containers. {{< /nextlink >}}
 {{< /whatsnext >}}
 
 ## Further reading
 
 {{< partial name="whats-next/whats-next.html" >}}
+
+[1]: https://app.datadoghq.com/containers
+[2]: https://app.datadoghq.com/fleet/install-agent/latest?platform=overview
+

content/en/containers/guide/kubernetes_explorer_custom_resource_collection.md

@@ -0,0 +1,27 @@
+---
+title: Resource Collection for Kubernetes Explorer
+---
+
+This guide discusses resource collection in Datadog's [Kubernetes Explorer][1].
+
+### Collected Kubernetes resources
+
+
+
+### Collected custom resources
+
+When the following CRDs are present in your cluster, the Agent automatically collects their Custom Resources (CRs). If a CRD you use is **not** listed here—or your Agent version is older—follow the **manual configuration** steps below.
+
+| CRD group          | CRD kind             | CRD versions | Minimal Agent version |
+| ------------------ | -------------------- | ------------ | --------------------- |
+| datadoghq.com      | datadogslo           | v1alpha1     | 7.71.0                |
+| datadoghq.com      | datadogdashboard     | v1alpha1     | 7.71.0                |
+| datadoghq.com      | datadogagentprofile  | v1alpha1     | 7.71.0                |
+| datadoghq.com      | datadogmonitor       | v1alpha1     | 7.71.0                |
+| datadoghq.com      | datadogmetric        | v1alpha1     | 7.71.0                |
+| datadoghq.com      | datadogpodautoscaler | v1alpha2     | 7.71.0                |
+| datadoghq.com      | datadogagent         | v2alpha1     | 7.71.0                |
+| argoproj.io        | rollout              | v1alpha1     | 7.71.0                |
+| karpenter.sh       | *                    | v1           | 7.71.0                |
+| karpenter.k8s.aws  | *                    | v1           | 7.71.0                |
+| azure.karpenter.sh | *                    | v1beta1      | 7.71.0                |

content/en/containers/monitoring/_index.md

@@ -0,0 +1,65 @@
+---
+title: Container Monitoring
+---
+
+After [installing the Datadog Agent][1], you can use Datadog Container Monitoring to visualize your container resources. For Kubernetes environments, you can also track resource utilization, automatically scale workloads, and investigate and remediate issues.
+
+## Explore containers
+
+{{< img src="infrastructure/livecontainers/live-containers-overview_2.png" alt="Live containers with summaries" width="80%" >}}
+
+In Datadog, [**Containers Explorer**][2] provides real-time visibility into all of your containers. To configure this page, read the [Containers Explorer documentation][3].
+
+## Explore container images
+
+{{< img src="security/vulnerabilities/container_images.png" alt="The container images view highlighting vulnerabilities and container column sort feature" width="80%">}}
+
+[**Container Images Explorer**][4] provides insights into every image used in your environment to help you assess your images' deployment footprint, including [Cloud Security][5] vulnerabilities. To configure this page, read the [Container Images Explorer documentation][6]. 
+
+## Explore Kubernetes resources
+
+{{< img src="infrastructure/livecontainers/orch_ex.png" alt="Orchestrator Explorer, showing Kubernetes Pods." style="width:80%;">}}
+
+[**Kubernetes Explorer**][7] allows you to monitor pods, clusters, workloads, and other Kubernetes resources. To configure this page, read the [Kubernetes Explorer documentation][8].
+
+### Kubernetes Resource Utilization
+
+Select the [**Resource Utilization**][9] tab in the Kubernetes section for insights into how compute resources are used across your infrastructure. For more information, read the [Kubernetes Resource Utilization documentation][10].
+
+### Kubernetes Autoscaling
+
+Select the [**Autoscaling**][11] tab in the Kubernetes section to view scaling recommendations and deploy autoscaling. For more information, read the [Autoscaling documentation][12].
+
+### Kubernetes Remediation
+
+Select the [**Remediation**][13] tab in the Kubernetes section to investigate and remediate errors with [Bits AI Dev Agent][14]. For more information, read the [Bits AI Kubernetes Remediation documentation][15].
+
+{{< callout url="https://www.datadoghq.com/product-preview/kubernetes-remediation/"
+ btn_hidden="false" header="Join the Preview!">}}
+Automated fixes from Bits AI Kubernetes Remediation is in Preview. To sign up, click <strong>Request Access</strong> and complete the form.
+{{< /callout >}}
+
+## Explore Amazon Elastic Container Service (ECS) resources
+
+{{< img src="infrastructure/livecontainers/orch_ecs_ex.png" alt="ECS Explorer displaying ECS tasks." style="width:80%;">}}
+
+[**ECS Explorer**][16] allows you to monitor tasks, services, and other Amazon ECS components across your AWS accounts. To configure this page, read the [ECS Explorer documentation][17].
+
+
+[1]: https://app.datadoghq.com/fleet/install-agent/latest?platform=overview
+[2]: https://app.datadoghq.com/containers
+[3]: /infrastructure/containers/explorer
+[4]: https://app.datadoghq.com/container-images
+[5]: /security/cloud_security_management
+[6]: /infrastructure/containers/container_images/
+[7]: https://app.datadoghq.com/orchestration/explorer
+[8]: /infrastructure/containers/kubernetes_explorer
+[9]: https://app.datadoghq.com/orchestration/resource/pod
+[10]: /infrastructure/containers/kubernetes_resource_utilization
+[11]: https://demo.datadoghq.com/orchestration/scaling/summary
+[12]: /containers/monitoring/autoscaling
+[13]: https://app.datadoghq.com/orchestration/remediation
+[14]: /bits_ai/bits_ai_dev_agent
+[15]: /containers/bits_ai_kubernetes_remediation/
+[16]: https://app.datadoghq.com/orchestration/explorer/ecsTask
+[17]: /infrastructure/containers/amazon_elastic_container_explorer

content/en/infrastructure/containers/amazon_elastic_container_explorer.md → content/en/containers/monitoring/amazon_elastic_container_explorer.md

@@ -1,5 +1,7 @@
 ---
 title: Amazon Elastic Container (ECS) Explorer
+aliases:
+  - /infrastructure/containers/amazon_elastic_container_explorer
 further_reading:
   - link: "https://www.datadoghq.com/blog/ecs-default-monitors/"
     tag: "Blog"

content/en/infrastructure/containers/configuration.md → content/en/containers/monitoring/configuration.md

@@ -1,7 +1,8 @@
 ---
-title: Configure Containers View
+title: Configure Kubernetes Explorer
 aliases:
   - /infrastructure/livecontainers/configuration
+  - /infrastructure/containers/configuration
 further_reading:
 - link: "/infrastructure/hostmap/"
   tag: "Documentation"
@@ -13,67 +14,7 @@ further_reading:
 
 This page lists configuration options for the [Containers][1] page in Datadog. To learn more about the Containers page and its capabilities, see [Containers View][2] documentation.
 
-## Configuration options
 
-### Include or exclude containers
-
-Include and exclude containers from real-time collection:
-
-- Exclude containers either by passing the environment variable `DD_CONTAINER_EXCLUDE` or by adding `container_exclude:` in your `datadog.yaml` main configuration file.
-- Include containers either by passing the environment variable `DD_CONTAINER_INCLUDE` or by adding `container_include:` in your `datadog.yaml` main configuration file.
-
-Both arguments take an **image name** as value. Regular expressions are also supported.
-
-For example, to exclude all Debian images except containers with a name starting with *frontend*, add these two configuration lines in your `datadog.yaml` file:
-
-```yaml
-container_exclude: ["image:debian"]
-container_include: ["name:frontend.*"]
-```
-
-**Note**: For Agent 5, instead of including the above in the `datadog.conf` main configuration file, explicitly add a `datadog.yaml` file to `/etc/datadog-agent/`, as the Process Agent requires all configuration options here. This configuration only excludes containers from real-time collection, **not** from Autodiscovery.
-
-### Scrubbing sensitive information
-
-To prevent the leaking of sensitive data, you can scrub sensitive words in container YAML files. Container scrubbing is enabled by default for Helm charts, and some default sensitive words are provided:
-
-- `password`
-- `passwd`
-- `mysql_pwd`
-- `access_token`
-- `auth_token`
-- `api_key`
-- `apikey`
-- `pwd`
-- `secret`
-- `credentials`
-- `stripetoken`
-
-You can set additional sensitive words by providing a list of words to the environment variable `DD_ORCHESTRATOR_EXPLORER_CUSTOM_SENSITIVE_WORDS`. This adds to, and does not overwrite, the default words.
-
-**Note**: The additional sensitive words must be in lowercase, as the Agent compares the text with the pattern in lowercase. This means `password` scrubs `MY_PASSWORD` to `MY_*******`, while `PASSWORD` does not.
-
-You need to setup this environment variable for the following agents:
-
-- process-agent
-- cluster-agent
-
-```yaml
-env:
-    - name: DD_ORCHESTRATOR_EXPLORER_CUSTOM_SENSITIVE_WORDS
-      value: "customword1 customword2 customword3"
-```
-
-For example, because `password` is a sensitive word, the scrubber changes `<MY_PASSWORD>` in any of the following to a string of asterisks, `***********`:
-
-```text
-password <MY_PASSWORD>
-password=<MY_PASSWORD>
-password: <MY_PASSWORD>
-password::::== <MY_PASSWORD>
-```
-
-However, the scrubber does not scrub paths that contain sensitive words. For example, it does not overwrite `/etc/vaultd/secret/haproxy-crt.pem` with `/etc/vaultd/******/haproxy-crt.pem` even though `secret` is a sensitive word.
 
 ## Configure Orchestrator Explorer