Merge pull request scouter-project#615 from scouter-project/master

doc merge master to develop

Author: gunlee01

README.md

@@ -4,7 +4,7 @@
 
 ![scouter](./scouter.document/img/main/scouter-logo-w200.png)
 
-[![Englsh](https://img.shields.io/badge/language-English-orange.svg)](README.md) [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](README_kr.md)
+[![English](https://img.shields.io/badge/language-English-orange.svg)](README.md) [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](README_kr.md)
 
 ## Application Performance Monitoring for Open Source S/Ws.
 SCOUTER is an open source APM like new relic and appdynamics.

scouter.document/main/Configuration.md

@@ -642,11 +642,11 @@
     public int xlog_error_sql_time_max_ms = 30000;
     @ConfigDesc("Leave an error message at XLog when UserTransaction's begin/end unpaired")
     public boolean xlog_error_check_user_transaction_enabled = true;
-    @ConfigDesc("mark as error on xlog flag if SqlException is occured.")
+    @ConfigDesc("mark as error on xlog flag if SqlException is occurred.")
     public boolean xlog_error_on_sqlexception_enabled = true;
-    @ConfigDesc("mark as error on xlog flag if Api call errors are occured.")
+    @ConfigDesc("mark as error on xlog flag if Api call errors are occurred.")
     public boolean xlog_error_on_apicall_exception_enabled = true;
-    @ConfigDesc("mark as error on xlog flag if redis error is occured.")
+    @ConfigDesc("mark as error on xlog flag if redis error is occurred.")
     public boolean xlog_error_on_redis_exception_enabled = true;
 
     //XLog hard sampling options
@@ -765,7 +765,7 @@
     public String hook_get_connection_patterns = "";
 
 
-    @ConfigDesc("IntialContext Class Set")
+    @ConfigDesc("InitialContext Class Set")
     @ConfigValueType(ValueType.COMMA_SEPARATED_VALUE)
     public String hook_context_classes = "javax/naming/InitialContext";
 
@@ -777,7 +777,7 @@
     @ConfigValueType(ValueType.COMMA_SEPARATED_VALUE)
     public String hook_method_ignore_prefixes = "get,set";
 
-    @ConfigDesc("Class set without Method hookingt")
+    @ConfigDesc("Class set without Method hooking")
     @ConfigValueType(ValueType.COMMA_SEPARATED_VALUE)
     public String hook_method_ignore_classes = "";
 
@@ -812,7 +812,7 @@
     @ConfigValueType(ValueType.COMMA_SEPARATED_VALUE)
     public String hook_jsp_patterns = "";
 
-    @ConfigDesc("Method set for preparestatement hooking")
+    @ConfigDesc("Method set for preparedstatement hooking")
     @ConfigValueType(ValueType.COMMA_SEPARATED_VALUE)
     public String hook_jdbc_pstmt_classes = "";
 
@@ -866,7 +866,7 @@
     @ConfigDesc("Deprecated. use hook_async_callrunnable_enabled")
     public boolean hook_async_callrunnable_enable = true;
 
-    @ConfigDesc("Hook callable and runnable for tracing async processing.\n It hook only 'hook_async_callrunnable_scan_prefixes' option contains pacakage or classes")
+    @ConfigDesc("Hook callable and runnable for tracing async processing.\n It hook only 'hook_async_callrunnable_scan_prefixes' option contains package or classes")
     public boolean hook_async_callrunnable_enabled = true;
 
     @ConfigDesc("scanning range prefixes for hooking callable, runnable implementations and lambda expressions.\n usually your application package.\n 2 or more packages can be separated by commas.")
@@ -880,13 +880,13 @@
     @ConfigDesc("PRE-released option before stable release!\nhook threadpool executor for tracing async processing.")
     public boolean hook_async_thread_pool_executor_enabled = false;
 
-    @ConfigDesc("Experimental! test it on staging environment of your system before enable this option.\n enable lambda expressioned class hook for detecting asyncronous processing. \nOnly classes under the package configured by 'hook_async_callrunnable_scan_package_prefixes' is hooked.")
+    @ConfigDesc("Experimental! test it on staging environment of your system before enable this option.\n enable lambda expressioned class hook for detecting asynchronous processing. \nOnly classes under the package configured by 'hook_async_callrunnable_scan_package_prefixes' is hooked.")
     public boolean hook_lambda_instrumentation_strategy_enabled = false;
 
     @ConfigDesc("")
     public String hook_add_fields = "";
     @ConfigDesc("")
-    public boolean _hook_serivce_enabled = true;
+    public boolean _hook_service_enabled = true;
     @ConfigDesc("")
     public boolean _hook_dbsql_enabled = true;
     @ConfigDesc("")
@@ -950,7 +950,7 @@
     @ConfigDesc("SFA thread dump Interval(ms)")
     public int sfa_dump_interval_ms = 10000;
 
-    //PSTS(Preiodical Stacktrace Step)
+    //PSTS(Periodical Stacktrace Step)
     @ConfigDesc("Activating periodical stacktrace step (write fixed interval thread dump on a profile)")
     public boolean _psts_enabled = false;
     @ConfigDesc("PSTS(periodical stacktrace step) thread dump Interval(ms) - hard min limit 2000")
@@ -965,7 +965,7 @@
 
    * example
    ```properties
-   net_colector_ip = 127.0.0.1
+   net_collector_ip = 127.0.0.1
    cpu_alert_enabled = false
    ```
 
@@ -1016,7 +1016,7 @@
 	@ConfigDesc("")
 	public boolean log_udp_object = false;
 	@ConfigDesc("Retaining log according to date")
-	public boolean log_rotation_enalbed = true;
+	public boolean log_rotation_enabled = true;
 	@ConfigDesc("Log directory")
 	public String log_dir = "./logs";
 	@ConfigDesc("Keeping period of log")

scouter.document/main/Plugin-Guide.md

@@ -52,7 +52,7 @@ refer to the link for details.
 refer to **[Scripting plugin Server API](Server-Plugin-Scripting.md)**.
 
 ### 2. Built-in (type) Plugin
-Builing scripting plugin is very simple and can be dynamically loaded on runtime environment.  
+Building scripting plugin is very simple and can be dynamically loaded on runtime environment.  
 On the other hand if you need the function permanently, it's too easy to fragile.
 So scouter provides another plugin type which allow you can attach pre-built compiled plugin and it's called as **Built-in Plugin**.
 

scouter.document/main/Quick-Start.md

@@ -35,15 +35,15 @@ Client(Viewer)    | Client program to check the collected performance informatio
 
 #### (1) **Download** integrated demonstration environment and a client program
  - Download integrated demonstration environment
-   - [Download demo-env1.tar.gz](https://github.com/scouter-project/scouter-demo/releases/download/v1.8.4.1/demo-env1.tar.gz) (It includes collector server, host agent, java agent, tomcat for demo system and start scripts...)
-   - Windows Case : [Download demo-env1.zip](https://github.com/scouter-project/scouter-demo/releases/download/v1.8.4.1/demo-env1.zip)
+   - [Download demo-env1.tar.gz](https://github.com/scouter-project/scouter-demo/releases/download/v2.6.2/demo-env1.tar.gz) (It includes collector server, host agent, java agent, tomcat for demo system and start scripts...)
+   - Windows Case : [Download demo-env1.zip](https://github.com/scouter-project/scouter-demo/releases/download/v2.6.2/demo-env1.zip)
 
  - Download a client program
    - download a client for your environment.
-    - [scouter.client.product-win32.win32.x86_64.zip](https://github.com/scouter-project/scouter/releases/download/v1.8.4.1/scouter.client.product-win32.win32.x86_64.zip)
-    - [scouter.client.product-win32.win32.x86.zip](https://github.com/scouter-project/scouter/releases/download/v1.8.4.1/scouter.client.product-win32.win32.x86.zip)
-    - [scouter.client.product-macosx.cocoa.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v1.8.4.1/scouter.client.product-macosx.cocoa.x86_64.tar.gz)
-    - [scouter.client.product-linux.gtk.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v1.8.4.1/scouter.client.product-linux.gtk.x86_64.tar.gz)
+    - [scouter.client.product-win32.win32.x86_64.zip](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-win32.win32.x86_64.zip)
+    - [scouter.client.product-win32.win32.x86.zip](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-win32.win32.x86.zip)
+    - [scouter.client.product-macosx.cocoa.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-macosx.cocoa.x86_64.tar.gz)
+    - [scouter.client.product-linux.gtk.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-linux.gtk.x86_64.tar.gz)
 
 #### (2) Decompress the downloaded file.
  decompress file and all installation is done.

scouter.document/main/Quick-Start_kr.md

@@ -36,15 +36,15 @@ Client(Viewer)    | 수집된 성능 정보를 확인하기 위한 Client 프로
 
 #### (1) 통합 데모 환경 및 클라이언트 프로그램 다운로드
  - 통합 데모 환경 다운로드
-   - [demo-env1.tar.gz 다운로드](https://github.com/scouter-project/scouter-demo/releases/download/v1.8.4.1/demo-env1.tar.gz) (Collector Server, Host Agent, Java Agent, Tomcat, 샘플 시스템, 설정, 기동 스크립트가 포함됨)
-   - Windows의 경우 [demo-env1.zip 다운로드](https://github.com/scouter-project/scouter-demo/releases/download/v1.8.4.1/demo-env1.zip)
+   - [demo-env1.tar.gz 다운로드](https://github.com/scouter-project/scouter-demo/releases/download/v2.6.2/demo-env1.tar.gz) (Collector Server, Host Agent, Java Agent, Tomcat, 샘플 시스템, 설정, 기동 스크립트가 포함됨)
+   - Windows의 경우 [demo-env1.zip 다운로드](https://github.com/scouter-project/scouter-demo/releases/download/v2.6.2/demo-env1.zip)
 
  - Client 다운로드
    - 자신의 환경에 맞는 파일을 다운로드 받는다.
-    - [scouter.client.product-win32.win32.x86_64.zip](https://github.com/scouter-project/scouter/releases/download/v1.8.4.11/scouter.client.product-win32.win32.x86_64.zip)
-    - [scouter.client.product-win32.win32.x86.zip](https://github.com/scouter-project/scouter/releases/download/v1.8.4.11/scouter.client.product-win32.win32.x86.zip)
-    - [scouter.client.product-macosx.cocoa.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v1.8.4.11/scouter.client.product-macosx.cocoa.x86_64.tar.gz)
-    - [scouter.client.product-linux.gtk.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v1.8.4.11/scouter.client.product-linux.gtk.x86_64.tar.gz)
+    - [scouter.client.product-win32.win32.x86_64.zip](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-win32.win32.x86_64.zip)
+    - [scouter.client.product-win32.win32.x86.zip](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-win32.win32.x86.zip)
+    - [scouter.client.product-macosx.cocoa.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-macosx.cocoa.x86_64.tar.gz)
+    - [scouter.client.product-linux.gtk.x86_64.tar.gz](https://github.com/scouter-project/scouter/releases/download/v2.6.2/scouter.client.product-linux.gtk.x86_64.tar.gz)
 
 #### (2) 압축 파일 해제
  압축 파일을 해제 함으로써 기본적인 설치가 완료 된다.

scouter.document/main/Setup-FAQ.md

@@ -41,7 +41,7 @@ If you want to another configuration file, uses -Dscouter.config=<file path> opt
 ### How to communicate between Server and Client
 Scouter Client uses TCP 6100 port to request monitoring data, same as Agent does.
 ```
-Clinet ——-> Server 
+Client ——-> Server 
      TCP 6100
 ```
 TCP 6100 port are used by both Agent and Client. User should specify Server's endpoint information when Client program run at first.

scouter.document/main/Setup.md

@@ -15,7 +15,7 @@
 ### 1.2. Collector Server Installation
 1. download the latest version of scouter-yyyyMMdd.tar.gz.
  - [Release Page](https://github.com/scouter-project/scouter/releases)
-2. Extract the file.(You can see the dircetory ./scouter/server)
+2. Extract the file.(You can see the directory ./scouter/server)
 3. execute start script.
 ```bash
 cd ./scouter/server
@@ -35,7 +35,7 @@ cd ./scouter/server
 
 ### 1.3. Network ports used by Collector server
 * UDP Receive Port : 6100 (This port is used for gathering performance metrics.)
-* TCP Service Port : 6100 (This port is used for commuication with scouter client and agents.)
+* TCP Service Port : 6100 (This port is used for communication with scouter client and agents.)
 
 ### 1.4. Configuration
 

scouter.document/main/Telegraf-Server.md

@@ -9,7 +9,7 @@ You can monitor the performance information of various products through Telegraf
   - [Telegraf Input plugins](https://github.com/influxdata/telegraf/tree/master/plugins/inputs)
 
 
-## Apply Telegraf server funtion
+## Apply Telegraf server function
 
 ### 1. Enabling the telegraf Server option on the Scouter
 First, enable the http server option of the Collector server on the Scouter Client screen.
@@ -20,7 +20,7 @@ If you want to change the http port, set it to `net_http_port=xxx`. The default
 If you change any of the above options, you must restart the Collector.  
 
 Next, activate the Telegraf setting.
-  - Menu : **Colellector > Configures > Telegraf > Telegraf Configure**
+  - Menu : **Collector > Configures > Telegraf > Telegraf Configure**
     - In the General tree, check `Enabled` to enable the Telegraf Server function.
 
 If you need to check the requested data, check `Debug Enabled 'to log all the requested data.

scouter.document/tech/Web-API-Guide.md

@@ -8,7 +8,9 @@
     - `net_http_server_enabled` : set `true`
     - `net_http_api_enabled` : set `true`
     - `net_http_port` : default value `6180`
-    - `net_http_api_allow_ips` : default value `localhost,127.0.0.1,0:0:0:0:0:0:0:1,::1`;
+    - `net_http_api_allow_ips` : default value `localhost,127.0.0.1,0:0:0:0:0:0:0:1,::1`
+    - `net_collector_ip_port_id_pws` : default value 127.0.0.1:6100:admin:admin
+       - format : {host}:{port}:{id}:{pw},{host}:{port}:{id}:{pw}
 
 ### StandAlone Mode Run
  - Web api needs much more memory and cpu usage than scouter collector server because of servlet processing, JSON parsing and another workings.

scouter.document/tech/Web-API-Guide_kr.md

@@ -8,7 +8,9 @@
     - `net_http_server_enabled` : set `true`
     - `net_http_api_enabled` : set `true`
     - `net_http_port` : default value `6180`
-    - `net_http_api_allow_ips` : default value `localhost,127.0.0.1,0:0:0:0:0:0:0:1,::1`;
+    - `net_http_api_allow_ips` : default value `localhost,127.0.0.1,0:0:0:0:0:0:0:1,::1`
+    - `net_collector_ip_port_id_pws` : default value 127.0.0.1:6100:admin:admin
+       - format : {host}:{port}:{id}:{pw},{host}:{port}:{id}:{pw}
 
 ### StandAlone Mode로 실행
  - Web API는 Servlet을 통해 서비스 되면 HTTP 프로토콜이나 JSON 파싱 등 부가적인 작업이 필요하기 때문에 기본 수집서버에 비해 자원 사용량이 높다.