cloud66_agent 0.0.1.pre6 → 0.0.1.pre7

data/bin/cloud66_agent

@@ -8,82 +8,67 @@ require 'cloud66_agent'
 # global config variable
 $config = Cloud66::Utils::Config.new
 
+# deal with global options
 OptionParser.new do |opts|
-	opts.banner = "Cloud 66 Agent v#{Cloud66::Utils::Version.current}"
+	opts.banner = "Cloud 66 Agent v#{Cloud66::Utils::Version.current} (#{$config.is_agent_configured? ? 'Configured' : 'Not Configured'})"
+	opts.on('--version', 'Agent version', '-v') { |v| puts "Cloud 66 Agent v#{Cloud66::Utils::Version.current} (#{$config.is_agent_configured? ? 'Configured' : 'Not Configured'})"; exit 0 }
+	opts.on('--log [LOG]', 'Log output') { |v| $config.log = (v == "STDOUT") ? STDOUT : v }
+	opts.on('--log-level [LOG_LEVEL]', 'Log level (int)') { |v| $config.log_level = v.to_i }
+end.order!
 
-	# following opts only for registration
-	opts.on('--url URL', 'Server URL') do |v|
-		$config.url = v
-	end
-	opts.on('--sockets SOCKETS', 'Sockets URL') do |v|
-		$config.faye_url = v
-	end
-	opts.on('--api-key APIKEY', 'API key') do |v|
-		$config.api_key = v
-	end
-	opts.on('--secret-key SECRETKEY', 'Secret Key') do |v|
-		$config.secret_key = v
-	end
-	opts.on('--server SERVERUID', 'Server id') do |v|
-		@server_uid = v
-	end
-
-	# respond to version requests
-	opts.on('--version') do |v|
-		puts "Cloud 66 Agent #{Cloud66::Utils::Version.current}"
-		exit 0
-	end
-
-	# logging configuration
-	opts.on('--log LOG', 'Log file path') do |v|
-		v == "STDOUT" ? $config.log_path = STDOUT : $config.log_path = v
-	end
-	opts.on('--log_level LOGLEVEL', 'Log level (int)') do |v|
-		$config.log_level = v.to_i
-	end
-end.parse!
-
-#pick up the command used
-command = ARGV[0].downcase unless ARGV[0].nil?
+command = ARGV.shift
+# ensure we have a command
+if command.nil?
+	puts "Cloud 66 Agent v#{Cloud66::Utils::Version.current} (#{$config.is_agent_configured? ? 'Configured' : 'Not Configured'})"
+	exit 0
+else
+	command = command.downcase
+end
 
 # prepare the global logger (can't have stdout logging for job_start command - as the stdout result is used)
-$config.log_path = "/var/log/cloud66/cloud66_agent.log" if command == 'job_start' && $config.log_path == STDOUT
-$logger = Logger.new($config.log_path)
+$config.log = "/var/log/cloud66_agent.log" if command == 'job_start' && $config.log == STDOUT
+$logger = Logger.new($config.log)
 $logger.level = $config.log_level
 
+# nothing allowed while disabled
 if $config.disabled
-	# no other commands allowed while disabled
 	$logger.error "This agent had been disabled. Please contact Cloud 66 if you think this is in error"
-	exit -1
-end
-
-if command.nil? || command.empty?
-	$logger.debug("Cloud 66 Agent v#{Cloud66::Utils::Version.current} (#{$config.is_agent_configured? ? 'Configured' : 'Not Configured'})")
-	exit 0
-end
-
-if !$config.is_agent_configured? && command != 'configure'
+	exit 86
+elsif !$config.is_agent_configured? && command != 'configure'
 	# no other commands allowed while not configured
 	$logger.error "Can only do command \"configure\" (until its been configured!)"
 	exit -1
 end
 
 # handle commands
