netuitived 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056b8a4954f8939a44f70aa80713dd1cff4b0649
-  data.tar.gz: 61138cad5231443e3946b7300da0399e3e189350
+  metadata.gz: 271aaf503bc348eb7535765a23b5eab9ea281c42
+  data.tar.gz: 027dfde32ce851a332d10551aabe18f8a9f8ac27
 SHA512:
-  metadata.gz: 552f6551d9f13347adef3491fcb96dff51629bf3fd2f626c4d5a6173e063aeacb17bcd11804400d901f9acc7d8b53b7ef8cac2f20eb683a312d56bb8f166bab0
-  data.tar.gz: 0e62a18b0075c13752a88ed89cc1ef8793ef938c951e7fedeb20905b2d108825166d78fb7b55b1a33c82ee114cee42ec5503ca686bfb9582f1c30ff493ece6b6
+  metadata.gz: 03268b422fd9e8a5f9df25efb5f60b2c764c3c6b4d4960e8db733b35c40cd28ec686949fb19d059866ab0963e861100cfa0632dc60b37e76f346c19a26bdd163
+  data.tar.gz: 84207609a064ae447dd14b6c3a3e40eb9503d6e1fcc1b2a60e4036c2d5d514407dfcce6b7101d0c19cd8e25faf56c952d2d15b0226dfd5ca746827d70f157924

data/bin/netuitived

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+require 'yaml'
+gem_root= File.expand_path("../..", __FILE__)
+data=YAML.load_file "#{gem_root}/config/agent.yml"
+if ARGV[0] == "start"
+	written = false
+	elementName=ENV["NETUITIVED_ELEMENT_NAME"]
+	if(elementName == nil or elementName == "")
+		elementName = data["elementName"]
+		if(elementName == "elementName" or elementName == "")
+			puts "please enter an element name: "
+			elementName = STDIN.gets.chomp
+			data["elementName"] = elementName
+			written = true
+		end
+	end
+	apiId=ENV["NETUITIVED_API_ID"]
+	if(apiId == nil or apiId == "")
+		apiId = data["apiId"]
+		if(apiId == "apiId" or apiId == "")
+			puts "please enter an api key: "
+			apiId = STDIN.gets.chomp
+			data["apiId"] = apiId
+			written = true
+		end
+	end
+	if written
+		File.open("#{gem_root}/config/agent.yml", 'w') {|f| f.write data.to_yaml } 
+	end
+    require 'netuitived'
+elsif ARGV[0] == "stop"
+	require 'drb/drb'
+	netuitivedAddr=data["netuitivedAddr"]
+	netuitivedPort=data["netuitivedPort"]
+	SERVER_URI="druby://#{netuitivedAddr}:#{netuitivedPort}"
+	DRb.start_service
+	DRbObject.new_with_uri(SERVER_URI).stopServer
+else
+    puts "invalid option. options are: start, stop"
+end

data/config/agent.yml

@@ -1,9 +1,10 @@
-apiId: [apiId] #apiId for the datasources. found in the datasources section in the netuitive ui
-baseAddr: "api.app.netuitive.com" #where to send the data. in most cases use the default
-port: nil #in most cases this will be nil
-elementName: [elementName] #name of the element to assign metrics to in netuitive. if unsure, just use the name of your app
-debugLevel: error #options (in ascending order of debugness) are: error, info, debug
-netuitivedAddr: "localhost"
-netuitivedPort: 8875
-interval: 60
+#all are configurable using environment variables
+apiId: apiId #apiId for the datasources. found in the datasources section in the netuitive ui. environment variable: NETUITIVED_API_ID
+baseAddr: "api.app.netuitive.com" #where to send the data. in most cases use the default. environment variable: NETUITIVED_BASE_ADDR
+port: nil #in most cases this will be nil. environment variable: NETUITIVED_PORT
+elementName: elementName #name of the element to assign metrics to in netuitive. if unsure, just use the name of your app. environment variable: NETUITIVED_ELEMENT_NAME
+debugLevel: error #options (in ascending order of debugness) are: error, info, debug. environment variable: NETUITIVED_DEBUG_LEVEL
+netuitivedAddr: "localhost" #environment variable: NETUITIVED_NETUITIVED_ADDR
+netuitivedPort: 8875 #environment variable: NETUITIVED_NETUITIVED_PORT
+interval: 60 #environment variable: NETUITIVED_INTERVAL
 

