site24x7_apminsight 1.0 → 1.1

data/VERSION

@@ -1 +1 @@
-1.0
+1.1

data/conf/apminsight.conf

@@ -71,6 +71,16 @@ transaction.trace.sql.parametrize=true
 #default value: 3 (second)
 transaction.trace.sql.stacktrace.threshold=3
 
+#Capture HTTP web request parameters, if enabled. To skip recording specific request parameters use webtrasnaction.trace.input.params.ignore key.
+#default value: false
+webtransaction.trace.input.params.record=false
+
+#Skip recording confidential request parameters like password, authKey, etc.
+#Use comma (,) as parameter names separator.
+#If no value is specified all parameters will be recorded.
+#Value(s) specified for this key are case sensitive.
+webtransaction.trace.input.params.ignore=password, pswd, pass, authKey, parentId, parentID, resourceId, resourceID, id, ID
+
 #Stop listening transactions with specified URL pattern.
 transaction.skip.listening=*.css, *.js, *.gif, *.jpg, *.jpeg, *.bmp, *.png
 
@@ -78,11 +88,21 @@ transaction.skip.listening=*.css, *.js, *.gif, *.jpg, *.jpeg, *.bmp, *.png
 #default value: 1 (transaction)
 transaction.tracking.request.interval=1
 
-#The packages which also needs to be instrumented. By Default, APM Insight does not instrument all the class
-#loaded in the JVM. eg: configuring com/test/customimpl/.* will include all the packages & classes that
-#starts with com.test.customimpl. It is best if this is enabled only in the testing/staging environment.
+#Time interval for the agent to collect the JVM related data like Memory Usage, Cpu Usage, etc.
+#For example, if value is set to 3, agent will collect data for every 3 minutes.
+#default value: 5 (minutes)
+#jvm.polling.interval=
+
+#The grouping (componentization) of includes packages. 
+#By Default, APM Insight groups transactions into 
+#STRUTS, FILTER, JSP, SERVLET, EJB, IBATIS, HIBERNATE, 
+#MYSQL, MSSQL, PGSQL, ORACLE, IBMDB2, SYBASE, JDBC (for other database types) and POJO (Plain Java Object) components.
+#For additional components of your custom includes packages, use include.components
+#eg: configuring com/test/memcache/.*:memcache will group all the packages & classes that
+#starts with com.test.memcache into MEMCACHE component.
+#Note : The package name will default be included for instrumentation and you need NOT give this in include.package separately.
 #Use comma(,) to separate multiple entries.
-#include.packages=
+#include.components=
 
 #Directory where agent logs information separately.
 #Defaults to the directory where apminsight-javaagent.jar is installed. 

data/lib/agent/configuration/am_configuration.rb

@@ -8,7 +8,7 @@ module ManageEngine
 	class APMConfig
 		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport,:license_key,:site24x7
 		attr_reader :appname,:proxyneeded, :apdex_t, :trans_trace, :trans_trace_t, :sql_capture, :sql_capture_params, :sql_trace_t,:proxy_user,:proxy_pass, :metric_overflow_t, :trace_overflow_t
-		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:include_packages
+		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:include_packages, :url_merge_pattern
 		attr_accessor :app_db,:app_dispatcher,:lastupdatedtime
 		def initialize
 			@obj = ManageEngine::APMObjectHolder.instance
@@ -23,6 +23,7 @@ module ManageEngine
 			@alreadyconnected = checkAgentInfo
 			@site24x7 = checkLicenseFile
 			@db_operations =["select","insert","update","delete"]
+			urlMergePattern
 			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
 			@obj.log.debug "APP HOME #{File.absolute_path(".")} "
 			@obj.log.debug "APP HOME #{Dir.pwd} "
@@ -34,6 +35,10 @@ module ManageEngine
 			@config.each do|key,val|
 			@obj.log.info "#{key} => #{val}"
 				end
+			@obj.log.info "URL Merge Patterns"
+			@url_merge_pattern.each do |key, val|
+				@obj.log.info "#{key} => #{val}"
+			end
 			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
 			@app_db="dummydb"
 			@app_dispatcher = getDispatcher
@@ -95,6 +100,18 @@ module ManageEngine
 			end
 
 		end
+		
+		def urlMergePattern
+			@url_merge_pattern = Hash.new
+			begin
+				if (FileTest.exists?(@obj.constants.mergepattern_conf))
+					@url_merge_pattern=@obj.util.readProperties(@obj.constants.mergepattern_conf)
+				end
+			rescue Exception => e
+				@obj.log.info "[Exception] Problem in Reading Configuration File : \n File : #{@obj.constants.mergepattern_conf}"
+				@obj.log.logException "#{e.message}",e
+			end
+		end
 
 		def updateAgentInfoFile(props)
 			@instance_id = props["agent.id"]
@@ -142,7 +159,7 @@ module ManageEngine
 			 when "proxy.server.port" then @proxy_port=value
 			 when "proxy.auth.username" then @proxy_user=value
 			 when "proxy.auth.password" then @proxy_pass=value