-$logger.info "Performing: \"#{command}\""
-if command == "configure"
-	Cloud66Agent.configure @server_uid
+$logger.info "Attempting: \"#{command}\""
+if command == 'configure'
+	OptionParser.new do |opts|
+		opts.on('--api-url [URL]', 'API URL') { |v| $config.api_url = v }
+		opts.on('--api-key API_KEY', 'API key') { |v| $config.api_key = v }
+		opts.on('--secret-key SECRET_KEY', 'Secret key') { |v| $config.secret_key = v }
+		opts.on('--server-uid SERVER_UID', 'Server UID') { |v| @server_uid = v }
+	end.order!
+	Cloud66Agent.configure(@server_uid)
+elsif command == 'job_start'
+	OptionParser.new do |opts|
+		opts.on('--job-uid JOB_UID', 'Job UID') { |v| @job_uid = v }
+	end.order!
+	Cloud66Agent.job_start(@job_uid)
+elsif command == 'job_end'
+	OptionParser.new do |opts|
+		opts.on('--job-uid JOB_UID', 'Job UID') { |v| @job_uid = v }
+		opts.on('--run-uid RUN_UID', 'Run UID') { |v| @run_uid = v }
+		opts.on('--run-status RUN_STATUS', 'Status') { |v| @run_status = v }
+		opts.on('--run-time RUN_TIME', 'Execution time') { |v| @run_time = v }
+		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)
 else
 	begin
-		arguments = ARGV[1..-1]
-		if arguments.empty?
-			Cloud66Agent.send command
-		else
-			Cloud66Agent.send(command, arguments)
-		end
-	rescue ArgumentError
-		$logger.error "Invalid command/arguments: #{command} #{arguments}"
+		Cloud66Agent.send command
+	rescue
+		$logger.error "Invalid command: #{command}"
 		exit -1
 	end
-end
-exit 0
-
+end

data/lib/cloud66_agent/commands/address.rb

@@ -13,7 +13,7 @@ module Cloud66
 				Utils::Server.send_address data
 				exit 0
 			rescue => exc
-				$logger.error "'address' failed: #{exc.message}"
+				$logger.error "Command \"address\" failed: #{exc.message}"
 				exit -1
 			end
 		end

data/lib/cloud66_agent/commands/configure.rb

@@ -11,21 +11,21 @@ module Cloud66
 					data = {
 						:timezone => Time.new.zone,
 						:server_uid => server_uid,
-						:ext_ip4 => address_info[:ext_ip4],
-						:int_ip4 => address_info[:int_ip4],
-						:ext_ip6 => address_info[:ext_ip6],
-						:int_ip6 => address_info[:int_ip6],
+						:ext_ipv4 => address_info[:ext_ipv4],
+						:int_ipv4 => address_info[:int_ipv4],
+						:ext_ipv6 => address_info[:ext_ipv6],
+						:int_ipv6 => address_info[:int_ipv6],
 						:version => Utils::Version.current,
 						:system => Utils::VitalSigns.system_info }
 				rescue => exc
 					data = { error: exc.message }
 				end
 				result = Utils::Server.send_configure data
-				$config.agent_uid = result['uid']
+				$config.agent_uid = result['agent_uid']
 				$config.save
 				exit 0
 			rescue => exc
-				$logger.error "'configure' failed: #{exc.message}"
+				$logger.error "Command \"configure\" failed: #{exc.message}"
 				exit -1
 			end
 

data/lib/cloud66_agent/commands/job_end.rb

@@ -3,17 +3,17 @@ require 'cloud66_agent/utils/server'
 module Cloud66
 	module Commands
 		class JobEnd
-			def self.perform(status, job_uid, session_uid, run_time, results_file)
-				job_results = File.exists?(results_file) ? IO.readlines(results_file) : []
+			def self.perform(job_uid, run_uid, run_status, run_time, results_file)
+				run_data = File.exists?(results_file) ? IO.readlines(results_file) : []
 				data = {
-					status: status,
-					session_uid: session_uid,
+					run_uid: run_uid,
+					run_status: run_status,
 					run_time: run_time,
-					job_results: job_results
+					run_data: run_data
 				}
 				Utils::Server.send_job_end(job_uid, data)
 			rescue => exc
-				$logger.error "'job_end' failed: #{exc.message}"
+				$logger.error "Command \"job_end\" failed: #{exc.message}"
 				exit -1
 			ensure
 				# get rid of the old results

data/lib/cloud66_agent/commands/job_start.rb

@@ -6,10 +6,10 @@ module Cloud66
 			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
-				puts result['session_uid']
+				puts result['run_uid']
 				exit 0
 			rescue => exc
-				$logger.error "'job_start' failed: #{exc.message}"
+				$logger.error "Command \"job_start\" failed: #{exc.message}"
 				exit -1
 			end
 		end

data/lib/cloud66_agent/commands/pulse.rb

@@ -7,7 +7,7 @@ module Cloud66
 				Utils::Server.send_pulse
 				exit 0
 			rescue => exc
