netuitived 0.9.12 → 0.10.0

data/lib/netuitive/api_emissary.rb

@@ -19,7 +19,7 @@ class APIEmissary
 			http.request req
 		end
 		NetuitiveLogger.log.debug "post finished"
-		if (response.code != "202")
+		if (response.code != "202" or response.code != "200")
 			NetuitiveLogger.log.error "Response from submitting netuitive metrics to api
 			code: #{response.code}
 			message: #{response.message}

data/lib/netuitive/metric_aggregator.rb

@@ -44,6 +44,14 @@ class MetricAggregator
 	end
 
 	def addSample(metricId, val)
+		addSampleWithType(metricId, val, "GAUGE")
+	end
+
+	def addCounterSample(metricId, val)
+		addSampleWithType(metricId, val, "COUNTER")
+	end
+
+	def addSampleWithType(metricId, val, type)
 		@metricMutex.synchronize{
 			NetuitiveLogger.log.debug "start addSample method"
 			NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
@@ -63,7 +71,7 @@ class MetricAggregator
 			end
 			if not metricExists metricId
 				NetuitiveLogger.log.info "adding new metric: #{metricId}"
-				@metrics.push(IngestMetric.new(metricId, metricId, nil, "custom", nil, false))
+				@metrics.push(IngestMetric.new(metricId, metricId, nil, type, nil, false))
 			end
 			@samples.push(IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil))
 			NetuitiveLogger.log.info "netuitive sample added #{metricId} val: #{val}"
@@ -83,6 +91,14 @@ class MetricAggregator
 	end
 
 	def aggregateMetric(metricId, val)
+		aggregateMetricWithType(metricId, val, "GAUGE")
+	end
+
+	def aggregateCounterMetric(metricId, val)
+		aggregateMetricWithType(metricId, val, "COUNTER")
+	end
+
+	def aggregateMetricWithType(metricId, val, type)
 		@metricMutex.synchronize{
 			NetuitiveLogger.log.debug "start addSample method"
 			NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
@@ -102,7 +118,7 @@ class MetricAggregator
 			end
 			if not metricExists metricId
 				NetuitiveLogger.log.info "adding new metric: #{metricId}"
-				@metrics.push(IngestMetric.new(metricId, metricId, nil, "custom", nil, false))
+				@metrics.push(IngestMetric.new(metricId, metricId, nil, type, nil, false))
 				@aggregatedSamples["#{metricId}"]=IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil)
 			else
 				if @aggregatedSamples["#{metricId}"] == nil 

data/lib/netuitive/netuitived_server.rb

@@ -15,10 +15,18 @@ class NetuitivedServer
 		@metricAggregator.addSample(metricId, val)
 	end
 
+	def addCounterSample(metricId, val)
+		@metricAggregator.addCounterSample(metricId, val)
+	end
+
 	def aggregateMetric(metricId, val)
 		@metricAggregator.aggregateMetric(metricId, val)
 	end
 
+	def aggregateCounterMetric(metricId, val)
+		@metricAggregator.aggregateCounterMetric(metricId, val)
+	end
+
 	def clearMetrics
 		@metricAggregator.clearMetrics
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netuitived
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Collects metrics over a certain interval and then sends them to Netuitive
 email: jking@netuitive.com