wavefront-client 0.5.3 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWMxMGEzMDUzMzU2NDg2MGEwNGM0ZWMzM2I4MGFkOTg1MmQ0NTA5OQ==
+    ZWYzOTdiOTVhYzhlMDhlNzYwMGQzZDMwZGU5ZWM5NGY1NGE4ODgxMQ==
   data.tar.gz: !binary |-
-    ZjI1YzE1YjVmMDZlMjBkMmUzZTdhMmQxNjlhNTY2MDFlN2YwZTVlYQ==
+    MDBhYzIwNDM5YmZmZjkzNTU2YTc1NzVkNWM1NWEzMjJhMDdlYTgxZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmE3ODcyMzUxMDE1YjkzN2U1Y2QwZDRkZTdmODg4NTY3NzIyYTAxZDJjMzI4
-    Mjg3NDE5Njc0NDkzMjE1ZmQxMTgwY2I3NzIxMmFkN2UwMjhkY2ZjNGQ2ZTlh
-    NDc1NDkwMzgyNWQ2MmVmODU0Mjc3YzA0MjJmMWYzOTNkMzkzOTc=
+    MTJkMDUxMmQyZTcxNTk4MTkyNzQyMDQ0Njk0MmFmNmQxMmYwYzQ4NGU0ODVm
+    NDMxNDZjNjNhNjAwNjk5YjMzNTMxNWE4NWY5ODI5ZjczYWNhMDgxMGU1MWZm
+    NjJkMWNiOWM3YjM0ZWRhMmMwYjViNmQzZDJiZDQzMzgzNTIwOTU=
   data.tar.gz: !binary |-
-    OTA1ZDg2MDVlYTEzZmEwMjUxMGRjOGMwYjM0MDFmODg5MzE5YzM0OTk3ZDg4
-    MjQzMTMwOGE4NWRmYzhkYWM4OGFlMmUxYjkzYjYwMmFmM2MyZDJjNWJiODBk
-    NTk0NTFmYjZlMTcxNzU4NDQ0YTI3ZGMxNzQ5Njg1NGRjNzQ3MGU=
+    YTE4OTg4YTAwYWI3N2MzZWYwYzFhMmZhNjE3ZjFiOGRhZjkzYzc5MTBlYWY0
+    Njc4Y2Q1NzY0MDI4OWI1OWY2MGJhZGM2ZDAyZWYwYTAzNDgyNjU4YTMzNWU0
+    ZWE1MDAyYjcyNGZkZTVmYjc4NmEwZGZjNjFmZjY2NmE2ZDI3YmE=

data/README.md

