site24x7_apminsight 1.8.3 → 1.8.6

data/lib/agent/configuration/am_configuration.rb

@@ -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 : @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
@@ -58,6 +58,7 @@ module ManageEngine
 					#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)
+          secureConfFile "#{@obj.constants.apm_conf}"
 				else
 				  gemSpecs = Gem.loaded_specs[@obj.constants.s247_apm_gem]
 				  if (gemSpecs == nil)
@@ -72,13 +73,14 @@ module ManageEngine
 						#copied sucessfully
 						@obj.log.info "Config File copied to application home directory. It is read from #{@obj.constants.apm_conf}"
 						@config = @obj.util.readProperties(@obj.constants.apm_conf)
+            secureConfFile "#{@obj.constants.apm_conf}"
 					else
 						#Problem in copying, so reading props from Conf file in Gem Location
 						@obj.log.warn "Config File not copied. It is read from #{gem_conf}"
 						@config = @obj.util.readProperties(gem_conf)
+            secureConfFile gem_conf
 					end
 				end
-				
 			rescue Exception=>e
 				@obj.log.info "[Exception] Problem in Reading Configuration File : \n File : #{@obj.constants.apm_conf}"
 				@obj.log.logException "#{e.message}",e
@@ -87,6 +89,14 @@ module ManageEngine
 			end
 		end
 
+		def secureConfFile(file)
+		  begin
+		    File.chmod(0600, file)
+		  rescue Exception => e
+		    @obj.log.warn "Unable to secure the conf file #{file}"
+		  end
+		end
+		
 		def checkAgentInfo
 			if FileTest.exists?(@obj.constants.agent_conf)
 				@obj.log.debug "Status : Agent Already Connected"
@@ -111,15 +121,14 @@ 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
@@ -138,6 +147,8 @@ module ManageEngine
 			@instance_id = props["agent.id"]
 			@agent_enabled= @obj.util.getBooleanValue props["agent.enabled"]
 			@obj.util.writeProperties(@obj.constants.agent_conf,props)
+			
+			secureConfFile(@obj.constants.agent_conf)
 		end
 
 		def initValues
@@ -246,8 +257,7 @@ module ManageEngine
 		def getHostType
 		  begin
   		  # Check for AWS environment
-#  		  response = Net::HTTP.get_response(URI('http://169.254.169.254/latest/meta-data/'))
-		    url = URI.parse('http://169.254.169.254/latest/meta-data/')
+		    url = URI.parse('http://169.254.169.254/latest/meta-data/') # AWS metadata url
         request = Net::HTTP::Get.new(url.path)
 		    response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
   		  if (response.kind_of? Net::HTTPOK)
@@ -259,8 +269,7 @@ module ManageEngine
       
       begin
   		  #Check for Azure environment
-#        response = Net::HTTP.get_response(URI('http://169.254.169.254/metadata/v1/maintenance'))
-        url = URI.parse('http://169.254.169.254/metadata/v1/maintenance')
+        url = URI.parse('http://169.254.169.254/metadata/v1/maintenance') # Azure metadata url
         request = Net::HTTP::Get.new(url.path)
         response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
         if (response.kind_of? Net::HTTPOK)
@@ -270,6 +279,15 @@ module ManageEngine
 		  rescue Exception => e
 		  end
 		  
+      begin
+        # Check for Heroku env. In the backgroud it is using AWS EC2, hence sending as AWS
+        if (ENV.has_key?('DYNO') || ENV.has_key?('STACK'))
+          @hostType = "AWS"
+          return @hostType
+        end
+      rescue Exception => e
+      end
+		  
       @hostType = nil
 		end
 		
@@ -289,11 +307,24 @@ module ManageEngine
 		def getEnvData
 			env =  Hash.new
 			begin
-			ENV.to_hash.each do |key, value|
-				env[key] = value
-			end
-			#env["Application Path"]="#{Rails.root}"
+			  env["OS"] = Gem::Platform.local.os
+			  env["OS Version"] = Gem::Platform.local.version
+			  env["OS Arch"] = Gem::Platform.local.cpu
+			  env["Ruby Version"] = "#{RUBY_VERSION}"
+        gemSpecs = Gem.loaded_specs[@obj.constants.s247_apm_gem]
+        if (gemSpecs == nil)
+          gemSpecs = Gem.loaded_specs[@obj.constants.apm_gem]
+        end
+        if (gemSpecs != nil)
+          env["Agent Installed Path"] = gemSpecs.full_gem_path
+        end
+			  
+#			ENV.to_hash.each do |key, value|
+#				env[key] = value
+#			end
+			env["Application Path"] = "#{Dir.pwd}"
 			rescue Exception=>e
+			  @obj.log.warn "Error in capturing env data. #{e.message}"
 			end
 			env
 		end

data/lib/agent/server/am_agent.rb

@@ -39,17 +39,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/worker/am_worker.rb

@@ -16,7 +16,7 @@ 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} "

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
+		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
@@ -12,8 +12,8 @@ module ManageEngine
 		def initialize
 		  @conf_location=ENV.has_key?('APMINSIGHT_HOME') ? ENV['APMINSIGHT_HOME']+"/" : "./"
 			#File path for APM Conf file
-			@apm_gem=@conf_location + "apminsight"
-			@s247_apm_gem=@conf_location + "site24x7_apminsight"
+			@apm_gem="apminsight"
+			@s247_apm_gem="site24x7_apminsight"
 			
 			#File path for APM Conf file
 			@apm_conf=@conf_location + "apminsight.conf"
@@ -55,6 +55,8 @@ module ManageEngine
       @site24x7CNurl = "https://plusinsight.site24x7.cn/"
       @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/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.8.3'
+    VERSION = '1.8.6'
     MAJOR_VERSION = '1.8'
-    MINOR_VERSION = '3'
+    MINOR_VERSION = '6'
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 3
-  version: 1.8.3
+  - 6
+  version: 1.8.6
 platform: ruby
 authors: 
 - Adithyan P
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2021-03-23 00:00:00 +05:30
+date: 2022-08-26 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency