Skip to content

Commit 084ba05

Browse files
Merge branch 'main' into knowledge-base-index-privileges
2 parents 2b0f455 + e6103ba commit 084ba05

File tree

35 files changed

+420
-416
lines changed

35 files changed

+420
-416
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,29 @@ PUT test-index
486486
}
487487
```
488488

489+
## Troubleshooting semantic_text fields [troubleshooting-semantic-text-fields]
490+
491+
If you want to verify that your embeddings look correct, you can view the
492+
inference data that `semantic_text` typically hides using `fields`.
493+
494+
```console
495+
POST test-index/_search
496+
{
497+
"query": {
498+
"match": {
499+
"my_semantic_field": "Which country is Paris in?"
500+
},
501+
"fields": [
502+
"_inference_fields"
503+
]
504+
}
505+
}
506+
```
507+
508+
This will return verbose chunked embeddings content that is used to perform
509+
semantic search for `semantic_text` fields.
510+
511+
489512
## Limitations [limitations]
490513

491514
`semantic_text` field types have the following limitations:

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,6 @@ static RoleDescriptor kibanaSystem(String name) {
333333
"indices:admin/data_stream/lifecycle/put"
334334
)
335335
.build(),
336-
// Read datasets for auto install content packages feature in Fleet
337-
RoleDescriptor.IndicesPrivileges.builder().indices("logs-*", "metrics-*", "traces-*").privileges("read").build(),
338336
// Endpoint specific action responses. Kibana reads and writes (for third party
339337
// agents) to the index to display action responses to the user.
340338
// `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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,10 +1402,7 @@ public void testKibanaSystemRole() {
14021402
|| indexName.startsWith(".logs-endpoint.actions-")
14031403
|| indexName.startsWith(".logs-endpoint.action.responses-")
14041404
|| indexName.startsWith(".logs-endpoint.heartbeat-")
1405-
|| indexName.startsWith(".logs-osquery_manager.actions-")
1406-
|| indexName.startsWith("logs-")
1407-
|| indexName.startsWith("metrics-")
1408-
|| indexName.startsWith("traces-");
1405+
|| indexName.startsWith(".logs-osquery_manager.actions-");
14091406
assertThat(
14101407
kibanaRole.indices().allowedIndicesMatcher(TransportGetAction.TYPE.name()).test(indexAbstraction),
14111408
is(isAlsoReadIndex)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -900,28 +900,28 @@ tasks.named('stringTemplates').configure {
900900
}
901901

902902
// TODO: add {value}_over_time for other types: boolean, bytes_refs
903-
File valueOverTimeAggregatorInputFile = file("src/main/java/org/elasticsearch/compute/aggregation/X-ValueOverTimeAggregator.java.st")
903+
File valueByTimestampAggregatorInputFile = file("src/main/java/org/elasticsearch/compute/aggregation/X-ValueByTimestampAggregator.java.st")
904904
["First", "Last"].forEach { Occurrence ->
905905
{
906906
template {
907907
it.properties = addOccurrence(intProperties, Occurrence)
908-
it.inputFile = valueOverTimeAggregatorInputFile
909-
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeIntAggregator.java"
908+
it.inputFile = valueByTimestampAggregatorInputFile
909+
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}IntByTimestampAggregator.java"
910910
}
911911
template {
912912
it.properties = addOccurrence(longProperties, Occurrence)
913-
it.inputFile = valueOverTimeAggregatorInputFile
914-
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeLongAggregator.java"
913+
it.inputFile = valueByTimestampAggregatorInputFile
914+
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}LongByTimestampAggregator.java"
915915
}
916916
template {
917917
it.properties = addOccurrence(floatProperties, Occurrence)
918-
it.inputFile = valueOverTimeAggregatorInputFile
919-
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeFloatAggregator.java"
918+
it.inputFile = valueByTimestampAggregatorInputFile
919+
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}FloatByTimestampAggregator.java"
920920
}
921921
template {
922922
it.properties = addOccurrence(doubleProperties, Occurrence)
923-
it.inputFile = valueOverTimeAggregatorInputFile
924-
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}OverTimeDoubleAggregator.java"
923+
it.inputFile = valueByTimestampAggregatorInputFile
924+
it.outputFile = "org/elasticsearch/compute/aggregation/${Occurrence}DoubleByTimestampAggregator.java"
925925
}
926926
}
927927
}
Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)