data/lib/netuitive/api_emissary.rb

@@ -1,16 +1,13 @@
 require 'net/http'
 require 'json'
 require 'netuitive/netuitived_config_manager'
+require 'netuitive/netuitived_logger'
 class APIEmissary
 	def sendElements(elementString)
-		if ConfigManager.isDebug?
-			puts elementString
-		end
+		NetuitiveLogger.log.debug elementString
 		req = Net::HTTP::Post.new("/ingest/#{ConfigManager.apiId}", initheader = {'Content-Type' =>'application/json'})
 		req.body = elementString
-		if ConfigManager.isDebug?
-			puts  "starting post"
-		end
+		NetuitiveLogger.log.debug "starting post"
 		if ConfigManager.port =~ /(.*)nil(.*)/
 			port = nil
 		else
@@ -21,11 +18,14 @@ class APIEmissary
 			http.ssl_version = :SSLv3
 			http.request req
 		end
-		if ConfigManager.isDebug?
-			puts  "post finished"
-		end
-		if (response.code != "202" and ConfigManager.isError?) or (ConfigManager.isInfo?)
-			puts "Response from submitting netuitive metrics to api
+		NetuitiveLogger.log.debug "post finished"
+		if (response.code != "202")
+			NetuitiveLogger.log.error "Response from submitting netuitive metrics to api
+			code: #{response.code}
+			message: #{response.message}
+			body: #{response.body}"
+		else
+			NetuitiveLogger.log.info "Response from submitting netuitive metrics to api
 			code: #{response.code}
 			message: #{response.message}
 			body: #{response.body}"

data/lib/netuitive/metric_aggregator.rb

@@ -3,6 +3,7 @@ require 'netuitive/ingest_metric'
 require 'netuitive/ingest_sample'
 require 'netuitive/ingest_element'
 require 'netuitive/netuitived_config_manager'
+require 'netuitive/netuitived_logger'
 
 class MetricAggregator
 
