Skip to content

Commit 90d77bc

Browse files
committed
[Stack Monitoring] [REVERT] Update stack monitoring templates for Stack 9 release (elastic#124112)
* [REVERT] Update stack monitoring templates for Stack 9 release (cherry picked from commit 0290b1c)
1 parent 6343545 commit 90d77bc

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,9 @@ public void testAddComplexWarning() {
315315
+ "profiling-symbols,synthetics] with patterns (.deprecation-indexing-template => [.logs-deprecation.*],"
316316
+ ".fleet-file-data => [.fleet-file-data-*-*],.fleet-files => [.fleet-files-*-*],.ml-anomalies- => [.ml-anomalies-*],"
317317
+ ".ml-notifications-000002 => [.ml-notifications-000002],.ml-state => [.ml-state*],.ml-stats => [.ml-stats-*],"
318-
+ ".monitoring-beats-mb => [.monitoring-beats-9-*],.monitoring-ent-search-mb => [.monitoring-ent-search-8-*],"
319-
+ ".monitoring-es-mb => [.monitoring-es-9-*],.monitoring-kibana-mb => [.monitoring-kibana-9-*],"
320-
+ ".monitoring-logstash-mb => [.monitoring-logstash-9-*],.profiling-ilm-lock => [.profiling-ilm-lock*],"
318+
+ ".monitoring-beats-mb => [.monitoring-beats-8-*],.monitoring-ent-search-mb => [.monitoring-ent-search-8-*],"
319+
+ ".monitoring-es-mb => [.monitoring-es-8-*],.monitoring-kibana-mb => [.monitoring-kibana-8-*],"
320+
+ ".monitoring-logstash-mb => [.monitoring-logstash-8-*],.profiling-ilm-lock => [.profiling-ilm-lock*],"
321321
+ ".slm-history => [.slm-history-7*],.watch-history-16 => [.watcher-history-16*],"
322322
+ "behavioral_analytics-events-default => [behavioral_analytics-events-*],ilm-history => [ilm-history-7*],"
323323
+ "logs => [logs-*-*],metrics => [metrics-*-*],profiling-events => [profiling-events*],profiling-executables => "

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"index_patterns": [".monitoring-ent-search-8-*"],
2+
"index_patterns": [".monitoring-ent-search-${xpack.stack.monitoring.template.version}-*"],
33
"version": ${xpack.stack.monitoring.template.release.version},
44
"_meta": {
55
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
"_meta": {
26-
"description": "Index lifecycle policy generated for [monitoring-*-9] data streams",
26+
"description": "Index lifecycle policy generated for [monitoring-*-8] data streams",
2727
"defaults": {
2828
"delete_min_age": "Using value of [${xpack.stack.monitoring.history.duration}] based on ${xpack.stack.monitoring.history.duration.reason}"
2929
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
* This template registry manages templates for two purposes:
4040
* 1) Internal Monitoring Collection (.monitoring-{product}-7-*)
41-
* 2) Stack Monitoring templates for bridging ECS format data to legacy monitoring data (.monitoring-{product}-9-*)
41+
* 2) Stack Monitoring templates for bridging ECS format data to legacy monitoring data (.monitoring-{product}-8-*)
4242
*/
4343
public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
4444
private static final Logger logger = LogManager.getLogger(MonitoringTemplateRegistry.class);
@@ -73,13 +73,13 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
7373
private static final String MONITORING_POLICY_RETENTION_REASON_VARIABLE = "xpack.stack.monitoring.history.duration.reason";
7474

7575
/**
76-
* The stack monitoring template registry version. This is the version id for templates used by Metricbeat in versions >8.x. Metricbeat
76+
* The stack monitoring template registry version. This is the version id for templates used by Metricbeat in version 8.x. Metricbeat
7777
* 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
7878
* mappings that point to the corresponding ECS fields.
7979
*/
80-
public static final int STACK_MONITORING_REGISTRY_VERSION = 9_00_00_99 + 1;
80+
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 21;
8181
private static final String STACK_MONITORING_REGISTRY_VERSION_VARIABLE = "xpack.stack.monitoring.template.release.version";
82-
private static final String STACK_TEMPLATE_VERSION = "9";
82+
private static final String STACK_TEMPLATE_VERSION = "8";
8383
private static final String STACK_TEMPLATE_VERSION_VARIABLE = "xpack.stack.monitoring.template.version";
8484
private static final Map<String, String> STACK_TEMPLATE_VARIABLES = Map.of(
8585
STACK_TEMPLATE_VERSION_VARIABLE,
@@ -159,7 +159,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
159159
);
160160

161161
//////////////////////////////////////////////////////////
162-
// Beats metricbeat template (for matching ".monitoring-beats-${version}-*" indices)
162+
// Beats metricbeat template (for matching ".monitoring-beats-8-*" indices)
163163
//////////////////////////////////////////////////////////
164164
public static final String BEATS_STACK_INDEX_TEMPLATE_NAME = ".monitoring-beats-mb";
165165
public static final IndexTemplateConfig BEATS_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(
@@ -171,7 +171,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
171171
);
172172

173173
//////////////////////////////////////////////////////////
174-
// ES metricbeat template (for matching ".monitoring-es-${version}-*" indices)
174+
// ES metricbeat template (for matching ".monitoring-es-8-*" indices)
175175
//////////////////////////////////////////////////////////
176176
public static final String ES_STACK_INDEX_TEMPLATE_NAME = ".monitoring-es-mb";
177177
public static final IndexTemplateConfig ES_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(
@@ -183,7 +183,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
183183
);
184184

185185
//////////////////////////////////////////////////////////
186-
// Kibana metricbeat template (for matching ".monitoring-kibana-${version}-*" indices)
186+
// Kibana metricbeat template (for matching ".monitoring-kibana-8-*" indices)
187187
//////////////////////////////////////////////////////////
188188
public static final String KIBANA_STACK_INDEX_TEMPLATE_NAME = ".monitoring-kibana-mb";
189189
public static final IndexTemplateConfig KIBANA_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(
@@ -195,7 +195,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
195195
);
196196

197197
//////////////////////////////////////////////////////////
198-
// Logstash metricbeat template (for matching ".monitoring-logstash-${version}-*" indices)
198+
// Logstash metricbeat template (for matching ".monitoring-logstash-8-*" indices)
199199
//////////////////////////////////////////////////////////
200200
public static final String LOGSTASH_STACK_INDEX_TEMPLATE_NAME = ".monitoring-logstash-mb";
201201
public static final IndexTemplateConfig LOGSTASH_STACK_INDEX_TEMPLATE = new IndexTemplateConfig(

0 commit comments

Comments
 (0)