fixed conflicts

Author: Supplementing

docs/reference/elasticsearch/mapping-reference/semantic-text.md

@@ -486,6 +486,29 @@ PUT test-index
 }
 ```
 
+## Troubleshooting semantic_text fields [troubleshooting-semantic-text-fields]
+
+If you want to verify that your embeddings look correct, you can view the
+inference data that `semantic_text` typically hides using `fields`.
+
+```console
+POST test-index/_search
+{
+    "query": {
+        "match": {
+            "my_semantic_field": "Which country is Paris in?"
+        },
+        "fields": [
+            "_inference_fields"
+          ]
+    }
+}
+```
+
+This will return verbose chunked embeddings content that is used to perform
+semantic search for `semantic_text` fields.
+
+
 ## Limitations [limitations]
 
 `semantic_text` field types have the following limitations:

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

@@ -174,11 +174,17 @@ static RoleDescriptor kibanaSystem(String name) {
                     .privileges("write", "delete", "create_index")
                     .allowRestrictedIndices(true)
                     .build(),
+<<<<<<< HEAD
                 // Knowledge base. Fleet creates, manages, and uses this index to store knowledge base documents to be consumed by AI assistants.
                 RoleDescriptor.IndicesPrivileges.builder()
                     .indices(".integration_knowledge*")
                     .privileges("read", "write", "create_index")
                     .build(),
+=======
+                // Knowledge base. Fleet creates, manages, and uses this index to store knowledge base documents to be consumed by AI
+                // assistants.
+                RoleDescriptor.IndicesPrivileges.builder().indices(".integration_knowledge*").privileges("all").build(),
+>>>>>>> 774c20bab17bd45c93886bdda6c3eb38d348e99a
                 // Other Fleet indices. Kibana reads and writes to these indices to manage
                 // Elastic Agents.
                 RoleDescriptor.IndicesPrivileges.builder()
@@ -333,8 +339,6 @@ static RoleDescriptor kibanaSystem(String name) {
                         "indices:admin/data_stream/lifecycle/put"
                     )
                     .build(),
-                // Read datasets for auto install content packages feature in Fleet
-                RoleDescriptor.IndicesPrivileges.builder().indices("logs-*", "metrics-*", "traces-*").privileges("read").build(),
                 // Endpoint specific action responses. Kibana reads and writes (for third party
                 // agents) to the index to display action responses to the user.
                 // `create_index`: is necessary in order to ensure that the DOT datastream index is

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java

@@ -1422,10 +1422,7 @@ public void testKibanaSystemRole() {
                 || indexName.startsWith(".logs-endpoint.actions-")
                 || indexName.startsWith(".logs-endpoint.action.responses-")
                 || indexName.startsWith(".logs-endpoint.heartbeat-")
-                || indexName.startsWith(".logs-osquery_manager.actions-")
-                || indexName.startsWith("logs-")
-                || indexName.startsWith("metrics-")
-                || indexName.startsWith("traces-");
+                || indexName.startsWith(".logs-osquery_manager.actions-");
             assertThat(
                 kibanaRole.indices().allowedIndicesMatcher(TransportGetAction.TYPE.name()).test(indexAbstraction),
                 is(isAlsoReadIndex)

x-pack/plugin/esql/compute/build.gradle

@@ -900,28 +900,28 @@ tasks.named('stringTemplates').configure {
   }
 
   // TODO: add {value}_over_time for other types: boolean, bytes_refs
-  File valueOverTimeAggregatorInputFile = file("src/main/java/org/elasticsearch/compute/aggregation/X-ValueOverTimeAggregator.java.st")
+  File valueByTimestampAggregatorInputFile = file("src/main/java/org/elasticsearch/compute/aggregation/X-ValueByTimestampAggregator.java.st")
   ["First", "Last"].forEach { Occurrence ->
     {
       template {
         it.properties = addOccurrence(intProperties, Occurrence)
-        it.inputFile = valueOverTimeAggregatorInputFile
-        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeIntAggregator.java"
+        it.inputFile = valueByTimestampAggregatorInputFile
+        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}IntByTimestampAggregator.java"
       }
       template {
         it.properties = addOccurrence(longProperties, Occurrence)
-        it.inputFile = valueOverTimeAggregatorInputFile
-        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeLongAggregator.java"
+        it.inputFile = valueByTimestampAggregatorInputFile
+        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}LongByTimestampAggregator.java"
       }
       template {
         it.properties = addOccurrence(floatProperties, Occurrence)
-        it.inputFile = valueOverTimeAggregatorInputFile
-        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeFloatAggregator.java"
+        it.inputFile = valueByTimestampAggregatorInputFile
+        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}FloatByTimestampAggregator.java"
       }
       template {
         it.properties = addOccurrence(doubleProperties, Occurrence)
-        it.inputFile = valueOverTimeAggregatorInputFile
-        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeDoubleAggregator.java"
+        it.inputFile = valueByTimestampAggregatorInputFile
+        it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}DoubleByTimestampAggregator.java"
       }
     }
   }