@@ -17,20 +18,16 @@ class MetricAggregator
 	def sendMetrics()
 		elementString=nil
 		@metricMutex.synchronize{
-			if ConfigManager.isDebug?
-				puts "self: #{self.object_id}" 
-				puts "Thread: #{Thread.current.object_id}"
-				puts "metrics id: #{@metrics.object_id}"
-				puts "samples id: #{@samples.object_id}"
-				puts "aggregatedSamples id: #{@aggregatedSamples.object_id}"
-				puts "metrics before send: #{@metrics.count}"
-				puts "samples before send: #{@aggregatedSamples.count + @samples.count}"
-			end
+			NetuitiveLogger.log.debug "self: #{self.object_id}" 
+			NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
+			NetuitiveLogger.log.debug "metrics id: #{@metrics.object_id}"
+			NetuitiveLogger.log.debug "samples id: #{@samples.object_id}"
+			NetuitiveLogger.log.debug "aggregatedSamples id: #{@aggregatedSamples.object_id}"
+			NetuitiveLogger.log.debug "metrics before send: #{@metrics.count}"
+			NetuitiveLogger.log.debug "samples before send: #{@aggregatedSamples.count + @samples.count}"
 
 			if @metrics.empty?
-				if ConfigManager.isInfo?
-					puts "no netuitive metrics to report"
-				end
+				NetuitiveLogger.log.info "no netuitive metrics to report"
 				return
 			end
 			aggregatedSamplesArray = @aggregatedSamples.values
@@ -47,31 +44,23 @@ class MetricAggregator
 
 	def addSample(metricId, val)
 		@metricMutex.synchronize{
-			if ConfigManager.isDebug?
-				puts "start addSample method"
-				puts "Thread: #{Thread.current.object_id}"
-				puts "self: #{self.object_id}" 
-				puts "metrics id: #{@metrics.object_id}"
-				puts "samples id: #{@samples.object_id}"
-				puts "aggregatedSamples id: #{@aggregatedSamples.object_id}"
-				puts "metrics before add: #{@metrics.count}"
-				puts "samples before add: #{@aggregatedSamples.count + @samples.count}"
-			end
+			NetuitiveLogger.log.debug "start addSample method"
+			NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
+			NetuitiveLogger.log.debug "self: #{self.object_id}" 
+			NetuitiveLogger.log.debug "metrics id: #{@metrics.object_id}"
+			NetuitiveLogger.log.debug "samples id: #{@samples.object_id}"
+			NetuitiveLogger.log.debug "aggregatedSamples id: #{@aggregatedSamples.object_id}"
+			NetuitiveLogger.log.debug "metrics before add: #{@metrics.count}"
+			NetuitiveLogger.log.debug "samples before add: #{@aggregatedSamples.count + @samples.count}"
 			if not metricExists metricId
-				if ConfigManager.isInfo?
-					puts "adding new metric: #{metricId}"
-				end
+				NetuitiveLogger.log.info "adding new metric: #{metricId}"
 				@metrics.push(IngestMetric.new(metricId, metricId, nil, "custom", nil, false))
 			end
 			@samples.push(IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil))
-			if ConfigManager.isInfo?
-				puts "netuitive sample added #{metricId} val: #{val}"
-			end
-			if ConfigManager.isDebug?
-				puts "metrics after add: #{@metrics.count}"
-				puts "samples after add: #{@aggregatedSamples.count + @samples.count}"
-				puts "end addSample method"
-			end
+			NetuitiveLogger.log.info "netuitive sample added #{metricId} val: #{val}"
+			NetuitiveLogger.log.debug "metrics after add: #{@metrics.count}"
+			NetuitiveLogger.log.debug "samples after add: #{@aggregatedSamples.count + @samples.count}"
+			NetuitiveLogger.log.debug "end addSample method"
 		}
 	end
 
@@ -86,49 +75,35 @@ class MetricAggregator
 
 	def aggregateMetric(metricId, val)
 		@metricMutex.synchronize{
-			if ConfigManager.isDebug?
-				puts "start addSample method"
-				puts "Thread: #{Thread.current.object_id}"
-				puts "self: #{self.object_id}" 
-				puts "metrics id: #{@metrics.object_id}"
-				puts "samples id: #{@samples.object_id}"
-				puts "aggregatedSamples id: #{@aggregatedSamples.object_id}"
-				puts "metrics before aggregate: #{@metrics.count}"
-				puts "samples before aggregate: #{@aggregatedSamples.count + @samples.count}"
-			end
+			NetuitiveLogger.log.debug "start addSample method"
+			NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
+			NetuitiveLogger.log.debug "self: #{self.object_id}" 
+			NetuitiveLogger.log.debug "metrics id: #{@metrics.object_id}"
+			NetuitiveLogger.log.debug "samples id: #{@samples.object_id}"
+			NetuitiveLogger.log.debug "aggregatedSamples id: #{@aggregatedSamples.object_id}"
+			NetuitiveLogger.log.debug "metrics before aggregate: #{@metrics.count}"
+			NetuitiveLogger.log.debug "samples before aggregate: #{@aggregatedSamples.count + @samples.count}"
 			if not metricExists metricId
-				if ConfigManager.isInfo?
-					puts "adding new metric: #{metricId}"
-				end
+				NetuitiveLogger.log.info "adding new metric: #{metricId}"
 				@metrics.push(IngestMetric.new(metricId, metricId, nil, "custom", nil, false))
 				@aggregatedSamples["#{metricId}"]=IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil)
 			else
 				previousVal = @aggregatedSamples["#{metricId}"].val
 				@aggregatedSamples["#{metricId}"].val+=val
