telemetry 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db54f9711d0efe92c4b4db18231d810965108b56
-  data.tar.gz: 6ec56bce41c6448d6b19ac242c54027760346ee5
+  metadata.gz: 96234d4025145d4e4fbcf26b06bf25a7a9ef0254
+  data.tar.gz: 7843c644cba8b9140d7afefab9d687be4f269012
 SHA512:
-  metadata.gz: e150e33b6c4732ce4588253c922ee2f111ed9258a8241e6205089bb5960097a2bfdd1e996750a8bf4d8b4bf374b9f5f6d7f0613da7e303b583b1395c07c7c1f3
-  data.tar.gz: 6a84215bbfe318ef9a81aedd4fa44280920e462dad85d708b5bc30ff12eeb0afc856c72faf345bcbe0c3ce7576e93a5cdefda911ae0db30161e5d20e7bba4af9
+  metadata.gz: 9ac9328464c45d9a9da1d213070f2732c0266d48e2547d6eb777e79cbb58e666c0c204fab58a53a4d16b72c79c344b1165382bfdf784e6859f41097c189e1fcc
+  data.tar.gz: 7d52ce029557d48aa86f8ec01e656ffedc518abf28668ebf88dfe1deb16e88355712669b91ccf19d772cfe19445fa7bdf88e81baca2a6b63d115964b18f57288

data/bin/telemetryd

@@ -18,9 +18,6 @@ runner.with_options do |opts|
   opts.on("-o", "--once", "Run once") do |o|
     options[:once] = o
   end
-  opts.on("-f", "--logfile PATH", "Log to a logfile") do |l|
-    options[:logfile] = l
-  end
 end
 
 runner.execute do |opts|
@@ -36,7 +33,6 @@ runner.execute do |opts|
 		exit
 	end
 
-	Telemetry::logfile = opts[:logfile] if opts[:logfile]
 	Telemetry::logger.info "Starting telemetryd"
 
 	# Loop Forever

data/lib/telemetry/api.rb

@@ -206,13 +206,13 @@ module Telemetry
 				case response.code
 				when "200"
 					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
+          Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj.is_a?(Hash) && rj['updated'] && rj['updated'].is_a?(Array) && rj['updated'].count > 0
+          Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj.is_a?(Hash) && rj['skipped'] && rj['skipped'].is_a?(Array) && rj['skipped'].count > 0
 					return rj
 				when "201"
 					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
+          Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj.is_a?(Hash) && rj['updated'] && rj['updated'].is_a?(Array) && rj['updated'].count > 0
+          Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj.is_a?(Hash) && rj['skipped'] && rj['skipped'].is_a?(Array) && rj['skipped'].count > 0
 					return rj
 				when "204"
 					return "No Body"
@@ -278,6 +278,9 @@ module Telemetry
 
 			rescue Exception => e
 				raise e
+
+			ensure
+				http.shutdown
 			end
 		end
 	end

data/lib/telemetry/daemon_config_parser.rb

@@ -211,8 +211,6 @@ module TelemetryDaemon
 	def run_scheduled_flow_updates
 		@@buffer = {}
 		@@tasks ||= {}
-		@@last_values ||= {}
-		@@values_expires_at ||= {}
 		@@next_run_at ||= {}
 
 		@@tasks.each do |task| 
@@ -269,14 +267,7 @@ module TelemetryDaemon
 
 			# Telemetry.logger.debug "LV\n\n #{@@last_values}\n\n"
 
-			# Skip if the values haven't changed (though send 1/day regardless)
-			if @@last_values[tag] != values || @@values_expires_at[tag] < now.to_i
-				@@buffer[tag] = values
-				@@last_values[tag] = values.clone # Save the value so we dont update unless it changes
-				@@values_expires_at[tag] = now.to_i + 86400  # Force an update 1/day
-			else
-				Telemetry.logger.debug "  - Skipping update for unchanged #{task[0]} #{task[1]}:\n#{@@last_values[tag]}"
-			end
+			@@buffer[tag] = values
 		end
 
 		@@buffer

data/lib/telemetry/flows.rb

@@ -228,6 +228,7 @@ module Telemetry
 		property :gauge_color
 		property :link
 		property :title
+		property :layout
 		property :gauges, :default => []
 	end
 
@@ -372,16 +373,15 @@ module Telemetry
 		property :title
 		property :expires_at
 		property :priority
-		property :icon
-		property :link
-		property :value, :required => true
-		property :type, :required => true
-		property :label
-		property :labels
+		property :aggregation
 		property :color
-		property :values
-		property :smoothing
+		property :interval
+		property :interval_count
+		property :label
+		property :renderer
+		property :value
 		property :value_type
+		property :values
 	end
 
 	# Upstatus

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  TELEMETRY_VERSION = "1.3.4"
+  TELEMETRY_VERSION = "1.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - W. Gersham Meharg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -173,3 +173,4 @@ summary: Telemetry Data Submission API Gem
 test_files:
 - spec/flows_spec.rb
 - spec/spec_helper.rb
+has_rdoc: