cloud66_agent 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1b13722c05c1fda8122d77b6ae685aaaea94b6
-  data.tar.gz: 57757bb9fbd697bb9b7419d7fc16e312ead068f6
+  metadata.gz: 51ef1d2f57617cdc1d773ba203a52f105f47437e
+  data.tar.gz: 76ef024511f59e0182a94eb39e4466cb38a0070e
 SHA512:
-  metadata.gz: 3a3c044f803a5dc271a66427c9fcfa4bbd116d5960647aa3976a6c2981085e722ad7b41258ec04f99cb1fc37ead159fd590d84d9163ceff1bd295362483f076e
-  data.tar.gz: cf251c79ef3db7a98713f0ad7a65367dfd2260d8e35df3e29a36d5c98d36af664c26e296d0c08525ffb1f7106d529cea57fc53fde4b5d3ed69767b4c28b09510
+  metadata.gz: dc9c0e1e78b71b067235a022b776d68122e03f6d412e4c1b7b9c2d9c3e0a559c6044a7544b7281993921b7811ad94a3da70121247a8a4a597d77c7de351793f9
+  data.tar.gz: cb8c05474defa7dc3901c8dcb6dbeed028d1f7ee6f8ea52f59149ef602064bf22eaa74006adaf45b097228e2d7c85233b0880013744e5aa0972c9a18f6ac32aa

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.6
+ruby-2.4.4

data/cloud66_agent.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
 	gem.name = "cloud66_agent"
 	gem.version = Cloud66::Utils::Version.current
 	gem.platform = Gem::Platform::RUBY
-	gem.date = '2017-01-05'
+	gem.date = '2018-04-10'
 	gem.authors = ["Cloud 66"]
 	gem.email = ['hello@cloud66.com']
 	gem.licenses = ['MIT']

data/lib/cloud66_agent/utils/version.rb

@@ -13,7 +13,7 @@ module Cloud66
 			#  Defines the minor version
 			# PATCH:
 			#  Defines the patch version
-			MAJOR, MINOR, PATCH = 1, 3, 0
+			MAJOR, MINOR, PATCH = 1, 3, 1
 
 			#ie. PRERELEASE_MODIFIER = 'beta1' or nil
 			PRERELEASE_MODIFIER = nil

data/lib/cloud66_agent/utils/vital_signs.rb

@@ -2,40 +2,46 @@ module Cloud66
 	module Utils
 		class VitalSigns
 
+			IP_BLOCK_REGEX = /\d{,2}|1\d{2}|2[0-4]\d|25[0-5]/
+			IP_REGEX = /\A#{IP_BLOCK_REGEX}\.#{IP_BLOCK_REGEX}\.#{IP_BLOCK_REGEX}\.#{IP_BLOCK_REGEX}\z/
+
 			def self.system_info
 				# system info
 				return parse_data(`facter`)
 			end
 
 			def self.address_info
+				result = {}
 				# AWS special case
 				if $config.is_aws
-					result = {}
 					reported_ip = `/usr/bin/curl -s http://169.254.169.254/latest/meta-data/public-ipv4`
 					result[:ext_ipv4] = reported_ip if reported_ip =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
 					reported_ip = `/usr/bin/curl -s http://169.254.169.254/latest/meta-data/local-ipv4`
 					result[:int_ipv4] = reported_ip if reported_ip =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
-					return result
 					# GC special case
 				elsif $config.is_gc
-					result = {}
 					external_ip = `/usr/bin/curl -s -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip`
 					result[:ext_ipv4] = external_ip if external_ip =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
 					internal_ip = `/usr/bin/curl -s -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/ip`
 					result[:int_ipv4] = internal_ip if internal_ip =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
-					return result
 				else
-					interfaces_raw = `facter interfaces`
-					interfaces = interfaces_raw.split(',').select { |interface| interface =~ /^eth/ }
-
+					interfaces_raw = `facter interfaces`.strip
+					interfaces = interfaces_raw.split(',').select { |interface| interface !~ /^lo/ }
 					# don't have any ip address info
-					return {} if interfaces.empty?
-
-					# return all interface information
-					facter_command = "facter #{interfaces.map { |interface| "ipaddress_#{interface} ipaddress6_#{interface}" }.join(' ')}"
-					hash = parse_data(`#{facter_command}`) rescue {}
-					return hash
+					unless interfaces.empty?
+						# return all interface information
+						facter_command = "facter #{interfaces.map { |interface| "ipaddress_#{interface} ipaddress6_#{interface}" }.join(' ')}"
+						raw_data = `#{facter_command}`.strip
+						result = parse_data(raw_data) rescue {}
+					end
+				end
+				normalised_hash = {}
+				result.each do |key, value|
+					if value =~ IP_REGEX && value != '127.0.0.1' && value != '127.0.1.1'
+						normalised_hash[key] = value
+					end
 				end
+				return normalised_hash
 			end
 
 			def self.is_aws?				
@@ -74,13 +80,11 @@ module Cloud66
 				data.lines.each do |line|
 					split = line.split('=>')
 					if split.size == 2
-						key = split[0]
-						value = split[1]
-						unless value.nil?
-							value = value.strip
+						key = split[0].strip rescue ''
+						value = split[1].strip rescue ''
+						if !value.nil? && value != 'nil'							
 							# exclude empty or long results (like ssh keys)
-							if !value.empty? && value.size < 100
-								key = key.strip
+							if !value.empty? && value.size < 100								
 								hash[key] = value
 							end
 						end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Cloud 66
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Cloud 66 server component