telemetry 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0173be3fb9501e7a0615bd6262d7143e122e6fad
-  data.tar.gz: 336346801dda08cba3f76b42b808b6979fded36f
+  metadata.gz: 45ea2abcafe731aecd8eae54d263934874d88bb8
+  data.tar.gz: 657e9dbfd677fdfae1d90cfeb31c9bccbd3b0c4a
 SHA512:
-  metadata.gz: df962f26f35757390db07ca10b994ce234aac2822df087708dfad849b82f689dcc81826a173f66abe53b062fb80b4d025d059c837cbd6ea447da647074552f4f
-  data.tar.gz: bdadffa5f7e62aeee5a51630b61e2cae8eb2dae6b56a797e7f8c037c1cffd0f71f3ab7e0f49ed27807064bad3bb8e5fb3022923ea75a15f76ddd2fb1e9ca75d1
+  metadata.gz: 91502bed54b2ce5004539adb8377f68750b2c8843817589ef7e79187275f82d9163e786572597aabec44f643b5d1dd8733ad949a5d369c5c0ac1c5db54a46913
+  data.tar.gz: 09d06b7e9ea6dda84f1ab49a21ab219f072f786dbf1facb3406126fd1f9c035d436f5b4fab79b4928b0c717ed1bad49ad62d481b875dd68327eba51bc6128036

data/README.md

@@ -130,7 +130,23 @@ An example of code to do this would be:
 	flow = Telemetry::Value.new(tag: "test-flow-value", value: 3434)
 	Telemetry::Api.affiliate_send("affiliate-identifier", flow)
 
-For more information see the [affiliate documentation](https://admin.telemetryapp.com/documentation/affiliates).
+For more information see the [affiliate documentation](https://admin.telemetryapp.com/user/documentation/affiliates).
+
+## Aggregations
+
+This gem supports the aggregations API interface.  Aggregations allow you to send data point by point and have Telemetry aggregate the data for you.  The gem supports the following methods:
+
+-	Telemetry::Api.aggregate(bucket, value)
+-	Telemetry::Api.aggregate_set_interval(bucket, interval, values) 
+
+An example of code to do this would be:
+
+	require 'telemetry'
+
+	Telemetry.token = "test-api-token"
+	Telemetry::Api.aggregate("my-bucket", 23124)
+
+For more infromation see the [aggregations documentation](https://admin.telemetryapp.com/user/documentation/aggregations)
 
 ## Daemon
 

data/bin/telemetryd

@@ -18,6 +18,9 @@ runner.with_options do |opts|
   opts.on("-o", "--once", "Run once") do |o|
     options[:once] = o
   end
+  opts.on("-l", "--logfile PATH", "Log to a logfile") do |l|
+    options[:logfile] = l
+  end
 end
 
 runner.execute do |opts|
@@ -33,6 +36,9 @@ runner.execute do |opts|
 		exit
 	end
 
+	Telemetry::logfile = opts[:logfile] if opts[:logfile]
+	Telemetry::logger.info "Starting telemetryd"
+
 	# Loop Forever
 	loop do
 		start_timestamp = Time.now.to_f
@@ -50,12 +56,15 @@ runner.execute do |opts|
 			sleep 3600
 
 		rescue Telemetry::AuthenticationFailed => e
+			Telemetry::logger.error "Authentication Failed, Exiting"
 			raise e
 
 		rescue Telemetry::AuthorizationError => e
+			Telemetry::logger.error "Authorization Failed, Exiting"
 			raise e
 
 		rescue Telemetry::FormatError => e
+			Telemetry::logger.error "Format Error, Exiting"
 			raise e
 
 		rescue Exception => e

data/lib/telemetry/api.rb

@@ -31,6 +31,11 @@ module Telemetry
 		@api_host
 	end
 
+	def self.logfile=(logfile)
+		@logger = Logger.new(logfile)
+		@logger.level = Logger::INFO
+	end
+
 	def self.logger=(logger)
 		@logger = logger
 	end
@@ -41,9 +46,9 @@ module Telemetry
 			if ENV['RACK_ENV'] == 'development'
 				@logger.level = Logger::DEBUG
 			else
-				@logger.level = Logger::WARN
+				@logger.level = Logger::INFO
 			end
-		end
+		end 
 		@logger
 	end
 
@@ -85,6 +90,16 @@ module Telemetry
 			Telemetry::Api.send(:delete, "/flows/#{id}/data")
 		end
 
+		def self.aggregate(bucket, value)
+			raise Telemetry::AuthenticationFailed, "Please set your Telemetry.token" unless Telemetry.token
+			return Telemetry::Api.send(:post, "/aggregations/#{bucket}", {:value => value})
+		end
+
+		def self.aggregate_set_interval(bucket, interval, values)
+			raise Telemetry::AuthenticationFailed, "Please set your Telemetry.token" unless Telemetry.token
+			return Telemetry::Api.send(:put, "/aggregations/#{bucket}/interval/#{interval}", {:value => value})
+		end
+
 		def self.channel_send_batch(channel_tag, flows)
 			raise Telemetry::AuthenticationFailed, "Please set your Telemetry.token" unless Telemetry.token
 			raise RuntimeError, "Must supply flows to send" unless flows
@@ -190,11 +205,15 @@ module Telemetry
 
 				case response.code
 				when "200"
-					Telemetry::logger.debug response.body
-					return MultiJson.load(response.body)
+					rj = MultiJson.load(response.body)
+					Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj && rj['updated'] && rj['updated'].count > 0
+					Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj && rj['skipped'] && rj['skipped'].count > 0
+					return rj
 				when "201"
-					Telemetry::logger.debug response.body
-					return MultiJson.load(response.body)
+					rj = MultiJson.load(response.body)
+					Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj && rj['updated'] && rj['updated'].count > 0
+					Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj && rj['skipped'] && rj['skipped'].count > 0
+					return rj
 				when "204"
 					return "No Body"
 				when "400"

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  TELEMETRY_VERSION = "1.3.1"
+  TELEMETRY_VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - W. Gersham Meharg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj