netuitive_ruby_api 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b783f29bf4127c1b6fe418595912ab9cc9e98b
-  data.tar.gz: 13c124a1024734d7e24ca32f4136a238963dc621
+  metadata.gz: 74fc103aa5937aa1ec899a8c077a77b6422cf3b5
+  data.tar.gz: 92841e2be3f35c1613211c5d61d39d6d6fc6f4e8
 SHA512:
-  metadata.gz: a9e2f16a832e662acb3fd778b8676d21634e9efacc8fe068c062a6676148d8dc32a96b92bea5803dedd966420f100df5baa69b1a8c60e243092e4381a10267f5
-  data.tar.gz: a2b9e4079b7f8cee623d248f7af5e7648904855259e532954fb49bb9a38c7a503ad2519a786d393a89a355b87dfda262677e35f8ff53d6de361564de8b121188
+  metadata.gz: cda154e4df70c990327808667d59a1a547a73514ae5fdb9df2ac4fe90996c4463e71f4ba0e5836dfdc4033c4daeae3facde9df7a7ae0bc959aed90e704c4e3f5
+  data.tar.gz: 9d6552e1bbd21b57f555f3e4376afe62fe2d9f0417deabee64c77c89f20e2dd81610d221b42eddf893ee3cfa5e064d512478c9f4cb32b51c1d6f3cd9511e2f32

data/config/agent.yml

@@ -1,5 +1,3 @@
-apiId: [apiId] #apiId for the datasources. found in the datasources section in the netuitive ui
-baseAddr: https://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: [element name] #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
+debugLevel: info #options (in ascending order of debugness) are: error, info, debug
+netuitivedAddr: localhost
+netuitivedPort: 8787

data/lib/netuitive/ruby_config_manager.rb

@@ -1,61 +1,66 @@
 class ConfigManager
 
-	attr_accessor :apiId, :baseAddr, :port, :elementName
+	class << self
+		def setup()
+			@@error=0
+			@@info=1
+			@@debug=2
+			readConfig()
+		end
 
-	def initialize()
-		@error=0
-		@info=1
-		@debug=2
-		readConfig()
-	end
+		def netuitivedAddr
+			@@netuitivedAddr
+		end
 
-	def isDebug?
-		if @debugLevel >= @debug
-			return true
+		def netuitivedPort
+			@@netuitivedPort
 		end
-		return false
-	end
 
-	def isInfo?
-		if @debugLevel >= @info
-			return true
+		def isDebug?
+			if @@debugLevel >= @@debug
+				return true
+			end
+			return false
 		end
-		return false
-	end
 
-	def isError?
-		if @debugLevel >= @error
-			return true
+		def isInfo?
+			if @@debugLevel >= @@info
+				return true
+			end
+			return false
 		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"]
-		debugLevelString=data["debugLevel"]
-		if debugLevelString == "error"
-			@debugLevel=@error
-		elsif debugLevelString == "info"
-			@debugLevel=@info
-		elsif debugLevelString == "debug"
-			@debugLevel=@debug
-		else
-			@debugLevel=@error
+		def isError?
+			if @@debugLevel >= @@error
+				return true
+			end
+			return false
 		end
 
-		if isDebug?
-			puts "read config file. Results: 
-			apiId: #{apiId}
-			baseAddr: #{baseAddr}
-			port: #{port}
-			elementName: #{elementName}
-			debugLevel: #{debugLevelString}"
+		def readConfig()
+			gem_root= File.expand_path("../../..", __FILE__)
+			data=YAML.load_file "#{gem_root}/config/agent.yml"
+			@@netuitivedAddr=data["netuitivedAddr"]
+			@@netuitivedPort=data["netuitivedPort"]
+			puts "port: #{@@netuitivedPort}"
+			puts "addr: #{@@netuitivedAddr}"
+			debugLevelString=data["debugLevel"]
+			if debugLevelString == "error"
+				@@debugLevel=@@error
+			elsif debugLevelString == "info"
+				@@debugLevel=@@info
+			elsif debugLevelString == "debug"
+				@@debugLevel=@@debug
+			else
+				@@debugLevel=@@error
+			end
+
+			if isDebug?
+				puts "read config file. Results: 
+				netuitivedAddr: #{@@netuitivedAddr}
+				netuitivedPort: #{@@netuitivedPort}
+				debugLevel: #{debugLevelString}"
+			end
 		end
 	end
