From db14213653404c0f6e247c8a612a7d9c92c97ae2 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Thu, 11 Dec 2025 15:08:42 -0600
Subject: [PATCH 01/15] add note about supported integrations

---
 .../create-an-inventory-rule.md               | 14 ++++++++++++--
 ...infrastructure-metrics-by-resource-type.md | 19 +++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/solutions/observability/incident-management/create-an-inventory-rule.md b/solutions/observability/incident-management/create-an-inventory-rule.md
index 7a5ad53ffa..ff279f6f55 100644
--- a/solutions/observability/incident-management/create-an-inventory-rule.md
+++ b/solutions/observability/incident-management/create-an-inventory-rule.md
@@ -36,8 +36,8 @@ When you select **Create inventory alert**, the parameters you configured on the
 Conditions for each rule can be applied to specific metrics relating to the inventory type you select. You can choose the aggregation type, the metric, and by including a warning threshold value, you can be alerted on multiple threshold values based on severity scores. When creating the rule, you can still get notified if no data is returned for the specific metric or if the rule fails to query {{es}}.
 
 :::{note}
-{applies_to}`{stack: "ga 9.2", serverless: "ga"}`
-Most inventory types respect the default data collection method (for example, [Elastic system integration](integration-docs://reference/system/index.md)). For the `Hosts` inventory type, however, you can use the **Schema** dropdown menu to explicitly target host data collected using **OpenTelemetry** or the **Elastic System Integration**.
+:applies_to: {"stack": "ga 9.2", "serverless": "ga"}`
+Most inventory types respect the default data collection method (for example, [Elastic System integration](integration-docs://reference/system/index.md)). For the `Hosts` inventory type, however, you can use the **Schema** dropdown menu to explicitly target host data collected using **OpenTelemetry** or the **Elastic System Integration**.
 :::
 
 In the following example, Kubernetes Pods is the selected inventory type. The conditions state that you will receive a critical alert for any pods within the `ingress-nginx` namespace with a memory usage of 95% or above and a warning alert if memory usage is 90% or above. The chart shows the results of applying the rule to the last 20 minutes of data. Note that the chart time range is 20 times the value of the look-back window specified in the `FOR THE LAST` field.
@@ -47,6 +47,16 @@ In the following example, Kubernetes Pods is the selected inventory type. The co
 :screenshot:
 :::
 
+### Supported data
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+
+The inventory types only support data from the following sources:
+
+* **Hosts**: OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration
+* **Kubernetes Pods**: [Kubernetes](integration-docs://reference/kubernetes.md) integration
+* **Docker Containers**: [Kubernetes](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations
+* **AWS**: [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations
+
 ## Add actions [action-types-infrastructure]
 
 You can extend your rules with actions that interact with third-party systems, write to logs or indices, or send user notifications. You can add an action to a rule at any time. You can create rules without adding actions, and you can also define multiple actions for a single rule.
diff --git a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
index bfce569ea2..d4ccb73b58 100644
--- a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+++ b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
@@ -14,6 +14,17 @@ products:
 
 The **Infrastructure Inventory** page provides a metrics-driven view of your entire infrastructure grouped by the resources you are monitoring. All monitored resources emitting a core set of infrastructure metrics are displayed to give you a quick view of the overall health of your infrastructure.
 
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+
+The [inventory views](#filter-resources) only support data from the following sources:
+
+* **Hosts**: OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration
+* **{{k8s}} Pods**: [{{k8s}}](integration-docs://reference/kubernetes.md) integration
+* **Docker Containers**: [{{k8s}}](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations
+* **AWS**: [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations
+:::
+
 To open the **Infrastructure inventory** page in:
 - **Elastic Stack,** find **Infrastructure** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
 - **Serverless,** go to **Infrastructure inventory** in your Observability Serverless project.
@@ -39,10 +50,10 @@ Need help getting started? Follow the steps in [Get started with system metrics]
 
 To get started with your analysis, select the type of resources you want to show in the high-level view. From the **Show** menu, select one of the following:
 
-* **Hosts** — the default
-* **Kubernetes Pods**
-* **Docker Containers** — shows *all* containers, not just Docker
-* **AWS** — includes EC2 instances, S3 buckets, RDS databases, and SQS queues
+* **Hosts**: Default view. {applies_to}`stack: ga 9.2`{applies_to}`serverless: ga` Supports data from the OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration.
+* **{{k8s}} Pods**: {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+* **Docker Containers** — Shows *all* container data (not only Docker). {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations.
+* **{{aws}}** — Includes EC2 instances, S3 buckets, RDS databases, and SQS queues. {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations.
 
 When you hover over each resource in the waffle map, the metrics specific to that resource are displayed.
 

From 809b90aa8fcb198f6e35bbdee91a5969873e0e06 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Thu, 11 Dec 2025 15:46:56 -0600
Subject: [PATCH 02/15] update ref docs

---
 .../observability-aws-metrics.md              | 20 +++++++++++++++++++
 .../observability-container-metrics.md        | 13 ++++++++++--
 .../observability-kubernetes-pod-metrics.md   | 12 ++++++++---
 .../create-an-inventory-rule.md               |  5 ++++-
 ...infrastructure-metrics-by-resource-type.md |  9 ++-------
 5 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index f729e64c05..3510f228fe 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -20,6 +20,11 @@ Additional AWS charges for GetMetricData API requests are generated using this m
 
 To analyze EC2 instance metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI only supports EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
+:::
+
 |  |  |
 | --- | --- |
 | **CPU Usage** | Average of `aws.ec2.cpu.total.pct`. |
@@ -33,6 +38,11 @@ To analyze EC2 instance metrics, you can select view filters based on the follow
 
 To analyze S3 bucket metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI only supports S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
+:::
+
 |  |  |
 | --- | --- |
 | **Bucket Size** | Average of `aws.s3_daily_storage.bucket.size.bytes`. |
@@ -46,6 +56,11 @@ To analyze S3 bucket metrics, you can select view filters based on the following
 
 To analyze SQS queue metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI only supports SQS metric data from the [SQS](integration-docs://reference/aws/ec2.md) integration.
+:::
+
 |  |  |
 | --- | --- |
 | **Messages Available** | Max of `aws.sqs.messages.visible`. |
@@ -59,6 +74,11 @@ To analyze SQS queue metrics, you can select view filters based on the following
 
 To analyze RDS database metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI only supports RDS metric data from the [RDS](integration-docs://reference/aws/ec2.md) integration.
+:::
+
 |  |  |
 | --- | --- |
 | **CPU Usage** | Average of `aws.rds.cpu.total.pct`. |
diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index cf4276d046..b377ad8cc7 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -19,6 +19,10 @@ Learn about key container metrics displayed in the Infrastructure UI:
 
 These are the key metrics displayed for Docker containers.
 
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI only supports Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
+:::
 
 ### CPU usage metrics [key-metrics-docker-cpu]
 
@@ -50,9 +54,14 @@ These are the key metrics displayed for Docker containers.
 | **Disk Write IOPS** | Average count of write operations from the device per second.<br><br>**Field Calculation:**  `counter_rate(max(docker.diskio.write.ops), kql='docker.diskio.write.ops: *')`<br> |
 
 
-## Kubernetes container metrics [key-metrics-kubernetes]
+## {{k8s}} container metrics [key-metrics-kubernetes]
 
-These are the key metrics displayed for Kubernetes (containerd) containers.
+These are the key metrics displayed for {{k8s}} (containerd) containers.
+
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI supports {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+:::
 
 
 ### CPU usage metrics [key-metrics-kubernetes-cpu]
diff --git a/reference/observability/observability-kubernetes-pod-metrics.md b/reference/observability/observability-kubernetes-pod-metrics.md
index 4af92c6331..0aa54ebb65 100644
--- a/reference/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/observability/observability-kubernetes-pod-metrics.md
@@ -7,9 +7,15 @@ products:
   - id: observability
 ---
 
-# Kubernetes pod metrics [observability-kubernetes-pod-metrics]
+# {{k8s}} pod metrics [observability-kubernetes-pod-metrics]
+
+To analyze {{k8s}} pod metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
+
+:::{note}
+:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+The Infrastructure UI only supports {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+:::
 
-To analyze Kubernetes pod metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
 |  |  |
 | --- | --- |
@@ -18,4 +24,4 @@ To analyze Kubernetes pod metrics, you can select view filters based on the foll
 | **Inbound Traffic** | Derivative of the maximum of `kubernetes.pod.network.rx.bytes` scaled to a 1 second rate. |
 | **Outbound Traffic** | Derivative of the maximum of `kubernetes.pod.network.tx.bytes` scaled to a 1 second rate. |
 
-For information about the fields used by the Infrastructure UI to display Kubernetes pod metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
+For information about the fields used by the Infrastructure UI to display {{k8s}} pod metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
diff --git a/solutions/observability/incident-management/create-an-inventory-rule.md b/solutions/observability/incident-management/create-an-inventory-rule.md
index ff279f6f55..c1ca69c9fb 100644
--- a/solutions/observability/incident-management/create-an-inventory-rule.md
+++ b/solutions/observability/incident-management/create-an-inventory-rule.md
@@ -48,7 +48,10 @@ In the following example, Kubernetes Pods is the selected inventory type. The co
 :::
 
 ### Supported data
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+```{applies_to}
+stack: ga 9.3
+serverless: ga
+```
 
 The inventory types only support data from the following sources:
 
diff --git a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
index d4ccb73b58..22e6dbb817 100644
--- a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+++ b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
@@ -17,12 +17,7 @@ The **Infrastructure Inventory** page provides a metrics-driven view of your ent
 :::{note}
 :applies_to: {"stack": "ga 9.3", "serverless": "ga"}
 
-The [inventory views](#filter-resources) only support data from the following sources:
-
-* **Hosts**: OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration
-* **{{k8s}} Pods**: [{{k8s}}](integration-docs://reference/kubernetes.md) integration
-* **Docker Containers**: [{{k8s}}](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations
-* **AWS**: [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations
+The Infrastructure Inventory only supports data from specific Elastic {{integrations}} depending on the inventory view. Refer to [Filter the inventory view](#filter-resources) for more information.
 :::
 
 To open the **Infrastructure inventory** page in:
@@ -53,7 +48,7 @@ To get started with your analysis, select the type of resources you want to show
 * **Hosts**: Default view. {applies_to}`stack: ga 9.2`{applies_to}`serverless: ga` Supports data from the OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration.
 * **{{k8s}} Pods**: {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 * **Docker Containers** — Shows *all* container data (not only Docker). {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations.
-* **{{aws}}** — Includes EC2 instances, S3 buckets, RDS databases, and SQS queues. {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations.
+* **{{aws}}** — Includes EC2 instances, S3 buckets, RDS databases, and SQS queues. {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations.
 
 When you hover over each resource in the waffle map, the metrics specific to that resource are displayed.
 

From e11d6421e88f4ee24f0a94cd7f152a58ecdde6a0 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Thu, 11 Dec 2025 15:57:01 -0600
Subject: [PATCH 03/15] fix links

---
 reference/observability/observability-aws-metrics.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index 3510f228fe..60dc0cd3d7 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -58,7 +58,7 @@ To analyze SQS queue metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: {"stack": "ga 9.3", "serverless": "ga"}
-The Infrastructure UI only supports SQS metric data from the [SQS](integration-docs://reference/aws/ec2.md) integration.
+The Infrastructure UI only supports SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
 :::
 
 |  |  |
@@ -76,7 +76,7 @@ To analyze RDS database metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: {"stack": "ga 9.3", "serverless": "ga"}
-The Infrastructure UI only supports RDS metric data from the [RDS](integration-docs://reference/aws/ec2.md) integration.
+The Infrastructure UI only supports RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
 :::
 
 |  |  |

From 8818a5f349f7e8d65c5046e02f8cb5ba775860a3 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Thu, 11 Dec 2025 16:01:34 -0600
Subject: [PATCH 04/15] update wording

---
 .../view-infrastructure-metrics-by-resource-type.md           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
index 22e6dbb817..dc54bc5d80 100644
--- a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+++ b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
@@ -17,7 +17,7 @@ The **Infrastructure Inventory** page provides a metrics-driven view of your ent
 :::{note}
 :applies_to: {"stack": "ga 9.3", "serverless": "ga"}
 
-The Infrastructure Inventory only supports data from specific Elastic {{integrations}} depending on the inventory view. Refer to [Filter the inventory view](#filter-resources) for more information.
+The Infrastructure Inventory only supports data from specific Elastic integrations. Refer to [Filter the inventory view](#filter-resources) for more information.
 :::
 
 To open the **Infrastructure inventory** page in:
@@ -45,7 +45,7 @@ Need help getting started? Follow the steps in [Get started with system metrics]
 
 To get started with your analysis, select the type of resources you want to show in the high-level view. From the **Show** menu, select one of the following:
 
-* **Hosts**: Default view. {applies_to}`stack: ga 9.2`{applies_to}`serverless: ga` Supports data from the OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration.
+* **Hosts**: Default view. {applies_to}`stack: ga 9.2`{applies_to}`serverless: ga` Supports data from OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration.
 * **{{k8s}} Pods**: {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 * **Docker Containers** — Shows *all* container data (not only Docker). {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations.
 * **{{aws}}** — Includes EC2 instances, S3 buckets, RDS databases, and SQS queues. {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations.

From b864b995253232ca9936bf4729358d311e52c901 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Fri, 12 Dec 2025 14:28:22 -0600
Subject: [PATCH 05/15] rearrange info

---
 .../observability-aws-metrics.md              | 13 ++++++++++--
 .../observability-container-metrics.md        | 11 ++++++++++
 .../observability-host-metrics.md             |  9 +++++++++
 .../observability-kubernetes-pod-metrics.md   | 11 ++++++++++
 .../create-an-inventory-rule.md               | 20 ++++++++-----------
 .../infra-and-hosts/analyze-compare-hosts.md  |  1 +
 ...infrastructure-metrics-by-resource-type.md | 14 ++++---------
 7 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index 60dc0cd3d7..cd141d082f 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -14,8 +14,6 @@ Additional AWS charges for GetMetricData API requests are generated using this m
 
 ::::
 
-
-
 ## Monitor EC2 instances [monitor-ec2-instances]
 
 To analyze EC2 instance metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
@@ -88,3 +86,14 @@ The Infrastructure UI only supports RDS metric data from the [RDS](integration-d
 | **Latency** | Average of `aws.rds.latency.dml`. |
 
 For information about the fields used by the Infrastructure UI to display AWS services metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
+
+## Infrastructure UI filtering logic [aws-metrics-filtering]
+```{applies_to}
+stack: ga 9.3
+serverless: ga
+```
+
+The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
+
+* Inventory UI searches - {{aws}} EC2, RDS, S3, SQS: `event.module : aws`
+* Inventory Rule - {{aws}} EC2, RDS, S3, SQS: `event.module : aws`
\ No newline at end of file
diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index b377ad8cc7..b4cf2d31b6 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -76,3 +76,14 @@ The Infrastructure UI supports {{k8s}} container metric data from the [{{k8s}}](
 | Metric | Description |
 | --- | --- |
 | **Memory Usage (%)** | Average memory usage for the container.<br><br>**Field Calculation:** `average(kubernetes.container.memory.usage.limit.pct)`<br> |
+
+## Infrastructure UI filtering logic [container-metrics-filtering]
+```{applies_to}
+stack: ga 9.3
+serverless: ga
+```
+
+The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
+
+* Inventory UI searches - Docker Containers: `event.module: 'docker'` OR `event.module: 'kubernetes'` OR `event.module: 'system'`
+* Inventory Rule - Docker Containers: `event.module: 'docker'` OR `event.module: 'kubernetes'` OR `event.module: 'system'`
\ No newline at end of file
diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index d6e7abc436..597312c88f 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -173,4 +173,13 @@ Refer to the following sections for host metrics and field calculation formulas
 | **Disk Write IOPS** | Average count of write operations from the device per second.<br><br>**Field Calculation**: `counter_rate(max(system.disk.operations, kql='attributes.direction: write'))`<br> |
 | **Disk Write Throughput** | Average number of bytes written from the device per second.<br><br>**Field Calculation**: `counter_rate(max(system.disk.io, kql='attributes.direction: write'))')`<br> |
 
+## Infrastructure UI filtering logic [host-metrics-filtering]
+```{applies_to}
+stack: ga 9.2
+serverless: ga
+```
 
+Data without the following attributes will not work in the Infrastructure UIs:
+
+* Inventory UI searches - Elastic System integration: event.module: 'system' OR metricset.module: 'system'
+* Inventory Rule - Elastic System integration: event.module: 'system' OR metricset.module: 'system'
\ No newline at end of file
diff --git a/reference/observability/observability-kubernetes-pod-metrics.md b/reference/observability/observability-kubernetes-pod-metrics.md
index 0aa54ebb65..df3aca75d4 100644
--- a/reference/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/observability/observability-kubernetes-pod-metrics.md
@@ -25,3 +25,14 @@ The Infrastructure UI only supports {{k8s}} pod metric data from the [{{k8s}}](i
 | **Outbound Traffic** | Derivative of the maximum of `kubernetes.pod.network.tx.bytes` scaled to a 1 second rate. |
 
 For information about the fields used by the Infrastructure UI to display {{k8s}} pod metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
+
+## Infrastructure UI filtering logic [k8s-pod-metrics-filtering]
+```{applies_to}
+stack: ga 9.3
+serverless: ga
+```
+
+The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
+
+* Inventory UI searches - Kubernetes Pods: `event.module : kubernetes`
+* Inventory Rule - Kubernetes Pods: `event.module : kubernetes`
\ No newline at end of file
diff --git a/solutions/observability/incident-management/create-an-inventory-rule.md b/solutions/observability/incident-management/create-an-inventory-rule.md
index c1ca69c9fb..b372fdfcbb 100644
--- a/solutions/observability/incident-management/create-an-inventory-rule.md
+++ b/solutions/observability/incident-management/create-an-inventory-rule.md
@@ -47,18 +47,14 @@ In the following example, Kubernetes Pods is the selected inventory type. The co
 :screenshot:
 :::
 
-### Supported data
-```{applies_to}
-stack: ga 9.3
-serverless: ga
-```
-
-The inventory types only support data from the following sources:
-
-* **Hosts**: OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration
-* **Kubernetes Pods**: [Kubernetes](integration-docs://reference/kubernetes.md) integration
-* **Docker Containers**: [Kubernetes](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations
-* **AWS**: [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations
+### Supported data by inventory type
+
+For more on the data supported by each inventory type, refer to the following references:
+
+* [Hosts](../../../reference/observability/observability-host-metrics.md)
+* [{{k8s}} Pods](../../../reference/observability/observability-kubernetes-pod-metrics.md)
+* [Docker Containers](../../../reference/observability/observability-container-metrics.md)
+* [AWS](../../../reference/observability/observability-aws-metrics.md)
 
 ## Add actions [action-types-infrastructure]
 
diff --git a/solutions/observability/infra-and-hosts/analyze-compare-hosts.md b/solutions/observability/infra-and-hosts/analyze-compare-hosts.md
index 1658716995..1b6c0a0484 100644
--- a/solutions/observability/infra-and-hosts/analyze-compare-hosts.md
+++ b/solutions/observability/infra-and-hosts/analyze-compare-hosts.md
@@ -163,6 +163,7 @@ serverless: ga
 
 The **Schema** menu shows the available data collection schemas for the current query. If host data from both the Elastic System integration and OpenTelemetry is available, the schema defaults to **OpenTelemetry**. Select **Elastic System Integration** to see host data collected by the Elastic System integration.
 
+Refer to [Host metrics](../../../reference/observability/observability-host-metrics.md) for more on supported data types for OpenTelemetry and the Elastic System integration.
 
 ## View host details [view-host-details]
 
diff --git a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
index dc54bc5d80..0df3c90381 100644
--- a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+++ b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
@@ -14,12 +14,6 @@ products:
 
 The **Infrastructure Inventory** page provides a metrics-driven view of your entire infrastructure grouped by the resources you are monitoring. All monitored resources emitting a core set of infrastructure metrics are displayed to give you a quick view of the overall health of your infrastructure.
 
-:::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
-
-The Infrastructure Inventory only supports data from specific Elastic integrations. Refer to [Filter the inventory view](#filter-resources) for more information.
-:::
-
 To open the **Infrastructure inventory** page in:
 - **Elastic Stack,** find **Infrastructure** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
 - **Serverless,** go to **Infrastructure inventory** in your Observability Serverless project.
@@ -45,10 +39,10 @@ Need help getting started? Follow the steps in [Get started with system metrics]
 
 To get started with your analysis, select the type of resources you want to show in the high-level view. From the **Show** menu, select one of the following:
 
-* **Hosts**: Default view. {applies_to}`stack: ga 9.2`{applies_to}`serverless: ga` Supports data from OpenTelemetry and the Elastic [System](integration-docs://reference/system/index.md) integration.
-* **{{k8s}} Pods**: {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
-* **Docker Containers** — Shows *all* container data (not only Docker). {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [{{k8s}}](integration-docs://reference/kubernetes.md), [System](integration-docs://reference/system/index.md), and [Docker](integration-docs://reference/docker.md) integrations.
-* **{{aws}}** — Includes EC2 instances, S3 buckets, RDS databases, and SQS queues. {applies_to}`stack: ga 9.3`{applies_to}`serverless: ga` Supports data from the [EC2](integration-docs://reference/aws/ec2.md), [S3](integration-docs://reference/aws/s3.md), [RDS](integration-docs://reference/aws/rds.md), and [SQS](integration-docs://reference/aws/sqs.md) integrations.
+* **Hosts**: the default view. Refer to [Host metrics](../../../reference/observability/observability-host-metrics.md) for more on supported data types for this view.
+* **Kubernetes Pods**: Refer to [{{k8s}} pod metrics](../../../reference/observability/observability-kubernetes-pod-metrics.md) for more on supported data types for this view.
+* **Docker Containers**: shows *all* containers, not only Docker containers. Refer to [Container metrics](../../../reference/observability/observability-container-metrics.md) for more on supported data types for this view.
+* **AWS**: includes EC2 instances, S3 buckets, RDS databases, and SQS queues. Refer to [AWS metrics](../../../reference/observability/observability-aws-metrics.md) for more on supported data types for this view.
 
 When you hover over each resource in the waffle map, the metrics specific to that resource are displayed.
 

From 2dd92358911acc818e387752f2e77b605e6f9f31 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Fri, 12 Dec 2025 14:35:24 -0600
Subject: [PATCH 06/15] fix host metrics wording

---
 reference/observability/observability-host-metrics.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index 597312c88f..5abed36b30 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -179,7 +179,7 @@ stack: ga 9.2
 serverless: ga
 ```
 
-Data without the following attributes will not work in the Infrastructure UIs:
+The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
 
 * Inventory UI searches - Elastic System integration: event.module: 'system' OR metricset.module: 'system'
 * Inventory Rule - Elastic System integration: event.module: 'system' OR metricset.module: 'system'
\ No newline at end of file

From 7f82f7a9073f2e96a0b1c7deaaac255bbced53bc Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Fri, 12 Dec 2025 15:42:32 -0600
Subject: [PATCH 07/15] fix applies to tags

---
 reference/observability/observability-aws-metrics.md | 12 +++++++-----
 .../observability/observability-container-metrics.md |  8 +++++---
 .../observability/observability-host-metrics.md      |  3 +++
 .../observability-kubernetes-pod-metrics.md          |  6 ++++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index cd141d082f..6bcfb8657f 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-aws-metrics.html
   - https://www.elastic.co/guide/en/observability/current/aws-metrics.html
+applies_to:
+  stack: ga
+  serverless: ga
 products:
   - id: cloud-serverless
   - id: observability
@@ -19,7 +22,7 @@ Additional AWS charges for GetMetricData API requests are generated using this m
 To analyze EC2 instance metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI only supports EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
 :::
 
@@ -37,7 +40,7 @@ The Infrastructure UI only supports EC2 metric data from the [EC2](integration-d
 To analyze S3 bucket metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI only supports S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
 :::
 
@@ -55,7 +58,7 @@ The Infrastructure UI only supports S3 metric data from the [S3](integration-doc
 To analyze SQS queue metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI only supports SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
 :::
 
@@ -73,7 +76,7 @@ The Infrastructure UI only supports SQS metric data from the [SQS](integration-d
 To analyze RDS database metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI only supports RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
 :::
 
@@ -90,7 +93,6 @@ For information about the fields used by the Infrastructure UI to display AWS se
 ## Infrastructure UI filtering logic [aws-metrics-filtering]
 ```{applies_to}
 stack: ga 9.3
-serverless: ga
 ```
 
 The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index b4cf2d31b6..8debda4ea4 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-container-metrics.html
   - https://www.elastic.co/guide/en/observability/current/container-metrics.html
+applies_to:
+  stack: ga
+  serverless: ga
 products:
   - id: cloud-serverless
   - id: observability
@@ -20,7 +23,7 @@ Learn about key container metrics displayed in the Infrastructure UI:
 These are the key metrics displayed for Docker containers.
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI only supports Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
 :::
 
@@ -59,7 +62,7 @@ The Infrastructure UI only supports Docker container metric data from the [Docke
 These are the key metrics displayed for {{k8s}} (containerd) containers.
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI supports {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 :::
 
@@ -80,7 +83,6 @@ The Infrastructure UI supports {{k8s}} container metric data from the [{{k8s}}](
 ## Infrastructure UI filtering logic [container-metrics-filtering]
 ```{applies_to}
 stack: ga 9.3
-serverless: ga
 ```
 
 The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index 5abed36b30..08b5ab1c55 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-host-metrics.html
   - https://www.elastic.co/guide/en/observability/current/host-metrics.html
+applies_to:
+  stack: ga
+  serverless: ga
 products:
   - id: cloud-serverless
   - id: observability
diff --git a/reference/observability/observability-kubernetes-pod-metrics.md b/reference/observability/observability-kubernetes-pod-metrics.md
index df3aca75d4..1762aeae50 100644
--- a/reference/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/observability/observability-kubernetes-pod-metrics.md
@@ -2,6 +2,9 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/serverless/current/observability-kubernetes-pod-metrics.html
   - https://www.elastic.co/guide/en/observability/current/kubernetes-pod-metrics.html
+applies_to:
+  stack: ga
+  serverless: ga
 products:
   - id: cloud-serverless
   - id: observability
@@ -12,7 +15,7 @@ products:
 To analyze {{k8s}} pod metrics, you can select view filters based on the following predefined metrics, or you can add [custom metrics](/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md#custom-metrics).
 
 :::{note}
-:applies_to: {"stack": "ga 9.3", "serverless": "ga"}
+:applies_to: stack: ga 9.3
 The Infrastructure UI only supports {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 :::
 
@@ -29,7 +32,6 @@ For information about the fields used by the Infrastructure UI to display {{k8s}
 ## Infrastructure UI filtering logic [k8s-pod-metrics-filtering]
 ```{applies_to}
 stack: ga 9.3
-serverless: ga
 ```
 
 The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:

From 148badbba70ebc402214e076ca8bdc269f5123a5 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 09:52:20 -0600
Subject: [PATCH 08/15] review updates

---
 .../observability-aws-metrics.md              | 72 +++++++++++++++----
 .../observability-container-metrics.md        | 26 ++++++-
 .../observability-host-metrics.md             | 22 ++++++
 .../observability-kubernetes-pod-metrics.md   | 26 +++----
 ...infrastructure-metrics-by-resource-type.md | 12 ++++
 5 files changed, 128 insertions(+), 30 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index 6bcfb8657f..5268d9f0e1 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -23,9 +23,22 @@ To analyze EC2 instance metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI only supports EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
 :::
 
+### Entity definition [monitor-ec2-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |  |
+| --- | --- | --- |
+| **Filter** | `event.module : aws` | Used to filter relevant data. |
+| **Identifier** | `cloud.instance.id` | Used to identify each entity |
+| **Display value** | `cloud.instance.name` | Used as a display friendly value |
+
+### Metrics [monitor-ec2-metrics]
+
 |  |  |
 | --- | --- |
 | **CPU Usage** | Average of `aws.ec2.cpu.total.pct`. |
@@ -41,9 +54,22 @@ To analyze S3 bucket metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI only supports S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
 :::
 
+### Entity definition [monitor-s3-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |
+| --- | --- |
+| **Filter** | `event.module : aws` | Used to filter relevant data. |
+| **Identifier** | `aws.s3.bucket.name` | Used to identify each entity |
+| **Display value** | `aws.s3.bucket.name` | Used as a display friendly value |
+
+### Metrics [monitor-s3-metrics]
+
 |  |  |
 | --- | --- |
 | **Bucket Size** | Average of `aws.s3_daily_storage.bucket.size.bytes`. |
@@ -59,9 +85,22 @@ To analyze SQS queue metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI only supports SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
 :::
 
+### Entity definition [monitor-sqs-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |
+| --- | --- |
+| **Filter** | `event.module : aws` | Used to filter relevant data. |
+| **Identifier** | `aws.sqs.queue.name` | Used to identify each entity. |
+| **Display value** | `aws.sqs.queue.name` | Used as a display friendly value. |
+
+### Metrics [monitor-sqs-metrics]
+
 |  |  |
 | --- | --- |
 | **Messages Available** | Max of `aws.sqs.messages.visible`. |
@@ -77,9 +116,22 @@ To analyze RDS database metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI only supports RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
 :::
 
+### Entity definition [monitor-rds-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |
+| --- | --- |
+| **Filter** | `event.module : aws` | Used to filter relevant data. |
+| **Identifier** | `aws.rds.db_instance.arn` | Used to identify each entity. |
+| **Display value** | `aws.rds.db_instance.identifier` | Used as a display friendly value. |
+
+### Metrics [monitor-rds-metrics]
+
 |  |  |
 | --- | --- |
 | **CPU Usage** | Average of `aws.rds.cpu.total.pct`. |
@@ -88,14 +140,4 @@ The Infrastructure UI only supports RDS metric data from the [RDS](integration-d
 | **Active Transactions** | Average of `aws.rds.transactions.active`. |
 | **Latency** | Average of `aws.rds.latency.dml`. |
 
-For information about the fields used by the Infrastructure UI to display AWS services metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
-
-## Infrastructure UI filtering logic [aws-metrics-filtering]
-```{applies_to}
-stack: ga 9.3
-```
-
-The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
-
-* Inventory UI searches - {{aws}} EC2, RDS, S3, SQS: `event.module : aws`
-* Inventory Rule - {{aws}} EC2, RDS, S3, SQS: `event.module : aws`
\ No newline at end of file
+For information about the fields used by the Infrastructure UI to display AWS services metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
\ No newline at end of file
diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index 8debda4ea4..39f2500ffd 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -17,16 +17,26 @@ Learn about key container metrics displayed in the Infrastructure UI:
 * [Docker](#key-metrics-docker)
 * [Kubernetes](#key-metrics-kubernetes)
 
-
 ## Docker container metrics [key-metrics-docker]
 
 These are the key metrics displayed for Docker containers.
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI only supports Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
 :::
 
+### Entity definition [monitor-docker-container-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |  |
+| --- | --- | --- |
+| **Filter** | `event.module : "docker"` | Used to filter relevant data. |
+| **Identifier** | `container.id` | Used to identify each entity. |
+| **Display value** | `container.name` | Used as a display friendly value. |
+
 ### CPU usage metrics [key-metrics-docker-cpu]
 
 | Metric | Description |
@@ -63,9 +73,19 @@ These are the key metrics displayed for {{k8s}} (containerd) containers.
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI supports {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 :::
 
+### Entity definition [monitor-k8s-container-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |  |
+| --- | --- | --- |
+| **Filter** | `event.module : "kubernetes"` | Used to filter relevant data. |
+| **Identifier** | `container.id` | Used to identify each entity. |
+| **Display value** | `container.name` | Used as a display friendly value. |
 
 ### CPU usage metrics [key-metrics-kubernetes-cpu]
 
diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index 08b5ab1c55..eaf4119d9c 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -30,6 +30,17 @@ Refer to the following sections for host metrics and field calculation formulas
 * [Disk](#key-metrics-network)
 * [Legacy](#legacy-metrics)
 
+### System integration entity definition [monitor-rds-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |
+| --- | --- |
+| **Filter** | `event.module: 'system'` or `metricset.module: 'system'` | Used to filter relevant data. |
+| **Identifier** | `host.name` | Used to identify each entity. |
+| **Display value** | `host.name` | Used as a display friendly value. |
+
 ### Hosts metrics [key-metrics-hosts]
 
 | Metric | Description |
@@ -117,6 +128,17 @@ Refer to the following sections for host metrics and field calculation formulas
 * [Network](#otel-metrics-network)
 * [Disk](#otel-metrics-network)
 
+### OpenTelemetry entity definition [monitor-rds-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |
+| --- | --- |
+| **Filter** | `data_stream.dataset: 'hostmetricsreceiver.otel'` | Used to filter relevant data. |
+| **Identifier** | `host.name` | Used to identify each entity. |
+| **Display value** | `host.name` | Used as a display friendly value. |
+
 ### OpenTelemetry hosts metrics [otel-metrics-hosts]
 
 | Metric | Description |
diff --git a/reference/observability/observability-kubernetes-pod-metrics.md b/reference/observability/observability-kubernetes-pod-metrics.md
index 1762aeae50..a5ca11d6b5 100644
--- a/reference/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/observability/observability-kubernetes-pod-metrics.md
@@ -16,9 +16,21 @@ To analyze {{k8s}} pod metrics, you can select view filters based on the followi
 
 :::{note}
 :applies_to: stack: ga 9.3
-The Infrastructure UI only supports {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 :::
 
+## Entity definition [monitor-k8s-pods-entity]
+```{applies_to}
+stack: ga 9.3
+```
+
+|  |  |  |
+| --- | --- | --- |
+| **Filter** | `event.module: "kubernetes"` | Used to filter relevant data. |
+| **Identifier** | `kubernetes.pod.uid` | Used to identify each entity. |
+| **Display value** | `kubernetes.pod.name` | Used as a display friendly value. |
+
+## Metrics [monitor-k8s-pods-metrics]
 
 |  |  |
 | --- | --- |
@@ -27,14 +39,4 @@ The Infrastructure UI only supports {{k8s}} pod metric data from the [{{k8s}}](i
 | **Inbound Traffic** | Derivative of the maximum of `kubernetes.pod.network.rx.bytes` scaled to a 1 second rate. |
 | **Outbound Traffic** | Derivative of the maximum of `kubernetes.pod.network.tx.bytes` scaled to a 1 second rate. |
 
-For information about the fields used by the Infrastructure UI to display {{k8s}} pod metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
-
-## Infrastructure UI filtering logic [k8s-pod-metrics-filtering]
-```{applies_to}
-stack: ga 9.3
-```
-
-The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
-
-* Inventory UI searches - Kubernetes Pods: `event.module : kubernetes`
-* Inventory Rule - Kubernetes Pods: `event.module : kubernetes`
\ No newline at end of file
+For information about the fields used by the Infrastructure UI to display {{k8s}} pod metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
\ No newline at end of file
diff --git a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
index 0df3c90381..8342989ac4 100644
--- a/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
+++ b/solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md
@@ -59,6 +59,10 @@ To examine the metrics for a specific time, use the time filter to select the da
 
 ## View host metrics [analyze-hosts-inventory]
 
+:::{note}
+Refer to [Host metrics](../../../reference/observability/observability-host-metrics.md) for more on supported data types for this view.
+:::
+
 By default the **Infrastructure Inventory** page displays a waffle map that shows the hosts you are monitoring and the current CPU usage for each host. Alternatively, you can click the **Table view** icon ![table view icon](/solutions/images/observability-table-view-icon.png "") to switch to a table view.
 
 Without leaving the **Infrastructure Inventory** page, you can view enhanced metrics relating to each host running in your infrastructure. On the waffle map, select a host to display the host details overlay.
@@ -262,6 +266,10 @@ These metrics are also available when viewing hosts on the **Hosts** page.
 
 ## View container metrics [analyze-containers-inventory]
 
+:::{note}
+Refer to [Container metrics](../../../reference/observability/observability-container-metrics.md) for more on supported data types for this view.
+:::
+
 When you select **Docker containers**, the **Infrastructure inventory** page displays a waffle map that shows the containers you are monitoring and the current CPU usage for each container. Alternatively, you can click the **Table view** icon ![Table view icon](/solutions/images/serverless-table-view-icon.png "") to switch to a table view.
 
 Without leaving the **Infrastructure inventory** page, you can view enhanced metrics relating to each container running in your infrastructure.
@@ -352,6 +360,10 @@ To view the logs in the {{logs-app}} for a detailed analysis, click **Open in Lo
 
 ## View metrics for other resources [analyze-resource-metrics]
 
+:::{note}
+Refer to [{{k8s}} pod metrics](../../../reference/observability/observability-kubernetes-pod-metrics.md) and [AWS metrics](../../../reference/observability/observability-aws-metrics.md) for more on supported data types for this view.
+:::
+
 When you have searched and filtered for a specific resource, you can drill down to analyze the metrics relating to it. For example, when viewing Kubernetes Pods in the high-level view, click the Pod you want to analyze and select **Kubernetes Pod metrics** to see detailed metrics:
 
 :::{image} /solutions/images/observability-pod-metrics.png

From 40e365dedaad46b09c0709e5b746e1be1d7b2ab0 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 09:59:24 -0600
Subject: [PATCH 09/15] remove filtering logic sections

---
 .../observability-container-metrics.md              | 12 +-----------
 .../observability/observability-host-metrics.md     | 13 +------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index 39f2500ffd..bce8a6c9cb 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -98,14 +98,4 @@ stack: ga 9.3
 
 | Metric | Description |
 | --- | --- |
-| **Memory Usage (%)** | Average memory usage for the container.<br><br>**Field Calculation:** `average(kubernetes.container.memory.usage.limit.pct)`<br> |
-
-## Infrastructure UI filtering logic [container-metrics-filtering]
-```{applies_to}
-stack: ga 9.3
-```
-
-The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
-
-* Inventory UI searches - Docker Containers: `event.module: 'docker'` OR `event.module: 'kubernetes'` OR `event.module: 'system'`
-* Inventory Rule - Docker Containers: `event.module: 'docker'` OR `event.module: 'kubernetes'` OR `event.module: 'system'`
\ No newline at end of file
+| **Memory Usage (%)** | Average memory usage for the container.<br><br>**Field Calculation:** `average(kubernetes.container.memory.usage.limit.pct)`<br> |
\ No newline at end of file
diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index eaf4119d9c..844328e765 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -196,15 +196,4 @@ stack: ga 9.3
 | **Disk Usage - Available (%)** | Percentage of disk space available.<br><br>**Field Calculation**: `average(system.filesystem.usage, kql='state: free')`<br> |
 | **Disk Usage - Used (%)** | Percentage of disk space used. <br><br>**Field Calculation**: `1 - sum(metrics.system.filesystem.usage, kql='state: free') / sum(metrics.system.filesystem.usage)`<br> |
 | **Disk Write IOPS** | Average count of write operations from the device per second.<br><br>**Field Calculation**: `counter_rate(max(system.disk.operations, kql='attributes.direction: write'))`<br> |
-| **Disk Write Throughput** | Average number of bytes written from the device per second.<br><br>**Field Calculation**: `counter_rate(max(system.disk.io, kql='attributes.direction: write'))')`<br> |
-
-## Infrastructure UI filtering logic [host-metrics-filtering]
-```{applies_to}
-stack: ga 9.2
-serverless: ga
-```
-
-The Infrastructure UI requires the following attributes to work correctly. Data that does not include them will not appear in these views:
-
-* Inventory UI searches - Elastic System integration: event.module: 'system' OR metricset.module: 'system'
-* Inventory Rule - Elastic System integration: event.module: 'system' OR metricset.module: 'system'
\ No newline at end of file
+| **Disk Write Throughput** | Average number of bytes written from the device per second.<br><br>**Field Calculation**: `counter_rate(max(system.disk.io, kql='attributes.direction: write'))')`<br> |
\ No newline at end of file

From 14856e1f0561b51a59b95c0fb996c88bc9b3a75e Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 10:38:22 -0600
Subject: [PATCH 10/15] update headings

---
 reference/observability/observability-host-metrics.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index 844328e765..c7e53663cd 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -30,7 +30,7 @@ Refer to the following sections for host metrics and field calculation formulas
 * [Disk](#key-metrics-network)
 * [Legacy](#legacy-metrics)
 
-### System integration entity definition [monitor-rds-entity]
+### Entity definition [monitor-rds-entity]
 ```{applies_to}
 stack: ga 9.3
 ```
@@ -128,7 +128,7 @@ Refer to the following sections for host metrics and field calculation formulas
 * [Network](#otel-metrics-network)
 * [Disk](#otel-metrics-network)
 
-### OpenTelemetry entity definition [monitor-rds-entity]
+### Entity definition [monitor-rds-entity]
 ```{applies_to}
 stack: ga 9.3
 ```

From 5b9c414a73b2a814825737ea650eab9487de6525 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 10:40:32 -0600
Subject: [PATCH 11/15] update headings

---
 reference/observability/observability-host-metrics.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index c7e53663cd..a218cb9a8f 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -128,7 +128,7 @@ Refer to the following sections for host metrics and field calculation formulas
 * [Network](#otel-metrics-network)
 * [Disk](#otel-metrics-network)
 
-### Entity definition [monitor-rds-entity]
+### Entity definition [opentelemetry-host-entity]
 ```{applies_to}
 stack: ga 9.3
 ```

From 6a8e89a2de62bfc3d4bef3aa8862454349b3e2d2 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 10:46:16 -0600
Subject: [PATCH 12/15] update headings

---
 .../observability/observability-host-metrics.md    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/reference/observability/observability-host-metrics.md b/reference/observability/observability-host-metrics.md
index a218cb9a8f..4113d1514d 100644
--- a/reference/observability/observability-host-metrics.md
+++ b/reference/observability/observability-host-metrics.md
@@ -41,7 +41,7 @@ stack: ga 9.3
 | **Identifier** | `host.name` | Used to identify each entity. |
 | **Display value** | `host.name` | Used as a display friendly value. |
 
-### Hosts metrics [key-metrics-hosts]
+### Hosts count [key-metrics-hosts]
 
 | Metric | Description |
 | --- | --- |
@@ -139,13 +139,13 @@ stack: ga 9.3
 | **Identifier** | `host.name` | Used to identify each entity. |
 | **Display value** | `host.name` | Used as a display friendly value. |
 
-### OpenTelemetry hosts metrics [otel-metrics-hosts]
+### Hosts count [otel-metrics-hosts]
 
 | Metric | Description |
 | --- | --- |
 | **Hosts** | Number of hosts returned by your search criteria.<br><br>**Field Calculation**: `unique_count(host.name)`<br> |
 
-### OpenTelemetry CPU usage metrics [otel-metrics-cpu]
+### CPU usage metrics [otel-metrics-cpu]
 
 | Metric | Description |
 | --- | --- |
@@ -162,7 +162,7 @@ stack: ga 9.3
 | **Load (15m)** | 15 minute load average.<br><br>Load average gives an indication of the number of threads that are runnable (either busy running on CPU, waiting to run, or waiting for a blocking IO operation to complete).<br><br>**Field Calculation**: `average(metrics.system.cpu.load_average.15m)`<br> |
 | **Normalized Load** | 1 minute load average normalized by the number of CPU cores.<br><br>Load average gives an indication of the number of threads that are runnable (either busy running on CPU, waiting to run, or waiting for a blocking IO operation to complete).<br><br>100% means the 1 minute load average is equal to the number of CPU cores of the host.<br><br>Taking the example of a 32 CPU cores host, if the 1 minute load average is 32, the value reported here is 100%. If the 1 minute load average is 48, the value reported here is 150%.<br><br>**Field Calculation**: `average(metrics.system.cpu.load_average.1m) / max(metrics.system.cpu.logical.count)`<br> |
 
-### OpenTelemetry memory metrics [otel-metrics-memory]
+### Memory metrics [otel-metrics-memory]
 
 | Metric | Description |
 | --- | --- |
@@ -173,20 +173,20 @@ stack: ga 9.3
 | **Memory Usage (%)** | Percentage of main memory usage excluding page cache.<br><br>This includes resident memory for all processes plus memory used by the kernel structures and code apart from the page cache.<br><br>A high level indicates a situation of memory saturation for the host. For example, 100% means the main memory is entirely filled with memory that can’t be reclaimed, except by swapping out.<br><br>**Field Calculation**: `average(system.memory.utilization, kql='state: used') + average(system.memory.utilization, kql='state: buffered') + average(system.memory.utilization, kql='state: slab_reclaimable') + average(system.memory.utilization, kql='state: slab_unreclaimable')`<br> |
 | **Memory Used** | Main memory usage excluding page cache.<br><br>**Field Calculation**: `average(metrics.system.memory.usage, kql='state: used') + average(metrics.system.memory.usage, kql='state: buffered') + average(metrics.system.memory.usage, kql='state: slab_reclaimable') + average(metrics.system.memory.usage, kql='state: slab_unreclaimable')`<br> |
 
-### OpenTelemetry log metrics [otel-metrics-log]
+### Log metrics [otel-metrics-log]
 
 | Metric | Description |
 | --- | --- |
 | **Log Rate** | Derivative of the cumulative sum of the document count scaled to a 1 second rate. This metric relies on the same indices as the logs.<br><br>**Field Calculation**: `cumulative_sum(doc_count)`<br> |
 
-### OpenTelemetry network metrics [otel-metrics-network]
+### Network metrics [otel-metrics-network]
 
 | Metric | Description |
 | --- | --- |
 | **Network Inbound (RX)** | Number of bytes that have been received per second on the public interfaces of the hosts.<br><br>**Field Calculation**: `8 * counter_rate(max(metrics.system.network.io, kql='direction: receive')))`<br> |
 | **Network Outbound (TX)** | Number of bytes that have been sent per second on the public interfaces of the hosts.<br><br>**Field Calculation**: `8 * counter_rate(max(metrics.system.network.io, kql='direction: transmit'))`<br> |
 
-### OpenTelemetry disk metrics [otel-metrics-disk]
+### Disk metrics [otel-metrics-disk]
 
 | Metric | Description |
 | --- | --- |

From 500c86a269373820bb534302d967ffb52f0f1d9a Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 13:01:54 -0600
Subject: [PATCH 13/15] update wording

---
 reference/observability/observability-aws-metrics.md      | 8 ++++----
 .../observability/observability-container-metrics.md      | 4 ++--
 .../observability/observability-kubernetes-pod-metrics.md | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index 5268d9f0e1..37d318d446 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -23,7 +23,7 @@ To analyze EC2 instance metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
 :::
 
 ### Entity definition [monitor-ec2-entity]
@@ -54,7 +54,7 @@ To analyze S3 bucket metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
 :::
 
 ### Entity definition [monitor-s3-entity]
@@ -85,7 +85,7 @@ To analyze SQS queue metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
 :::
 
 ### Entity definition [monitor-sqs-entity]
@@ -116,7 +116,7 @@ To analyze RDS database metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
 :::
 
 ### Entity definition [monitor-rds-entity]
diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index bce8a6c9cb..1bfc93e674 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -23,7 +23,7 @@ These are the key metrics displayed for Docker containers.
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
 :::
 
 ### Entity definition [monitor-docker-container-entity]
@@ -73,7 +73,7 @@ These are the key metrics displayed for {{k8s}} (containerd) containers.
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 :::
 
 ### Entity definition [monitor-k8s-container-entity]
diff --git a/reference/observability/observability-kubernetes-pod-metrics.md b/reference/observability/observability-kubernetes-pod-metrics.md
index a5ca11d6b5..052220b1be 100644
--- a/reference/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/observability/observability-kubernetes-pod-metrics.md
@@ -16,7 +16,7 @@ To analyze {{k8s}} pod metrics, you can select view filters based on the followi
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and respective [Inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
 :::
 
 ## Entity definition [monitor-k8s-pods-entity]

From 89d682832c11ad875284b9f251f9b19445e086c9 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 14:33:39 -0600
Subject: [PATCH 14/15] review updates

---
 .../observability/observability-aws-metrics.md | 18 +++++++++---------
 .../observability-container-metrics.md         |  4 ++--
 .../observability-kubernetes-pod-metrics.md    |  2 +-
 .../create-an-inventory-rule.md                |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index 37d318d446..c527408c9e 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -23,7 +23,7 @@ To analyze EC2 instance metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support EC2 metric data from the [EC2](integration-docs://reference/aws/ec2.md) integration.
+For EC2 instances, The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metrics collected by the [EC2 integration](integration-docs://reference/aws/ec2.md).
 :::
 
 ### Entity definition [monitor-ec2-entity]
@@ -34,8 +34,8 @@ stack: ga 9.3
 |  |  |  |
 | --- | --- | --- |
 | **Filter** | `event.module : aws` | Used to filter relevant data. |
-| **Identifier** | `cloud.instance.id` | Used to identify each entity |
-| **Display value** | `cloud.instance.name` | Used as a display friendly value |
+| **Identifier** | `cloud.instance.id` | Used to identify each entity. |
+| **Display value** | `cloud.instance.name` | Used as a display friendly value. |
 
 ### Metrics [monitor-ec2-metrics]
 
@@ -54,7 +54,7 @@ To analyze S3 bucket metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support S3 metric data from the [S3](integration-docs://reference/aws/s3.md) integration.
+For S3 buckets, the [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric data collected by the [S3 integration](integration-docs://reference/aws/s3.md).
 :::
 
 ### Entity definition [monitor-s3-entity]
@@ -65,8 +65,8 @@ stack: ga 9.3
 |  |  |
 | --- | --- |
 | **Filter** | `event.module : aws` | Used to filter relevant data. |
-| **Identifier** | `aws.s3.bucket.name` | Used to identify each entity |
-| **Display value** | `aws.s3.bucket.name` | Used as a display friendly value |
+| **Identifier** | `aws.s3.bucket.name` | Used to identify each entity. |
+| **Display value** | `aws.s3.bucket.name` | Used as a display friendly value. |
 
 ### Metrics [monitor-s3-metrics]
 
@@ -85,7 +85,7 @@ To analyze SQS queue metrics, you can select view filters based on the following
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support SQS metric data from the [SQS](integration-docs://reference/aws/sqs.md) integration.
+For SQS queues, the [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric data collected by the [SQS integration](integration-docs://reference/aws/sqs.md).
 :::
 
 ### Entity definition [monitor-sqs-entity]
@@ -116,7 +116,7 @@ To analyze RDS database metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support RDS metric data from the [RDS](integration-docs://reference/aws/rds.md) integration.
+For RDS databases, the [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric data collected by the [RDS](integration-docs://reference/aws/rds.md) integration.
 :::
 
 ### Entity definition [monitor-rds-entity]
@@ -140,4 +140,4 @@ stack: ga 9.3
 | **Active Transactions** | Average of `aws.rds.transactions.active`. |
 | **Latency** | Average of `aws.rds.latency.dml`. |
 
-For information about the fields used by the Infrastructure UI to display AWS services metrics, see the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
\ No newline at end of file
+For information about the fields used by the Infrastructure UI to display AWS services metrics, refer to the [Infrastructure app fields](/reference/observability/fields-and-object-schemas.md).
\ No newline at end of file
diff --git a/reference/observability/observability-container-metrics.md b/reference/observability/observability-container-metrics.md
index 1bfc93e674..8e4dc586cd 100644
--- a/reference/observability/observability-container-metrics.md
+++ b/reference/observability/observability-container-metrics.md
@@ -23,7 +23,7 @@ These are the key metrics displayed for Docker containers.
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support Docker container metric data from the [Docker](integration-docs://reference/docker.md) integration.
+For Docker container metrics, the [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric data collected by the [Docker integration](integration-docs://reference/docker.md).
 :::
 
 ### Entity definition [monitor-docker-container-entity]
@@ -73,7 +73,7 @@ These are the key metrics displayed for {{k8s}} (containerd) containers.
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} container metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+For {{k8s}} container metrics, the [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric data collected by the [{{k8s}} integration](integration-docs://reference/kubernetes.md).
 :::
 
 ### Entity definition [monitor-k8s-container-entity]
diff --git a/reference/observability/observability-kubernetes-pod-metrics.md b/reference/observability/observability-kubernetes-pod-metrics.md
index 052220b1be..aee350cc96 100644
--- a/reference/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/observability/observability-kubernetes-pod-metrics.md
@@ -16,7 +16,7 @@ To analyze {{k8s}} pod metrics, you can select view filters based on the followi
 
 :::{note}
 :applies_to: stack: ga 9.3
-The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support {{k8s}} pod metric data from the [{{k8s}}](integration-docs://reference/kubernetes.md) integration.
+For {{k8s}} pod metrics, the [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric data collected by the [{{k8s}} integration](integration-docs://reference/kubernetes.md).
 :::
 
 ## Entity definition [monitor-k8s-pods-entity]
diff --git a/solutions/observability/incident-management/create-an-inventory-rule.md b/solutions/observability/incident-management/create-an-inventory-rule.md
index b372fdfcbb..4a767d1704 100644
--- a/solutions/observability/incident-management/create-an-inventory-rule.md
+++ b/solutions/observability/incident-management/create-an-inventory-rule.md
@@ -37,7 +37,7 @@ Conditions for each rule can be applied to specific metrics relating to the inve
 
 :::{note}
 :applies_to: {"stack": "ga 9.2", "serverless": "ga"}`
-Most inventory types respect the default data collection method (for example, [Elastic System integration](integration-docs://reference/system/index.md)). For the `Hosts` inventory type, however, you can use the **Schema** dropdown menu to explicitly target host data collected using **OpenTelemetry** or the **Elastic System Integration**.
+Most inventory types respect the default data collection method (for example, [Elastic System Integration](integration-docs://reference/system/index.md)). For the `Hosts` inventory type, however, you can use the **Schema** dropdown menu to explicitly target host data collected using **OpenTelemetry** or the **Elastic System Integration**.
 :::
 
 In the following example, Kubernetes Pods is the selected inventory type. The conditions state that you will receive a critical alert for any pods within the `ingress-nginx` namespace with a memory usage of 95% or above and a warning alert if memory usage is 90% or above. The chart shows the results of applying the rule to the last 20 minutes of data. Note that the chart time range is 20 times the value of the look-back window specified in the `FOR THE LAST` field.

From 3da36da0c0b0cce4974b64e5299b551ddf97a709 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <michael.birnstiehl@elastic.co>
Date: Mon, 15 Dec 2025 14:35:43 -0600
Subject: [PATCH 15/15] fix typo

---
 reference/observability/observability-aws-metrics.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/observability/observability-aws-metrics.md b/reference/observability/observability-aws-metrics.md
index c527408c9e..b72b8e6fdd 100644
--- a/reference/observability/observability-aws-metrics.md
+++ b/reference/observability/observability-aws-metrics.md
@@ -23,7 +23,7 @@ To analyze EC2 instance metrics, you can select view filters based on the follow
 
 :::{note}
 :applies_to: stack: ga 9.3
-For EC2 instances, The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metrics collected by the [EC2 integration](integration-docs://reference/aws/ec2.md).
+For EC2 instances, The [Infrastructure UI](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) and [inventory rules](/solutions/observability/incident-management/create-an-inventory-rule.md) only support metric collected by the [EC2 integration](integration-docs://reference/aws/ec2.md).
 :::
 
 ### Entity definition [monitor-ec2-entity]