cloud66_agent 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51ef1d2f57617cdc1d773ba203a52f105f47437e
-  data.tar.gz: 76ef024511f59e0182a94eb39e4466cb38a0070e
+SHA256:
+  metadata.gz: c38dc8b98765dbcd9303528cc6ff8c57013613c1908b259e73c0b17d5f1327c7
+  data.tar.gz: 930f568ce197cf07f061f026af19231b6050486769450f617049449451b44e50
 SHA512:
-  metadata.gz: dc9c0e1e78b71b067235a022b776d68122e03f6d412e4c1b7b9c2d9c3e0a559c6044a7544b7281993921b7811ad94a3da70121247a8a4a597d77c7de351793f9
-  data.tar.gz: cb8c05474defa7dc3901c8dcb6dbeed028d1f7ee6f8ea52f59149ef602064bf22eaa74006adaf45b097228e2d7c85233b0880013744e5aa0972c9a18f6ac32aa
+  metadata.gz: 00c8fa84e68deea570a160aa7aa9eca9286312c35dad0b44e7700a7cb793f753a03f99f1a311be63aa666b918c1c9a1c42f7fc2d174386f9a6482f399cdd47fa
+  data.tar.gz: affeb9cb1ef085b1db0f8ff18e366b4e7e7af408c6fed305eb637587a46b315a22a9d7b9353288ed6fd741fda2331b16bb2eb7db7f00fb783339772f606c5854

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.4
+ruby-2.4.5

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 = '2018-04-10'
+	gem.date = '2019-03-27'
 	gem.authors = ["Cloud 66"]
 	gem.email = ['hello@cloud66.com']
 	gem.licenses = ['MIT']

data/lib/cloud66_agent/commands/configure.rb

@@ -3,48 +3,54 @@ require 'cloud66_agent/utils/version'
 require 'cloud66_agent/utils/server'
 
 module Cloud66
-	module Commands
-		class Configure
-			def self.perform(server_uid, cloud)
-				begin
-					if cloud.nil? || cloud.empty?
-						# try figure it out
-						$config.is_aws = Utils::VitalSigns.is_aws?
+  module Commands
+    class Configure
+      def self.perform(server_uid, cloud)
+        begin
+          if cloud.nil? || cloud.empty?
+            # try figure it out
+            $config.is_aws = Utils::VitalSigns.is_aws?
 
-						if $config.is_aws
-							$config.is_gc = false
-						else
-							# try figure it out
-							$config.is_gc = Utils::VitalSigns.is_gc?
-						end
-					else
-						# use the passed in value
-						$config.is_aws = (cloud == 'aws')
+            if $config.is_aws
+              $config.is_gc = false
+            else
+              # try figure it out
+              $config.is_gc = Utils::VitalSigns.is_gc?
+            end
+          else
+            # use the passed in value
+            $config.is_aws = (cloud == 'aws')
 
-						# use the passed in value
-						$config.is_gc = (cloud == 'googlecloud')
-					end
-					data = {
-						:timezone => Time.new.zone,
-						:server_uid => server_uid,
-						:version => Utils::Version.current,
-						:system => Utils::VitalSigns.system_info }
+            # use the passed in value
+            $config.is_gc = (cloud == 'googlecloud')
+          end
+          data = {
+              :timezone => Time.new.zone,
+              :server_uid => server_uid,
+              :version => Utils::Version.current,
+              :system => Utils::VitalSigns.system_info}
 
-					address_info = Utils::VitalSigns.address_info
-					data = data.merge(address_info)
-				rescue => exc
-					data = { error: exc.message }
-				end
-				result = Utils::Server.send_configure data
-				$config.agent_uid = result['agent_uid']
-				$config.disabled = false
-				$config.save
-				exit 0
-			rescue => exc
-				$logger.error "Command \"configure\" failed: #{exc.message}"
-				exit -1
-			end
+          address_info = Utils::VitalSigns.address_info
+          data = data.merge(address_info)
+        rescue => exc
+          data = {error: exc.message}
+        end
+        result = Utils::Server.send_configure data
+        $config.agent_uid = result['agent_uid']
 
-		end
-	end
+        disk_warning_percent = result['disk_warning_percent']
+        $config.disk_warning_percent = disk_warning_percent.to_i unless disk_warning_percent.nil?
+        disk_critical_percent = result['disk_critical_percent']
+        $config.disk_critical_percent = disk_critical_percent.to_i unless disk_critical_percent.nil?
+
+        $config.disabled = false
+        $config.save
+        exit 0
+      rescue => exc
+        $logger.error "Command \"configure\" failed: #{exc.message}"
+        exit -1
+      end
+
+    end
+  end
 end

data/lib/cloud66_agent/commands/vitals.rb

@@ -6,11 +6,11 @@ module Cloud66
 		class Vitals
 			def self.perform
 				begin
-					data = Utils::VitalSigns.vitals_info
+					data = Utils::VitalSigns.vitals_alerts
 				rescue => exc
 					data = { error: exc.message }
 				end
-				Utils::Server.send_vitals data
+				Utils::Server.send_vitals(data) if !data.nil? && !data.empty?
 				exit 0
 			rescue => exc
 				$logger.error "Command \"vitals\" failed: #{exc.message}"

data/lib/cloud66_agent/utils/config.rb

@@ -1,115 +1,125 @@
 require 'cloud66_agent/utils/vital_signs'
 
 module Cloud66
-	module Utils
-		class Config
-
-			# default conf dir
-			CONFIG_PATH = "/etc/cloud66/cloud66_agent.yml"
-
-			attr_accessor :api_url,
-						  :api_key,
-						  :secret_key,
-						  :agent_uid,
-						  :disabled,
-						  :is_aws,
-						  :is_gc,
-						  :log,
-						  :log_level
-
-			# load up the config at startup
-			def initialize
-				load if File.exists?(CONFIG_PATH)
-
-				# set defaults
-				@log = @log.nil? ? "/var/log/cloud66_agent.log" : @log == "STDOUT" ? STDOUT : @log
-				@log_level ||= 2
-				@api_url ||= 'https://api.cloud66.com'
-				@disabled ||= false
-				@is_aws ||= false
-				@is_gc ||= false
-			end
-
-			def is_agent_configured?
-				return !@agent_uid.nil? && !@agent_uid.empty?
-			end
-
-			def save
-				Dir.mkdir(CONFIG_PATH) if !FileTest::directory?(File.dirname(CONFIG_PATH))
-
-				File.open(CONFIG_PATH, 'w+') do |out|
-					data = {
-						'api_url' => @api_url,
-						'api_key' => @api_key,
-						'secret_key' => @secret_key,
-						'agent_uid' => @agent_uid,
-						'disabled' => @disabled,
-						'is_aws' => @is_aws,
-						'is_gc' => @is_gc,
-						'log' => @log == STDOUT ? "STDOUT" : @log,
-						'log_level' => @log_level,
-					}
-					out.puts to_cust_yaml(data)					
-				end
-			end
-
-			def delete
-				File.delete(CONFIG_PATH) if File.exists?(CONFIG_PATH)
-			end
-
-			private
-
-			def load
-				raise "config not found" unless File.exists?(CONFIG_PATH)
-				config = from_cust_yaml(IO.read(CONFIG_PATH))
-				@api_url = config['api_url']
-				@api_key = config['api_key']
-				@secret_key = config['secret_key']
-				@agent_uid = config['agent_uid']
-				@disabled = config['disabled']
-				@is_aws = config['is_aws']
-				@is_gc = config['is_gc']
-				@log = config['log']
-				@log_level = config['log_level']
-			rescue
-				# we can't load the file
-			end
-
-			# temporary measure to handle psych dependency errors
-			def to_cust_yaml(hash)
-				yaml_output = ''
-				hash.each do |key, value|
-					if !!value == value || value.is_a?(Integer)
-						yaml_output += "#{key}: #{value.to_s}\n"
-					else
-						yaml_output += "#{key}: \"#{value.to_s}\"\n"
-					end
-				end
-				return yaml_output
-			end
-
-			# temporary measure to handle psych dependency errors
-			def from_cust_yaml(yaml)
-				hash = {}
-				yaml.lines.each do |line|
-					next if line.nil? || !line.include?(':')					
-					key = line.split(':', 2)[0].strip
-					value = line.split(':', 2)[1].strip						
-					next if value.empty?
-
-					if value =~ /^(true|false)$/
-						value = true if value == 'true'
-						value = false if value == 'false'
-					elsif value =~ /^[0-9]+$/
-						value = value.to_i				
-					elsif value =~ /^".*"$/
-						value = value.gsub(/^"/, '').gsub(/"$/,'')
-					end
-					hash[key] = value
-				end
-				return hash
-			end		
-
-		end
-	end
+  module Utils
+    class Config
+
+      # default conf dir
+      CONFIG_PATH = "/etc/cloud66/cloud66_agent.yml"
+
+      attr_accessor :api_url,
+                    :api_key,
+                    :secret_key,
+                    :agent_uid,
+                    :disabled,
+                    :is_aws,
+                    :is_gc,
+                    :log,
+                    :log_level,
+                    :disk_warning_percent,
+                    :disk_critical_percent
+
+      # load up the config at startup
+      def initialize
+        load if File.exists?(CONFIG_PATH)
+
+        # set defaults
+        @log = @log.nil? ? "/var/log/cloud66_agent.log" : @log == "STDOUT" ? STDOUT : @log
+        @log_level ||= 2
+        @api_url ||= 'https://api.cloud66.com'
+        @disabled ||= false
+        @is_aws ||= false
+        @is_gc ||= false
+
+        # defaults
+        @disk_warning_percent = 80
+        @disk_critical_percent = 90
+      end
+
+      def is_agent_configured?
+        return !@agent_uid.nil? && !@agent_uid.empty?
+      end
+
+      def save
+        Dir.mkdir(CONFIG_PATH) if !FileTest::directory?(File.dirname(CONFIG_PATH))
+
+        File.open(CONFIG_PATH, 'w+') do |out|
+          data = {
+              'api_url' => @api_url,
+              'api_key' => @api_key,
+              'secret_key' => @secret_key,
+              'agent_uid' => @agent_uid,
+              'disabled' => @disabled,
+              'is_aws' => @is_aws,
+              'is_gc' => @is_gc,
+              'log' => @log == STDOUT ? "STDOUT" : @log,
+              'log_level' => @log_level,
+              'disk_warning_percent' => @disk_warning_percent,
+              'disk_critical_percent' => @disk_critical_percent,
+          }
+          out.puts to_cust_yaml(data)
+        end
+      end
+
+      def delete
+        File.delete(CONFIG_PATH) if File.exists?(CONFIG_PATH)
+      end
+
+      private
+
+      def load
+        raise "config not found" unless File.exists?(CONFIG_PATH)
+        config = from_cust_yaml(IO.read(CONFIG_PATH))
+        @api_url = config['api_url']
+        @api_key = config['api_key']
+        @secret_key = config['secret_key']
+        @agent_uid = config['agent_uid']
+        @disabled = config['disabled']
+        @is_aws = config['is_aws']
+        @is_gc = config['is_gc']
+        @log = config['log']
+        @log_level = config['log_level']
+        @disk_warning_percent = config['disk_warning_percent'].to_i if config['disk_warning_percent']
+        @disk_critical_percent = config['disk_critical_percent'].to_i if config['disk_critical_percent']
+      rescue
+        # we can't load the file
+      end
+
+      # temporary measure to handle psych dependency errors
+      def to_cust_yaml(hash)
+        yaml_output = ''
+        hash.each do |key, value|
+          if !!value == value || value.is_a?(Integer)
+            yaml_output += "#{key}: #{value.to_s}\n"
+          else
+            yaml_output += "#{key}: \"#{value.to_s}\"\n"
+          end
+        end
+        return yaml_output
+      end
+
+      # temporary measure to handle psych dependency errors
+      def from_cust_yaml(yaml)
+        hash = {}
+        yaml.lines.each do |line|
+          next if line.nil? || !line.include?(':')
+          key = line.split(':', 2)[0].strip
+          value = line.split(':', 2)[1].strip
+          next if value.empty?
+
+          if value =~ /^(true|false)$/
+            value = true if value == 'true'
+            value = false if value == 'false'
+          elsif value =~ /^[0-9]+$/
+            value = value.to_i
+          elsif value =~ /^".*"$/
+            value = value.gsub(/^"/, '').gsub(/"$/, '')
+          end
+          hash[key] = value
+        end
+        return hash
+      end
+
+    end
+  end
 end

data/lib/cloud66_agent/utils/server.rb

@@ -2,92 +2,92 @@ require 'httparty'
 require 'json'
 
 module Cloud66
-	module Utils
+  module Utils
 
-		class Server
-			include HTTParty
-			# set the default request timeout to 45 seconds
-			# this sets the open_timeout and the read_timeout
-			default_timeout 45
+    class Server
+      include HTTParty
+      # set the default request timeout to 45 seconds
+      # this sets the open_timeout and the read_timeout
+      default_timeout 45
 
-			def self.send_configure(data)
-				process(do_request(:post, '/server/configure.json', build_content(data)))
-			end
+      def self.send_configure(data)
+        process(do_request(:post, '/server/configure.json', build_content(data)))
+      end
 
-			def self.send_pulse
-				process(do_request(:get, "/server/#{$config.agent_uid}/pulse.json", build_content))
-			end
+      def self.send_pulse
+        process(do_request(:get, "/server/#{$config.agent_uid}/pulse.json", build_content))
+      end
 
-			def self.send_address(data)
-				process(do_request(:post, "/server/#{$config.agent_uid}/address.json", build_content(data)))
-			end
+      def self.send_address(data)
+        process(do_request(:post, "/server/#{$config.agent_uid}/address.json", build_content(data)))
+      end
 
-			def self.send_vitals(data)
-				process(do_request(:post, "/server/#{$config.agent_uid}/vitals.json", build_content(data)))
-			end
+      def self.send_vitals(data)
+        process(do_request(:post, "/server/#{$config.agent_uid}/vitals_alerts.json", build_content(data)))
+      end
 
-			def self.send_job_start(job_uid)
-				process(do_request(:get, "/job/#{job_uid}/start.json", build_content))
-			end
+      def self.send_job_start(job_uid)
+        process(do_request(:get, "/job/#{job_uid}/start.json", build_content))
+      end
 
-			def self.send_job_end(job_uid, data)
-				process(do_request(:post, "/job/#{job_uid}/end.json", build_content(data)))
-			end
+      def self.send_job_end(job_uid, data)
+        process(do_request(:post, "/job/#{job_uid}/end.json", build_content(data)))
+      end
 
-			def self.send_fail2ban(data)
-				process(do_request(:post, "/server/#{$config.agent_uid}/fail2ban.json", build_content(data)))
-			end
+      def self.send_fail2ban(data)
+        process(do_request(:post, "/server/#{$config.agent_uid}/fail2ban.json", build_content(data)))
+      end
 
-			def self.send_message(data)
-				#puts data
-				process(do_request(:post, "/server/#{$config.agent_uid}/message.json", build_content(data)))
-			end
+      def self.send_message(data)
+        #puts data
+        process(do_request(:post, "/server/#{$config.agent_uid}/message.json", build_content(data)))
+      end
 
-			private
+      private
 
-			def self.process(response)
-				$logger.debug "Received response!"
-				if response.code != 200
-					$logger.debug "Response code: #{response.code}"
-					$logger.debug "Response body: #{response.body}"
-					raise response.body
-				else
-					parsed_response = response.parsed_response
-					unless parsed_response['ok']
-						if parsed_response['shut_down']
-							$config.disabled = true
-							$config.save
-							exit 86
-						elsif parsed_response.has_key?('error')
-							raise parsed_response['error']
-						else
-							raise "unidentified error"
-						end
-					end
-					$logger.debug "Parsed response: #{parsed_response}"
-					parsed_response['data']
-				end
-			end
+      def self.process(response)
+        $logger.debug "Received response!"
+        if response.code != 200
+          $logger.debug "Response code: #{response.code}"
+          $logger.debug "Response body: #{response.body}"
+          raise response.body
+        else
+          parsed_response = response.parsed_response
+          unless parsed_response['ok']
+            if parsed_response['shut_down']
+              $config.disabled = true
+              $config.save
+              exit 86
+            elsif parsed_response.has_key?('error')
+              raise parsed_response['error']
+            else
+              raise "unidentified error"
+            end
+          end
+          $logger.debug "Parsed response: #{parsed_response}"
+          parsed_response['data']
+        end
+      end
 
-			def self.do_request(verb, url, content)
-				$logger.debug "Sending (#{verb}) request..."
-				$logger.debug "Request url: #{url}"
-				$logger.debug "Request content: #{content}"
-				base_uri $config.api_url
-				self.send verb, url, content
-			end
+      def self.do_request(verb, url, content)
+        $logger.debug "Sending (#{verb}) request..."
+        $logger.debug "Request url: #{url}"
+        $logger.debug "Request content: #{content}"
+        base_uri $config.api_url
+        self.send verb, url, content
+      end
 
-			def self.build_content(data = nil)
-				time = Time.now.utc.to_i
-				hash = Digest::SHA1.hexdigest("#{$config.api_key}#{$config.secret_key}#{time}").downcase
-				if data.nil?
-					content = { :headers => { 'api-key' => $config.api_key, 'hash' => hash, 'time' => time.to_s } }
-				else
-					content = { :headers => { 'api-key' => $config.api_key, 'hash' => hash, 'time' => time.to_s, 'Content-Type' => 'application/json' }, :body => { data: data }.to_json }
-				end
-				content
-			end
+      def self.build_content(data = nil)
+        time = Time.now.utc.to_i
+        hash = Digest::SHA1.hexdigest("#{$config.api_key}#{$config.secret_key}#{time}").downcase
+        if data.nil?
+          content = {:headers => {'api-key' => $config.api_key, 'hash' => hash, 'time' => time.to_s}}
+        else
+          content = {:headers => {'api-key' => $config.api_key, 'hash' => hash, 'time' => time.to_s, 'Content-Type' => 'application/json'}, :body => {data: data}.to_json}
+        end
+        content
+      end
 
-		end
-	end
+    end
+  end
 end

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, 1
+			MAJOR, MINOR, PATCH = 1, 4, 0
 
 			#ie. PRERELEASE_MODIFIER = 'beta1' or nil
 			PRERELEASE_MODIFIER = nil

data/lib/cloud66_agent/utils/vital_signs.rb

@@ -1,97 +1,123 @@
 module Cloud66
-	module Utils
-		class VitalSigns
+  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/
+      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
-					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]?)$/
-					# GC special case
-				elsif $config.is_gc
-					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]?)$/
-				else
-					interfaces_raw = `facter interfaces`.strip
-					interfaces = interfaces_raw.split(',').select { |interface| interface !~ /^lo/ }
-					# don't have any ip address info
-					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.system_info
+        # system info
+        return parse_data(`facter`)
+      end
 
-			def self.is_aws?				
-				# 6 seconds to find out if this is a AWS image or not!
-				instance = `/usr/bin/curl --connect-timeout 6 -s http://169.254.169.254/latest/meta-data/instance-id` rescue nil
-				return false if instance.nil? || instance.empty?
+      def self.vitals_alerts
+        vitals_alerts = {}
+        space_alerts = calculate_space_alerts($config.disk_warning_percent, $config.disk_critical_percent)
+        vitals_alerts[:disk] = space_alerts if space_alerts.present?
+        return vitals_alerts
+      end
 
-				# now check the external ip to make sure we're not just being routed
-				reported_ip = `/usr/bin/curl -s http://169.254.169.254/latest/meta-data/public-ipv4` rescue nil
-				return false if reported_ip.nil? || reported_ip.empty?
-				return false unless 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]?)$/
+      def self.address_info
+        result = {}
+        # AWS special case
+        if $config.is_aws
+          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]?)$/
+          # GC special case
+        elsif $config.is_gc
+          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]?)$/
+        else
+          interfaces_raw = `facter interfaces`.strip
+          interfaces = interfaces_raw.split(',').select {|interface| interface !~ /^lo/}
+          # don't have any ip address info
+          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
 
-				# it is aws  
-				return true
-			rescue => exc
-				return false
-			end
+      def self.is_aws?
+        # 6 seconds to find out if this is a AWS image or not!
+        instance = `/usr/bin/curl --connect-timeout 6 -s http://169.254.169.254/latest/meta-data/instance-id` rescue nil
+        return false if instance.nil? || instance.empty?
 
-			def self.is_gc?
-				# 6 seconds to find out if this is a AWS image or not!
-				external_ip = `/usr/bin/curl --connect-timeout 6 -s -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip` rescue nil
-				return false if external_ip.nil? || external_ip.empty?
-				return false unless 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]?)$/
+        # now check the external ip to make sure we're not just being routed
+        reported_ip = `/usr/bin/curl -s http://169.254.169.254/latest/meta-data/public-ipv4` rescue nil
+        return false if reported_ip.nil? || reported_ip.empty?
+        return false unless 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]?)$/
 
-				# it is google cloud
-				return true
-			rescue => exc
-				return false
-			end
+        # it is aws
+        return true
+      rescue => exc
+        return false
+      end
 
-			private
+      def self.is_gc?
+        # 6 seconds to find out if this is a AWS image or not!
+        external_ip = `/usr/bin/curl --connect-timeout 6 -s -H "Metadata-Flavor: Google" http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip` rescue nil
+        return false if external_ip.nil? || external_ip.empty?
+        return false unless 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]?)$/
 
-			# parse the data, not using YAML due to YAML parsing issues and JSON output not always working
-			def self.parse_data(data)
-				hash = {}
-				data.lines.each do |line|
-					split = line.split('=>')
-					if split.size == 2
-						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								
-								hash[key] = value
-							end
-						end
-					end
-				end
-				return hash
-			end
-		end
-	end
+        # it is google cloud
+        return true
+      rescue => exc
+        return false
+      end
+
+      def self.calculate_space_alerts(warning_threshold, critical_threshold)
+        space_alerts = []
+        return space_alerts if warning_threshold == 0 || critical_threshold == 0
+        # get the df output (linux only)
+        df_output = `sudo df -h | grep -v /var/lib/docker | grep -v /var/lib/kubelet | grep -v Use% | awk '{print $1"|"$6"|"$5}'`
+        df_output.lines.each do |df_line|
+          parts = df_line.split('|')
+          next unless parts.size == 3
+          filesystem = parts[0].strip
+          mounted = parts[1].strip
+          percentage = parts[2].strip.gsub(/%/, '').to_i
+          if percentage >= critical_threshold
+            space_alerts << {level: :critical, filesystem: filesystem, mounted: mounted, percentage: percentage}
+          elsif percentage > warning_threshold
+            space_alerts << {level: :warning, filesystem: filesystem, mounted: mounted, percentage: percentage}
+          end
+        end
+        return space_alerts
+      end
+
+      # parse the data, not using YAML due to YAML parsing issues and JSON output not always working
+      def self.parse_data(data)
+        hash = {}
+        data.lines.each do |line|
+          split = line.split('=>')
+          if split.size == 2
+            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
+                hash[key] = value
+              end
+            end
+          end
+        end
+        return hash
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Cloud 66
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2019-03-27 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.6.14.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Cloud 66 server component