Merge pull request #9 from nices96/master

Add options to ignore given NAME & TITLE patterns

Author: nices96

.classpath

@@ -6,10 +6,10 @@
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/scouter.common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/scouter.server"/>
 	<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-email-1.4.jar"/>
 	<classpathentry kind="lib" path="lib/javax.mail-1.5.2.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/scouter-common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/scouter-server"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

README.md

@@ -28,8 +28,9 @@
 * **_ext\_plugin\_elapsed\_time_threshold_** : 응답시간의 임계치 (ms) - 기본 값은 0으로, 0일때 응답시간의 임계치 초과 여부를 확인하지 않는다.
 * **_ext\_plugin\_gc\_time_threshold_** : GC Time의 임계치 (ms) - 기본 값은 0으로, 0일때 GC Time의 임계치 초과 여부를 확인하지 않는다.
 * **_ext\_plugin\_thread\_count_threshold_** : Thread Count의 임계치 - 기본 값은 0으로, 0일때 Thread Count의 임계치 초과 여부를 확인하지 않는다.
-
-
+* **_ext\_plugin\_ignore\_name_patterns_** : Alert 메시지 발송에서 제외할 NAME 패턴 목록 (',' 구분자 사용, * (wildcard) 사용 가능)
+* **_ext\_plugin\_ignore\_title_patterns_** : Alert 메시지 발송에서 제외할 TITLE 패턴 목록 (',' 구분자 사용, * (wildcard) 사용 가능)
+* **_ext\_plugin\_ignore\_continuous_dup_alert_** : 연속된 동일 Alert을 1시간 동안 제외 - 기본 값은 false
 
 * Example
 ```
@@ -49,6 +50,10 @@ ext_plugin_email_cc_address=ccreceiver@yopmail.com
 ext_plugin_elapsed_time_threshold=5000
 ext_plugin_gc_time_threshold=5000
 ext_plugin_thread_count_threshold=300
+
+ext_plugin_ignore_name_patterns=myTomcat1
+ext_plugin_ignore_title_patterns=Elapsed,CONNECTION,activat*
+ext_plugin_ignore_continuous_dup_alert=true
 ```
 
 ### Dependencies

src/scouter/plugin/server/alert/email/EmailPlugin.java

@@ -61,6 +61,8 @@ public class EmailPlugin {
 
     private static AtomicInteger ai = new AtomicInteger(0);
     private static List<Integer> javaeeObjHashList = new ArrayList<Integer>();
+    private static AlertPack lastPack;
+    private static long lastSentTimestamp;
 
     public EmailPlugin() {
     	if (ai.incrementAndGet() == 1) {
@@ -155,6 +157,41 @@ public void run() {
                             	title = "An object has been inactivated.";
                             	msg = pack.message.substring(0, pack.message.indexOf("OBJECT") - 1);
                             }
+                            
+                            try {
+	                            String ignoreNamePattern = conf.getValue("ext_plugin_ignore_name_patterns");
+	                            String ignoreTitlePattern = conf.getValue("ext_plugin_ignore_title_patterns");
+	                            
+	                            if (ignoreNamePattern != null && !"".equals(ignoreNamePattern)) {
+		                            for (String pattern : ignoreNamePattern.split(",")) {
+		                        		if (name.matches(".*[" + pattern.replaceAll("-", "\\\\-") + "].*")) {
+		                        			return;
+		                        		}
+		                        	}
+	                            }
+
+	                            if (ignoreTitlePattern != null && !"".equals(ignoreTitlePattern)) {
+		                            for (String pattern : ignoreTitlePattern.split(",")) {
+		                        		if (title.matches(".*[" + pattern.replaceAll("-", "\\\\-") + "].*")) {
+		                        			return;
+		                        		}
+		                        	}
+	                            }
+	                            
+	                            if (conf.getBoolean("ext_plugin_ignore_continuous_dup_alert", false) && lastPack != null) {
+		                            long diff = System.currentTimeMillis() - lastSentTimestamp;
+	                            	if (lastPack.objHash == pack.objHash 
+	                            			&& lastPack.title.equals(pack.title)
+	                            			&& diff < DateUtil.MILLIS_PER_HOUR) {
+	                            		return;
+	                            	}
+	                            }
+	                            
+	                            lastPack = pack;
+                            } catch (Exception e) {
+                            	// ignore
+                            	println("[Error] : " + e.getMessage());
+                            }
 
                             // Make email message
                             String message = "[TYPE] : " + pack.objType.toUpperCase() + "\n" + 
@@ -186,7 +223,8 @@ public void run() {
 
                             // Send the email
                             email.send();
-                            
+
+                        	lastSentTimestamp = System.currentTimeMillis();
                             println("Email sent to [" + to + "] successfully.");
                         } catch (Exception e) {
                         	println("[Error] : " + e.getMessage());