From 133a437f7712da0d830bcdaf9639fcaa5edb3287 Mon Sep 17 00:00:00 2001 From: Ruben van Staden Date: Sat, 15 Nov 2025 13:40:51 -0500 Subject: [PATCH 1/3] apm[monitoring]: update monitor mappsing to include new TBS metrics --- .../main/resources/monitoring-beats-mb.json | 28 +++++++++++++++++++ .../src/main/resources/monitoring-beats.json | 12 ++++++++ 2 files changed, 40 insertions(+) diff --git a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats-mb.json b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats-mb.json index fcb299115ffd2..3c4df169873db 100644 --- a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats-mb.json +++ b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats-mb.json @@ -820,6 +820,18 @@ }, "value_log_size": { "type": "long" + }, + "storage_limit": { + "type": "long" + }, + "disk_used": { + "type": "long" + }, + "disk_total": { + "type": "long" + }, + "disk_usage_threshold": { + "type": "long" } } } @@ -2301,6 +2313,22 @@ "value_log_size": { "type": "alias", "path": "beat.stats.apm_server.sampling.tail.storage.value_log_size" + }, + "storage_limit": { + "type": "alias", + "path": "beat.stats.apm_server.sampling.tail.storage.storage_limit" + }, + "disk_used": { + "type": "alias", + "path": "beat.stats.apm_server.sampling.tail.storage.disk_used" + }, + "disk_total": { + "type": "alias", + "path": "beat.stats.apm_server.sampling.tail.storage.disk_total" + }, + "disk_usage_threshold": { + "type": "alias", + "path": "beat.stats.apm_server.sampling.tail.storage.disk_usage_threshold" } } } diff --git a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats.json index e1a8b5cc37060..14333605b1455 100644 --- a/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/template-resources/src/main/resources/monitoring-beats.json @@ -1000,6 +1000,18 @@ }, "value_log_size": { "type": "long" + }, + "storage_limit": { + "type": "long" + }, + "disk_used": { + "type": "long" + }, + "disk_total": { + "type": "long" + }, + "disk_usage_threshold": { + "type": "long" } } } From 96e78f084fcb51e9fdf49d6a39baa73cc49b975a Mon Sep 17 00:00:00 2001 From: Ruben van Staden Date: Tue, 18 Nov 2025 20:58:52 -0500 Subject: [PATCH 2/3] chore: increment registry version --- .../xpack/monitoring/MonitoringTemplateRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java index 79fe1d9e4f6fb..f2f6805d62dbd 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java @@ -77,7 +77,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry { * writes monitoring data in ECS format as of 8.0. These templates define the ECS schema as well as alias fields for the old monitoring * mappings that point to the corresponding ECS fields. */ - public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 22; + public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 23; private static final String STACK_MONITORING_REGISTRY_VERSION_VARIABLE = "xpack.stack.monitoring.template.release.version"; private static final String STACK_TEMPLATE_VERSION = "8"; private static final String STACK_TEMPLATE_VERSION_VARIABLE = "xpack.stack.monitoring.template.version"; From 4f4715e64b06d7cb5f4286b7ad32a77c13aae14e Mon Sep 17 00:00:00 2001 From: Ruben van Staden Date: Wed, 19 Nov 2025 17:24:13 -0500 Subject: [PATCH 3/3] Update docs/changelog/138131.yaml --- docs/changelog/138131.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/138131.yaml diff --git a/docs/changelog/138131.yaml b/docs/changelog/138131.yaml new file mode 100644 index 0000000000000..aa34e2642ddff --- /dev/null +++ b/docs/changelog/138131.yaml @@ -0,0 +1,5 @@ +pr: 138131 +summary: "Apm-server: update monitor mappings to include new TBS metrics" +area: Monitoring +type: enhancement +issues: []