kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Append the root slash(/) to getIndex and getTemplate requests in ES client (#6663) 

* Append the root slash(/) to getIndex and getTemplate requests

Signed-off-by: Gao Hongtao <hanahmily@gmail.com>

* Document this bug

Signed-off-by: Gao Hongtao <hanahmily@gmail.com>
This commit is contained in:
Gao Hongtao 2021-04-01 14:26:57 +08:00 committed by GitHub
parent 75b52917df
commit b8a040ea74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -65,6 +65,7 @@ Release Notes.
* Add function `retagByK8sMeta` and opt type `K8sRetagType.Pod2Service` in MAL for k8s to relate pods and services. * Add function `retagByK8sMeta` and opt type `K8sRetagType.Pod2Service` in MAL for k8s to relate pods and services.
* Fix ALS K8SServiceRegistry didn't remove the correct entry. * Fix ALS K8SServiceRegistry didn't remove the correct entry.
* Using "service.istio.io/canonical-name" to replace "app" label to resolve Envoy ALS service name * Using "service.istio.io/canonical-name" to replace "app" label to resolve Envoy ALS service name
* Append the root slash(/) to getIndex and getTemplate requests in ES client
#### UI #### UI
* Update selector scroller to show in all pages. * Update selector scroller to show in all pages.

4
oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
View File

@ -234,7 +234,7 @@ public class ElasticSearchClient implements Client, HealthCheckable {
indexName = formatIndexName(indexName); indexName = formatIndexName(indexName);
try { try {
Response response = client.getLowLevelClient() Response response = client.getLowLevelClient()
.performRequest(HttpGet.METHOD_NAME, indexName); .performRequest(HttpGet.METHOD_NAME, "/" + indexName);
int statusCode = response.getStatusLine().getStatusCode(); int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) { if (statusCode != HttpStatus.SC_OK) {
healthChecker.health(); healthChecker.health();
@ -341,7 +341,7 @@ public class ElasticSearchClient implements Client, HealthCheckable {
name = formatIndexName(name); name = formatIndexName(name);
try { try {
Response response = client.getLowLevelClient() Response response = client.getLowLevelClient()
.performRequest(HttpGet.METHOD_NAME, "_template/" + name); .performRequest(HttpGet.METHOD_NAME, "/_template/" + name);
int statusCode = response.getStatusLine().getStatusCode(); int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) { if (statusCode != HttpStatus.SC_OK) {
healthChecker.health(); healthChecker.health();