-				if ConfigManager.isInfo?
-					puts "netuitive sample aggregated #{metricId} old val: #{previousVal} new val: #{@aggregatedSamples["#{metricId}"].val}"
-				end
-			end
-			if ConfigManager.isDebug?
-				puts "metrics after aggregate: #{@metrics.count}"
-				puts "samples after aggregate: #{@aggregatedSamples.count + @samples.count}"
-				puts "end addSample method"
+				NetuitiveLogger.log.info "netuitive sample aggregated #{metricId} old val: #{previousVal} new val: #{@aggregatedSamples["#{metricId}"].val}"
 			end
+			NetuitiveLogger.log.debug "metrics after aggregate: #{@metrics.count}"
+			NetuitiveLogger.log.debug "samples after aggregate: #{@aggregatedSamples.count + @samples.count}"
+			NetuitiveLogger.log.debug "end addSample method"
 		}
 	end
 
 	def clearMetrics
-		if ConfigManager.isDebug?
-			puts "start clearMetrics method"
-		end
+		NetuitiveLogger.log.debug "start clearMetrics method"
 		@metrics=Array.new
 		@samples=Array.new
 		@aggregatedSamples=Hash.new
-		if ConfigManager.isInfo?
-			puts "netuitive metrics cleared"
-		end
-		if ConfigManager.isDebug?
-			puts "end clearMetrics method"
-		end
+		NetuitiveLogger.log.info "netuitive metrics cleared"
+		NetuitiveLogger.log.debug "end clearMetrics method"
 	end
 end

data/lib/netuitive/netuitived_config_manager.rb

@@ -1,11 +1,9 @@
 require 'yaml'
+require 'netuitive/netuitived_logger'
 class ConfigManager
 
 	class << self
 		def setup()
-			@@error=0
-			@@info=1
-			@@debug=2
 			readConfig()
 		end
 
@@ -37,57 +35,58 @@ class ConfigManager
 			@@interval
 		end
 
-		def isDebug?
-			if @@debugLevel >= @@debug
-				return true
-			end
-			return false
-		end
-
-		def isInfo?
-			if @@debugLevel >= @@info
-				return true
-			end
-			return false
-		end
-
-		def isError?
-			if @@debugLevel >= @@error
-				return true
-			end
-			return false
-		end
-
 		def readConfig()
 			gem_root= File.expand_path("../../..", __FILE__)
 			data=YAML.load_file "#{gem_root}/config/agent.yml"
-			@@apiId=data["apiId"]
-			@@baseAddr=data["baseAddr"]
-			@@port=data["port"]
-			@@elementName=data["elementName"]
-			@@netuitivedAddr=data["netuitivedAddr"]
-			@@netuitivedPort=data["netuitivedPort"]
-			@@interval=data["interval"]
-			puts "port: #{@@netuitivedPort}"
-			puts "addr: #{@@netuitivedAddr}"
-			debugLevelString=data["debugLevel"]
+			@@apiId=ENV["NETUITIVED_API_ID"]
+			if(@@apiId == nil or @@apiId == "")
+				@@apiId=data["apiId"]
+			end
+			@@baseAddr=ENV["NETUITIVED_BASE_ADDR"]
+			if(@@baseAddr == nil or @@baseAddr == "")
+				@@baseAddr=data["baseAddr"]
+			end
+			@@port=ENV["NETUITIVED_PORT"]
+			if(@@port == nil or @@port == "")
+				@@port=data["port"]
+			end
+			@@elementName=ENV["NETUITIVED_ELEMENT_NAME"]
+			if(@@elementName == nil or @@elementName == "")
+				@@elementName=data["elementName"]
+			end
+			@@netuitivedAddr=ENV["NETUITIVED_NETUITIVED_ADDR"]
+			if(@@netuitivedAddr == nil or @@netuitivedAddr == "")
+				@@netuitivedAddr=data["netuitivedAddr"]
+			end
+			@@netuitivedPort=ENV["NETUITIVED_NETUITIVED_PORT"]
+			if(@@netuitivedPort == nil or @@netuitivedPort == "")
+				@@netuitivedPort=data["netuitivedPort"]
+			end
+			@@interval=ENV["NETUITIVED_INTERVAL"]
+			if(@@interval == nil or @@interval == "")
+				@@interval=data["interval"]
+			end
+			debugLevelString=ENV["NETUITIVED_DEBUG_LEVEL"]
+			if(debugLevelString == nil or debugLevelString == "")
+				debugLevelString=data["debugLevel"]
+			end
+			NetuitiveLogger.log.info "port: #{@@netuitivedPort}"
+			NetuitiveLogger.log.info "addr: #{@@netuitivedAddr}"
 			if debugLevelString == "error"