-				$logger.error "'pulse' failed: #{exc.message}"
+				$logger.error "Command \"pulse\" failed: #{exc.message}"
 				exit -1
 			end
 		end

data/lib/cloud66_agent/commands/vitals.rb

@@ -13,7 +13,7 @@ module Cloud66
 				Utils::Server.send_vitals data
 				exit 0
 			rescue => exc
-				$logger.error "'vitals' failed: #{exc.message}"
+				$logger.error "Command \"vitals\" failed: #{exc.message}"
 				exit -1
 			end
 		end

data/lib/cloud66_agent/utils/config.rb

@@ -5,24 +5,22 @@ module Cloud66
 			# default conf dir
 			CONFIG_PATH = "/etc/cloud66/cloud66_agent.yml"
 
-			attr_accessor :api_key,
-						  :agent_uid,
+			attr_accessor :api_url,
+						  :api_key,
 						  :secret_key,
-						  :log_path,
-						  :log_level,
-						  :url,
-						  :faye_url,
-						  :disabled
+						  :agent_uid,
+						  :disabled,
+						  :log,
+						  :log_level
 
 			# load up the config at startup
 			def initialize
 				load if File.exists?(CONFIG_PATH)
 
 				# set defaults
-				@log_path = @log_path.nil? || @log_path.to_s.strip.empty? || @log_path == "STDOUT" ? STDOUT : @log_path
+				@log = @log.nil? || @log.to_s.strip.empty? || @log == "STDOUT" ? STDOUT : @log
 				@log_level ||= 2
-				@url ||= 'https://api.cloud66.com'
-				@faye_url ||= 'https://sockets.cloud66.com/push'
+				@api_url ||= 'https://api.cloud66.com'
 				@disabled ||= false
 			end
 
@@ -35,18 +33,14 @@ module Cloud66
 
 				File.open(CONFIG_PATH, 'w+') do |out|
 					data = {
+						'api_url' => @api_url,
 						'api_key' => @api_key,
-						'agent_uid' => @agent_uid,
 						'secret_key' => @secret_key,
-						'log_path' => @log_path == STDOUT ? "STDOUT" : @log_path,
-						'log_level' => @log_level,
-						'disabled' => @disabled
+						'agent_uid' => @agent_uid,
+						'disabled' => @disabled,
+						'log' => @log == STDOUT ? "STDOUT" : @log,
+						'log_level' => @log_level
 					}
-					# store the url if it is different
-					data['url'] = @url if @url != 'https://api.cloud66.com'
-					# store the faye url if it is different
-					data['faye_url'] = @faye_url if @faye_url != 'https://sockets.cloud66.com/push'
-
 					YAML::dump(data, out)
 				end
 			end
@@ -60,29 +54,14 @@ module Cloud66
 			def load
 				raise "config not found" unless File.exists?(CONFIG_PATH)
 				config = YAML::load(File.open(CONFIG_PATH))
-
+				@api_url = config['api_url']
 				@api_key = config['api_key']
-				@agent_uid = config['agent_uid']
 				@secret_key = config['secret_key']
-
-				# get if it exists in the config
-				config_url = config['url']
-				@url = config_url if !config_url.nil? && !config_url.strip.empty?
-
-				# get if it exists in the config
-				config_faye_url = config['faye_url']
-				@faye_url = config_faye_url if !config_faye_url.nil? && !config_faye_url.strip.empty?
-
-				# get if it exists in the config
-				config_log_path = config['log_path']
-				@log_path = config_log_path if !config_log_path.nil? && !config_log_path.strip.empty?
-
+				@agent_uid = config['agent_uid']
+				@log = config['log']
 				# get if it exists in the config
 				config_log_level = config['log_level']
-				@log_level = config_log_level.to_i
-
-				disabled = config['disabled']
-				@disabled = disabled if !disabled.nil?
+				@log_level = config_log_level.to_i if config_log_level
 			rescue
 				# we can't load the file
 			end

data/lib/cloud66_agent/utils/server.rb

@@ -24,11 +24,11 @@ module Cloud66
 			end
 
 			def self.send_job_start(job_uid)
-				process(do_get("/server/#{job_uid}/job_start.json", build_content))
+				process(do_get("/job/#{job_uid}/start.json", build_content))
 			end
 
 			def self.send_job_end(job_uid, data)
-				process(do_post("/server/#{job_uid}/job_end.json", build_content(data)))
+				process(do_post("/job/#{job_uid}/end.json", build_content(data)))
 			end
 
 			private
