site24x7_apminsight 1.1 → 1.1.1

data/README.rdoc

@@ -42,7 +42,7 @@ The following configuration options are mandatory and should be provided for the
 
     agent.server.port - The HTTP listening port of the Application Server.
 
-More configuration options of APM Insight Ruby Agent can be found here. https://help.site24x7.com/APM-Insight-Agent-Configuration.html
+More configuration options of APM Insight Ruby Agent can be found here. https://www.site24x7.com/help/apm/apm-insight-configuration.html
  
 Supported Environments :
 
@@ -62,6 +62,6 @@ References
 
 	* Help Documentation for apminsight
 
-		https://help.site24x7.com/Installing-Ruby-Agent.html
-		https://help.site24x7.com/Troubleshooting-Tips-Ruby-Agent.html
+		https://www.site24x7.com/help/apm/ruby-agent.html
+		https://support.site24x7.com/portal/helpcenter/site24x7/apm-insight/ruby-monitoring
 

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "site24x7_apminsight"
-  gem.homepage = "https://help.site24x7.com/Installing-Ruby-Agent.html" #to be changed after the web page is ready
+  gem.homepage = "https://www.site24x7.com/help/apm/ruby-agent.html"
   gem.license = "MIT"
   gem.summary = %Q{Application Performace Monitor}
   gem.description = %Q{Application Performace Monitor : Monitor the web tranasactions}

data/VERSION

@@ -1 +1 @@
-1.1
+1.1.1

data/conf/apminsight.conf

@@ -9,7 +9,7 @@
 #
 #All the configuration options defaults to factory configuration if commented or not supported values
 
-#License key of your account.
+#License key of your Site24x7 APM Insight account.
 license.key=
 
 #Logical name of your application. Say for example you have "Order Processing" applications running in
@@ -71,7 +71,8 @@ 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.
+#Capture HTTP request input 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
 
@@ -82,28 +83,12 @@ webtransaction.trace.input.params.record=false
 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
+transaction.skip.listening=*.css, *.js, *.gif, *.jpg, *.jpeg, *.bmp, *.png, *.ico
 
-#Sampling counter.Say for example when you specify the value as 20, agent will track one in 20 transactions.
+#Sampling counter. Say for example when you specify the value as 20, agent will track one in 20 transactions.
 #default value: 1 (transaction)
 transaction.tracking.request.interval=1
 
-#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.components=
-
 #Directory where agent logs information separately.
 #Defaults to the directory where apminsight-javaagent.jar is installed. 
 #Use forward slash(/) as path separator.
@@ -113,4 +98,4 @@ transaction.tracking.request.interval=1
 #information. The levels are SEVERE, WARNING, INFO, FINE in the order 
 #respectively. Defaults to the level INFO if commented or mentioned 
 #incorrectly.
-apminsight.log.level=INFO
+apminsight.log.level=INFO

data/lib/agent/configuration/am_configuration.rb

@@ -142,6 +142,7 @@ module ManageEngine
 		def assignConfig
 		initValues
 		 @config.each do |key,value|
+		 	 value = checkAndGetEnvValue(value)
 			 case key
 			 when "application.name" then @appname=value
 			 when "apm.host" then @apmhost=value
@@ -156,7 +157,7 @@ module ManageEngine
 			 when "transaction.trace.sql.parametrize" then @sql_capture_params=@obj.util.getBooleanValue value
 			 when "transaction.trace.sql.stacktrace.threshold" then @sql_trace_t=isFloat(@sql_trace_t,value)
 			 when "proxy.server.host" then @proxy_host=value
-			 when "proxy.server.port" then @proxy_port=value
+			 when "proxy.server.port" then @proxy_port=isInteger(@proxy_port,value)
 			 when "proxy.auth.username" then @proxy_user=value
 			 when "proxy.auth.password" then @proxy_pass=value
 			 when "apm.protocol.https" then @is_secured=@obj.util.getBooleanValue value
@@ -167,11 +168,21 @@ module ManageEngine
 			end
 		 end
 		end
+		
+		#Checks whether the given value is Environment Variable
+		def checkAndGetEnvValue(data)
+			value = "#{data}"[/{(.*)}/,1]
+			if (value != nil && ENV.has_key?(value))
+				return data.gsub(/{.*}/, ENV[value])
+			else
+				return data
+			end
+		end
 
 		def getAgentInfo
 			data =  Hash.new
 			agentdata = Hash.new
-			agentdata = {"application.type"=>"RUBY","application.name"=>@appname,"hostname"=>@agenthost,"port"=>@agentport,"agent.version"=>"1.0"}
+			agentdata = {"application.type"=>"RUBY","application.name"=>@appname,"hostname"=>@agenthost,"port"=>@agentport,"agent.version"=>"1.1"}
 			data["agent_info"]=agentdata
 			data["environment"]=getEnvData
 			data["custom_config_info"]=getAgentConfigData

data/lib/agent/server/am_agent.rb

@@ -18,7 +18,9 @@ module ManageEngine
 				puts "APM Insight Ruby Agent Started"
 			else
 				@obj.log.info "Agent Initialization Failed - Going to shutdown"
-				@obj.instrumenter.doSubscribe
+				#While parsing the response from /arh/connect we set instrumenter to nil on delete request
+				#Server startup fails when the below instruction is executed
+				#@obj.instrumenter.doUnSubscribe
 				@obj.shutdownagent
 			end
            	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000Z
+date: 2016-05-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &23260260 !ruby/object:Gem::Requirement
+  requirement: &24015144 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23260260
+  version_requirements: *24015144
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23259972 !ruby/object:Gem::Requirement
+  requirement: &24014856 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23259972
+  version_requirements: *24014856
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23259684 !ruby/object:Gem::Requirement
+  requirement: &24014568 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *23259684
+  version_requirements: *24014568
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23259396 !ruby/object:Gem::Requirement
+  requirement: &24014280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23259396
+  version_requirements: *24014280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23259108 !ruby/object:Gem::Requirement
+  requirement: &24013992 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *23259108
+  version_requirements: *24013992
 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)
@@ -99,7 +99,7 @@ files:
 - lib/agent/server/worker/am_worker.rb
 - lib/agent/server/instrument/am_apm.rb
 - lib/agent/server/instrument/am_instrumenter.rb
-homepage: https://help.site24x7.com/Installing-Ruby-Agent.html
+homepage: https://www.site24x7.com/help/apm/ruby-agent.html
 licenses: []
 post_install_message: 
 rdoc_options: []