Adding 'mode' and 'codec' fields to ES monitoring template (elastic#143673)

* Enhance monitoring template by adding 'mode' and 'codec' fields to monitoring mapping

* Added changelog entry

* Fixed tests

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>

Author: 3kt

docs/changelog/143673.yaml

@@ -0,0 +1,5 @@
+pr: 143673
+summary: Add mode and codec fields to Stack Monitoring index template
+area: Monitoring
+type: enhancement
+issues: []

x-pack/plugin/core/template-resources/src/main/resources/monitoring-es-mb.json

@@ -2020,6 +2020,14 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "codec": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "recovery": {
                   "properties": {
                     "stop_time": {
@@ -3699,6 +3707,14 @@
               "type": "alias",
               "path": "elasticsearch.index.name"
             },
+            "mode": {
+              "type": "alias",
+              "path": "elasticsearch.index.mode"
+            },
+            "codec": {
+              "type": "alias",
+              "path": "elasticsearch.index.codec"
+            },
             "primaries": {
               "properties": {
                 "docs": {

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 + 23;
+    public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 24;
     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";

x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java

@@ -12,6 +12,8 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.routing.IndexRoutingTable;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.index.IndexSettings;
+import org.elasticsearch.index.engine.EngineConfig;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.core.monitoring.MonitoredSystem;
 import org.elasticsearch.xpack.core.monitoring.exporter.MonitoringDoc;
@@ -70,6 +72,8 @@ protected void innerToXContent(XContentBuilder builder, Params params) throws IO
             builder.field("uuid", metadata.getIndexUUID());
             builder.field("created", metadata.getCreationDate());
             builder.field("status", health.getStatus().name().toLowerCase(Locale.ROOT));
+            builder.field("mode", IndexSettings.MODE.get(metadata.getSettings()).getName());
+            builder.field("codec", EngineConfig.INDEX_CODEC_SETTING.get(metadata.getSettings()));
 
             builder.startObject("shards");
             {
@@ -123,6 +127,8 @@ protected void innerToXContent(XContentBuilder builder, Params params) throws IO
         "index_stats.uuid",
         "index_stats.created",
         "index_stats.status",
+        "index_stats.mode",
+        "index_stats.codec",
         "index_stats.shards.total",
         "index_stats.shards.primaries",
         "index_stats.shards.replicas",

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDocTests.java

@@ -21,8 +21,10 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.cache.query.QueryCacheStats;
 import org.elasticsearch.index.cache.request.RequestCacheStats;
+import org.elasticsearch.index.engine.EngineConfig;
 import org.elasticsearch.index.engine.SegmentsStats;
 import org.elasticsearch.index.fielddata.FieldDataStats;
 import org.elasticsearch.index.refresh.RefreshStats;
@@ -348,7 +350,9 @@ private String indexStatsSummary() throws IOException {
             .field("index", index.getName())
             .field("uuid", index.getUUID())
             .field("created", metadata.getCreationDate())
-            .field("status", indexHealth.getStatus().name().toLowerCase(Locale.ROOT));
+            .field("status", indexHealth.getStatus().name().toLowerCase(Locale.ROOT))
+            .field("mode", IndexSettings.MODE.get(metadata.getSettings()).getName())
+            .field("codec", EngineConfig.INDEX_CODEC_SETTING.get(metadata.getSettings()));
         {
             builder.startObject("shards")
                 .field("total", total)