This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch document/advanced in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/document/advanced by this push: new 2b6d93c Provide setting override document. 2b6d93c is described below commit 2b6d93c36d72f10bb22b104e679b95bdb8f43b04 Author: wu-sheng <wu.sh...@foxmail.com> AuthorDate: Mon Apr 2 15:34:21 2018 +0800 Provide setting override document. --- docs/en/Deploy-skywalking-agent.md | 3 --- docs/en/Setting-override.md | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/en/Deploy-skywalking-agent.md b/docs/en/Deploy-skywalking-agent.md index 900c39f..ae6eaac 100644 --- a/docs/en/Deploy-skywalking-agent.md +++ b/docs/en/Deploy-skywalking-agent.md @@ -27,9 +27,6 @@ New agent package looks like this: # Advanced features - All plugins are in `/plugin` folder. The plugin jar is active when it is in there. Remove the plugin jar, it disabled. -- Besides set config through `/config/agent.config`, you can use System.Env and System.Properties(-D) to set config. - - Key of env and properties = `skywalking.` + key in `agent.config` file - - Priority: System.Env > System.Properties(-D) > `/config/agent.config` - The default logging output folder is `/log`. # Deploy agent in Tomcat FAQ diff --git a/docs/en/Setting-override.md b/docs/en/Setting-override.md index e69de29..41770e0 100644 --- a/docs/en/Setting-override.md +++ b/docs/en/Setting-override.md @@ -0,0 +1,24 @@ +# Setting Override +## Supported version +5.0.0-beta + + +_Agent setting override supported since 3.2.5_ + +## What is setting override? +In default, SkyWalking provide `agent.config` for client, and `application.yml` for server settings. + +Setting override means end user can override the settings in these config file, by using system properties, or system environment variables. + +## Override priority +System.Env > System.Properties(-D) > Config file + +## Override +### Agent +Use `skywalking.` + key in config file as system properties and envs key, to override the value. + +- Why need this prefix? + + The agent system properites and env share with target application, this prefix can avoid variable conflict. + +### Collector +Use key in config file as system properties and envs key, to override the value. \ No newline at end of file -- To stop receiving notification emails like this one, please contact wush...@apache.org.