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 0f31b29f feat: add origin_system to logtail to identify third-party
plaform (#541)
0f31b29f is described below
commit 0f31b29f648c7bf84a09e0d1dbc9cb7d76234929
Author: Yandi Lee <[email protected]>
AuthorDate: Thu Feb 6 11:03:22 2025 +0800
feat: add origin_system to logtail to identify third-party plaform (#541)
---
ozhera-log/log-manager/pom.xml | 2 +-
.../java/org/apache/ozhera/log/manager/model/bo/LogTailParam.java | 2 ++
.../java/org/apache/ozhera/log/manager/model/dto/LogTailDTO.java | 2 ++
.../org/apache/ozhera/log/manager/model/pojo/MilogLogTailDo.java | 5 +++++
.../java/org/apache/ozhera/log/manager/model/vo/QuickQueryVO.java | 2 ++
.../apache/ozhera/log/manager/service/impl/LogTailServiceImpl.java | 7 +++++++
ozhera-log/log-manager/src/main/resources/log.sql | 4 +++-
7 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ozhera-log/log-manager/pom.xml b/ozhera-log/log-manager/pom.xml
index 9015576d..f197e805 100644
--- a/ozhera-log/log-manager/pom.xml
+++ b/ozhera-log/log-manager/pom.xml
@@ -30,7 +30,7 @@ http://www.apache.org/licenses/LICENSE-2.0
<modelVersion>4.0.0</modelVersion>
<artifactId>log-manager</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.3.4-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/LogTailParam.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/LogTailParam.java
index 42ae870b..1de93cf6 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/LogTailParam.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/LogTailParam.java
@@ -80,4 +80,6 @@ public class LogTailParam {
private Integer batchSendSize = 20;
private Boolean collectionReady = true;
+
+ private String originSystem;
}
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/dto/LogTailDTO.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/dto/LogTailDTO.java
index 60779aed..859ddfb1 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/dto/LogTailDTO.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/dto/LogTailDTO.java
@@ -79,4 +79,6 @@ public class LogTailDTO {
private Integer batchSendSize;
private Boolean collectionReady;
+
+ private String originSystem;
}
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/pojo/MilogLogTailDo.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/pojo/MilogLogTailDo.java
index 46073c68..ccc4ea08 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/pojo/MilogLogTailDo.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/pojo/MilogLogTailDo.java
@@ -157,6 +157,11 @@ public class MilogLogTailDo extends BaseCommon {
@Comment("start to ready coll")
private Boolean collectionReady;
+ @Column(value = "origin_system")
+ @ColDefine(type = ColType.VARCHAR, width = 1024)
+ @Comment("Indicates the system that originated the record; 'hera' for
internal, and others for external sources.")
+ private String originSystem;
+
public MilogLogTailDo() {
}
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 3b217883..d66345a3 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
@@ -47,5 +47,7 @@ public class QuickQueryVO implements Serializable {
private Integer isFavourite;
private String deploySpace;
private String logPath;
+ private String originSystem;
+
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 0afe2eb2..b28925e3 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
@@ -61,6 +61,7 @@ import com.xiaomi.youpin.docean.plugin.config.anno.Value;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.nutz.lang.Strings;
import javax.annotation.Resource;
import java.time.Instant;
@@ -166,6 +167,7 @@ public class LogTailServiceImpl extends BaseService
implements LogTailService {
.deploySpace(logTailDo.getDeploySpace())
.logPath(logTailDo.getLogPath())
.collectionReady(logTailDo.getCollectionReady())
+ .originSystem(logTailDo.getOriginSystem())
.build();
}
@@ -393,6 +395,9 @@ public class LogTailServiceImpl extends BaseService
implements LogTailService {
if (ret == null) {
return new Result<>(CommonError.ParamsError.getCode(), "tail does
not exist");
}
+ if ((null != param.getOriginSystem()) &&
!Strings.equals(ret.getOriginSystem(), param.getOriginSystem())) {
+ return new Result<>(CommonError.ParamsError.getCode(),
"origin_system is forbidden to update");
+ }
// Parameter validation
String errorMsg = heraConfigValid.verifyLogTailParam(param);
if (StringUtils.isNotEmpty(errorMsg)) {
@@ -665,6 +670,7 @@ public class LogTailServiceImpl extends BaseService
implements LogTailService {
}
milogLogtailDo.setFirstLineReg((StringUtils.isNotEmpty(logTailParam.getFirstLineReg())
? logTailParam.getFirstLineReg() : ""));
milogLogtailDo.setCollectionReady(logTailParam.getCollectionReady());
+ milogLogtailDo.setOriginSystem(logTailParam.getOriginSystem());
return milogLogtailDo;
}
@@ -704,6 +710,7 @@ public class LogTailServiceImpl extends BaseService
implements LogTailService {
logTailDTO.setDeploySpace(milogLogtailDo.getDeploySpace());
logTailDTO.setFirstLineReg(milogLogtailDo.getFirstLineReg());
logTailDTO.setCollectionReady(milogLogtailDo.getCollectionReady());
+ logTailDTO.setOriginSystem(milogLogtailDo.getOriginSystem());
return logTailDTO;
}
diff --git a/ozhera-log/log-manager/src/main/resources/log.sql
b/ozhera-log/log-manager/src/main/resources/log.sql
index 01df753c..9cade867 100644
--- a/ozhera-log/log-manager/src/main/resources/log.sql
+++ b/ozhera-log/log-manager/src/main/resources/log.sql
@@ -470,7 +470,9 @@ CREATE TABLE `milog_logstail` (
`filter` json NULL COMMENT 'filter config',
`en_es_index` json NULL COMMENT 'the index configuration',
`deploy_way` int(0) NULL DEFAULT NULL COMMENT 'deployment type：1-mione;
2-miline; 3-k8s',
- `first_line_reg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL
DEFAULT NULL COMMENT 'Custom line regex'
+ `first_line_reg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL
DEFAULT NULL COMMENT 'Custom line regex',
+ `collection_ready` int(0) NULL DEFAULT NULL COMMENT 'start to collect
log：any non-zero value means true',
+ `origin_system` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL
DEFAULT 'hera' COMMENT 'Indicates the system that originated the record; 'hera'
for internal, and others for external sources.'
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 90115 CHARACTER SET = utf8mb4 COLLATE =
utf8mb4_bin ROW_FORMAT = Dynamic;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
