Merge branch 'main' into fix/143368

Author: kkrik-es

server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java

@@ -74,6 +74,9 @@ public class MapperFeatures implements FeatureSpecification {
     static final NodeFeature MV_MIN_FUNCTION_FUSE_TO_LOAD = new NodeFeature("mapper.keyword.mv_min_function_fuse_to_load");
     static final NodeFeature TDIGEST_TYPE = new NodeFeature("mapper.tdigest_type");
     public static final NodeFeature TEXT_FIELD_DOC_VALUES = new NodeFeature("mapper.text.doc_values");
+    static final NodeFeature DENSE_VECTOR_DYNAMIC_TEMPLATE_DOTTED_FIELD_FIX = new NodeFeature(
+        "mapper.dense_vector.dynamic_template_dotted_field_fix"
+    );
 
     @Override
     public Set<NodeFeature> getTestFeatures() {
@@ -127,7 +130,8 @@ public Set<NodeFeature> getTestFeatures() {
             HIGH_CARDINALITY_LENGTH_FUNCTION_FUSE_TO_LOAD,
             MV_MIN_FUNCTION_FUSE_TO_LOAD,
             TDIGEST_TYPE,
-            TEXT_FIELD_DOC_VALUES
+            TEXT_FIELD_DOC_VALUES,
+            DENSE_VECTOR_DYNAMIC_TEMPLATE_DOTTED_FIELD_FIX
         );
     }
 }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java

@@ -345,7 +345,10 @@ static RoleDescriptor kibanaSystem(String name) {
                     )
                     .build(),
                 // Kibana logs streams
-                RoleDescriptor.IndicesPrivileges.builder().indices("logs", "logs.*").privileges("read", "manage").build(),
+                RoleDescriptor.IndicesPrivileges.builder()
+                    .indices("logs", "logs.*", "$.logs", "$.logs.*")
+                    .privileges("read", "manage")
+                    .build(),
                 // Kibana Security Solution EDR workflows team
                 // - `.endpoint-script-file*`:
                 // indexes are used internally within Kibana in support of Elastic Defend scripts library.

x-pack/plugin/rank-vectors/src/main/java/org/elasticsearch/xpack/rank/vectors/RankVectorsFeatures.java

@@ -14,10 +14,13 @@
 
 public class RankVectorsFeatures implements FeatureSpecification {
     public static final NodeFeature RANK_VECTORS_FEATURE = new NodeFeature("rank_vectors");
+    static final NodeFeature RANK_VECTORS_DYNAMIC_TEMPLATE_DOTTED_FIELD_FIX = new NodeFeature(
+        "mapper.rank_vectors.dynamic_template_dotted_field_fix"
+    );
 
     @Override
     public Set<NodeFeature> getTestFeatures() {
-        return Set.of(RANK_VECTORS_FEATURE);
+        return Set.of(RANK_VECTORS_FEATURE, RANK_VECTORS_DYNAMIC_TEMPLATE_DOTTED_FIELD_FIX);
     }
 
 }