hallmonitor 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf8d13dcc1fef8473f9ba94777c6ccdc764f19c
-  data.tar.gz: deeab3f14fd9fa69015ed13aaa607edf9239b1d9
+  metadata.gz: d535fc73fa9953de660b0884b36496a159c20d7b
+  data.tar.gz: 336bb38e055f533a545d859eb92461b97f025438
 SHA512:
-  metadata.gz: 814c9f8c30f73f40dd1ad3b474ede958444dfe2b0918fc0de87166dad1259ac3733efe62ca30adbbeb11c658b01ded7b196eadfaad63196e7e4ccd6969d893a1
-  data.tar.gz: affa457a4e18eac08dba4d6c4d0f5fc1580534a277b17b475257b7164ba8400d72e1e7f172481545ca91d2b79278ba7987e41956e8f1bdc0548456354f5b260b
+  metadata.gz: 8b637d698988d1f05b2603df29c94fc5fc7de6c8a845e331e8acc2599c093e675d9fc5b2d3214fd749c93eaedf00650cd94f99b941095a006f5413a0de6014ff
+  data.tar.gz: 58add99e48674c87f883545c05b2a4b90301892b708086d1196c74cea358b4cf41498b9f212770ed2f66fd924f5ee8cec72d176443ed935b789540eb5ad8091e

data/lib/hallmonitor/outputters/influxdb.rb

@@ -8,7 +8,18 @@ module Hallmonitor
     # An outputter for InfluxDB
     class Influxdb < Outputter
       # Simple EventData struct, used to communicate with an optional Transformer
-      EventData = Struct.new(:name, :tags, :fields)
+      EventData = Struct.new(:name, :tags, :fields, :timestamp)
+
+      # Maps Influxdb client precisions to multipliers for Time#to_r to get
+      # the value to send to influxdb for the timestamp
+      PRECISION_MAP = {
+        'ns' => 10**9,
+        'u' => 10**6,
+        'ms' => 10**3,
+        's' => 1,
+        'm' => 1 / 60,
+        'h' => 1 / 3600
+      }.freeze
 
       # @return [#transform(Event, EventData)] Object used to transform data
       #   before it is sent to InfluxDB
@@ -39,6 +50,7 @@ module Hallmonitor
         @tags = {}.merge(tags)
         @client = influxdb_client || raise('Must supply an InfluxDb client')
         @transformer = transformer
+        @precision_mult = PRECISION_MAP[@client.config.time_precision || 's']
       end
 
       # Sends events to InfluxDB instance
@@ -54,7 +66,7 @@ module Hallmonitor
       # @param data [EventData] Struct of data we're building for InfluxDB
       def transform_and_write(event, event_data)
         event_data = @transformer.transform(event, event_data) if @transformer
-        data = { tags: event_data.tags, values: event_data.fields }
+        data = { tags: event_data.tags, values: event_data.fields, timestamp: event_data.timestamp }
         @client.write_point(event_data.name, data)
       end
 
@@ -75,9 +87,17 @@ module Hallmonitor
         data.name = event.name
         data.tags = @tags.merge(event.tags.merge(type: type))
         data.fields = value.is_a?(Hash) ? value : { value: value }
+        data.timestamp = calc_timestamp(event)
         data
       end
 
+      # Calculates a timestamp based on the indicated {Time} object
+      # and the influxdb client's precision
+      # @param event [Hallmonitor::Event]
+      def calc_timestamp(event)
+        (event.time.to_r * @precision_mult).to_i if event.time.respond_to?(:to_r)
+      end
+
       def build_timer_data(event)
         build_data(event, 'timer', event.duration)
       end

data/lib/hallmonitor/version.rb

@@ -1,7 +1,7 @@
 module Hallmonitor
   module Version
     MAJOR = 4
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     BUILD = nil
 

data/spec/hallmonitor/outputters/influxdb_spec.rb

@@ -6,7 +6,9 @@ module Hallmonitor
     RSpec.describe Influxdb do
       let(:influxdb_client) { nil }
       let(:default_tags) { {} }
-      let(:outputter) { described_class.new(influxdb_client, tags: default_tags) }
+      let(:outputter) do
+        described_class.new(influxdb_client, tags: default_tags)
+      end
 
       context '#initialize' do
         context 'with a bad influxdb client' do
@@ -16,9 +18,13 @@ module Hallmonitor
         end
 
         context 'with a good client' do
-          let(:influxdb_client) { double('influxdb_client') }
+          let(:influxdb_client) { instance_double(InfluxDB::Client) }
           before do
             allow(influxdb_client).to receive(:write_point)
+            allow(influxdb_client).to(
+              receive(:config)
+                .and_return(double(time_precision: 'ms'))
+            )
           end
 
           it 'does not raise an error' do
@@ -38,10 +44,18 @@ module Hallmonitor
         let(:expected_data) do
           {
             values: { value: expected_value },
-            tags: default_tags.merge(tags).merge(type: expected_type)
+            tags: default_tags.merge(tags).merge(type: expected_type),
+            timestamp: a_value_within(1000).of((Time.now.to_r * 10**3).to_i)
           }
         end
 
+        before do
+          allow(influxdb_client).to(
+            receive(:config)
+              .and_return(double(time_precision: 'ms'))
+          )
+        end
+
         it 'sends the correct information to influxdb' do
           expect(influxdb_client).to(
             receive(:write_point).with(event_name, expected_data))
@@ -79,7 +93,8 @@ module Hallmonitor
           let(:expected_data) do
             {
               values: { value: expected_value },
-              tags: { additional: 'foo' }
+              tags: { additional: 'foo' },
+              timestamp: nil
             }
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hallmonitor
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Chris TenHarmsel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json