From e60950c5c38990b2a62f0bcb9659c2088eb52f72 Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Thu, 18 Feb 2021 23:45:18 +0800
Subject: [PATCH] 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 c765d3f42..943e03e4a 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 dd17a94a5..e6dfbb4a7 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