Skip to content

Commit f7281b8

Browse files
authored
Modify fleet search URLs to avoid url collisions (#79856)
Currently the fleet search URL of /_fleet/_msearch will collide with the normal msearch API when the fleet plugin is not enabled. This is because _fleet will be identified as an index to search. This commit resolves the issue by changing the APIs to /_fleet/_fleet_search and /_fleet/_fleet_msearch.
1 parent b59e0dc commit f7281b8

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

docs/reference/fleet/fleet-multi-search.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ without prior notice.
1717
[[fleet-multi-search-api-request]]
1818
==== {api-request-title}
1919

20-
`GET /_fleet/_msearch`
20+
`GET /_fleet/_fleet_msearch`
2121

22-
`GET /<index>/_fleet/_msearch`
22+
`GET /<index>/_fleet/_fleet_msearch`
2323

2424
[[fleet-multi-search-api-path-params]]
2525
==== {api-path-parms-title}

docs/reference/fleet/fleet-search.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ timed out.
4242
[[fleet-search-api-request]]
4343
==== {api-request-title}
4444

45-
`GET /<target>/_fleet/_search`
45+
`GET /<target>/_fleet/_fleet_search`
4646

4747
[[fleet-search-api-path-params]]
4848
==== {api-path-parms-title}

rest-api-spec/src/main/resources/rest-api-spec/api/fleet.msearch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"url":{
1414
"paths":[
1515
{
16-
"path":"/_fleet/_msearch",
16+
"path":"/_fleet/_fleet_msearch",
1717
"methods":[
1818
"GET",
1919
"POST"
2020
]
2121
},
2222
{
23-
"path":"/{index}/_fleet/_msearch",
23+
"path":"/{index}/_fleet/_fleet_msearch",
2424
"methods":[
2525
"GET",
2626
"POST"

rest-api-spec/src/main/resources/rest-api-spec/api/fleet.search.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url":{
1414
"paths":[
1515
{
16-
"path":"/{index}/_fleet/_search",
16+
"path":"/{index}/_fleet/_fleet_search",
1717
"methods":[
1818
"GET",
1919
"POST"

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/rest/RestFleetMultiSearchAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ public String getName() {
4848
@Override
4949
public List<Route> routes() {
5050
return Arrays.asList(
51-
new Route(GET, "/_fleet/_msearch"),
52-
new Route(POST, "/_fleet/_msearch"),
53-
new Route(GET, "/{index}/_fleet/_msearch"),
54-
new Route(POST, "/{index}/_fleet/_msearch")
51+
new Route(GET, "/_fleet/_fleet_msearch"),
52+
new Route(POST, "/_fleet/_fleet_msearch"),
53+
new Route(GET, "/{index}/_fleet/_fleet_msearch"),
54+
new Route(POST, "/{index}/_fleet/_fleet_msearch")
5555
);
5656
}
5757

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/rest/RestFleetSearchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public String getName() {
3838

3939
@Override
4040
public List<Route> routes() {
41-
return Arrays.asList(new Route(GET, "/{index}/_fleet/_search"), new Route(POST, "/{index}/_fleet/_search"));
41+
return Arrays.asList(new Route(GET, "/{index}/_fleet/_fleet_search"), new Route(POST, "/{index}/_fleet/_fleet_search"));
4242
}
4343

4444
@Override

0 commit comments

Comments
 (0)