@@ -20,7 +20,7 @@ writer = Wavefront::Writer.new({:agent_host => 'agent.local.com', :host_name =>
 # value of the metric at current timestamp is: 5
 writer.write(5)
 # Let's write a different metric overwriting the default options from the constructor
-writer.write(6, 'namespace.my.other.metric', 'server2', {})
+writer.write(6, 'namespace.my.other.metric', {host_name: 'server2'})
 ```
 
 * The initializer takes a hash of options, wherein one can set
@@ -32,9 +32,17 @@ writer.write(6, 'namespace.my.other.metric', 'server2', {})
   * The write method parameters are:
     * `metric_value` - A number, the value of the metric reporting at the current timestamp
     * `metric_name` - A `String`, this must be present, either within the write method call or set on the Writer class
-    * `host_name` - A `String`, which will appear as the host for the sent metric in Wavefront. 
-    * `point_tags` - A `Map` of key, value pairs of strings which will be sent to Wavefront. Not required. Note that if you specify these as part of the write method call they replace any set at the class level. The two maps are _not_ merged.
-    * `timestamp` - The Epoch Seconds of the reported point. Default: `Time.now`
+    * A hash of options:
+      * `host_name` - A `String`, which will appear as the host for the sent
+         metric in Wavefront. Defaults to the `host_name` used to initialize
+         the class.
+      * `point_tags` - A `Map` of key, value pairs of strings which will be
+        sent to Wavefront. Not required. Note that if you specify these as
+        part of the write method call they replace any set at the class level.
+        The two maps are _not_ merged. Defaults to the `point_tags` used to
+        initialize the class
+      * `timestamp` - The Epoch Seconds (`Fixnum`), or a Ruby `Time` object, of
+        the reported point Default: `Time.now`
 
 ### Host Tags
 
@@ -52,13 +60,13 @@ meta.add_tags(["host.server1.server.com","host.server2.server.com"],["tag1","tag
 meta.remove_tags(["server1.server.com","server2.server.com"],["tag1","tag2"]) # Remove an arbitrary number of tags from an arbitrary number of hosts
 ```
 
-* The initializer takes up to 3 parameters: 
+* The initializer takes up to 3 parameters:
   * `token`              - A valid Wavefront API Token. This is required.
   * `host`               - A `String` representing the Wavefront endpoint to connect to. Default: `metrics.wavefront.com`.
   * `debug` `true|false` - When set to `true` output `RestClient` debugging to `stdout`. Default: `false`.
 
 ### Query Client
-  
+
 The `Wavefront::Client` class can be used to send queries to Wavefront and get a response
 
 Example usage:
@@ -72,7 +80,7 @@ response = wave.query('<TS_EXPRESSION>')  # <TS_EXPRESSION> : Placeholder for a
 response = wave.query('<TS_EXPRESSION>', 'm', {:start_time => Time.now - 86400, :end_time => Time.now})  # <TS_EXPRESSION> : Placeholder for a valid Wavefront ts() query
 ```
 
-* Like the Metadata class, the initializer takes up to 3 parameters: 
+* Like the Metadata class, the initializer takes up to 3 parameters:
   * `token`              - A valid Wavefront API Token. This is required.
   * `host`               - A `String` representing the Wavefront endpoint to connect to. Default: `metrics.wavefront.com`.
   * `debug` `true|false` - When set to `true` output `RestClient` debugging to `stdout`. Default: `false`.
@@ -84,6 +92,7 @@ response = wave.query('<TS_EXPRESSION>', 'm', {:start_time => Time.now - 86400,
     * `:start_time` - An object of class `Time` that specifies the query start time. Default: `Time.now - 600`.
     * `:end_time` - And object of class `Time` that specifies the query end time. Default: `Time.now`.
     * `:response_format` `[ :raw, :ruby, :graphite, :highcharts ]` - See the section "Response Classes" below. Default: `:raw`.
+    * `:prefix_length` - Used when performing schema manipulations. See the Graphite response format below. Default `1`.
 
 
 ### Response Classes
@@ -105,7 +114,7 @@ response.class  # Wavefront::Response::Raw
 response = wave.query('<TS_EXPRESSION>', 'm', {:response_format => :ruby}) # <TS_EXPRESSION> : Placeholder for a valid Wavefront ts() query
 response.class # Wavefront::Response::Ruby
 response.instance_variables  # [:@response, :@query, :@name, :@timeseries, :@stats]
-response.query  
+response.query
 ```
 
 * `:response_format => :graphite`
@@ -117,6 +126,17 @@ response = wave.query('<TS_EXPRESSION>', 'm', {:response_format => :graphite}) #
 response.graphite[0]['datapoints'].first  # [99.8, 1403702640]
 ```
 
+**Note:** The `target` schema String is constructed from the `label` and the `host` portions of the raw Wavefront response in order to be idiomatically Graphite. In order to determine how to do this properly one must split the `label` into a prefix and a postfix, inserting the `host` between then.
+
+For example, `label: "web.prod.base.host.cpu-0.percent-idle"` and `host: i-12345678`, by default, would yield: `web.i-12345678.prod.base.host.cpu-0.percent-idle` as the Graphite target.
+
+Depending on the vagaries of your particular configuration you may wish to specify more than the default 1 field as a prefix. This can be achieved passing the `:prefix_length` key as an option with an appropriate `Fixnum`. For example:
+
+```
+response = wave.query('<TS_EXPRESSION>', 'm', {:response_format => :graphite, :prefix_length => 2})
+response.graphite[0]['target'] # web.prod.i-12345678.base.host.cpu-0.percent-idle
+```
+
 * `:response_format => :highcharts`
 
 A ruby object that returns highcharts-format data via the `response` method:
@@ -155,4 +175,15 @@ rake install
 5. Create new Pull Request
 
 
+## Credits
+
+Many thanks to SpaceApe games for initially contributing this Ruby client. Contributors include:
+
+Sam Pointer
+Louis McCormack
+Joshua McGhee
+Robert Fisher
+Salil Deshmukh
+Conor Beverland
+
 [1]: http://wavefront.com

data/bin/wavefront-client

@@ -15,6 +15,8 @@
 
 require 'wavefront/client'
 require 'slop'
+require 'pp'
+require 'json'
 
 @opts = Slop.parse(strict: true) do
   banner 'Usage: wavefront-client QUERY (OPTIONS)'
@@ -24,6 +26,8 @@ require 'slop'
   on 's', 'start=', 'Time in UNIX epoch seconds to begin the query from'
   on 't', 'token=', 'Wavefront authentication token'
   on 'e', 'end=', 'Time in UNIX epoch seconds to query to'
+  on 'f', 'format=', "Output format (#{Wavefront::Client::FORMATS.join(', ')})", default: Wavefront::Client::DEFAULT_FORMAT.to_s
+  on 'p', 'prefixlength=', 'The number of path elements to treat as a prefix when doing schema manipulations', default: 1
   on 'h', 'help', 'Display this message'
 end
 
@@ -44,14 +48,29 @@ else
   exit 1
 end
 
+unless Wavefront::Client::FORMATS.include?(@opts[:format].to_sym)
+  puts "The output format must be on of #{Wavefront::Client::FORMATS.join(', ')}"
+  exit 1
+end
+
 options = Hash.new
+options[:response_format] = @opts[:format].to_sym
+options[:prefix_length] = @opts[:prefixlength].to_i
+
 if @opts[:start]
-  options[:start_time] = @opts[:start]
+  options[:start_time] = Time.at(@opts[:start].to_i)
 end
 
 if @opts[:end]
-  options[:end_time] = @opts[:end]
+  options[:end_time] = Time.at(@opts[:end].to_i)
 end
 
 wave = Wavefront::Client.new(@opts[:token])
-puts wave.query(query, granularity, options)
+case options[:response_format]
+when :raw
+  puts wave.query(query, granularity, options)
+when :graphite
+  puts wave.query(query, granularity, options).graphite.to_json
+else
+  pp wave.query(query, granularity, options)
+end

data/lib/wavefront/client/version.rb

@@ -16,6 +16,6 @@ See the License for the specific language governing permissions and
 
 module Wavefront
   class Client
-    VERSION = "0.5.3"
+    VERSION = "1.0.1"
   end
 end

data/lib/wavefront/client.rb

@@ -43,10 +43,12 @@ module Wavefront
       options[:end_time] ||= Time.now
       options[:start_time] ||= options[:end_time] - DEFAULT_PERIOD_SECONDS
       options[:response_format] ||= DEFAULT_FORMAT
+      options[:prefix_length] ||= 1
 
       [ options[:start_time], options[:end_time] ].each { |o| raise Wavefront::Exception::InvalidTimeFormat unless o.is_a?(Time) }
       raise Wavefront::Exception::InvalidGranularity unless GRANULARITIES.include?(granularity)
       raise Wavefront::Exception::InvalidResponseFormat unless FORMATS.include?(options[:response_format])
+      raise InvalidPrefixLength unless options[:prefix_length].is_a?(Fixnum)
 
       args = {:params =>
               {:q => query, :g => granularity, :n => 'Unknown',
@@ -54,7 +56,7 @@ module Wavefront
       response = RestClient.get @base_uri.to_s, args
 
       klass = Object.const_get('Wavefront').const_get('Response').const_get(options[:response_format].to_s.capitalize)
-      return klass.new(response)
+      return klass.new(response, options)
 
     end
 

data/lib/wavefront/exception.rb

@@ -23,5 +23,6 @@ module Wavefront
     class InvaldResponseFormat < ::Exception; end
     class EmptyMetricName < ::Exception; end
     class NotImplemented < ::Exception; end
+    class InvalidPrefixLength < ::Exception; end
   end
 end

data/lib/wavefront/mixins.rb

@@ -0,0 +1,29 @@
+=begin 
+    Copyright 2015 Wavefront Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+   limitations under the License.
+
+=end
+
+module Wavefront
+  module Mixins
+    def interpolate_schema(label, host, prefix_length)
+      label_parts = label.split('.')
+      interpolated = Array.new
+      interpolated << label_parts.shift(prefix_length)
+      interpolated << host
+      interpolated << label_parts
+      interpolated.flatten!
+      return interpolated.join('.')
+    end
+  end
+end

data/lib/wavefront/response.rb

@@ -16,15 +16,17 @@ See the License for the specific language governing permissions and
 
 require 'wavefront/client/version'
 require 'wavefront/exception'
+require 'wavefront/mixins'
 require 'json'
 
 module Wavefront
   class Response
     class Raw
-      attr_reader :response
+      attr_reader :response, :options
 
-      def initialize(response)
+      def initialize(response, options={})
         @response = response
+        @options = options
       end
 
       def to_s
@@ -35,10 +37,11 @@ module Wavefront
 
     class Ruby
       include JSON
-      attr_reader :response
+      attr_reader :response, :options
       
-      def initialize(response)
+      def initialize(response, options={})
         @response = response
+        @options = options
 
         JSON.parse(response).each_pair do |k,v|
           self.instance_variable_set("@#{k}", v)	# Dynamically populate instance vars
@@ -49,43 +52,61 @@ module Wavefront
     end
 
     class Graphite < Wavefront::Response::Ruby
-      attr_reader :response, :graphite
+      include Wavefront::Mixins
+      attr_reader :response, :graphite, :options
 
-      def initialize(response)
+      def initialize(response, options={})
         super
+        options[:prefix_length] ||= 1     # See also Wavefront::Client
         
-        datapoints = Array.new
+        @graphite = Array.new
         self.timeseries.each do |ts|
+
+          output_timeseries = Hash.new
+          output_timeseries['target'] = interpolate_schema(ts['label'], ts['host'], options[:prefix_length])
+
+          datapoints = Array.new
           ts['data'].each do |d|
             datapoints << [d[1], d[0]]
           end
-        end
 
-        @graphite = [{ 'target' => self.query, 'datapoints' => datapoints }]
+          output_timeseries['datapoints'] = datapoints
+          @graphite << output_timeseries 
+
+        end
       end
 
     end
 
     class Highcharts < Wavefront::Response::Ruby
       include JSON
-      attr_reader :response, :highcharts
+      attr_reader :response, :highcharts, :options
 
-      def initialize(response)
+      def initialize(response, options={})
         super
 
         @response = JSON.parse(response)
-
-	@highcharts = []
-	self.timeseries.each do |series|
-	  # Highcharts expects the time in milliseconds since the epoch
-	  # And for some reason the first value tends to be BS
-
-	  @highcharts << { 'name' => series['label'],  'data' => series['data'][1..-1].map!{|x,y| [ x * 1000, y ]} }
-	end
+	      @highcharts = []
+	      self.timeseries.each do |series|
+          # Highcharts expects the time in milliseconds since the epoch
+          # And for some reason the first value tends to be BS
+          # We also have to deal with missing (null/nil) data points.
+          amended_data = Array.new
+          next unless series['data'].size > 0
+          series['data'][1..-1].each do |time_value_pair|
+            if time_value_pair[0]
+              time_value_pair[0] = time_value_pair[0] * 1000
+            else
+              time_value_pair[0] = "null"
+            end
+            amended_data << time_value_pair
+          end
+          @highcharts << { 'name' => series['label'],  'data' => amended_data }
+        end
       end
 
       def to_json
-	@highcharts.to_json
+        @highcharts.to_json
       end
     end
 

data/lib/wavefront/writer.rb

@@ -1,4 +1,4 @@
-=begin 
+=begin
     Copyright 2015 Wavefront Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,23 +31,37 @@ module Wavefront
       options[:host_name] ||= DEFAULT_HOSTNAME
       options[:metric_name] ||= ''
       options[:point_tags] ||= {}
-      
+
       @host_name = options[:host_name]
       @metric_name = options[:metric_name]
       @point_tags = options[:point_tags]
-      
+
       @socket = get_socket(options[:agent_host], options[:agent_port])
     end
-    
-    def write(metric_value, metric_name=@metric_name, host=@host_name, point_tags=@point_tags, timestamp=Time.now)
-      raise Wavefront::Exception::EmptyMetricName if metric_name.empty?
-      tags = point_tags.empty? ? '' : point_tags.map{|k,v| "#{k}=\"#{v}\""}.join(' ')
-      append = tags.empty? ? "host=#{host}" : "host=#{host} #{tags}"
-      @socket.puts "#{metric_name} #{metric_value} #{timestamp.to_i} #{append}"
+
+    def write(metric_value, metric_name = @metric_name, options = {})
+      options[:host_name] ||= @host_name
+      options[:point_tags] ||= @point_tags
+      options[:timestamp] ||= Time.now
+
+      if metric_name.empty?
+        raise Wavefront::Exception::EmptyMetricName
+      end
+
+      if options[:point_tags].empty?
+        append = "host=#{options[:host_name]}"
+      else
+        tags = options[:point_tags].map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
+        append = "host=#{options[:host_name]} #{tags}"
+      end
+
+      @socket.puts [metric_name, metric_value, options[:timestamp].to_i,
+                    append].join(' ')
     end
 
     private
-    def get_socket(host,port)
+
+    def get_socket(host, port)
       TCPSocket.new(host, port)
     end
 

data/spec/example_response.json

@@ -1 +1 @@
-{"query":"ts(\"collectd.memory.memory.cached\", host=\"test.server\")","name":"Unknown","timeseries":[{"label":"collectd.memory.memory.cached","host":"test.server","data":[[1436487780,4.625565013333333E8],[1436487840,4.625646933333333E8],[1436487900,4.625728853333333E8],[1436487960,4.625810773333333E8],[1436488020,4.625926826666667E8],[1436488080,4.626015573333333E8],[1436488140,4.626097493333333E8],[1436488200,4.626179413333333E8],[1436488260,4.626261333333333E8],[1436488320,4.626343253333333E8],[1436488380,4.626425173333333E8],[1436488440,4.626507093333333E8],[1436488500,4.626589013333333E8],[1436488560,4.626670933333333E8],[1436488620,4.626752853333333E8],[1436488680,4.626868906666667E8],[1436488740,4.626957653333333E8],[1436488800,4.627039573333333E8],[1436488860,4.627121493333333E8],[1436488920,4.627203413333333E8],[1436488980,4.6272512E8]]}],"granularity":60,"stats":{"keys":24,"points":1336,"summaries":1314,"summarized_points":0,"summarized_summaries":0,"buffer_keys":24,"compacted_keys":2,"compacted_points":1314,"latency":78,"queries":2,"s3_keys":0,"cpu_ns":5412921}}
+{"query":"100 - ts(ops.prod.base.host.cpu-*.percent-idle)","name":"Unknown","timeseries":[{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-0ae6d2a7","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-0de6d2a0","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-32388c9f","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-406d6eed","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-4fe968e2","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-5b3f8bf6","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-ba3f8b17","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-bce7d311","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-bd971010","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"ip-172-31-31-195","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"unknown","data":[]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-24292a89","data":[[1439371440,0.4000000000000033],[1439371500,0.5826666666666659],[1439371560,0.3335000000000008],[1439371620,0.5326666666666663],[1439371680,0.3000000000000019],[1439371740,0.44983333333333303],[1439371800,0.4170000000000016],[1439371860,0.3999999999999986],[1439371920,0.46683333333333366],[1439371980,0.4163333333333341],[1439372040,0.48316666666666447],[1439372100,0.43299999999999983],[1439372160,0.4165000000000016],[1439372220,0.3498333333333316],[1439372280,0.6000000000000014],[1439372340,0.4168333333333365],[1439372400,87.93666666666667],[1439372460,99.65514166666667],[1439372520,11.878333333333334],[1439372580,0.449333333333333],[1439372640,0.3499999999999967],[1439372700,0.6333333333333305],[1439372760,0.5168333333333308],[1439372820,0.38333333333333286],[1439372880,0.3498333333333316],[1439372940,0.4824999999999993],[1439373000,0.416666666666669],[1439373060,0.4660000000000011],[1439373120,0.4001666666666684],[1439373180,0.4164999999999992],[1439373240,0.36666666666666714]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-249e1f89","data":[[1439371440,0.38283333333333286],[1439371500,0.34983333333333394],[1439371560,0.34966666666666885],[1439371620,0.36616666666666714],[1439371680,0.38333333333333286],[1439371740,0.3333333333333333],[1439371800,0.5495000000000019],[1439371860,0.25],[1439371920,0.2666666666666681],[1439371980,0.36616666666666714],[1439372040,0.28350000000000125],[1439372100,0.4829999999999994],[1439372160,0.43283333333333474],[1439372220,0.4659999999999987],[1439372280,0.36649999999999966],[1439372340,0.333333333333331],[1439372400,84.88483333333333],[1439372460,99.59467666666667],[1439372520,2.799333333333337],[1439372580,0.28316666666666873],[1439372640,0.2500000000000024],[1439372700,0.3498333333333363],[1439372760,0.4164999999999992],[1439372820,0.3495000000000014],[1439372880,0.44933333333333064],[1439372940,0.28333333333333616],[1439373000,0.36650000000000205],[1439373060,0.24983333333333255],[1439373120,0.3163333333333351],[1439373180,0.38350000000000267],[1439373240,0.36666666666666475]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-27292a8a","data":[[1439371440,0.3000000000000019],[1439371500,0.28333333333333616],[1439371560,0.2666666666666681],[1439371620,0.36633333333333223],[1439371680,0.3330000000000008],[1439371740,0.31650000000000017],[1439371800,0.5498333333333321],[1439371860,0.34966666666666885],[1439371920,0.36650000000000205],[1439371980,0.5998333333333316],[1439372040,0.3335000000000008],[1439372100,0.34983333333333394],[1439372160,0.2833333333333338],[1439372220,0.3166666666666676],[1439372280,0.29999999999999954],[1439372340,0.36649999999999966],[1439372400,90.50422833333333],[1439372460,96.05833333333334],[1439372520,0.9016666666666684],[1439372580,0.28316666666666396],[1439372640,0.3990000000000009],[1439372700,0.44966666666666794],[1439372760,0.44966666666666794],[1439372820,0.4165000000000016],[1439372880,0.3833333333333305],[1439372940,0.3330000000000008],[1439373000,0.5326666666666663],[1439373060,0.4331666666666673],[1439373120,0.416166666666669],[1439373180,0.4993333333333349],[1439373240,0.31650000000000017]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-4bb938e6","data":[[1439371440,0.28316666666666634],[1439371500,0.4159999999999992],[1439371560,0.2833333333333338],[1439371620,0.28333333333333144],[1439371680,0.36600000000000205],[1439371740,0.29983333333333445],[1439371800,0.3333333333333333],[1439371860,0.36633333333333457],[1439371920,0.4159999999999992],[1439371980,0.28316666666666873],[1439372040,0.3333333333333357],[1439372100,0.3500000000000038],[1439372160,0.2666666666666681],[1439372220,0.2666666666666657],[1439372280,0.4001666666666684],[1439372340,0.5328333333333338],[1439372400,93.83716666666666],[1439372460,99.36666666666667],[1439372520,0.8335000000000008],[1439372580,0.4330000000000022],[1439372640,0.382666666666663],[1439372700,0.3000000000000019],[1439372760,0.44966666666666794],[1439372820,0.3830000000000003],[1439372880,0.3668333333333346],[1439372940,0.3000000000000019],[1439373000,0.4161666666666667],[1439373060,0.25],[1439373120,0.3333333333333333],[1439373180,0.31700000000000017],[1439373240,0.3331666666666659]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-0bab2aa6","data":[[1439371440,0.28333333333333616],[1439371500,0.3000000000000019],[1439371560,0.23333333333333428],[1439371620,0.23333333333333192],[1439371680,0.3501666666666665],[1439371740,0.36650000000000443],[1439371800,0.3334999999999984],[1439371860,0.29983333333333445],[1439371920,0.36650000000000205],[1439371980,0.2833333333333338],[1439372040,0.43283333333333707],[1439372100,0.3168333333333327],[1439372160,0.2498333333333349],[1439372220,0.3334999999999984],[1439372280,0.38333333333333525],[1439372340,0.3500000000000038],[1439372400,94.44966666666667],[1439372460,94.86545833333334],[1439372520,0.950833333333333],[1439372580,0.29983333333333445],[1439372640,0.2833333333333338],[1439372700,0.3330000000000008],[1439372760,0.3498333333333363],[1439372820,0.29983333333333206],[1439372880,0.28316666666666634],[1439372940,0.3333333333333333],[1439373000,0.3828333333333328],[1439373060,0.29983333333333445],[1439373120,0.2833333333333338],[1439373180,0.3161666666666652],[1439373240,0.36633333333333223]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-592f2cf4","data":[[1439371440,0.28333333333333616],[1439371500,0.36616666666666947],[1439371560,0.31666666666667],[1439371620,0.23333333333333428],[1439371680,0.4336666666666673],[1439371740,0.3496666666666665],[1439371800,0.4333333333333371],[1439371860,0.2665000000000006],[1439371920,0.3164999999999978],[1439371980,0.36650000000000205],[1439372040,0.3500000000000014],[1439372100,0.38333333333333286],[1439372160,0.350333333333334],[1439372220,0.44966666666667027],[1439372280,0.3333333333333333],[1439372340,0.3328333333333333],[1439372400,90.5225],[1439372460,99.21745333333334],[1439372520,0.617000000000002],[1439372580,0.2666666666666681],[1439372640,0.2998333333333368],[1439372700,0.36649999999999966],[1439372760,0.38333333333333286],[1439372820,0.2666666666666657],[1439372880,0.29983333333333445],[1439372940,0.43316666666666964],[1439373000,0.44933333333333536],[1439373060,0.3164999999999978],[1439373120,0.3830000000000003],[1439373180,0.43283333333333474],[1439373240,0.3500000000000014]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-a99e1f04","data":[[1439371440,0.34983333333333394],[1439371500,0.3666666666666695],[1439371560,0.23333333333333192],[1439371620,0.38283333333333286],[1439371680,0.23333333333333428],[1439371740,0.2166666666666662],[1439371800,0.29999999999999954],[1439371860,0.2500000000000024],[1439371920,0.3660000000000044],[1439371980,0.29983333333333206],[1439372040,0.3500000000000014],[1439372100,0.44983333333333536],[1439372160,0.28316666666666873],[1439372220,0.3165000000000025],[1439372280,0.44949999999999807],[1439372340,0.21666666666666856],[1439372400,90.03998333333334],[1439372460,93.50291666666666],[1439372520,0.5836666666666683],[1439372580,0.36616666666666714],[1439372640,0.3329999999999984],[1439372700,0.2666666666666681],[1439372760,0.3328333333333357],[1439372820,0.3330000000000008],[1439372880,0.30016666666666464],[1439372940,0.28316666666666873],[1439373000,0.29999999999999954],[1439373060,0.2996666666666646],[1439373120,0.3830000000000003],[1439373180,0.3330000000000008],[1439373240,0.399666666666666]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-743635d9","data":[[1439371440,0.3831666666666654],[1439371500,0.3500000000000014],[1439371560,0.29983333333333206],[1439371620,0.43333333333333],[1439371680,0.38333333333333286],[1439371740,0.34983333333333394],[1439371800,0.4494999999999981],[1439371860,0.36616666666666475],[1439371920,0.46633333333333366],[1439371980,0.3000000000000019],[1439372040,0.3335000000000008],[1439372100,0.3000000000000019],[1439372160,0.31650000000000017],[1439372220,0.333333333333331],[1439372280,0.3996666666666684],[1439372340,0.3666666666666695],[1439372400,91.44183333333334],[1439372460,99.75181666666667],[1439372520,2.2713333333333354],[1439372580,0.24983333333333016],[1439372640,0.29999999999999954],[1439372700,0.40000000000000097],[1439372760,0.30016666666666464],[1439372820,0.43283333333333474],[1439372880,0.4829999999999994],[1439372940,0.2500000000000024],[1439373000,0.4833333333333319],[1439373060,0.2666666666666657],[1439373120,0.2666666666666681],[1439373180,0.36649999999999966],[1439373240,0.4670000000000011]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-bbc7c416","data":[[1439371440,0.4831666666666668],[1439371500,0.3331666666666706],[1439371560,0.28350000000000125],[1439371620,0.28300000000000125],[1439371680,0.30016666666666697],[1439371740,0.3331666666666682],[1439371800,0.3831666666666654],[1439371860,0.2500000000000024],[1439371920,0.34933333333333155],[1439371980,0.3333333333333357],[1439372040,0.3331666666666659],[1439372100,0.3333333333333333],[1439372160,0.44949999999999807],[1439372220,0.36650000000000205],[1439372280,0.3168333333333351],[1439372340,0.4333333333333371],[1439372400,86.07533333333333],[1439372460,99.82667666666667],[1439372520,2.8129999999999997],[1439372580,0.38333333333333286],[1439372640,0.3999999999999986],[1439372700,0.4163333333333365],[1439372760,0.4165000000000016],[1439372820,0.40016666666666606],[1439372880,0.41616666666666663],[1439372940,0.3331666666666635],[1439373000,0.3998333333333311],[1439373060,0.36650000000000205],[1439373120,0.2666666666666681],[1439373180,0.3331666666666659],[1439373240,0.40000000000000097]]},{"label":"ops.prod.base.host.cpu-0.percent-idle","host":"i-e0a1204d","data":[[1439371440,0.5160000000000006],[1439371500,0.44983333333333064],[1439371560,0.41616666666666663],[1439371620,0.4826666666666668],[1439371680,0.2833333333333338],[1439371740,0.3500000000000014],[1439371800,0.4833333333333343],[1439371860,0.3999999999999986],[1439371920,0.2666666666666681],[1439371980,0.3166666666666676],[1439372040,0.28299999999999886],[1439372100,0.2666666666666681],[1439372160,0.5],[1439372220,0.3830000000000003],[1439372280,0.36633333333333223],[1439372340,0.43266666666666725],[1439372400,95.13166666666666],[1439372460,94.40085],[1439372520,0.9680000000000035],[1439372580,0.449333333333333],[1439372640,0.3331666666666682],[1439372700,0.4826666666666668],[1439372760,0.3168333333333351],[1439372820,0.44966666666666555],[1439372880,0.31650000000000017],[1439372940,0.36633333333333223],[1439373000,0.3669999999999997],[1439373060,0.4663333333333336],[1439373120,0.4826666666666668],[1439373180,0.46683333333333127],[1439373240,0.3999999999999986]]}],"granularity":60,"stats":{"keys":1269,"points":15452,"summaries":14338,"summarized_points":0,"summarized_summaries":0,"buffer_keys":1259,"compacted_keys":155,"compacted_points":14338,"latency":4,"queries":20,"s3_keys":0,"cpu_ns":15186747,"skipped_compacted_keys":144}}

data/spec/wavefront/mixins_spec.rb

@@ -0,0 +1,29 @@
+=begin 
+    Copyright 2015 Wavefront Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+   limitations under the License.
+
+=end
+
+require 'spec_helper'
+require 'wavefront/mixins'
+
+HOST = 'i-12345678'
+
+describe Wavefront::Mixins do
+  include Wavefront::Mixins
+  it 'provides a method to interpolate the schema' do
+    wavefront_schema = "a.b.c.d.e"
+    expect(interpolate_schema(wavefront_schema, HOST, 1)).to eq("a.#{HOST}.b.c.d.e")
+    expect(interpolate_schema(wavefront_schema, HOST, 2)).to eq("a.b.#{HOST}.c.d.e")
+  end
+end

data/spec/wavefront/response_spec.rb

@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 
 require 'spec_helper'
 require 'pathname'
+require 'json'
 
 RESPONSE = 'test'
 
@@ -52,14 +53,18 @@ describe Wavefront::Response::Ruby do
 end
 
 describe Wavefront::Response::Graphite do
+  include Wavefront::Mixins
+  include JSON
   it 'returns something that resembles some graphite output' do
     example_response = File.read(Pathname.new(__FILE__).parent.parent.join('example_response.json'))
     response = Wavefront::Response::Graphite.new(example_response)
+    response_hash = JSON.parse(example_response)
+    schema = interpolate_schema(response_hash['timeseries'][0]['label'], response_hash['timeseries'][0]['host'], 1)
 
-    expect(response.graphite.size).to eq(1)
+    expect(response.graphite.size).to eq(21)
     expect(response.graphite[0].keys.size).to eq(2)
-    expect(response.graphite[0]['target']).to eq(response.query)
-    expect(response.graphite[0]['datapoints'].size).to eq(21)
+    expect(response.graphite[0]['target']).to eq(schema)
+    expect(response.graphite[15]['datapoints'].size).to eq(31)
   end
 end
 
@@ -68,7 +73,7 @@ describe Wavefront::Response::Highcharts do
     example_response = File.read(Pathname.new(__FILE__).parent.parent.join('example_response.json'))
     response = Wavefront::Response::Highcharts.new(example_response)
     
-    expect(JSON.parse(response.to_json).size).to eq(response.timeseries.size)
+    expect(response.highcharts[0]['data'].size).to eq(30)
     JSON.parse(response.to_json).each { |m| expect(m.keys.size).to eq(2) }
   end
 end

data/spec/wavefront/writer_spec.rb

@@ -1,4 +1,4 @@
-=begin 
+=begin
     Copyright 2015 Wavefront Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@ describe Wavefront::Writer do
 
   it 'has some defaults' do
     expect(Wavefront::Writer::DEFAULT_HOST).to_not be_nil
-    expect(Wavefront::Writer::DEFAULT_HOST).to be_a_kind_of String 
+    expect(Wavefront::Writer::DEFAULT_HOST).to be_a_kind_of String
     expect(Wavefront::Writer::DEFAULT_PORT).to_not be_nil
-    expect(Wavefront::Writer::DEFAULT_PORT).to be_a_kind_of Fixnum 
+    expect(Wavefront::Writer::DEFAULT_PORT).to be_a_kind_of Fixnum
     expect(Wavefront::Writer::DEFAULT_HOSTNAME).to_not be_nil
-    expect(Wavefront::Writer::DEFAULT_HOSTNAME).to be_a_kind_of String 
+    expect(Wavefront::Writer::DEFAULT_HOSTNAME).to be_a_kind_of String
   end
 
 
@@ -62,9 +62,9 @@ describe Wavefront::Writer do
       allow(Time).to receive(:now).and_return(123456789)
       expect(socket).to receive(:puts).with("metric 50 123456789 host=somehost")
       writer = Wavefront::Writer.new
-      writer.write(50, "metric", host, {}, 123456789)
+      writer.write(50, "metric", {host_name: host, timestamp: 123456789})
     end
-    
+
     it 'should accept a single tag and append it correctly' do
       host = 'somehost'
       port = '8566'
@@ -74,7 +74,8 @@ describe Wavefront::Writer do
       allow(Time).to receive(:now).and_return(123456789)
       expect(socket).to receive(:puts).with("metric 50 123456789 host=somehost tag_key_one=\"tag_val_one\"")
       writer = Wavefront::Writer.new
-      writer.write(50, "metric", host, tags, 123456789)
+      writer.write(50, "metric",
+                   {host_name: host, point_tags: tags, timestamp: 123456789})
     end
 
    it 'should accept multiple tags and append them correctly' do
@@ -86,9 +87,9 @@ describe Wavefront::Writer do
       allow(Time).to receive(:now).and_return(123456789)
       expect(socket).to receive(:puts).with("metric 50 123456789 host=somehost tag_key_one=\"tag_val_one\" k2=\"v2\"")
       writer = Wavefront::Writer.new
-      writer.write(50, "metric", host, tags, 123456789)
+      writer.write(50, "metric",
+                   {host_name: host, point_tags: tags, timestamp: 123456789})
 
    end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-client
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Sam Pointer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,12 +108,14 @@ files:
 - lib/wavefront/events.rb
 - lib/wavefront/exception.rb
 - lib/wavefront/metadata.rb
+- lib/wavefront/mixins.rb
 - lib/wavefront/response.rb
 - lib/wavefront/writer.rb
 - spec/example_response.json
 - spec/spec_helper.rb
 - spec/wavefront/client_spec.rb
 - spec/wavefront/metadata_spec.rb
+- spec/wavefront/mixins_spec.rb
 - spec/wavefront/response_spec.rb
 - spec/wavefront/writer_spec.rb
 - wavefront-client.gemspec
@@ -146,5 +148,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/wavefront/client_spec.rb
 - spec/wavefront/metadata_spec.rb
+- spec/wavefront/mixins_spec.rb
 - spec/wavefront/response_spec.rb
 - spec/wavefront/writer_spec.rb