-
 end 

data/lib/netuitive_ruby_api.rb

@@ -1,14 +1,17 @@
-require 'netuitive/metric_aggregator'
+require 'netuitive/ruby_config_manager'
+require 'drb/drb'
 class NetuitiveRubyAPI
 	class << self
-		def setup
-			@@aggregator=MetricAggregator.new
+		def setup(server)
+			@@netuitivedServer=server
 		end 
 
-		def aggregator
-			return @@aggregator
+		def netuitivedServer
+			return @@netuitivedServer
 		end
 	end
 end
-
-NetuitiveRubyAPI.setup
+ConfigManager::setup
+SERVER_URI="druby://#{ConfigManager.netuitivedAddr}:#{ConfigManager.netuitivedPort}"
+DRb.start_service
+NetuitiveRubyAPI.setup(DRbObject.new_with_uri(SERVER_URI))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netuitive_ruby_api
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Allows for easy submittion of metrics to Netuitive
 email: jking@netuitive.com
@@ -16,17 +16,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/netuitive/api_emissary.rb
-- lib/netuitive/ingest_attribute.rb
-- lib/netuitive/ingest_element.rb
-- lib/netuitive/ingest_metric.rb
-- lib/netuitive/ingest_sample.rb
-- lib/netuitive/ingest_tag.rb
-- lib/netuitive/metric_aggregator.rb
 - lib/netuitive/ruby_config_manager.rb
 - lib/netuitive_ruby_api.rb
 - config/agent.yml
-- ./LICENSE
+- "./LICENSE"
 homepage: http://rubygems.org/gems/netuitive_ruby_api
 licenses:
 - Apache v2.0
@@ -37,12 +30,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/netuitive/api_emissary.rb

@@ -1,35 +0,0 @@
-require 'net/http'
-require 'rubygems'
-require 'json'
-require 'yaml'
-require 'netuitive/ruby_config_manager'
-class APIEmissary
-	
-	def initialize(apiId, baseAddr, port)
-		@apiId=apiId
-		@baseAddr=baseAddr
-		@port=port
-		@configManager=ConfigManager.new
-	end 
-
-	def sendElements(elements)
-		if @configManager.isDebug?
-			puts elements.to_json
-		end
-
-		uri = URI("#{@baseAddr}/ingest/#{@apiId}")
-		req = Net::HTTP::Post.new(uri.path, initheader = {'Content-Type' =>'application/json'})
-        req.body = elements.to_json
-        response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-  			http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  			http.ssl_version = :SSLv3
-  			http.request req
-		end
-		if (response.code != "202" and @configManager.isError?) or (@configManager.isInfo?)
-			puts "Response from submitting netuitive metrics to api
-			code: #{response.code}
-			message: #{response.message}
-			body: #{response.body}"
-		end
-	end
-end

data/lib/netuitive/ingest_attribute.rb

@@ -1,10 +0,0 @@
-require 'json'
-class IngestAttribute
-    def initialize(name, value)
-        @name=name
-        @value=value
-    end
-    def to_json(options = {})
-        {'name' => @name, 'value' => @value}.to_json
-    end
-end

data/lib/netuitive/ingest_element.rb

@@ -1,17 +0,0 @@
-require 'json'
-class IngestElement
-    attr_accessor :id, :name, :type, :location, :metrics, :samples, :tags, :attributes
-    def initialize(id, name, type, location, metrics, samples, tags, attributes)
-        @id=id
-        @name=name
-        @type=type
-        @location=location
-        @metrics=metrics
-        @samples=samples
-        @tags=tags
-        @attributes=attributes
-    end
-    def to_json(options = {})
-        {'id' => @id, 'name' => @name, 'type' => @type, 'location' => @location, 'metrics' => @metrics, 'samples' => @samples,'tags' => @tags, 'attributes' => @attributes}.to_json.tr('\\', '')
-    end
-end

data/lib/netuitive/ingest_metric.rb

@@ -1,15 +0,0 @@
-require 'json'
-class IngestMetric
-    attr_accessor :id, :name, :unit, :type, :tags, :aggregate
-    def initialize(id, name, unit, type, tags, aggregate)
-        @id=id
-        @name=name
-        @unit=unit
-        @type=type
-        @tags=tags
-        @aggregate=aggregate
-    end
-    def to_json(options = {})
-        {'id' => @id,'name' => @name, 'unit' => @unit,'type' => @type, 'tags' => @tags}.to_json
-    end
-end

data/lib/netuitive/ingest_sample.rb

@@ -1,18 +0,0 @@
-require 'json'
-class IngestSample
-    attr_accessor :metricId, :timestamp, :val, :min, :max, :avg, :sum, :cnt
-    def initialize(metricId, timestamp, val, min, max, avg, sum, cnt)
-        @metricId=metricId
-        @timestamp=timestamp
-        @val=val
-        @min=min
-        @max=max
-        @avg=avg
-        @sum=sum
-        @cnt=cnt
-    end
-    def to_json(options = {})
-        millis=@timestamp.to_f * 1000 
-        {'metricId' => @metricId,'timestamp' => millis.round, 'val' => @val,'min' => @min, 'max' => @max, 'avg' => @avg,'sum' => @sum, 'cnt' => @cnt}.to_json
-    end
-end

data/lib/netuitive/ingest_tag.rb

@@ -1,10 +0,0 @@
-require 'json'
-class IngestTag
-    def initialize(name, value)
-        @name=name
-        @value=value
-    end
-    def to_json(options = {})
-        {'name' => @name, 'value' => @value}.to_json
-    end
-end

data/lib/netuitive/metric_aggregator.rb

@@ -1,81 +0,0 @@
-require 'netuitive/api_emissary'
-require 'netuitive/ingest_metric'
-require 'netuitive/ingest_sample'
-require 'netuitive/ingest_element'
-require 'netuitive/ruby_config_manager'
-
-class MetricAggregator
-
-	def initialize()
-		@metrics=Array.new
-		@samples=Array.new
-		@aggregatedMetrics=Array.new
-		@aggregatedSamples=Hash.new
-		@metricMutex=Mutex.new
-		@configManager=ConfigManager.new
-		@apiEmissary=APIEmissary.new(@configManager.apiId, @configManager.baseAddr, @configManager.port)
-	end
-
-	def sendMetrics()
-		@metricMutex.synchronize{
-			if @metrics.empty?
-				if @configManager.isInfo?
-					puts "no netuitive metrics to report"
-				end
-				return
-			end
-			aggregatedSamplesArray = @aggregatedSamples.values
-			aggregatedSamplesArray.each do |sample|
-				sample.timestamp=Time.new
-			end
-			element=IngestElement.new(@configManager.elementName, @configManager.elementName, "custom", nil, @metrics+@aggregatedMetrics, @samples+aggregatedSamplesArray, nil, nil)
-			elements= [element]
-			@apiEmissary.sendElements(elements)
-			clearMetrics
-		}
-	end
-
-	def addSample(metricId, val)
-		@metricMutex.synchronize{
-			if not metricExists metricId
-				metric=IngestMetric.new(metricId, metricId, nil, "custom", nil, false)
-				@metrics.push(metric)
-			end
-			sample=IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil)
-			@samples.push(sample)
-			if @configManager.isInfo?
-				puts "netuitive sample added #{metricId} val: #{val}"
-			end
-		}
-	end
-
-	def metricExists(metricId)
-		@metrics.each do |metric|
-				if metric.id == metricId
-					return true
-				end
-			end
-		return false
-	end
-
-	def aggregateMetric(metricId, val)
-		@metricMutex.synchronize{
-			if not metricExists metricId
-				metric=IngestMetric.new(metricId, metricId, nil, "custom", nil, false)
-				@metrics.push(metric)
-				sample=IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil)
-				@aggregatedSamples["#{metricId}"]=sample
-			else
-				sample=@aggregatedSamples["#{metricId}"]
-				sample.val+=val
-				@aggregatedSamples["#{metricId}"]=sample
-			end
-		}
-	end
-
-	def clearMetrics
-		@metrics=Array.new
-		@samples=Array.new
-		@aggregatedSamples=Hash.new
-	end
-end