This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new bacd8e3f feat: add log field into es in /ozhera-log (#523)
bacd8e3f is described below
commit bacd8e3f009c38e7c24bf60df87b914f069af147
Author: songyutong1 <[email protected]>
AuthorDate: Thu Feb 6 10:39:08 2025 +0800
feat: add log field into es in /ozhera-log (#523)
---
.../src/main/java/org/apache/ozhera/log/model/LogtailConfig.java | 2 ++
.../main/java/org/apache/ozhera/log/manager/model/vo/QuickQueryVO.java | 2 +-
.../org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java | 1 +
.../ozhera/log/manager/service/impl/MilogConfigNacosServiceImpl.java | 1 +
.../java/org/apache/ozhera/log/stream/common/LogStreamConstants.java | 1 +
.../src/main/java/org/apache/ozhera/log/stream/job/JobManager.java | 1 +
.../src/main/java/org/apache/ozhera/log/stream/job/LogDataTransfer.java | 1 +
.../src/main/java/org/apache/ozhera/log/stream/job/SinkJobConfig.java | 1 +
8 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/model/LogtailConfig.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/model/LogtailConfig.java
index 68a3c6d5..5dbf8aea 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/model/LogtailConfig.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/model/LogtailConfig.java
@@ -38,6 +38,8 @@ public class LogtailConfig {
private String type;
private Integer appType;
+ private String deploySpace;
+
private Integer parseType;
private String tail;
/**
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/vo/QuickQueryVO.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/vo/QuickQueryVO.java
index eea42217..3b217883 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/vo/QuickQueryVO.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/vo/QuickQueryVO.java
@@ -46,6 +46,6 @@ public class QuickQueryVO implements Serializable {
private String envName;
private Integer isFavourite;
private String deploySpace;
-
+ private String logPath;
private Boolean collectionReady;
}
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
index 7d975ce0..0afe2eb2 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java
@@ -164,6 +164,7 @@ public class LogTailServiceImpl extends BaseService
implements LogTailService {
.envName(logTailDo.getEnvName())
.isFavourite(isFavourite == null || isFavourite < 1 ? 0 : 1)
.deploySpace(logTailDo.getDeploySpace())
+ .logPath(logTailDo.getLogPath())
.collectionReady(logTailDo.getCollectionReady())
.build();
}
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/MilogConfigNacosServiceImpl.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/MilogConfigNacosServiceImpl.java
index eb22b7c9..964ff95b 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/MilogConfigNacosServiceImpl.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/MilogConfigNacosServiceImpl.java
@@ -447,6 +447,7 @@ public class MilogConfigNacosServiceImpl implements
MilogConfigNacosService {
logtailConfig.setParseScript(milogLogTail.getParseScript());
logtailConfig.setValueList(milogLogTail.getValueList());
logtailConfig.setAppType(milogLogTail.getAppType());
+ logtailConfig.setDeploySpace(milogLogTail.getDeploySpace());
// Query MQ information
handleTailConfig(tailId, milogLogTail.getStoreId(),
milogLogTail.getSpaceId(),
milogLogTail.getMilogAppId(), logtailConfig,
milogLogTail.getAppType());
diff --git
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/common/LogStreamConstants.java
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/common/LogStreamConstants.java
index 5923260e..a4273edf 100644
---
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/common/LogStreamConstants.java
+++
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/common/LogStreamConstants.java
@@ -38,5 +38,6 @@ public class LogStreamConstants {
public static final String LOG_STREAM_SPACE_ID = "spaceId";
public static final String LOG_STREAM_STORE_ID = "storeId";
public static final String LOG_STREAM_TAIL_ID = "tailId";
+ public static final String DEPLOY_SPACE = "deploy_space";
}
diff --git
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
index 447419d5..ac6fa56d 100644
---
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
+++
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
@@ -186,6 +186,7 @@ public class JobManager {
.jobType(SinkJobEnum.NORMAL_JOB.name())
.storageType(sinkConfig.getStorageType())
.consumerGroup(logtailConfig.getConsumerGroup())
+ .deploySpace(logtailConfig.getDeploySpace())
.build();
sinkJobConfig.setLogTailId(logtailConfig.getLogtailId());
sinkJobConfig.setLogStoreId(sinkConfig.getLogstoreId());
diff --git
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/LogDataTransfer.java
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/LogDataTransfer.java
index 1bcdb0b0..d63f3896 100644
---
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/LogDataTransfer.java
+++
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/LogDataTransfer.java
@@ -143,6 +143,7 @@ public class LogDataTransfer {
dataMap.putIfAbsent(LOG_STREAM_SPACE_ID,
sinkJobConfig.getLogSpaceId());
dataMap.putIfAbsent(LOG_STREAM_STORE_ID,
sinkJobConfig.getLogStoreId());
dataMap.putIfAbsent(LOG_STREAM_TAIL_ID, sinkJobConfig.getLogTailId());
+ dataMap.putIfAbsent(DEPLOY_SPACE, sinkJobConfig.getDeploySpace());
}
private void sendMessage(Map<String, Object> dataMap) throws Exception {
diff --git
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/SinkJobConfig.java
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/SinkJobConfig.java
index ec41152a..476ccc55 100644
---
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/SinkJobConfig.java
+++
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/SinkJobConfig.java
@@ -61,4 +61,5 @@ public class SinkJobConfig extends LogConfig {
*/
private String jobType;
private String consumerGroup;
+ private String deploySpace;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
