This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch feature/token-auth
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/feature/token-auth by this
push:
new 28ddb5d Add settings in config files.
28ddb5d is described below
commit 28ddb5d70e931f54578640e5be3e4ea3d2ba5b4c
Author: wusheng <[email protected]>
AuthorDate: Thu Mar 29 17:15:04 2018 +0800
Add settings in config files.
---
apm-collector/apm-collector-boot/src/main/resources/application.yml | 3 +++
.../main/java/org/apache/skywalking/apm/agent/core/conf/Config.java | 2 +-
apm-sniffer/config/agent.config | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/apm-collector/apm-collector-boot/src/main/resources/application.yml
b/apm-collector/apm-collector-boot/src/main/resources/application.yml
index 18aa44f..bcaa653 100644
--- a/apm-collector/apm-collector-boot/src/main/resources/application.yml
+++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml
@@ -34,6 +34,9 @@ agent_gRPC:
#Set these two setting to open ssl
#ssl_cert_chain_file: $path
#ssl_private_key_file: $path
+
+ #Set your own token to active auth
+ #authentication: xxxxxx
agent_jetty:
jetty:
host: localhost
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
index 751b8fd..893d1aa 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -43,7 +43,7 @@ public class Config {
public static String APPLICATION_CODE = "";
/**
- * Authentication is always used when backend authentication mechanism
active.
+ * Authentication active is based on backend setting, see
application.yml for more details.
* For most scenarios, this needs backend extensions, only basic match
auth provided in default implementation.
*/
public static String AUTHENTICATION = "";
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
index cc0d27a..24f1ec9 100644
--- a/apm-sniffer/config/agent.config
+++ b/apm-sniffer/config/agent.config
@@ -21,6 +21,9 @@ agent.application_code=Your_ApplicationName
# Negative number means sample traces as many as possible, most likely 100%
# agent.sample_n_per_3_secs=-1
+# Authentication active is based on backend setting, see application.yml for
more details.
+# agent.authentication = xxxx
+
# The max amount of spans in a single segment.
# Through this config item, skywalking keep your application memory cost
estimated.
# agent.span_limit_per_segment=300
--
To stop receiving notification emails like this one, please contact
[email protected].
