This is an automated email from the ASF dual-hosted git repository.
zhangyang2024 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new df525d2d32 fix: add GreptimeDB docker-compose assembly configuration
(#3960)
df525d2d32 is described below
commit df525d2d328713c801ca223d9a20e9833235c230
Author: Yang Chen <[email protected]>
AuthorDate: Wed Jan 14 20:51:24 2026 +0800
fix: add GreptimeDB docker-compose assembly configuration (#3960)
Co-authored-by: Duansg <[email protected]>
---
script/assembly/server/assembly-docker-compose.xml | 11 +++++++++++
.../hertzbeat-postgresql-greptimedb/docker-compose.yaml | 2 +-
.../routes/log/log-integration/log-integration.component.ts | 13 +------------
web-app/src/assets/doc/log-integration/otlp.en-US.md | 7 +++++++
web-app/src/assets/doc/log-integration/otlp.zh-CN.md | 9 +++++++++
5 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/script/assembly/server/assembly-docker-compose.xml
b/script/assembly/server/assembly-docker-compose.xml
index 8574047eab..2654ed2ef1 100644
--- a/script/assembly/server/assembly-docker-compose.xml
+++ b/script/assembly/server/assembly-docker-compose.xml
@@ -72,6 +72,17 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
</includes>
<outputDirectory>hertzbeat-postgresql-victoria-metrics</outputDirectory>
</fileSet>
+ <fileSet>
+
<directory>../script/docker-compose/hertzbeat-postgresql-greptimedb</directory>
+ <filtered>true</filtered>
+ <includes>
+ <include>conf/**</include>
+ <include>*.yaml</include>
+ <include>*.md</include>
+ <include>ext-lib/README</include>
+ </includes>
+ <outputDirectory>hertzbeat-postgresql-greptimedb</outputDirectory>
+ </fileSet>
<fileSet>
<directory>../script/docker-compose</directory>
<filtered>true</filtered>
diff --git
a/script/docker-compose/hertzbeat-postgresql-greptimedb/docker-compose.yaml
b/script/docker-compose/hertzbeat-postgresql-greptimedb/docker-compose.yaml
index 8c2a20cc2a..be1603c409 100644
--- a/script/docker-compose/hertzbeat-postgresql-greptimedb/docker-compose.yaml
+++ b/script/docker-compose/hertzbeat-postgresql-greptimedb/docker-compose.yaml
@@ -64,7 +64,7 @@ services:
- "14002:4002"
- "14003:4003"
volumes:
- - ./dbdata/tsdbdata:/greptimedb_data
+ - greptime-tsdb-data:/greptimedb_data
command:
- "standalone"
- "start"
diff --git
a/web-app/src/app/routes/log/log-integration/log-integration.component.ts
b/web-app/src/app/routes/log/log-integration/log-integration.component.ts
index f057925b58..8ca1b9de05 100644
--- a/web-app/src/app/routes/log/log-integration/log-integration.component.ts
+++ b/web-app/src/app/routes/log/log-integration/log-integration.component.ts
@@ -147,17 +147,6 @@ export class LogIntegrationComponent implements OnInit {
el.select();
document.execCommand('copy');
document.body.removeChild(el);
- if (navigator && navigator.clipboard && navigator.clipboard.writeText) {
- navigator.clipboard
- .writeText(this.token)
- .then(() => {
-
this.notifySvc.success(this.i18nSvc.fanyi('common.notify.copy-success'),
this.i18nSvc.fanyi('log.integration.token.notice'));
- })
- .catch(() => {
- this.notifySvc.error(this.i18nSvc.fanyi('common.notify.copy-fail'),
this.i18nSvc.fanyi('log.integration.token.notice'));
- });
- } else {
- this.notifySvc.error(this.i18nSvc.fanyi('common.notify.copy-fail'),
this.i18nSvc.fanyi('log.integration.token.notice'));
- }
+ this.notifySvc.success(this.i18nSvc.fanyi('common.notify.copy-success'),
this.i18nSvc.fanyi('log.integration.token.notice'));
}
}
diff --git a/web-app/src/assets/doc/log-integration/otlp.en-US.md
b/web-app/src/assets/doc/log-integration/otlp.en-US.md
index 4f717e3c22..f6c370de0a 100644
--- a/web-app/src/assets/doc/log-integration/otlp.en-US.md
+++ b/web-app/src/assets/doc/log-integration/otlp.en-US.md
@@ -80,6 +80,13 @@ exporters:
encoding: json
headers:
Authorization: "Bearer {token}"
+
+service:
+ pipelines:
+ logs:
+ receivers: [otlp]
+ processors: [batch]
+ exporters: [otlphttp]
```
### Configuration Verification
diff --git a/web-app/src/assets/doc/log-integration/otlp.zh-CN.md
b/web-app/src/assets/doc/log-integration/otlp.zh-CN.md
index a52064b5bb..6427f95ac8 100644
--- a/web-app/src/assets/doc/log-integration/otlp.zh-CN.md
+++ b/web-app/src/assets/doc/log-integration/otlp.zh-CN.md
@@ -78,6 +78,15 @@ exporters:
logs_endpoint: http://{hertzbeat_host}:1157/api/logs/ingest/otlp
compression: none
encoding: json
+ headers:
+ Authorization: "Bearer {token}"
+
+service:
+ pipelines:
+ logs:
+ receivers: [otlp]
+ processors: [batch]
+ exporters: [otlphttp]
```
### 配置验证
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
