You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/02/18 15:45:37 UTC
[skywalking] branch master updated: Change the Zabbix receiver is
disabled by default (#6395)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e60950c Change the Zabbix receiver is disabled by default (#6395)
e60950c is described below
commit e60950c5c38990b2a62f0bcb9659c2088eb52f72
Author: mrproliu <74...@qq.com>
AuthorDate: Thu Feb 18 23:45:18 2021 +0800
Change the Zabbix receiver is disabled by default (#6395)
---
oap-server/server-bootstrap/src/main/resources/application.yml | 2 +-
test/e2e/e2e-test/docker/zabbix/docker-compose.yml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml b/oap-server/server-bootstrap/src/main/resources/application.yml
index c765d3f..943e03e 100755
--- a/oap-server/server-bootstrap/src/main/resources/application.yml
+++ b/oap-server/server-bootstrap/src/main/resources/application.yml
@@ -267,7 +267,7 @@ receiver-profile:
default:
receiver-zabbix:
- selector: ${SW_RECEIVER_ZABBIX:default}
+ selector: ${SW_RECEIVER_ZABBIX:-}
default:
port: ${SW_RECEIVER_ZABBIX_PORT:10051}
host: ${SW_RECEIVER_ZABBIX_HOST:0.0.0.0}
diff --git a/test/e2e/e2e-test/docker/zabbix/docker-compose.yml b/test/e2e/e2e-test/docker/zabbix/docker-compose.yml
index dd17a94..e6dfbb4 100644
--- a/test/e2e/e2e-test/docker/zabbix/docker-compose.yml
+++ b/test/e2e/e2e-test/docker/zabbix/docker-compose.yml
@@ -20,6 +20,8 @@ services:
extends:
file: ../base-compose.yml
service: oap
+ environment:
+ SW_RECEIVER_ZABBIX: default
volumes:
- ./agent.yaml:/skywalking/config/zabbix-rules/agent.yaml