@@ -1070,7 +1070,7 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
1070
1070
state = ClusterState .builder (state )
1071
1071
.metadata (Metadata .builder (state .metadata ())
1072
1072
.put (new DataStream ("unreferenced" ,
1073
- new DataStream .TimestampField ("@timestamp" , Collections . singletonMap ( "type" , "date" ) ),
1073
+ new DataStream .TimestampField ("@timestamp" ),
1074
1074
Collections .singletonList (new Index (".ds-unreferenced-000001" , "uuid2" ))))
1075
1075
.put (IndexMetadata .builder (".ds-unreferenced-000001" )
1076
1076
.settings (Settings .builder ()
@@ -1082,15 +1082,23 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
1082
1082
.build ())
1083
1083
.build ();
1084
1084
1085
- ComposableIndexTemplate template = new ComposableIndexTemplate (Collections .singletonList ("logs-*-*" ), null , null ,
1086
- 100L , null , null , new ComposableIndexTemplate .DataStreamTemplate ("@timestamp" ));
1085
+ String mapping = "{\n " +
1086
+ " \" properties\" : {\n " +
1087
+ " \" @timestamp\" : {\n " +
1088
+ " \" type\" : \" date\" \n " +
1089
+ " }\n " +
1090
+ " }\n " +
1091
+ " }" ;
1092
+ Template mappingTemplate = new Template (null , new CompressedXContent (mapping ), null );
1093
+ ComposableIndexTemplate template = new ComposableIndexTemplate (Collections .singletonList ("logs-*-*" ),
1094
+ mappingTemplate , null , 100L , null , null , new ComposableIndexTemplate .DataStreamTemplate ("@timestamp" ));
1087
1095
1088
1096
state = service .addIndexTemplateV2 (state , false , "logs" , template );
1089
1097
1090
1098
ClusterState stateWithDS = ClusterState .builder (state )
1091
1099
.metadata (Metadata .builder (state .metadata ())
1092
1100
.put (new DataStream ("logs-mysql-default" ,
1093
- new DataStream .TimestampField ("@timestamp" , Collections . singletonMap ( "type" , "date" ) ),
1101
+ new DataStream .TimestampField ("@timestamp" ),
1094
1102
Collections .singletonList (new Index (".ds-logs-mysql-default-000001" , "uuid" ))))
1095
1103
.put (IndexMetadata .builder (".ds-logs-mysql-default-000001" )
1096
1104
.settings (Settings .builder ()
@@ -1126,8 +1134,8 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
1126
1134
1127
1135
// Change the pattern to one that doesn't match the data stream
1128
1136
e = expectThrows (IllegalArgumentException .class , () -> {
1129
- ComposableIndexTemplate newTemplate = new ComposableIndexTemplate (Collections .singletonList ("logs-postgres-*" ), null , null ,
1130
- 100L , null , null , new ComposableIndexTemplate .DataStreamTemplate ("@timestamp" ));
1137
+ ComposableIndexTemplate newTemplate = new ComposableIndexTemplate (Collections .singletonList ("logs-postgres-*" ), mappingTemplate ,
1138
+ null , 100L , null , null , new ComposableIndexTemplate .DataStreamTemplate ("@timestamp" ));
1131
1139
service .addIndexTemplateV2 (stateWithDS , false , "logs" , newTemplate );
1132
1140
});
1133
1141
@@ -1136,8 +1144,8 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
1136
1144
"cause data streams [unreferenced, logs-mysql-default] to no longer match a data stream template" ));
1137
1145
1138
1146
// Add an additional template that matches our data stream at a lower priority
1139
- ComposableIndexTemplate mysqlTemplate = new ComposableIndexTemplate (Collections .singletonList ("logs-mysql-*" ), null , null ,
1140
- 50L , null , null , new ComposableIndexTemplate .DataStreamTemplate ("@timestamp" ));
1147
+ ComposableIndexTemplate mysqlTemplate = new ComposableIndexTemplate (Collections .singletonList ("logs-mysql-*" ), mappingTemplate ,
1148
+ null , 50L , null , null , new ComposableIndexTemplate .DataStreamTemplate ("@timestamp" ));
1141
1149
ClusterState stateWithDSAndTemplate = service .addIndexTemplateV2 (stateWithDS , false , "logs-mysql" , mysqlTemplate );
1142
1150
1143
1151
// We should be able to replace the "logs" template, because we have the "logs-mysql" template that can handle the data stream
0 commit comments