site24x7_apminsight 1.8.5.1 → 1.8.7

data/lib/agent/configuration/am_configuration.rb

@@ -7,7 +7,7 @@ require 'agent/version'
 
 module ManageEngine
 	class APMConfig
-		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport,:license_key,:site24x7, :site24x7url, :hostType
+		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport,:license_key,:site24x7, :site24x7url, :hostType,:delayedStart
 		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, :dbmetric_overflow_t
 		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:txn_skip_listen, :url_merge_pattern
 		attr_accessor :app_db,:app_dispatcher,:lastupdatedtime
@@ -24,7 +24,7 @@ module ManageEngine
 			@alreadyconnected = checkAgentInfo
 			@site24x7 = checkLicenseFile
 			if (@site24x7)
-			  @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @license_key.start_with?('au_') ? @obj.constants.site24x7AUurl : @license_key.start_with?('in_') ? @obj.constants.site24x7INurl : @license_key.start_with?('gd_') ? @obj.constants.site24x7GDurl : @obj.constants.site24x7USurl
+			  @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @license_key.start_with?('au_') ? @obj.constants.site24x7AUurl : @license_key.start_with?('in_') ? @obj.constants.site24x7INurl : @license_key.start_with?('gd_') ? @obj.constants.site24x7GDurl : @license_key.start_with?('jp_') ? @obj.constants.site24x7JPurl : @obj.constants.site24x7USurl
 			end
 			@db_operations =["select","insert","update","delete"]
 			urlMergePattern
@@ -54,7 +54,7 @@ module ManageEngine
 		
 		def configureFile
 			begin
-				if(FileTest.exists?(@obj.constants.apm_conf))
+				if(FileTest.exist?(@obj.constants.apm_conf))
 					#conf file exists in APPlication Home
 						@obj.log.debug "Config File Exists. It is read from #{@obj.constants.apm_conf}"
 					@config = @obj.util.readProperties(@obj.constants.apm_conf)
@@ -98,7 +98,7 @@ module ManageEngine
 		end
 		
 		def checkAgentInfo
-			if FileTest.exists?(@obj.constants.agent_conf)
+			if FileTest.exist?(@obj.constants.agent_conf)
 				@obj.log.debug "Status : Agent Already Connected"
 				props = @obj.util.readProperties(@obj.constants.agent_conf)
 				instance_id = props["agent.id"]
@@ -121,21 +121,20 @@ module ManageEngine
 		end
 
 		def checkLicenseFile
-			if(@license_key != nil)
-				@obj.log.info "License key is not null. Connecting to site24x7"
-				@obj.constants.setLicenseKey @license_key
-				true
-			else
-				@obj.log.info "License key is null. Connecting to APPManager"
-				false
-			end
-
+      @obj.constants.setLicenseKey @license_key
+		  if(@license_key.start_with?('APMI_')) 
+		    @obj.log.info "Connecting to App Manager"
+		    false
+		  else
+		    @obj.log.info "Connecting to Site24x7"
+		    true
+		  end
 		end
 		
 		def urlMergePattern
 			@url_merge_pattern = Hash.new
 			begin
-				if (FileTest.exists?(@obj.constants.mergepattern_conf))
+				if (FileTest.exist?(@obj.constants.mergepattern_conf))
 					@url_merge_pattern=@obj.util.readProperties(@obj.constants.mergepattern_conf)
 				end
 			rescue Exception => e
@@ -172,6 +171,7 @@ module ManageEngine
       @dbmetric_overflow_t=500
 			@trace_overflow_t=30
 			@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
+      @delayedStart = false
 		end
 
 		def assignConfig
@@ -213,6 +213,7 @@ module ManageEngine
 			 when "metricstore.metric.bucket.size" then @metric_overflow_t = isInteger(@metric_overflow_t, value)
        when "metricstore.dbmetric.bucket.size" then @dbmetric_overflow_t = isInteger(@dbmetric_overflow_t, value)
        when "transaction.tracestore.size" then @trace_overflow_t = isInteger(@trace_overflow_t, value)
+			 when "agent.delay.start" then @delayedStart=@obj.util.getBooleanValue value
 			end
 		 end
      store_encrypted_data(@config)

data/lib/agent/logging/am_logger.rb

@@ -40,7 +40,7 @@ module ManageEngine
 		def	getLogsPath
 			props = {}
 			begin
-				if FileTest.exists?(@obj.constants.apm_conf)
+				if FileTest.exist?(@obj.constants.apm_conf)
 				propsFile=File.open(@obj.constants.apm_conf, 'r') 
 				propsFile.read.each_line do |line|
 					line.strip!

data/lib/agent/server/am_agent.rb

@@ -9,7 +9,16 @@ module ManageEngine
 		def initialize
 			@obj = ManageEngine::APMObjectHolder.instance
 			@obj.log.debug "Agent Initialization - START"
-			doConnect
+			if @obj.config.delayedStart
+        @obj.log.info "Delaying agent handshake as per configuration.."
+        @obj.agent_initialized = true # to be reset when connecting
+        @apm = Thread.new do
+          sleep ((@obj.config.connect_interval).to_i)/2
+          doConnect
+        end
+      else
+        doConnect
+      end
 
 			if !@obj.shutdown && @obj.agent_initialized
 				@obj.log.info "Agent Initialization - DONE"
@@ -26,12 +35,12 @@ module ManageEngine
 				#@obj.instrumenter.doUnSubscribe
 				@obj.shutdownagent
 			end
-           	
-
-       end
+     end
 
 		def doConnect
 			begin	
+        @obj.agent_initialized=false #resetting, to go with the flow
+        
 				if @obj.shutdown
 					@obj.log.info "[ Problem in Agent Startup ]"
 				else
