telemetry 1.0.1 → 1.0.2

data/bin/telemetryd

@@ -30,7 +30,7 @@ runner.execute do |opts|
 	loop do
 		start_timestamp = Time.now.to_f
 		output = Telemetry.run_scheduled_flow_updates
-		Telemetry::Net.send(output)
+		Telemetry::Api.send(output)
 		Telemetry.wait_for_interval_from(start_timestamp)
 	end
 end

data/lib/telemetry/config_parser.rb

@@ -122,6 +122,7 @@ module Telemetry
 
 	def run_scheduled_flow_updates
 		@@buffer = {}
+		@@tasks ||= {}
 		@@last_values ||= {}
 		@@values_expires_at ||= {}
 		@@next_run_at ||= {}

data/lib/telemetry/telemetry.rb

@@ -1,9 +1,10 @@
 #/usr/bin/env ruby
 
 module Telemetry
-	class Net
-		require "multi_json"
-		require "rest_client"
+	class Api
+		require 'multi_json'
+		require 'net/http'
+		require 'uri'
 
 		def self.send(data)
 			return unless Telemetry.token
@@ -11,39 +12,45 @@ module Telemetry
 
 			RestClient.proxy = ENV['http_proxy'] if ENV['http_proxy']
 
-			uri = "https://#{Telemetry.token}:@data.telemetryapp.com/v1/data.json"
 			body = MultiJson.dump({:data => data})
 
+			uri = URI("https://data.telemetryapp.com/v1/data.json")
+			request = Net::HTTP::Post.new(uri.path)
+			request.basic_auth(Telemetry.token, "")
+			request['Content-Type'] = 'application/json'
+			request.body = body 
+
 			begin
-				response = RestClient.post(uri, body, :content_type => :json, :accept => :json) do |response, request, result|
-				 	case response.code
-				 	when 200
-				 		json = MultiJson.load(response)
+				result = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => true) do |http|
+				  response = http.request(request)
+				  case response.code
+				 	when "200"
+				 		json = MultiJson.load(response.body)
 				 		if json
 				    		puts "#{Time.now} Update OK: Updated #{json["updated"].count} flows" if json["updated"] && json["updated"].count > 0
 				    		puts "#{Time.now} Update OK: Skipped #{json["skipped"].count} flows (#{json["skipped"].join(", ")})" if json["skipped"] && json["skipped"].count > 0
 				    		puts "#{Time.now} Update OK: Errors with #{json["errors"].count} flows (#{json["errors"].join(", ")})" if json["errors"] && json["errors"].count > 0
 				    	end
-				    when 400
-				    	puts "#{Time.now} ERROR 400: Request error. #{response}. Exiting."
+				    when "400"
+				    	puts "#{Time.now} ERROR 400: Request error. #{response.body}. Exiting."
 				    	exit
-					when 401
+					when "401"
 				    	puts "#{Time.now} ERROR 401: Authentication failed, please check your api_token. Exiting."
 				    	exit
-				    when 403
+				    when "403"
 				    	puts "#{Time.now} ERROR 403: Authorization failed, please check your account access. Exiting."
 				    	exit
-				    when 429
+				    when "429"
 				    	puts "#{Time.now} ERROR 429: Rate limited. Please reduce your update interval. Pausing updates for 300s."
 				    	sleep 300
-				    when 500
+				    when "500"
 				    	puts "#{Time.now} ERROR 500: Data API server error.  Pausing updates for 60s."
 				    	sleep 60
-				    when 503
+				    when "503"
 				    	puts "#{Time.now} ERROR 503: Data API server is down.  Pausing updates for 60s."
 				    	sleep 60
 				    else
-				    	puts "#{Time.now} ERROR UNK: #{response}.  Exiting."
+				    	puts "#{Time.now} ERROR UNK: #{response.body}.  Exiting."
 				    	exit
 				  	end
 				end

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/telemetry.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["gersham@etosi.com"]
   gem.description   = %q{Telemetry Data Submission API Gem.  See our website for a more detailed description.}
   gem.summary       = %q{Telemetry Data Submission API Gem}
-  gem.homepage      = "http://www.telemetryboard.com"
+  gem.homepage      = "http://www.telemetryapp.com"
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -18,6 +18,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.2'
   gem.add_dependency "oj"
   gem.add_dependency "multi_json"
-  gem.add_dependency "rest-client"
   gem.add_dependency "dante"
 end

data/telemetryd_config.rb

@@ -1,16 +1,35 @@
 interval 5
-api_token "c65bc385a3b301359590a80973483ebf"
+api_token "130be0e02baf48892b82d41e9b7f1a19"
 
-gauge "demo-gauge" do
-	set value: rand(1000)
-	set max: rand(1000)
-end
+gauge "test_gauge" do 
+	
+	# value (required) - the current value of the gauge
+	set value: 33
+
+	# range (optional) - the number of hours in the past to take the max value from
+	# typically this is either 24 (a day) or 168 (a week)
+	set range: 168 
+
+	# max (optional) - the maximum value of the gauge, exclusive of setting range
+	set max: 100
+
+	# value_color (optional) - the color for the value.
+	set value_color: "#FF0000"
+
+	# value_2 (optional) - a second value to display on the side
+	set value_2: 33
+
+	# value_2_color (optional) - the color of the second value
+	set value_2_color: "green"
+
+	# value_2_label (optional) - a text label for the value_2
+	set value_2_label: "Errors"
 
-gauge "blah-gauge" do
-	set value: 44
-	set max: 55
 end
 
-value "foobard" do
-	set value: rand(1000)
+upstatus "test_upstatus" do
+
+
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +80,7 @@ files:
 - lib/telemetry/version.rb
 - telemetry.gemspec
 - telemetryd_config.rb
-homepage: http://www.telemetryboard.com
+homepage: http://www.telemetryapp.com
 licenses: []
 post_install_message: 
 rdoc_options: []