@@ -61,7 +61,7 @@ module Cloud66
 				$logger.debug "Sending (post) request..."
 				$logger.debug "Request url: #{url}"
 				$logger.debug "Request content: #{content}"
-				base_uri $config.url
+				base_uri $config.api_url
 				post(url, content)
 			end
 
@@ -69,7 +69,7 @@ module Cloud66
 				$logger.debug "Sending (delete) request..."
 				$logger.debug "Request url: #{url}"
 				$logger.debug "Request content: #{content}"
-				base_uri $config.url
+				base_uri $config.api_url
 				delete(url, content)
 			end
 
@@ -77,7 +77,7 @@ module Cloud66
 				$logger.debug "Sending (get) request..."
 				$logger.debug "Request url: #{url}"
 				$logger.debug "Request content: #{content}"
-				base_uri $config.url
+				base_uri $config.api_url
 				get(url, content)
 			end
 
@@ -85,7 +85,7 @@ module Cloud66
 				$logger.debug "Sending (put) request..."
 				$logger.debug "Request url: #{url}"
 				$logger.debug "Request content: #{content}"
-				base_uri $config.url
+				base_uri $config.api_url
 				put(url, content)
 			end
 

data/lib/cloud66_agent/utils/version.rb

@@ -16,7 +16,7 @@ module Cloud66
 			MAJOR, MINOR, PATCH = 0, 0, 1
 
 			#ie. PRERELEASE_MODIFIER = 'beta1'
-			PRERELEASE_MODIFIER = "pre6"
+			PRERELEASE_MODIFIER = "pre7"
 
 			##
 			# Returns the major version ( big release based off of multiple minor releases )

data/lib/cloud66_agent/utils/vital_signs.rb

@@ -6,26 +6,15 @@ module Cloud66
 		class VitalSigns
 
 			def self.system_info
-				return { ext_ipv4: "123.123.123.123",
-						 int_ipv4: "123.123.123.123",
-						 ext_ipv6: "123.123.123.123",
-						 int_ipv6: "123.123.123.123" } if RUBY_PLATFORM.include?('darwin')
-
 				# system info
-				return parse_data(`sudo facter`)
+				return parse_data(`facter`)
 			end
 
 			def self.address_info
-				return { ext_ipv4: "123.123.123.123",
-						 int_ipv4: "123.123.123.123",
-						 ext_ipv6: "123.123.123.123",
-						 int_ipv6: "123.123.123.123" } if RUBY_PLATFORM.include?('darwin')
-
 				# address information
 				hash = parse_data(`facter ipaddress ec2_public_ipv4 ipaddress_eth0 ipaddress6 ipaddress6_eth0`)
 
 				result = {}
-
 				if hash.has_key?('ec2_public_ipv4')
 					# return ec2 info first (most specific)
 					result[:ext_ipv4] = hash['ec2_public_ipv4']

data/lib/cloud66_agent.rb

@@ -3,7 +3,8 @@ Dir.glob(File.dirname(File.absolute_path(__FILE__)) + '/cloud66_agent/commands/*
 
 class Cloud66Agent
 	def self.configure(server_uid)
-		Cloud66::Commands::Configure.perform server_uid
+		raise ArgumentError.new if server_uid.nil?
+		Cloud66::Commands::Configure.perform(server_uid)
 	end
 
 	def self.pulse
@@ -18,19 +19,13 @@ class Cloud66Agent
 		Cloud66::Commands::Address.perform
 	end
 
-	def self.job_start(args)
-		job_uid = args[0]
+	def self.job_start(job_uid)
 		raise ArgumentError.new if job_uid.nil?
-		Cloud66::Commands::JobStart.perform job_uid
+		Cloud66::Commands::JobStart.perform(job_uid)
 	end
 
-	def self.job_end(args)
-		status = args[0]
-		job_uid = args[1]
-		session_uid = args[2]
-		run_time = args[3]
-		results_file = args[4]
-		raise ArgumentError.new if status.nil? || job_uid.nil? || session_uid.nil? || run_time.nil? || results_file.nil?
-		Cloud66::Commands::JobEnd.perform(status, job_uid, session_uid, run_time, results_file)
+	def self.job_end(job_uid, run_uid, run_status, run_time, results_file)
+		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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre6
+  version: 0.0.1.pre7
   prerelease: 6
 platform: ruby
 authors: