Merge pull request #286 from scouter-project/master

Merge for release

Author: bill23-kim

.gitignore

@@ -48,6 +48,10 @@ Session.vim
 .netrwhist
 *~
 
+### Eclipse template
+.metadata
+.settings
+
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
 

README.md

@@ -2,18 +2,17 @@
 
 ![Englsh](https://img.shields.io/badge/language-English-red.svg) [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](README_kr.md)
 
-## Open Source S/W Application Performance Monitoring
+## Application Performance Monitoring for Open Source S/Ws.
 
-SCOUTER is an open source APM and a database monitoring tool.
-APM means application performance monitoring or application performance management.
+SCOUTER is an open source APM line new relic and appdynamics.
+(APM means application performance monitoring or application performance management.)
 
  - Monitoring target (currently)
-   - Opensource WAS - Tomcat, JBoss, Resin ...
-   - Opensource DB - MariaDB(on closed beta testing now)
+   - Java application - Web applications (on Tomcat, JBoss, Resin...), Standalone java applications
+   - OS - Linux, Windows, Unix
 
-
- - Monitoring target (hopeful with every contributor)
-   - Nodejs, Redis, MongoDB, PostgreSQL, Apach HTTPD, nginX, php ...
+ - Monitoring target (to-be : hopeful with every contributor)
+   - Nodejs, Redis, Apach HTTPD, nginX, php ...
 
 ![Screen](./scouter.document/img/main/dashboard-sample-1.png)
 

README_kr.md

@@ -4,13 +4,18 @@
 
 ## 오픈소스 S/W 어플리케이션 성능 모니터링
 
-APM은 Application performance montoring 또는 application performance management를 의미하고 SCOUTER는 오픈소스 APM 도구로서 Java, WAS에 대한 모니터링 및 DB Agent를 통해 오픈소스 DB 모니터링 기능을 제공한다.
+SCOUTER는 오픈소스 APM 도구로서 Java, WAS에 대한 모니터링 모니터링 기능을 제공한다.
+ - **APM** : Application performance montoring / application performance management
 
 기업용 IT는 상용 서비스를 기반으로 진화하여 왔다. 그러나 이제는 점점 더 오픈 소스 기반의 시스템 구축이 늘어나고 있다. 오픈소스 기반의 시스템을 구축할때 성능 관리 또한 같이 고려 되어야하는데 오픈 소스인 Scouter는 가장 훌륭한 선택이 될 것이다.
 
- - 모니터링 대상 
-   - 오픈소스 WAS - Tomcat, JBoss, Resin ...
-   - 오픈소스 DB - MariaDB (클로즈 베타 테스트 진행중)
+ - 모니터링 대상 (현재)
+   - Java application - Web application (on Tomcat, JBoss, Resin ...), Standalone java application
+   - OS - LInux, Windows, Unix
+
+ - 모니터링 대상 (TOBE)
+   - Nodejs, Redis, Apach HTTPD, nginX, php ...
+
 
 ![Screen](./scouter.document/img/main/dashboard-sample-1.png)
 

scouter.agent.batch/.gitignore

@@ -0,0 +1 @@
+/bin/

scouter.agent.batch/src/scouter/agent/batch/Configure.java

@@ -304,7 +304,6 @@ private void apply() {
 			this.sfa_dump_dir = dir;
 			this.sfa_dump_header_exists = getBoolean("sfa_dump_header_exists", true);
 		}
-		
 		this.sfa_dump_send_elapsed_ms = getLong("sfa_dump_send_elapsed_ms", 30000L);
 		this.batch_log_send_elapsed_ms = getLong("batch_log_send_elapsed_ms", 30000L);
 
@@ -321,9 +320,8 @@ private void apply() {
 		this.net_collector_tcp_so_timeout_ms = getInt("net_collector_tcp_so_timeout_ms", 60000);
 
 		this.net_local_udp_port = getInt("net_local_udp_port", NetConstants.LOCAL_UDP_PORT);
-		this.net_tcp_stack_session_count = getInt("net_tcp_stack_session_count", 1);
-		
-		
+		this.net_tcp_stack_session_count = getInt("net_tcp_stack_session_count", 1, 1);
+
 		this.sql_enabled = getBoolean("sql_enabled", true);
 		this.hook_jdbc_pstmt_classes = getValue("hook_jdbc_pstmt_classes", "");
 		this.hook_jdbc_stmt_classes = getValue("hook_jdbc_stmt_classes", "");
@@ -333,10 +331,11 @@ private void apply() {
 		this._log_asm_enabled = getBoolean("_log_asm_enabled", false);
 		this.obj_type_inherit_to_child_enabled = getBoolean("obj_type_inherit_to_child_enabled", false);
 
-		this.log_dir = getValue("log_dir", "");
+		this.log_dir = getValue("log_dir", ".");
 		this.log_rotation_enabled = getBoolean("log_rotation_enabled", true);
-		this.log_keep_days = getInt("log_keep_days", 7);
-        this._trace = getBoolean("_trace", false);
+		this.log_keep_days = getInt("log_keep_days", 7, 1);
+
+		this._trace = getBoolean("_trace", false);
         this._trace_use_logger = getBoolean("_trace_use_logger", false);
 		this.log_ignore_set = getStringSet("mgr_log_ignore_ids", ",");
 

scouter.agent.batch/src/scouter/agent/batch/Main.java

@@ -1,3 +1,19 @@
+/*
+ *  Copyright 2016 the original author or authors. 
+ *  @https://github.com/scouter-project/scouter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
 package scouter.agent.batch;
 
 import java.io.File;
@@ -8,6 +24,7 @@
 import scouter.agent.batch.netio.data.net.UdpLocalServer;
 import scouter.agent.batch.netio.request.ReqestHandlingProxy;
 import scouter.agent.batch.netio.service.net.TcpRequestMgr;
+import scouter.agent.batch.task.LogMonitor;
 import scouter.agent.batch.task.StatusSender;
 import scouter.lang.pack.MapPack;
 import scouter.lang.pack.ObjectPack;
@@ -42,7 +59,9 @@ public static void main(String[] args) {
 		exit.deleteOnExit();
 		long startTime = System.currentTimeMillis();
 		long currentTime;
-		
+
+		LogMonitor.getInstance();
+			
 		StatusSender statusSender = new StatusSender();
 		while (true) {
 			currentTime = System.currentTimeMillis();

scouter.agent.batch/src/scouter/agent/batch/netio/data/net/BatchNetFlag.java

@@ -1,3 +1,19 @@
+/*
+ *  Copyright 2016 the original author or authors. 
+ *  @https://github.com/scouter-project/scouter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
 package scouter.agent.batch.netio.data.net;
 
 public class BatchNetFlag {

scouter.agent.batch/src/scouter/agent/batch/netio/data/net/TCPStackZipWorker.java

@@ -1,3 +1,19 @@
+/*
+ *  Copyright 2016 the original author or authors. 
+ *  @https://github.com/scouter-project/scouter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
 package scouter.agent.batch.netio.data.net;
 
 import java.io.BufferedInputStream;

scouter.agent.batch/src/scouter/agent/batch/netio/data/net/TcpAgentReqMgr.java

@@ -1,3 +1,19 @@
+/*
+ *  Copyright 2016 the original author or authors. 
+ *  @https://github.com/scouter-project/scouter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
 package scouter.agent.batch.netio.data.net;
 
 import java.io.File;

scouter.agent.batch/src/scouter/agent/batch/netio/data/net/UdpLocalServer.java

@@ -1,3 +1,19 @@
+/*
+ *  Copyright 2016 the original author or authors. 
+ *  @https://github.com/scouter-project/scouter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
 package scouter.agent.batch.netio.data.net;
 
 import java.net.DatagramPacket;
@@ -11,6 +27,11 @@
 public class UdpLocalServer extends Thread{
 	private static UdpLocalServer instance;
 
+	private int days = 0;
+	private int startBatchs = 0;
+	private int endBatchs = 0;
+	private int endNoSignalBatchs = 0;
+	
 	public static synchronized UdpLocalServer getInstance() {
 		if (instance == null) {
 			instance = new UdpLocalServer();
@@ -58,12 +79,41 @@ public void run(){
 		}
 	}
 
+	public int getStartBatchs(){
+		return startBatchs;
+	}
+	
+	public int getEndBatchs(){
+		return endBatchs;
+	}
+	
+	public int getEndNoSignalBatchs(){
+		return endNoSignalBatchs;
+	}
+	
+	public void addEndNoSignalBatchs(){
+		checkDays();
+		endNoSignalBatchs++;
+	}
+	
+	private void checkDays(){
+		int currentDays = (int)(System.currentTimeMillis() / 86400000L);
+		if(currentDays != days){
+			startBatchs = endBatchs = endNoSignalBatchs = 0;
+			days = currentDays;
+		}
+	}
+	
 	private void processRunningInfo(byte [] data){
 		DataInputX input = new DataInputX(data);
 		try{
 			MapPack mapPack = new MapPack();
 			mapPack.read(input);
 			String key = new StringBuilder(50).append(mapPack.getText("batchJobId")).append('-').append(mapPack.getLong("pID")).append('-').append(mapPack.getLong("startTime")).toString();
+			checkDays();
+			if(!Main.batchMap.containsKey(key)){
+				startBatchs++;
+			}
 			Main.batchMap.put(key, mapPack);
 		}catch(Exception ex){
 			ex.printStackTrace();
@@ -74,9 +124,11 @@ private void processEndInfo(byte [] data){
 		DataInputX input = new DataInputX(data);
 		try{
 			String key = new StringBuilder(50).append(input.readText()).append('-').append(input.readInt()).append('-').append(input.readLong()).toString();
+			checkDays();
+			endBatchs++;
 			Main.batchMap.remove(key);
 		}catch(Exception ex){
 			ex.printStackTrace();
-		}		
+		}
 	}
 }