-				@@debugLevel=@@error
+				NetuitiveLogger.log.level = Logger::ERROR
 			elsif debugLevelString == "info"
-				@@debugLevel=@@info
+				NetuitiveLogger.log.level = Logger::INFO
 			elsif debugLevelString == "debug"
-				@@debugLevel=@@debug
+				NetuitiveLogger.log.level = Logger::DEBUG
 			else
-				@@debugLevel=@@error
+				NetuitiveLogger.log.level = Logger::ERROR
 			end
-			if isDebug?
-				puts "read config file. Results: 
+			NetuitiveLogger.log.debug "read config file. Results: 
 				apiId: #{apiId}
 				baseAddr: #{baseAddr}
 				port: #{port}
 				elementName: #{elementName}
 				debugLevel: #{debugLevelString}"
-			end
 		end
 	end
 end 

data/lib/netuitive/netuitived_logger.rb

@@ -0,0 +1,23 @@
+require 'logger'
+class NetuitiveLogger
+	begin
+		@@log = Logger.new("#{File.expand_path("../../..", __FILE__)}/log/netuitive.log",'daily', 10)
+	rescue
+		puts "netuitive unable to open log file"
+		@@log = CheaterLogger.new
+	end
+	class << self
+		def log
+			return @@log
+		end
+	end
+end
+
+class CheaterLogger
+	def debug(message)
+	end
+	def error(message)
+	end
+	def info(message)
+	end
+end

data/lib/netuitive/netuitived_server.rb

@@ -1,5 +1,5 @@
 require 'netuitive/metric_aggregator'
-
+require 'netuitive/netuitived_logger'
 class NetuitivedServer
 
 	def initialize()
@@ -22,5 +22,19 @@ class NetuitivedServer
 		@metricAggregator.clearMetrics
 	end
 
+	def stopServer
+		Thread.new do
+    		exitProcess
+    	end
+	end
+
+	def exitProcess
+		sleep(1)
+		NetuitiveLogger.log.info "stopping netuitived"
+		Process.exit!(true)
+	end
+
+	private :exitProcess
+
 end
  

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: netuitived
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies: []
 description: Collects metrics over a certain interval and then sends them to Netuitive
 email: jking@netuitive.com
-executables: []
+executables:
+- netuitived
 extensions: []
 extra_rdoc_files: []
 files:
@@ -24,11 +25,14 @@ files:
 - lib/netuitive/ingest_tag.rb
 - lib/netuitive/metric_aggregator.rb
 - lib/netuitive/netuitived_config_manager.rb
+- lib/netuitive/netuitived_logger.rb
 - lib/netuitive/netuitived_server.rb
 - lib/netuitive/scheduler.rb
 - lib/netuitived.rb
 - config/agent.yml
 - "./LICENSE"
+- log/netuitive.log
+- bin/netuitived
 homepage: http://rubygems.org/gems/netuitived
 licenses:
 - Apache v2.0