[Stack Monitoring] [REVERT] Update stack monitoring templates for Stack 9 release

server/src/test/java/org/elasticsearch/common/logging/HeaderWarningTests.java

@@ -315,9 +315,9 @@ public void testAddComplexWarning() {
                 + "profiling-symbols,synthetics] with patterns (.deprecation-indexing-template => [.logs-deprecation.*],"
                 + ".fleet-file-data => [.fleet-file-data-*-*],.fleet-files => [.fleet-files-*-*],.ml-anomalies- => [.ml-anomalies-*],"
                 + ".ml-notifications-000002 => [.ml-notifications-000002],.ml-state => [.ml-state*],.ml-stats => [.ml-stats-*],"
-                + ".monitoring-beats-mb => [.monitoring-beats-9-*],.monitoring-ent-search-mb => [.monitoring-ent-search-8-*],"
-                + ".monitoring-es-mb => [.monitoring-es-9-*],.monitoring-kibana-mb => [.monitoring-kibana-9-*],"
-                + ".monitoring-logstash-mb => [.monitoring-logstash-9-*],.profiling-ilm-lock => [.profiling-ilm-lock*],"
+                + ".monitoring-beats-mb => [.monitoring-beats-8-*],.monitoring-ent-search-mb => [.monitoring-ent-search-8-*],"
+                + ".monitoring-es-mb => [.monitoring-es-8-*],.monitoring-kibana-mb => [.monitoring-kibana-8-*],"
+                + ".monitoring-logstash-mb => [.monitoring-logstash-8-*],.profiling-ilm-lock => [.profiling-ilm-lock*],"
                 + ".slm-history => [.slm-history-7*],.watch-history-16 => [.watcher-history-16*],"
                 + "behavioral_analytics-events-default => [behavioral_analytics-events-*],ilm-history => [ilm-history-7*],"
                 + "logs => [logs-*-*],metrics => [metrics-*-*],profiling-events => [profiling-events*],profiling-executables => "

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

@@ -1,5 +1,5 @@
 {
-  "index_patterns": [".monitoring-ent-search-8-*"],
+  "index_patterns": [".monitoring-ent-search-${xpack.stack.monitoring.template.version}-*"],
   "version": ${xpack.stack.monitoring.template.release.version},
   "_meta": {
     "description": "Template used by Enterprise Search Metricbeat module monitoring information for Stack Monitoring",

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

@@ -23,7 +23,7 @@
     }
   },
   "_meta": {
-    "description": "Index lifecycle policy generated for [monitoring-*-9] data streams",
+    "description": "Index lifecycle policy generated for [monitoring-*-8] data streams",
     "defaults": {
       "delete_min_age": "Using value of [${xpack.stack.monitoring.history.duration}] based on ${xpack.stack.monitoring.history.duration.reason}"
     }

x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java

@@ -38,7 +38,7 @@
  *
  * This template registry manages templates for two purposes:
  * 1) Internal Monitoring Collection (.monitoring-{product}-7-*)
- * 2) Stack Monitoring templates for bridging ECS format data to legacy monitoring data (.monitoring-{product}-9-*)
+ * 2) Stack Monitoring templates for bridging ECS format data to legacy monitoring data (.monitoring-{product}-8-*)
  */
 public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
     private static final Logger logger = LogManager.getLogger(MonitoringTemplateRegistry.class);
@@ -73,13 +73,13 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
     private static final String MONITORING_POLICY_RETENTION_REASON_VARIABLE = "xpack.stack.monitoring.history.duration.reason";
 
     /**
-     * The stack monitoring template registry version. This is the version id for templates used by Metricbeat in versions >8.x. Metricbeat
+     * The stack monitoring template registry version. This is the version id for templates used by Metricbeat in version 8.x. Metricbeat
      * 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 = 9_00_00_99 + 1;
+    public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 21;
     private static final String STACK_MONITORING_REGISTRY_VERSION_VARIABLE = "xpack.stack.monitoring.template.release.version";
-    private static final String STACK_TEMPLATE_VERSION = "9";
+    private static final String STACK_TEMPLATE_VERSION = "8";
     private static final String STACK_TEMPLATE_VERSION_VARIABLE = "xpack.stack.monitoring.template.version";
     private static final Map<String, String> STACK_TEMPLATE_VARIABLES = Map.of(
         STACK_TEMPLATE_VERSION_VARIABLE,
@@ -159,7 +159,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
     );
 
     //////////////////////////////////////////////////////////
-    // Beats metricbeat template (for matching ".monitoring-beats-${version}-*" indices)
+    // Beats metricbeat template (for matching ".monitoring-beats-8-*" indices)
     //////////////////////////////////////////////////////////
     public static final String BEATS_STACK_INDEX_TEMPLATE_NAME = ".monitoring-beats-mb";
     public static final IndexTemplateConfig BEATS_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(
@@ -171,7 +171,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
     );
 
     //////////////////////////////////////////////////////////
-    // ES metricbeat template (for matching ".monitoring-es-${version}-*" indices)
+    // ES metricbeat template (for matching ".monitoring-es-8-*" indices)
     //////////////////////////////////////////////////////////
     public static final String ES_STACK_INDEX_TEMPLATE_NAME = ".monitoring-es-mb";
     public static final IndexTemplateConfig ES_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(
@@ -183,7 +183,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
     );
 
     //////////////////////////////////////////////////////////
-    // Kibana metricbeat template (for matching ".monitoring-kibana-${version}-*" indices)
+    // Kibana metricbeat template (for matching ".monitoring-kibana-8-*" indices)
     //////////////////////////////////////////////////////////
     public static final String KIBANA_STACK_INDEX_TEMPLATE_NAME = ".monitoring-kibana-mb";
     public static final IndexTemplateConfig KIBANA_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(
@@ -195,7 +195,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
     );
 
     //////////////////////////////////////////////////////////
-    // Logstash metricbeat template (for matching ".monitoring-logstash-${version}-*" indices)
+    // Logstash metricbeat template (for matching ".monitoring-logstash-8-*" indices)
     //////////////////////////////////////////////////////////
     public static final String LOGSTASH_STACK_INDEX_TEMPLATE_NAME = ".monitoring-logstash-mb";
     public static final IndexTemplateConfig LOGSTASH_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(