diff --git a/docs/changelog/92950.yaml b/docs/changelog/92950.yaml new file mode 100644 index 0000000000000..464d56bbda2e9 --- /dev/null +++ b/docs/changelog/92950.yaml @@ -0,0 +1,5 @@ +pr: 92950 +summary: Add monitoring mappings for es ingest metricset +area: Monitoring +type: enhancement +issues: [] diff --git a/x-pack/plugin/core/src/main/resources/monitoring-es-mb.json b/x-pack/plugin/core/src/main/resources/monitoring-es-mb.json index d64a24f07389a..89fc282c89e14 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-es-mb.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-es-mb.json @@ -305,6 +305,10 @@ } } }, + "roles": { + "ignore_above": 1024, + "type": "keyword" + }, "version": { "ignore_above": 1024, "type": "keyword" @@ -1860,6 +1864,74 @@ } } }, + "ingest_pipeline": { + "properties": { + "name": { + "ignore_above": 1024, + "type": "wildcard" + }, + "processor": { + "properties": { + "count": { + "type": "long" + }, + "failed": { + "type": "long" + }, + "order_index": { + "type": "long" + }, + "time": { + "properties": { + "total": { + "properties": { + "ms": { + "type": "long" + } + } + } + } + }, + "type": { + "ignore_above": 1024, + "type": "keyword" + }, + "type_tag": { + "ignore_above": 1024, + "type": "keyword" + } + } + }, + "total": { + "properties": { + "count": { + "type": "long" + }, + "failed": { + "type": "long" + }, + "time": { + "properties": { + "total": { + "properties": { + "ms": { + "type": "long" + } + } + }, + "self": { + "properties": { + "ms": { + "type": "long" + } + } + } + } + } + } + } + } + }, "shard": { "properties": { "number": { 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 2c94546bb61d2..68521d90c8a09 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 @@ -78,7 +78,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 = Version.V_8_0_0.id + 4; + public static final int STACK_MONITORING_REGISTRY_VERSION = Version.V_8_0_0.id + 5; 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";