@@ -39,17 +48,20 @@ module ManageEngine
 					resp = nil
 					if @obj.config.alreadyconnected
 						@obj.log.debug "[doConnect] Already Connected - Make Contact - Instance id = #{@obj.config.instance_id}"
-						if @obj.config.site24x7
-							resp = startConnect "?license.key="+@obj.config.license_key+"&instance_id="+@obj.config.instance_id,agentInfo
-						else
-							resp = startConnect "?instance_id="+@obj.config.instance_id,agentInfo
-						end
+						resp = startConnect "?license.key="+@obj.config.license_key+"&instance_id="+@obj.config.instance_id,agentInfo
 					else
 						@obj.log.debug "[doConnect] Going to connect - New "
-						if @obj.config.site24x7
-							resp = startConnect "?license.key="+@obj.config.license_key,agentInfo
+#						if @obj.config.site24x7
+#							resp = startConnect "?license.key="+@obj.config.license_key,agentInfo
+#						else
+#							resp = startConnect "",agentInfo
+#						end
+            # Checking the license pattern for APM as per team requirement
+						if !@obj.config.site24x7 && !@obj.config.license_key.match?("APMI_[A-Fa-f0-9]{64}")
+					    @obj.log.info "Invalid license key for App Manager, aborting agent init"
+					    @obj.shutdown=true
 						else
-							resp = startConnect "",agentInfo
+              resp = startConnect "?license.key="+@obj.config.license_key,agentInfo
 						end
 					end
 					

data/lib/agent/server/am_connector.rb

@@ -19,7 +19,7 @@ module ManageEngine
 
 				u = url uri
 				#@obj.log.info "[connector] [ POST]  START"
-				@obj.log.debug "[connector] [ POST]  : \n\n#{u}\n\n#{data}\n\n"
+				@obj.log.debug "[connector] [ POST]  : #{u}\n#{data}"
 				con =  connection(u)
 				req = Net::HTTP::Post.new(u.request_uri,initheader = {'Content-Type' =>'application/json'})
 				req.body=data.to_json

data/lib/agent/server/worker/am_worker.rb

@@ -16,17 +16,17 @@ class APMWorker
       @obj = ManageEngine::APMObjectHolder.instance
     
     	if @status=="working"
-        @obj.log.debug "woker thread already started"
+        @obj.log.debug "worker thread already started"
       elsif @status == "initialized"
         @obj.log.info "start worker thread for - #{Process.pid} :: #{@status}  "
         #@obj.log.info "Starting APMWorker Thread #{Process.pid} "
         @apm = Thread.new do
           @status  = 'working'
       	  while !@obj.shutdown do
+            sleep (@obj.config.connect_interval).to_i
       	    checkforagentstatus
     				updateConfig
             dc
-    				sleep (@obj.config.connect_interval).to_i
           end#w
           @status= "end"
           @obj.log.debug "Worker thread ends"

data/lib/agent/util/am_constants.rb

@@ -3,7 +3,7 @@ module ManageEngine
 	class APMConstants
 
 		attr_reader :conf_location, :apm_gem,:s247_apm_gem,:apm_conf,:agent_conf,:connection_open_timeout,:connection_read_timeout,:connect_uri,:connect_data_uri,:connect_trace_uri,:connect_config_update_uri,:mergepattern_conf
-		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl, :site24x7GDurl
+		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl, :site24x7GDurl, :site24x7JPurl
 		attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info, :agent_specific_info
 		attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
 		attr_reader :mf_logmetric, :mf_logmetric_warning, :mf_exception_st, :mf_err_st, :mf_loginfo, :mf_loginfo_time, :mf_loginfo_level, :mf_loginfo_str, :mf_loginfo_err_clz, :mf_loginfo_st, :mf_loginfo_level_warn
@@ -56,6 +56,7 @@ module ManageEngine
       @site24x7AUurl = "https://plusinsight.site24x7.net.au/"
       @site24x7INurl = "https://plusinsight.site24x7.in/"
       @site24x7GDurl = "https://gdplusinsight.site24x7.com/"
+      @site24x7JPurl = "https://plusinsight.site24x7.jp/"
 			
 			#Response Codes 
 			@licence_expired = 701

data/lib/agent/util/am_util.rb

@@ -50,22 +50,21 @@ module ManageEngine
 			props = {}
 			begin
 				propsFile=File.open(filepath, 'r') 
-      			propsFile.read.each_line do |line|
-        			line.strip!
-        			if (line[0] != ?# and line[0] != ?=)
-          				i = line.index('=')
-        	  			if (i)
-    	        			props[line[0..i - 1].strip] = line[i + 1..-1].strip
-	          			else
-            				props[line] = ''
-         				end
-        			end
-      	  		end
+    		propsFile.read.each_line do |line|
+  			line.strip!
+  			if (line[0] != ?# and line[0] != ?=)
+    				i = line.index('=')
+  	  			if (i)
+        			props[line[0..i - 1].strip] = line[i + 1..-1].strip
+      			else
+      				props[line] = ''
+     				end
+    			end
+      	end
+        propsFile.close
 			rescue Exception=>e
 				@log.info "Problem in Reading Property File :  #{e.message} "
 				@log.error "#{e.backtrace}"
-			ensure
-					propsFile.close
 			end
 			props
 		end

data/lib/agent/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.8.5.1'
+    VERSION = '1.8.7'
     MAJOR_VERSION = '1.8'
-    MINOR_VERSION = '5.1'
+    MINOR_VERSION = '7'
   end
 end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 5
-  - 1
-  version: 1.8.5.1
+  - 7
+  version: 1.8.7
 platform: ruby
 authors: 
 - Adithyan P
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2021-07-06 00:00:00 +05:30
+date: 2023-07-05 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency