cloud66_agent 0.0.1.pre7 → 1.0.0

data/bin/cloud66_agent

@@ -64,6 +64,12 @@ elsif command == 'job_end'
 		opts.on('--results-file RESULTS_FILE', 'Results file') { |v| @results_file = v }
 	end.order!
 	Cloud66Agent.job_end(@job_uid, @run_uid, @run_status, @run_time, @results_file)
+elsif command == 'fail2ban'
+	OptionParser.new do |opts|
+		opts.on('--is-banned IS_BANNED', 'Is this a ban action') { |v| @is_banned = v }
+		opts.on('--ip-address IP_ADDRESS', 'IP address to act on') { |v| @ip_address = v }
+	end.order!
+	Cloud66Agent.fail2ban(@is_banned, @ip_address)
 else
 	begin
 		Cloud66Agent.send command

data/lib/cloud66_agent/commands/fail2ban.rb

@@ -0,0 +1,18 @@
+require 'cloud66_agent/utils/server'
+
+module Cloud66
+	module Commands
+		class Fail2ban
+			def self.perform(is_banned, ip_address)
+				data = {
+					is_banned: is_banned,
+					ip_address: ip_address
+				}
+				Utils::Server.send_fail2ban(data)
+			rescue => exc
+				$logger.error "Command \"fail2ban\" failed: #{exc.message}"
+				exit -1
+			end
+		end
+	end
+end

data/lib/cloud66_agent/commands/job_start.rb

@@ -4,8 +4,8 @@ module Cloud66
 	module Commands
 		class JobStart
 			def self.perform(job_uid)
-				result = Utils::Server.send_job_start job_uid
-				# this is the only time we need a response value from the client
+				result = Utils::Server.send_job_start(job_uid)
+				# this is the response value for the script
 				puts result['run_uid']
 				exit 0
 			rescue => exc

data/lib/cloud66_agent/utils/server.rb

@@ -6,29 +6,36 @@ module Cloud66
 
 		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_post('/server/configure.json', build_content(data)))
+				process(do_request(:post, '/server/configure.json', build_content(data)))
 			end
 
 			def self.send_pulse
-				process(do_get("/server/#{$config.agent_uid}/pulse.json", build_content))
+				process(do_request(:get, "/server/#{$config.agent_uid}/pulse.json", build_content))
 			end
 
 			def self.send_address(data)
-				process(do_post("/server/#{$config.agent_uid}/address.json", build_content(data)))
+				process(do_request(:post, "/server/#{$config.agent_uid}/address.json", build_content(data)))
 			end
 
 			def self.send_vitals(data)
-				process(do_post("/server/#{$config.agent_uid}/vitals.json", build_content(data)))
+				process(do_request(:post, "/server/#{$config.agent_uid}/vitals.json", build_content(data)))
 			end
 
 			def self.send_job_start(job_uid)
-				process(do_get("/job/#{job_uid}/start.json", build_content))
+				process(do_request(:get, "/job/#{job_uid}/start.json", build_content))
 			end
 
 			def self.send_job_end(job_uid, data)
-				process(do_post("/job/#{job_uid}/end.json", build_content(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
 
 			private
@@ -57,36 +64,12 @@ module Cloud66
 				end
 			end
 
-			def self.do_post(url, content)
-				$logger.debug "Sending (post) request..."
+			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
-				post(url, content)
-			end
-
-			def self.do_delete(url, content)
-				$logger.debug "Sending (delete) request..."
-				$logger.debug "Request url: #{url}"
-				$logger.debug "Request content: #{content}"
-				base_uri $config.api_url
-				delete(url, content)
-			end
-
-			def self.do_get(url, content)
-				$logger.debug "Sending (get) request..."
-				$logger.debug "Request url: #{url}"
-				$logger.debug "Request content: #{content}"
-				base_uri $config.api_url
-				get(url, content)
-			end
-
-			def self.do_put(url, content)
-				$logger.debug "Sending (put) request..."
-				$logger.debug "Request url: #{url}"
-				$logger.debug "Request content: #{content}"
-				base_uri $config.api_url
-				put(url, content)
+				self.send verb, url, content
 			end
 
 			def self.build_content(data = nil)
@@ -102,54 +85,4 @@ module Cloud66
 
 		end
 	end
-end
-
-
-=begin
-		def get_job
-			process(self.class.get("/queue/#{@agent_id}.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key) } ))
-		end
-
-
-
-		def unregister(agent)
-			process(self.class.delete("/agent/#{@agent_id}.json", :headers => ClientAuth.build_headers(@api_key, @secret_key)))
-		end
-
-		def post_results(job_id, data)
-			process(self.class.post("/job/#{job_id}/complete.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key).merge({'Content-Type' => 'application/json'}), :body => data.to_json } ))
-		end
-
-		def pulse_without_ip_address
-			process(self.class.get("/agent/#{@agent_id}/pulse.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key) } ))
-		end
-
-		def pulse_with_ip_address(data)
-			process(self.class.post("/agent/#{@agent_id}/pulse.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key).merge({'Content-Type' => 'application/json'}), :body => data.to_json } ))
-		end
-
-		def status(stat)
-			data = { :status => stat }
-			process(self.class.post("/agent/#{@agent_id}/status.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key).merge({'Content-Type' => 'application/json'}), :body => data.to_json }))
-		end
-
-		def init(data)
-			process(self.class.post("/agent/#{@agent_id}/initialize.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key).merge({'Content-Type' => 'application/json'}), :body => data.to_json }))
-		end
-
-		def send_vital_signs(data)
-			process(self.class.post("/agent/#{@agent_id}/vitalsigns.json", { :headers => ClientAuth.build_headers(@api_key, @secret_key).merge({'Content-Type' => 'application/json'}), :body => data.to_json } ))
-		end
-
-		private
-
-		def process(response)
-			if response.code != 200
-				raise response.body
-			else
-				response.parsed_response
-			end
-		end
-	end
-end
-=end
+end

data/lib/cloud66_agent/utils/version.rb

@@ -13,10 +13,10 @@ module Cloud66
 			#  Defines the minor version
 			# PATCH:
 			#  Defines the patch version
-			MAJOR, MINOR, PATCH = 0, 0, 1
+			MAJOR, MINOR, PATCH = 1, 0, 0
 
 			#ie. PRERELEASE_MODIFIER = 'beta1'
-			PRERELEASE_MODIFIER = "pre7"
+			PRERELEASE_MODIFIER = nil
 
 			##
 			# Returns the major version ( big release based off of multiple minor releases )

data/lib/cloud66_agent.rb

@@ -28,4 +28,9 @@ class Cloud66Agent
 		raise ArgumentError.new if run_status.nil? || job_uid.nil? || run_uid.nil? || run_time.nil? || results_file.nil?
 		Cloud66::Commands::JobEnd.perform(job_uid, run_uid, run_status, run_time, results_file)
 	end
+
+	def self.fail2ban(is_banned, ip_address)
+		raise ArgumentError.new if is_banned.nil? || ip_address.nil?
+		Cloud66::Commands::Fail2ban.perform(is_banned, ip_address)
+	end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre7
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Cloud 66
@@ -61,6 +61,7 @@ files:
 - lib/cloud66_agent.rb
 - lib/cloud66_agent/commands/address.rb
 - lib/cloud66_agent/commands/configure.rb
+- lib/cloud66_agent/commands/fail2ban.rb
 - lib/cloud66_agent/commands/job_end.rb
 - lib/cloud66_agent/commands/job_start.rb
 - lib/cloud66_agent/commands/pulse.rb
@@ -86,9 +87,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25