-			 when "apminsight.secure" then @is_secured=@obj.util.getBooleanValue value
+			 when "apm.protocol.https" then @is_secured=@obj.util.getBooleanValue value
 			 when "apminsight.log.dir" then @logs_dir=value
 			 when "agent.connection.retry" then @connection_retry=value #Not in Conf - yet to come
 			when "agent.connection.interval" then	 @connect_interval=value#Not in Conf - yet to come

data/lib/agent/metrics/am_metricsparser.rb

@@ -180,6 +180,14 @@ module ManageEngine
 				rt = (d["end"] - d["start"]).to_i
 				path=pl[:path]
 				#path=pl["path"]
+				
+				@obj.config.url_merge_pattern.each do |key, val|
+					if (path.match(key) != nil)
+						path=val
+						break
+					end
+				end
+				
 				controller=pl[:controller]
 				#controller=pl["controller"]
 				action = pl[:action]
@@ -391,7 +399,14 @@ module ManageEngine
 			#trData = Array.new
 			#trData[0] = ((d["start"]).to_f * 1000).to_i
 			pl = d["payload"]
-			trData[1] = pl[:path] + " " +pl[:controller] + "#" + pl[:action]
+			path = pl[:path]
+			@obj.config.url_merge_pattern.each do |key, val|
+				if (path.match(key) != nil)
+					path=val
+					break
+				end
+			end
+			trData[1] = path + " " +pl[:controller] + "#" + pl[:action]
 			#trData[1] = pl["path"] + " " +pl["controller"] + "#" + pl["action"]
 			trData[2] = ""
 			trData[3] = (d["end"] - trData[0]).to_i

data/lib/agent/server/am_connector.rb

@@ -105,8 +105,8 @@ module ManageEngine
 			else
 				#@obj.log.info "Proxy Not Needed #{url.host} #{url.port}"
 				con = Net::HTTP.new(url.host, url.port)
-				con.use_ssl=true
-				con.verify_mode=OpenSSL::SSL::VERIFY_NONE
+				#con.use_ssl=true
+				#con.verify_mode=OpenSSL::SSL::VERIFY_NONE
 				#@obj.log.info "connection = #{con}"
 			end
 			con=getScheme(con)
@@ -116,9 +116,9 @@ module ManageEngine
 		end
 
 		def getScheme(con)
-			if(@obj.config.is_secured)
+			if(@obj.config.license_key != nil || @obj.config.is_secured)
 				#@obj.log.info "[connect] Secured"
-				con = Net::HTTP::Proxy(@obj.config.proxy_host, @obj.config.proxy_port,@obj.config.proxy_user,@obj.config.proxy_pass).new(url.host, url.port)		
+				#con = Net::HTTP::Proxy(@obj.config.proxy_host, @obj.config.proxy_port,@obj.config.proxy_user,@obj.config.proxy_pass).new(url.host, url.port)		
 				con.use_ssl=true
 				con.verify_mode=OpenSSL::SSL::VERIFY_NONE
 			end

data/lib/agent/server/instrument/am_apm.rb

@@ -10,7 +10,7 @@ class Class
 		elsif
      		result = old_new(*args,&block)
 		end
-	 rescue Excetion=>exe
+	 rescue Exception=>exe
         raise exe		 
 		result = self
 	 end

data/lib/agent/util/am_constants.rb

@@ -2,7 +2,7 @@
 module ManageEngine
 	class APMConstants
 
-		attr_reader :apm_gem,:apm_conf,:agent_conf,:connection_open_timeout,:connection_read_timeout,:connect_uri,:connect_data_uri,:connect_trace_uri,:connect_config_update_uri,:site24x7url
+		attr_reader :apm_gem,:apm_conf,:agent_conf,:connection_open_timeout,:connection_read_timeout,:connect_uri,:connect_data_uri,:connect_trace_uri,:connect_config_update_uri,:site24x7url, :mergepattern_conf
 		attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info
 		attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
 		
@@ -21,6 +21,9 @@ module ManageEngine
 			
 			#file path for agent data store lock
 			@agent_store="apminsight.store"
+			
+			#file name for url merge patterns
+			@mergepattern_conf="transaction_merge_patterns.conf"
 
 
 			#Timeout for opening Connections

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000Z
+date: 2014-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &27413904 !ruby/object:Gem::Requirement
+  requirement: &23260260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27413904
+  version_requirements: *23260260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27413616 !ruby/object:Gem::Requirement
+  requirement: &23259972 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *27413616
+  version_requirements: *23259972
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27413328 !ruby/object:Gem::Requirement
+  requirement: &23259684 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *27413328
+  version_requirements: *23259684
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &27413040 !ruby/object:Gem::Requirement
+  requirement: &23259396 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27413040
+  version_requirements: *23259396
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &27412752 !ruby/object:Gem::Requirement
+  requirement: &23259108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *27412752
+  version_requirements: *23259108
 description: Site24x7 APMInsight gives you end-to-end web-transaction awareness of
   Rails applications enabling you to isolate performance issues and resolve them quickly.
   To monitor Rails application performance, download and deploy Ruby agent(site24x7_apminsight)