This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch release-2.2.5-incubating-rc2
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/release-2.2.5-incubating-rc2
by this push:
new 4c44950e feat: preparing to release version 2.2.5-incubating
4c44950e is described below
commit 4c44950e79e0d61ffa038c5a5562c18b7c16360a
Author: gaoxihui <[email protected]>
AuthorDate: Fri Jan 10 16:20:10 2025 +0800
feat: preparing to release version 2.2.5-incubating
---
ozhera-log/log-agent-exporter-extension.pdf | Bin 772761 -> 0 bytes
.../src/main/resources/agent_channel_config.json | 60 ---------------------
.../src/main/resources/log_impl_type.json | 14 -----
pom.xml | 1 +
4 files changed, 1 insertion(+), 74 deletions(-)
diff --git a/ozhera-log/log-agent-exporter-extension.pdf
b/ozhera-log/log-agent-exporter-extension.pdf
deleted file mode 100644
index 84c3eb17..00000000
Binary files a/ozhera-log/log-agent-exporter-extension.pdf and /dev/null differ
diff --git a/ozhera-log/log-agent/src/main/resources/agent_channel_config.json
b/ozhera-log/log-agent/src/main/resources/agent_channel_config.json
deleted file mode 100644
index de5ada99..00000000
--- a/ozhera-log/log-agent/src/main/resources/agent_channel_config.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "channelDefine": [
- {
- "channelId": 25168,
- "tailName": "测试",
- "appId": 100,
- "appName": "test",
- "ips": [
- "127.0.0.1"
- ],
- "ipDirectoryRel": [
- {
- "key": "log-test",
- "ip": "127.0.0.1"
- }
- ],
- "input": {
- "type": "APP_LOG_MULTI",
- "logPattern": "/home/work/log/hera-app/*.log",
- "logSplitExpress": "/home/work/log/log-agent/server.log.*",
- "patternCode": "test_server_log"
- },
- "output": {
- "type": "rocketmq",
- "ak": "Please delete this line if not have ak",
- "sk": "Please delete this line if not have sk",
- "clusterInfo": "http://your-rmq-cluster:9876";,
- "producerGroup": "your producerGroup",
- "topic": "your topic",
- "batchExportSize": 600
- },
- "filters": [
- {
- "code": "RATELIMITCODE0",
- "name": "RATELIMITER",
- "type": "REGIONAL",
- "order": 100,
- "lifecycle": "",
- "args": {
- "permitsPerSecond": 40
- }
- }
- ]
- }
- ],
- "agentDefine": {
- "filters": [
- {
- "code": "RATELIMITCODE6",
- "name": "RATELIMITER",
- "type": "GLOBAL",
- "order": 100,
- "lifecycle": "",
- "args": {
- "permitsPerSecond": 2000
- }
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/ozhera-log/log-agent/src/main/resources/log_impl_type.json
b/ozhera-log/log-agent/src/main/resources/log_impl_type.json
deleted file mode 100644
index 14041d65..00000000
--- a/ozhera-log/log-agent/src/main/resources/log_impl_type.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "APP_LOG": "org.apache.ozhera.log.agent.input.AppLogInput",
- "APP_LOG_MULTI": "org.apache.ozhera.log.agent.input.AppLogInput",
- "APP_LOG_SIGNAL": "org.apache.ozhera.log.agent.input.AppLogInput",
- "MIS_APP_LOG": "org.apache.ozhera.log.agent.input.MisAppLogInput",
- "NGINX": "org.apache.ozhera.log.agent.input.NginxInput",
- "OPENTELEMETRY": "org.apache.ozhera.log.agent.input.OpentelemetryInput",
- "DOCKER": "org.apache.ozhera.log.agent.input.AppLogInput",
- "FREE": "org.apache.ozhera.log.agent.input.FreeLogInput",
- "ORIGIN_LOG": "org.apache.ozhera.log.agent.input.OriginLogInput",
- "rocketmq": "org.apache.ozhera.log.agent.extension.RmqOutput",
- "talos": "com.xiaomi.mone.log.agent.output.TalosOutput",
- "kafka": "org.apache.ozhera.log.agent.extension.KafkaOutput"
-}
diff --git a/pom.xml b/pom.xml
index 9e1761e1..990719e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1059,6 +1059,7 @@
<configuration>
<excludes>
<exclude>**/*.png</exclude>
+ <exclude>**/*.PNG</exclude>
<exclude>**/*.jpg</exclude>
<exclude>**/*.jpeg</exclude>
</excludes>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
