diff --git a/redirects.yml b/redirects.yml
index 78574e95aa..4e918fbe3b 100644
--- a/redirects.yml
+++ b/redirects.yml
@@ -5,6 +5,7 @@ redirects:
'deploy-manage/security/ece-traffic-filtering-through-the-api.md': 'deploy-manage/security/ec-traffic-filtering-through-the-api.md'
'deploy-manage/security/install-stack-demo-secure.md': '!deploy-manage/security/self-setup.md'
'reference/observability/fields-and-object-schemas/logs-app-fields.md': '!reference/observability/fields-and-object-schemas.md'
+ 'reference/observability/fields-and-object-schemas/metrics-app-fields.md': '!reference/observability/fields-and-object-schemas.md'
# Related to https://github.com/elastic/docs-content/pull/1069
'solutions/observability/apps/llm-observability.md': 'solutions/observability/applications/llm-observability.md'
'solutions/observability/apps.md': 'solutions/observability/applications/index.md'
@@ -183,4 +184,4 @@ redirects:
'solutions/observability/apps/analyze-monitors.md': 'solutions/observability/uptime/analyze-monitors.md'
'solutions/observability/apps/inspect-uptime-duration-anomalies.md': 'solutions/observability/uptime/inspect-duration-anomalies.md'
'solutions/observability/apps/configure-settings.md': 'solutions/observability/uptime/configure-settings.md'
- 'solutions/observability/apps/tutorial-monitor-java-application.md': 'solutions/observability/applications/tutorial-monitor-java-application.md'
\ No newline at end of file
+ 'solutions/observability/apps/tutorial-monitor-java-application.md': 'solutions/observability/applications/tutorial-monitor-java-application.md'
diff --git a/reference/data-analysis/observability/observability-aws-metrics.md b/reference/data-analysis/observability/observability-aws-metrics.md
index 21cedb95f3..ffbfdb6a5b 100644
--- a/reference/data-analysis/observability/observability-aws-metrics.md
+++ b/reference/data-analysis/observability/observability-aws-metrics.md
@@ -64,4 +64,4 @@ To analyze RDS database metrics, you can select view filters based on the follow
| **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/serverless/infrastructure-app-fields.md).
+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).
diff --git a/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md b/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md
index 621a3e9695..ee9edc7dd8 100644
--- a/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md
+++ b/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md
@@ -15,4 +15,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/serverless/infrastructure-app-fields.md).
+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).
diff --git a/reference/observability/fields-and-object-schemas.md b/reference/observability/fields-and-object-schemas.md
index 0979952696..1391f63c89 100644
--- a/reference/observability/fields-and-object-schemas.md
+++ b/reference/observability/fields-and-object-schemas.md
@@ -1,6 +1,11 @@
---
+applies_to:
+ stack: all
+ serverless: all
mapped_pages:
- https://www.elastic.co/guide/en/observability/current/fields-reference.html
+ - https://www.elastic.co/guide/en/observability/current/metrics-app-fields.html
+ - https://www.elastic.co/guide/en/serverless/current/observability-infrastructure-monitoring-required-fields.html
---
# Fields and object schemas [fields-reference]
@@ -11,7 +16,352 @@ ECS is an open source specification that defines a standard set of fields to use
Beat modules (for example, [{{filebeat}} modules](beats://reference/filebeat/filebeat-modules.md)) are ECS-compliant, so manual field mapping is not required, and all data is populated automatically in the Infrastructure app. If you cannot use {{beats}}, map your data to [ECS fields](ecs://reference/ecs-converting.md)). You can also try using the experimental [ECS Mapper](https://github.com/elastic/ecs-mapper) tool.
-This reference covers [{{infrastructure-app}} fields](/reference/observability/fields-and-object-schemas/metrics-app-fields.md).
+This reference covers {{infrastructure-app}} fields.
+## Infrastructure app fields [metrics-app-fields]
+This section lists the required fields the {{infrastructure-app}} uses to display data. Please note that some of the fields listed are not [ECS fields](ecs://reference/index.md#_what_is_ecs).
+### Additional field details [_additional_field_details]
+
+The `event.dataset` field is required to display data properly in some views. This field is a combination of `metricset.module`, which is the {{metricbeat}} module name, and `metricset.name`, which is the metricset name.
+
+To determine each metric’s optimal time interval, all charts use `metricset.period`. If `metricset.period` is not available, then it falls back to 1 minute intervals.
+
+### Base fields [base-fields]
+
+The `base` field set contains all fields which are on the top level. These fields are common across all types of events.
+
+`@timestamp`
+: Date/time when the event originated.
+
+ This is the date/time extracted from the event, typically representing when the source generated the event. If the event source has no original timestamp, this value is typically populated by the first time the pipeline received the event. Required field for all events.
+
+ type: date
+
+ required: True
+
+ ECS field: True
+
+ example: `May 27, 2020 @ 15:22:27.982`
+
+`message`
+: For log events the message field contains the log message, optimized for viewing in a log viewer.
+
+ For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event.
+
+ If multiple messages exist, they can be combined into one message.
+
+ type: text
+
+ required: True
+
+ ECS field: True
+
+ example: `Hello World`
+
+### Hosts fields [host-fields]
+
+These fields must be mapped to display host data in the {{infrastructure-app}}.
+
+`host.name`
+: Name of the host.
+
+ It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `MacBook-Elastic.local`
+
+`host.ip`
+: IP of the host that records the event.
+
+ type: `ip`
+
+ required: True
+
+ ECS field: True
+
+### Docker container fields [docker-fields]
+
+These fields must be mapped to display Docker container data in the {{infrastructure-app}}.
+
+`container.id`
+: Unique container id.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `data`
+
+`container.name`
+: Container name.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+`container.ip_address`
+: IP of the container.
+
+ type: `ip`
+
+ required: True
+
+ ECS field: False
+
+### Kubernetes pod fields [kubernetes-fields]
+
+These fields must be mapped to display Kubernetes pod data in the {{infrastructure-app}}.
+
+`kubernetes.pod.uid`
+: Kubernetes Pod UID.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+ example: `8454328b-673d-11ea-7d80-21010a840123`
+
+`kubernetes.pod.name`
+: Kubernetes pod name.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+ example: `nginx-demo`
+
+`kubernetes.pod.ip`
+: IP of the Kubernetes pod.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+### AWS EC2 instance fields [aws-ec2-fields]
+
+These fields must be mapped to display EC2 instance data in the {{infrastructure-app}}.
+
+`cloud.instance.id`
+: Instance ID of the host machine.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `i-1234567890abcdef0`
+
+`cloud.instance.name`
+: Instance name of the host machine.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+`aws.ec2.instance.public.ip`
+: Instance public IP of the host machine.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+### AWS S3 bucket fields [aws-s3-fields]
+
+These fields must be mapped to display S3 bucket data in the {{infrastructure-app}}.
+
+`aws.s3.bucket.name`
+: The name or ID of the AWS S3 bucket.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+### AWS SQS queue fields [aws-sqs-fields]
+
+These fields must be mapped to display SQS queue data in the {{infrastructure-app}}.
+
+`aws.sqs.queue.name`
+: The name or ID of the AWS SQS queue.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+### AWS RDS database fields [aws-rds-fields]
+
+These fields must be mapped to display RDS database data in the {{infrastructure-app}}.
+
+`aws.rds.db_instance.arn`
+: Amazon Resource Name (ARN) for each RDS.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+`aws.rds.db_instance.identifier`
+: Contains a user-supplied database identifier. This identifier is the unique key that identifies a DB instance.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+### Additional grouping fields [group-inventory-fields]
+
+Depending on which entity you select in the **Infrastructure inventory** view, these additional fields can be mapped to group entities by.
+
+`cloud.availability_zone`
+: Availability zone in which this host is running.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `us-east-1c`
+
+`cloud.machine.type`
+: Machine type of the host machine.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `t2.medium`
+
+`cloud.region`
+: Region in which this host is running.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `us-east-1`
+
+`cloud.instance.id`
+: Instance ID of the host machine.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `i-1234567890abcdef0`
+
+`cloud.provider`
+: Name of the cloud provider. Example values are `aws`, `azure`, `gcp`, or `digitalocean`.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `aws`
+
+`cloud.instance.name`
+: Instance name of the host machine.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+`cloud.project.id`
+: Name of the project in Google Cloud.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+`service.type`
+: The type of the service data is collected from.
+
+ The type can be used to group and correlate logs and metrics from one service type.
+
+ Example: If metrics are collected from {{es}}, service.type would be `elasticsearch`.
+
+ type: keyword
+
+ required: True
+
+ ECS field: False
+
+ example: `elasticsearch`
+
+`host.hostname`
+: Name of the host.
+
+ It normally contains what the `hostname` command returns on the host machine.
+
+ type: keyword
+
+ required: True, if you want to use the {{ml-features}}.
+
+ ECS field: True
+
+ example: `Elastic.local`
+
+`host.os.name`
+: Operating system name, without the version.
+
+ Multi-fields:
+
+ * os.name.text (type: text)
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `Mac OS X`
+
+`host.os.kernel`
+: Operating system kernel version as a raw string.
+
+ type: keyword
+
+ required: True
+
+ ECS field: True
+
+ example: `4.4.0-112-generic`
\ No newline at end of file
diff --git a/reference/observability/fields-and-object-schemas/metrics-app-fields.md b/reference/observability/fields-and-object-schemas/metrics-app-fields.md
deleted file mode 100644
index 1082d9fc7f..0000000000
--- a/reference/observability/fields-and-object-schemas/metrics-app-fields.md
+++ /dev/null
@@ -1,391 +0,0 @@
----
-mapped_pages:
- - https://www.elastic.co/guide/en/observability/current/metrics-app-fields.html
----
-
-# Infrastructure app fields [metrics-app-fields]
-
-This section lists the required fields the {{infrastructure-app}} uses to display data. Please note that some of the fields listed are not [ECS fields](ecs://reference/index.md#_what_is_ecs).
-
-
-## Additional field details [_additional_field_details]
-
-The `event.dataset` field is required to display data properly in some views. This field is a combination of `metricset.module`, which is the {{metricbeat}} module name, and `metricset.name`, which is the metricset name.
-
-To determine each metric’s optimal time interval, all charts use `metricset.period`. If `metricset.period` is not available, then it falls back to 1 minute intervals.
-
-
-## Base fields [base-fields]
-
-The `base` field set contains all fields which are on the top level. These fields are common across all types of events.
-
-`@timestamp`
-: Date/time when the event originated.
-
- This is the date/time extracted from the event, typically representing when the source generated the event. If the event source has no original timestamp, this value is typically populated by the first time the pipeline received the event. Required field for all events.
-
- type: date
-
- required: True
-
- ECS field: True
-
- example: `May 27, 2020 @ 15:22:27.982`
-
-
-`message`
-: For log events the message field contains the log message, optimized for viewing in a log viewer.
-
- For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event.
-
- If multiple messages exist, they can be combined into one message.
-
- type: text
-
- required: True
-
- ECS field: True
-
- example: `Hello World`
-
-
-
-## Hosts fields [host-fields]
-
-These fields must be mapped to display host data in the {{infrastructure-app}}.
-
-`host.name`
-: Name of the host.
-
- It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `MacBook-Elastic.local`
-
-
-`host.ip`
-: IP of the host that records the event.
-
- type: `ip`
-
- required: True
-
- ECS field: True
-
-
-
-## Docker container fields [docker-fields]
-
-These fields must be mapped to display Docker container data in the {{infrastructure-app}}.
-
-`container.id`
-: Unique container id.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `data`
-
-
-`container.name`
-: Container name.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
-
-`container.ip_address`
-: IP of the container.
-
- type: `ip`
-
- required: True
-
- ECS field: False
-
-
-
-## Kubernetes pod fields [kubernetes-fields]
-
-These fields must be mapped to display Kubernetes pod data in the {{infrastructure-app}}.
-
-`kubernetes.pod.uid`
-: Kubernetes Pod UID.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
- example: `8454328b-673d-11ea-7d80-21010a840123`
-
-
-`kubernetes.pod.name`
-: Kubernetes pod name.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
- example: `nginx-demo`
-
-
-`kubernetes.pod.ip`
-: IP of the Kubernetes pod.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-
-## AWS EC2 instance fields [aws-ec2-fields]
-
-These fields must be mapped to display EC2 instance data in the {{infrastructure-app}}.
-
-`cloud.instance.id`
-: Instance ID of the host machine.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `i-1234567890abcdef0`
-
-
-`cloud.instance.name`
-: Instance name of the host machine.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
-
-`aws.ec2.instance.public.ip`
-: Instance public IP of the host machine.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-
-## AWS S3 bucket fields [aws-s3-fields]
-
-These fields must be mapped to display S3 bucket data in the {{infrastructure-app}}.
-
-`aws.s3.bucket.name`
-: The name or ID of the AWS S3 bucket.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-
-## AWS SQS queue fields [aws-sqs-fields]
-
-These fields must be mapped to display SQS queue data in the {{infrastructure-app}}.
-
-`aws.sqs.queue.name`
-: The name or ID of the AWS SQS queue.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-
-## AWS RDS database fields [aws-rds-fields]
-
-These fields must be mapped to display RDS database data in the {{infrastructure-app}}.
-
-`aws.rds.db_instance.arn`
-: Amazon Resource Name (ARN) for each RDS.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-`aws.rds.db_instance.identifier`
-: Contains a user-supplied database identifier. This identifier is the unique key that identifies a DB instance.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-
-## Additional grouping fields [group-inventory-fields]
-
-Depending on which entity you select in the **Infrastructure inventory** view, these additional fields can be mapped to group entities by.
-
-`cloud.availability_zone`
-: Availability zone in which this host is running.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `us-east-1c`
-
-
-`cloud.machine.type`
-: Machine type of the host machine.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `t2.medium`
-
-
-`cloud.region`
-: Region in which this host is running.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `us-east-1`
-
-
-`cloud.instance.id`
-: Instance ID of the host machine.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `i-1234567890abcdef0`
-
-
-`cloud.provider`
-: Name of the cloud provider. Example values are `aws`, `azure`, `gcp`, or `digitalocean`.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `aws`
-
-
-`cloud.instance.name`
-: Instance name of the host machine.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
-
-`cloud.project.id`
-: Name of the project in Google Cloud.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
-
-`service.type`
-: The type of the service data is collected from.
-
- The type can be used to group and correlate logs and metrics from one service type.
-
- Example: If metrics are collected from {{es}}, service.type would be `elasticsearch`.
-
- type: keyword
-
- required: True
-
- ECS field: False
-
- example: `elasticsearch`
-
-
-`host.hostname`
-: Name of the host.
-
- It normally contains what the `hostname` command returns on the host machine.
-
- type: keyword
-
- required: True, if you want to use the {{ml-features}}.
-
- ECS field: True
-
- example: `Elastic.local`
-
-
-`host.os.name`
-: Operating system name, without the version.
-
- Multi-fields:
-
- * os.name.text (type: text)
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `Mac OS X`
-
-
-`host.os.kernel`
-: Operating system kernel version as a raw string.
-
- type: keyword
-
- required: True
-
- ECS field: True
-
- example: `4.4.0-112-generic`
-
-
diff --git a/reference/observability/index.md b/reference/observability/index.md
index f78173e66a..fddeaff38d 100644
--- a/reference/observability/index.md
+++ b/reference/observability/index.md
@@ -10,12 +10,7 @@ mapped_pages:
% TO-DO: Add links to "What is Elastic Observability?"%
-This section contains reference information for Elastic Observability features, including:
-
-* Fields reference
- * Logs Discover fields
- * Infrastructure app fields
-* Elastic Entity Model
+This section contains field reference information Infrastructure app fields.
You can use these APIs to interface with Elastic Observability features:
diff --git a/reference/observability/serverless/infrastructure-app-fields.md b/reference/observability/serverless/infrastructure-app-fields.md
deleted file mode 100644
index f1acfcd60b..0000000000
--- a/reference/observability/serverless/infrastructure-app-fields.md
+++ /dev/null
@@ -1,115 +0,0 @@
----
-mapped_pages:
- - https://www.elastic.co/guide/en/serverless/current/observability-infrastructure-monitoring-required-fields.html
----
-
-# Infrastructure app fields [observability-infrastructure-monitoring-required-fields]
-
-This section lists the fields the Infrastructure UI uses to display data. Please note that some of the fields listed here are not [ECS fields](ecs://reference/index.md#_what_is_ecs).
-
-
-## Additional field details [observability-infrastructure-monitoring-required-fields-additional-field-details]
-
-The `event.dataset` field is required to display data properly in some views. This field is a combination of `metricset.module`, which is the {{metricbeat}} module name, and `metricset.name`, which is the metricset name.
-
-To determine each metric’s optimal time interval, all charts use `metricset.period`. If `metricset.period` is not available, then it falls back to 1 minute intervals.
-
-
-## Base fields [base-fields]
-
-The `base` field set contains all fields which are on the top level. These fields are common across all types of events.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `@timestamp` | Date/time when the event originated.
This is the date/time extracted from the event, typically representing when the source generated the event. If the event source has no original timestamp, this value is typically populated by the first time the pipeline received the event. Required field for all events.
Example: `May 27, 2020 @ 15:22:27.982`
| date |
-| `message` | For log events the message field contains the log message, optimized for viewing in a log viewer.
For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event.
If multiple messages exist, they can be combined into one message.
Example: `Hello World`
| text |
-
-
-## Hosts fields [host-fields]
-
-These fields must be mapped to display host data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `host.name` | Name of the host.
It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.
Example: `MacBook-Elastic.local`
| keyword |
-| `host.ip` | IP of the host that records the event. | ip |
-
-
-## Docker container fields [docker-fields]
-
-These fields must be mapped to display Docker container data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `container.id` | Unique container id.
Example: `data`
| keyword |
-| `container.name` | Container name. | keyword |
-| `container.ip_address` | IP of the container.
*Not an ECS field*
| ip |
-
-
-## Kubernetes pod fields [kubernetes-fields]
-
-These fields must be mapped to display Kubernetes pod data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `kubernetes.pod.uid` | Kubernetes Pod UID.
Example: `8454328b-673d-11ea-7d80-21010a840123`
*Not an ECS field*
| keyword |
-| `kubernetes.pod.name` | Kubernetes pod name.
Example: `nginx-demo`
*Not an ECS field*
| keyword |
-| `kubernetes.pod.ip` | IP of the Kubernetes pod.
*Not an ECS field*
| keyword |
-
-
-## AWS EC2 instance fields [aws-ec2-fields]
-
-These fields must be mapped to display EC2 instance data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `cloud.instance.id` | Instance ID of the host machine.
Example: `i-1234567890abcdef0`
| keyword |
-| `cloud.instance.name` | Instance name of the host machine. | keyword |
-| `aws.ec2.instance.public.ip` | Instance public IP of the host machine.
*Not an ECS field*
| keyword |
-
-
-## AWS S3 bucket fields [aws-s3-fields]
-
-These fields must be mapped to display S3 bucket data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `aws.s3.bucket.name` | The name or ID of the AWS S3 bucket.
*Not an ECS field*
| keyword |
-
-
-## AWS SQS queue fields [aws-sqs-fields]
-
-These fields must be mapped to display SQS queue data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `aws.sqs.queue.name` | The name or ID of the AWS SQS queue.
*Not an ECS field*
| keyword |
-
-
-## AWS RDS database fields [aws-rds-fields]
-
-These fields must be mapped to display RDS database data in the {{infrastructure-app}}.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `aws.rds.db_instance.arn` | Amazon Resource Name (ARN) for each RDS.
*Not an ECS field*
| keyword |
-| `aws.rds.db_instance.identifier` | Contains a user-supplied database identifier. This identifier is the unique key that identifies a DB instance.
*Not an ECS field*
| keyword |
-
-
-## Additional grouping fields [group-inventory-fields]
-
-Depending on which entity you select in the **Infrastructure inventory** view, these additional fields can be mapped to group entities by.
-
-| Field | Description | Type |
-| --- | --- | --- |
-| `cloud.availability_zone` | Availability zone in which this host is running.
Example: `us-east-1c`
| keyword |
-| `cloud.machine.type` | Machine type of the host machine.
Example: `t2.medium`
| keyword |
-| `cloud.region` | Region in which this host is running.
Example: `us-east-1`
| keyword |
-| `cloud.instance.id` | Instance ID of the host machine.
Example: `i-1234567890abcdef0`
| keyword |
-| `cloud.provider` | Name of the cloud provider. Example values are `aws`, `azure`, `gcp`, or `digitalocean`.
Example: `aws`
| keyword |
-| `cloud.instance.name` | Instance name of the host machine. | keyword |
-| `cloud.project.id` | Name of the project in Google Cloud.
*Not an ECS field*
| keyword |
-| `service.type` | The type of service data is collected from.
The type can be used to group and correlate logs and metrics from one service type.
For example, the service type for metrics collected from {{es}} is `elasticsearch`.
Example: `elasticsearch`
*Not an ECS field*
| keyword |
-| `host.hostname` | Name of the host. This field is required if you want to use {{ml-features}}
It normally contains what the `hostname` command returns on the host machine.
Example: `Elastic.local`
| keyword |
-| `host.os.name` | Operating system name, without the version.
Multi-fields:
os.name.text (type: text)
Example: `Mac OS X`
| keyword |
-| `host.os.kernel` | Operating system kernel version as a raw string.
Example: `4.4.0-112-generic`
| keyword |
diff --git a/reference/observability/toc.yml b/reference/observability/toc.yml
index f1435b61c5..27b7ec4f93 100644
--- a/reference/observability/toc.yml
+++ b/reference/observability/toc.yml
@@ -1,7 +1,4 @@
toc:
- file: index.md
- file: fields-and-object-schemas.md
- children:
- - file: fields-and-object-schemas/metrics-app-fields.md
- - file: serverless/infrastructure-app-fields.md
- hidden: elastic-entity-model.md
\ No newline at end of file