site24x7_apminsight 1.8.3 → 1.8.5

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 : @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"
@@ -138,6 +148,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 +258,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 +270,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 +280,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
 		

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
 		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
@@ -55,6 +55,7 @@ module ManageEngine
       @site24x7CNurl = "https://plusinsight.site24x7.cn/"
       @site24x7AUurl = "https://plusinsight.site24x7.net.au/"
       @site24x7INurl = "https://plusinsight.site24x7.in/"
+      @site24x7GDurl = "https://gdplusinsight.site24x7.com/"
 			
 			#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.5'
     MAJOR_VERSION = '1.8'
-    MINOR_VERSION = '3'
+    MINOR_VERSION = '5'
   end
 end

metadata

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