This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new d214bafcc8 [type:feature] es logging support for custom index (#5102)
d214bafcc8 is described below
commit d214bafcc8c43533febcdbb50aee9f9d48b1750c
Author: Misaya295 <[email protected]>
AuthorDate: Fri Sep 1 16:57:32 2023 +0800
[type:feature] es logging support for custom index (#5102)
* fix sql
* add indexName
* fix style
* fix ci
* fix ci
---
db/init/mysql/schema.sql | 2 +-
db/init/og/create-table.sql | 2 +-
db/init/oracle/schema.sql | 2 +-
db/init/pg/create-table.sql | 2 +-
db/upgrade/2.6.0-upgrade-2.6.1-mysql.sql | 4 ++++
db/upgrade/2.6.0-upgrade-2.6.1-og.sql | 6 +++++-
db/upgrade/2.6.0-upgrade-2.6.1-oracle.sql | 5 ++++-
db/upgrade/2.6.0-upgrade-2.6.1-pg.sql | 6 +++++-
.../src/main/resources/sql-script/h2/schema.sql | 2 +-
.../client/ElasticSearchLogCollectClient.java | 25 +++++++++++-----------
.../collector/ElasticSearchLogCollector.java | 6 ++++++
.../config/ElasticSearchLogCollectConfig.java | 21 +++++++++++++++++-
.../LoggingElasticSearchPluginDataHandler.java | 4 ++++
13 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 57a9c85dc5..023d1cae83 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -1029,7 +1029,7 @@ INSERT INTO `plugin_handle` VALUES
('1529402613204172885', '32', 'sampleRate', '
INSERT INTO `plugin_handle` VALUES ('1529402613204172886', '32',
'maxResponseBody', 'maxResponseBody', 1, 3, 7,
'{\"required\":\"0\",\"defaultValue\":524288}', '2022-06-19 22:00:00',
'2022-06-19 22:00:00');
INSERT INTO `plugin_handle` VALUES ('1529402613204172887', '32',
'maxRequestBody', 'maxRequestBody', 1, 3, 8,
'{\"required\":\"0\",\"defaultValue\":524288}', '2022-06-19 22:00:00',
'2022-06-19 22:00:00');
INSERT INTO `plugin_handle` VALUES ('1529402613204172888', '32',
'compressAlg', 'compressAlg', 3, 3, 9,
'{\"required\":\"0\",\"defaultValue\":\"none\"}', '2022-06-19 22:00:00',
'2022-06-19 22:00:00');
-INSERT INTO `plugin_handle` VALUES ('1529402613204172889', '32', 'index',
'index', 2, 1, 1,
'{\"required\":\"0\",\"defaultValue\":\"\",\"placeholder\":\"optional\"}',
'2022-06-19 22:00:00', '2022-06-19 22:00:00');
+INSERT INTO `plugin_handle` VALUES ('1529402613204172889', '32', 'indexName',
'indexName', 2, 3, 10,
'{\"required\":\"0\",\"defaultValue\":\"shenyu-access-logging\"}', '2022-06-19
22:00:00', '2022-06-19 22:00:00');
INSERT INTO `plugin_handle` VALUES ('1529402613204172890', '32', 'sampleRate',
'sampleRate', 2, 1, 2,
'{\"required\":\"0\",\"defaultValue\":\"\",\"placeholder\":\"optional,0,0.01~1\"}',
'2022-06-19 22:00:00', '2022-06-19 22:00:00');
INSERT INTO `plugin_handle` VALUES ('1529402613204172891', '1',
'signRequestBody', 'signRequestBody', 3, 2, 9,
'{"required":"0","defaultValue":"false","placeholder":"signRequestBody","rule":""}',
'2022-06-29 10:08:02', '2022-06-29 10:08:02');
INSERT INTO `plugin_handle` VALUES ('1529402613204172892', '33', 'topic',
'topic', 2, 3, 1,
'{\"required\":\"1\",\"defaultValue\":\"shenyu-access-logging\"}', '2022-07-04
22:00:00', '2022-07-04 22:00:00');
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index b0b198478f..4614330738 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -1174,7 +1174,7 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529403902783524923', '32', 'sampl
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524924', '32',
'maxResponseBody', 'maxResponseBody', 1, 3, 8,
'{"required":"0","defaultValue":524288}', '2022-06-19 22:00:00', '2022-06-19
22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524925', '32',
'maxRequestBody', 'maxRequestBody', 1, 3, 9,
'{"required":"0","defaultValue":524288}', '2022-06-19 22:00:00', '2022-06-19
22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524926', '32',
'compressAlg', 'compressAlg', 3, 3, 10,
'{"required":"0","defaultValue":"none"}', '2022-06-19 22:00:00', '2022-06-19
22:00:00');
-INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524927', '32',
'index', 'index', 2, 1, 1,
'{"required":"0","defaultValue":"","placeholder":"optional"}', '2022-06-19
22:00:00', '2022-06-19 22:00:00');
+INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524927', '32',
'indexName', 'indexName', 2, 3, 10,
'{"required":"0","defaultValue":"shenyu-access-logging"}', '2022-06-19
22:00:00', '2022-06-19 22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524928', '32',
'sampleRate', 'sampleRate', 2, 1, 2,
'{"required":"0","defaultValue":"","placeholder":"optional,0,0.01~1"}',
'2022-06-19 22:00:00', '2022-06-19 22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524929', '1',
'signRequestBody', 'signRequestBody', 3, 2, 9,
'{"required":"0","defaultValue":"false","placeholder":"signRequestBody","rule":""}',
'2022-06-29 10:08:02', '2022-06-29 10:08:02');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524950', '33',
'topic', 'topic', 2, 3, 1,
'{"required":"1","defaultValue":"shenyu-access-logging"}', '2022-07-04
22:00:00', '2022-07-04 22:00:00');
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index 81a7751493..88f6ba4f73 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -1672,7 +1672,7 @@ insert /*+
IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type)) */
values ('1518229897214468173', '32', 'compressAlg', 'compressAlg', 3, 3, 9,
'{"required":"0","defaultValue":"none"}');
insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
-values ('1518229897214468174', '32', 'index', 'index', 2, 1, 1,
'{"required":"0","defaultValue":"","placeholder":"optional"}');
+values ('1518229897214468174', '32', 'indexName', 'indexName', 2, 3, 10,
'{"required":"1","defaultValue":"shenyu-access-logging"}');
insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
values ('1518229897214468175', '32', 'sampleRate', 'sampleRate', 2, 1, 2,
'{"required":"0","defaultValue":"","placeholder":"optional,0,0.01~1"}');
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 3472e3a5e5..cbbb1e5e2f 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -1173,7 +1173,7 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529403902783524923', '32', 'sampl
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524924', '32',
'maxResponseBody', 'maxResponseBody', 1, 3, 8,
'{"required":"0","defaultValue":524288}', '2022-06-19 22:00:00', '2022-06-19
22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524925', '32',
'maxRequestBody', 'maxRequestBody', 1, 3, 9,
'{"required":"0","defaultValue":524288}', '2022-06-19 22:00:00', '2022-06-19
22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524926', '32',
'compressAlg', 'compressAlg', 3, 3, 10,
'{"required":"0","defaultValue":"none"}', '2022-06-19 22:00:00', '2022-06-19
22:00:00');
-INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524927', '32',
'index', 'index', 2, 1, 1,
'{"required":"0","defaultValue":"","placeholder":"optional"}', '2022-06-19
22:00:00', '2022-06-19 22:00:00');
+INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524927', '32',
'indexName', 'indexName', 2, 3, 10,
'{"required":"1","defaultValue":"shenyu-access-logging"}', '2022-06-19
22:00:00', '2022-06-19 22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524928', '32',
'sampleRate', 'sampleRate', 2, 1, 2,
'{"required":"0","defaultValue":"","placeholder":"optional,0,0.01~1"}',
'2022-06-19 22:00:00', '2022-06-19 22:00:00');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524929', '1',
'signRequestBody', 'signRequestBody', 3, 2, 9,
'{"required":"0","defaultValue":"false","placeholder":"signRequestBody","rule":""}',
'2022-06-29 10:08:02', '2022-06-29 10:08:02');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524950', '33',
'topic', 'topic', 2, 3, 1,
'{"required":"1","defaultValue":"shenyu-access-logging"}', '2022-07-04
22:00:00', '2022-07-04 22:00:00');
diff --git a/db/upgrade/2.6.0-upgrade-2.6.1-mysql.sql
b/db/upgrade/2.6.0-upgrade-2.6.1-mysql.sql
index fd724059e3..94678f2316 100755
--- a/db/upgrade/2.6.0-upgrade-2.6.1-mysql.sql
+++ b/db/upgrade/2.6.0-upgrade-2.6.1-mysql.sql
@@ -22,3 +22,7 @@ INSERT INTO `plugin_handle` VALUES ('1529402613204172777',
'38', 'ttl', 'ttl', 3
INSERT INTO `shenyu_dict` VALUES ('1572621976689762310', 'engine', 'engine',
'ReplicatedReplicatedMergeTree', 'ReplicatedReplicatedMergeTree', '', 2, 1,
'2023-03-01 11:14:15', '2023-08-16 11:15:14');
INSERT INTO `shenyu_dict` VALUES ('1572621976689762311', 'engine', 'engine',
'ReplicatedMergeTree', 'ReplicatedMergeTree', '', 3, 1, '2023-03-01 11:14:15',
'2023-08-16 11:15:14');
---- clickhouse plugin end
+
+--elasticsearch plugin
+UPDATE `shenyu`.`plugin_handle` SET `plugin_id` = '32', `field` = 'indexName',
`label` = 'indexName', `data_type` = 2, `type` = 3, `sort` = 10, `ext_obj` =
'{\"required\":\"0\",\"defaultValue\":\"shenyu-access-logging\"}',
`date_created` = '2022-06-19 22:00:00.000', `date_updated` = '2023-08-31
22:28:28.353' WHERE `plugin_id` = '32' and field = 'index';
+--elasticsearch plugin end
\ No newline at end of file
diff --git a/db/upgrade/2.6.0-upgrade-2.6.1-og.sql
b/db/upgrade/2.6.0-upgrade-2.6.1-og.sql
index dcedc40847..27ec4fa4cf 100644
--- a/db/upgrade/2.6.0-upgrade-2.6.1-og.sql
+++ b/db/upgrade/2.6.0-upgrade-2.6.1-og.sql
@@ -22,4 +22,8 @@ INSERT INTO "public"."shenyu_dict" VALUES
('1629403902796107811', 'operator', 'O
INSERT INTO "public"."plugin_handle" VALUES ('1529402613204172777', '38',
'ttl', 'ttl', 3, 3, 10, '{"required":"0","defaultValue":"30"}', '2023-03-01
11:14:15', '2023-08-16 11:15:14');
INSERT INTO "public"."shenyu_dict" VALUES ('1572621976689762310', 'engine',
'engine', 'ReplicatedReplicatedMergeTree', 'ReplicatedReplicatedMergeTree', '',
2, 1, '2023-03-01 11:14:15', '2023-08-16 11:15:14');
INSERT INTO "public"."shenyu_dict" VALUES ('1572621976689762311', 'engine',
'engine', 'ReplicatedMergeTree', 'ReplicatedMergeTree', '', 3, 1, '2023-03-01
11:14:15', '2023-08-16 11:15:14');
---- clickhouse plugin end
\ No newline at end of file
+--- clickhouse plugin end
+
+--elasticsearch plugin
+UPDATE "public"."plugin_handle" SET plugin_id = '32', field = 'indexName',
label = 'indexName', data_type = 2, type = 3, sort = 10, ext_obj =
'{"required":"0","defaultValue":"shenyu-access-logging"}', date_created =
'2022-06-19 22:00:00.000', date_updated = '2023-08-31 22:28:28.353' WHERE
plugin_id = '32' AND field = 'index';
+--elasticsearch plugin end
diff --git a/db/upgrade/2.6.0-upgrade-2.6.1-oracle.sql
b/db/upgrade/2.6.0-upgrade-2.6.1-oracle.sql
index f6d1bc3dd5..bd883471f5 100755
--- a/db/upgrade/2.6.0-upgrade-2.6.1-oracle.sql
+++ b/db/upgrade/2.6.0-upgrade-2.6.1-oracle.sql
@@ -30,4 +30,7 @@ insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(shenyu_dict(type,
dict_code, dict_name)) *
VALUES ('1572621976689762311', 'engine', 'engine', 'ReplicatedMergeTree',
'ReplicatedMergeTree', '', 3, 1);
---- clickhouse plugin end
-
+--elasticsearch plugin
+update plugin_handle set plugin_id = '32', field = 'indexName', label =
'indexName', data_type = 2, type = 3, sort = 10, ext_obj =
'{\"required\":\"0\",\"defaultValue\":\"shenyu-access-logging\"}'
+where plugin_id = '32' and field = 'index';
+--elasticsearch plugin end
\ No newline at end of file
diff --git a/db/upgrade/2.6.0-upgrade-2.6.1-pg.sql
b/db/upgrade/2.6.0-upgrade-2.6.1-pg.sql
index f8a33b745b..07074ccdbc 100755
--- a/db/upgrade/2.6.0-upgrade-2.6.1-pg.sql
+++ b/db/upgrade/2.6.0-upgrade-2.6.1-pg.sql
@@ -22,4 +22,8 @@ INSERT INTO "public"."shenyu_dict" VALUES
('1629403902796107811', 'operator', 'O
INSERT INTO "public"."shenyu_dict" VALUES ('1572621976689762310', 'engine',
'engine', 'ReplicatedReplicatedMergeTree', 'ReplicatedReplicatedMergeTree', '',
2, 1, '2023-03-01 11:14:15', '2023-08-16 11:15:14');
INSERT INTO "public"."shenyu_dict" VALUES ('1572621976689762311', 'engine',
'engine', 'ReplicatedMergeTree', 'ReplicatedMergeTree', '', 3, 1, '2023-03-01
11:14:15', '2023-08-16 11:15:14');
INSERT INTO "public"."plugin_handle" VALUES ('1529402613204172737', '38',
'ttl', 'ttl', 3, 3, 10, '{"required":"0","defaultValue":"30"}', '2023-03-01
11:14:15', '2023-08-16 11:15:14');
----- clickhouse plugin end
\ No newline at end of file
+---- clickhouse plugin end
+
+--elasticsearch plugin
+UPDATE "public"."plugin_handle" SET plugin_id = '32', field = 'indexName',
label = 'indexName', data_type = 2, type = 3, sort = 10, ext_obj =
'{"required":"0","defaultValue":"shenyu-access-logging"}', date_created =
'2022-06-19 22:00:00.000', date_updated = '2023-08-31 22:28:28.353' WHERE
plugin_id = '32' AND field = 'index';
+--elasticsearch plugin end
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index 20d92ffc0b..1ca3604984 100755
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -726,7 +726,7 @@ INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172879', '32', 'maxResponseBody', 'maxResponseBody', 1, 3, 7,
'{"required":"0","defaultValue":524288}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172880', '32', 'maxRequestBody', 'maxRequestBody', 1, 3, 8,
'{"required":"0","defaultValue":524288}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172881', '32', 'compressAlg', 'compressAlg', 3, 3, 9,
'{"required":"0","defaultValue":"none"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172882', '32', 'index', 'index', 2, 1, 1,
'{"required":"0","defaultValue":"","placeholder":"optional"}');
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172882', '32', 'indexName', 'indexName', 2, 3, 10,
'{"required":"0","defaultValue":"shenyu-access-logging"}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172883', '32', 'sampleRate', 'sampleRate', 2, 1, 2,
'{"required":"0","defaultValue":"","placeholder":"optional,0,0.01~1"}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172884', '1', 'signRequestBody', 'signRequestBody', 3, 2, 9,
'{"required":"0","defaultValue":"false","placeholder":"signRequestBody","rule":""}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172885', '33', 'topic', 'topic', 2, 3, 1,
'{"required":"1","defaultValue":"shenyu-access-logging"}');
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
index 8679d89f3c..29def36fb9 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
@@ -29,6 +29,7 @@ import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.shenyu.common.utils.LogUtils;
import org.apache.shenyu.plugin.logging.common.client.AbstractLogConsumeClient;
import org.apache.shenyu.plugin.logging.common.constant.GenericLoggingConstant;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
@@ -66,7 +67,7 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
public void initClient0(@NonNull final
ElasticSearchLogCollectConfig.ElasticSearchLogConfig config) {
RestClientBuilder builder = RestClient
.builder(new HttpHost(config.getHost(),
Integer.parseInt(config.getPort())));
-
+
// authentication and config auth cathe.
if (StringUtils.isNoneBlank(config.getUsername()) &&
StringUtils.isNoneBlank(config.getPassword())) {
final CredentialsProvider credentialsProvider = new
BasicCredentialsProvider();
@@ -79,15 +80,15 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
return
asyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
});
}
-
+
restClient = builder.build();
transport = new RestClientTransport(restClient, new
JacksonJsonpMapper());
client = new ElasticsearchClient(transport);
- LOG.info("init ElasticSearchLogCollectClient success");
+ LogUtils.info(LOG, "init ElasticSearchLogCollectClient success");
// Determine whether the index exists, and create it if it does not
exist
- if (!existsIndex(GenericLoggingConstant.INDEX)) {
- createIndex(GenericLoggingConstant.INDEX);
- LOG.info("create index success");
+ if (!existsIndex(config.getIndexName())) {
+ createIndex(config.getIndexName());
+ LogUtils.info(LOG, "create index success");
}
}
@@ -98,14 +99,14 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
try {
bulkOperations.add(new BulkOperation.Builder().create(d ->
d.document(log).index(GenericLoggingConstant.INDEX)).build());
} catch (Exception e) {
- LOG.error("add logs error", e);
+ LogUtils.error(LOG, "add logs error: ", e);
}
});
// Bulk storage
try {
client.bulk(e ->
e.index(GenericLoggingConstant.INDEX).operations(bulkOperations));
} catch (Exception e) {
- LOG.error("elasticsearch store logs error", e);
+ LogUtils.error(LOG, "elasticsearch store logs error:", e);
}
}
@@ -120,7 +121,7 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
BooleanResponse existsResponse = client.indices().exists(c ->
c.index(indexName));
return existsResponse.value();
} catch (Exception e) {
- LOG.error("fail to check the index exists");
+ LogUtils.error(LOG, "fail to check the index exists, error:", e);
}
return true;
}
@@ -134,7 +135,7 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
try {
client.indices().create(c -> c.index(indexName));
} catch (IOException e) {
- LOG.error("create index error");
+ LogUtils.error(LOG, "create index error:", e);
}
}
@@ -147,12 +148,12 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
try {
transport.close();
} catch (IOException e) {
- LOG.error("transport close has IOException : ", e);
+ LogUtils.error(LOG, "transport close has IOException : ", e);
}
try {
restClient.close();
} catch (IOException e) {
- LOG.error("restClient close has IOException : ", e);
+ LogUtils.error(LOG, "restClient close has IOException : ", e);
}
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
index 3044ce0b7a..2b48b87f52 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
@@ -45,6 +45,12 @@ public class ElasticSearchLogCollector extends
AbstractLogCollector<ElasticSearc
return
LoggingElasticSearchPluginDataHandler.getElasticSearchLogCollectClient();
}
+ /**
+ * desensitize log.
+ * @param log log entity
+ * @param keyWordMatch keyWordMatch
+ * @param desensitizeAlg data desensitize algorithm
+ */
@Override
protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/config/ElasticSearchLogCollectConfig.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/config/ElasticSearchLogCollectConfig.java
index 8cdb03624a..fd6160d815 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/config/ElasticSearchLogCollectConfig.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/config/ElasticSearchLogCollectConfig.java
@@ -68,6 +68,24 @@ public class ElasticSearchLogCollectConfig {
private String compressAlg;
+ private String indexName;
+
+ /**
+ * getIndexName.
+ * @return indexName
+ */
+ public String getIndexName() {
+ return indexName;
+ }
+
+ /**
+ * setIndexName.
+ * @param indexName indexName
+ */
+ public void setIndeName(final String indexName) {
+ this.indexName = indexName;
+ }
+
/**
* whether compress.
*
@@ -190,7 +208,8 @@ public class ElasticSearchLogCollectConfig {
&& Objects.equals(getSampleRate(), that.getSampleRate())
&& Objects.equals(getBufferQueueSize(),
that.getBufferQueueSize())
&& Objects.equals(getMaxResponseBody(),
that.getMaxRequestBody())
- && Objects.equals(getMaxRequestBody(),
that.getMaxResponseBody());
+ && Objects.equals(getMaxRequestBody(),
that.getMaxResponseBody())
+ && Objects.equals(getIndexName(), that.getIndexName());
}
@Override
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/handler/LoggingElasticSearchPluginDataHandler.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/handler/LoggingElasticSearchPluginDataHandler.java
index 82e3d8fe5c..88a41b5f3b 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/handler/LoggingElasticSearchPluginDataHandler.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/handler/LoggingElasticSearchPluginDataHandler.java
@@ -51,6 +51,10 @@ public class LoggingElasticSearchPluginDataHandler extends
AbstractLogPluginData
ELASTICSEARCH_LOG_COLLECT_CLIENT.initClient(globalLogConfig);
}
+ /**
+ * plugin named.
+ * @return plugin named.
+ */
@Override
public String pluginNamed() {
return PluginEnum.LOGGING_ELASTIC_SEARCH.getName();
