logstash-output-librato 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af38790c8c984bcef1c23c6e8d10be6330e5902e
-  data.tar.gz: 12a42103ec99ab0b198b4bf2291fad75743776c6
+  metadata.gz: 8d8f6622975d71749bdcf732b227e20ae302e829
+  data.tar.gz: 405b9e76c811ed3cea2b1355ffd11e626ca9b5e6
 SHA512:
-  metadata.gz: 02d70d9b0024458bc98f4d8cbb1550a451f847ff8d512090cc5ff9c017fd19bc44066f4a16fa49e23aa6da413efb87a09846f06694bf10b4f46361eabe840cc8
-  data.tar.gz: a54d8cd55e1986c2a6637786d2f54324a416929c7fcbd7aad35f624ce0fac1bf33f964558015a9c923ba835e4bb4f5675e3b8f879cfdd30362e5f530f3a8188d
+  metadata.gz: e5d164e5f81608a2ec10ee7457af57cf021045f442575366320eec1c765b704548631a306f912920428eaf77f22b270ea55b435aae20e75484bfd481bec5299f
+  data.tar.gz: 545f60bea32dc01e560a06ade9474b0db15455f90b56157a161796fabe07dcbe40707407a3f9f38e62064d7db68ce6649321a5eab40232557996ef2d15f91380

data/lib/logstash/outputs/librato.rb

@@ -1,12 +1,13 @@
 # encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
+require "logstash/json"
 
 
 class LogStash::Outputs::Librato < LogStash::Outputs::Base
   # This output lets you send metrics, annotations and alerts to
   # Librato based on Logstash events
-  # 
+  #
   # This is VERY experimental and inefficient right now.
 
   config_name "librato"
@@ -71,7 +72,7 @@ class LogStash::Outputs::Librato < LogStash::Outputs::Base
     @client = Net::HTTP.new(@uri.host, @uri.port)
     @client.use_ssl = true
     @client.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    
+
   end # def register
 
   public
@@ -86,9 +87,9 @@ class LogStash::Outputs::Librato < LogStash::Outputs::Base
       g_hash.each do |k,v|
         g_hash[k] = v.to_f if k=="value"
       end
-      g_hash['measure_time'] = event["@timestamp"].to_i unless g_hash['measure_time']
+      g_hash['measure_time'] = event.timestamp.to_i unless g_hash['measure_time']
       @logger.warn("Gauges hash", :data => g_hash)
-      metrics_event['gauges'] = Array.new 
+      metrics_event['gauges'] = Array.new
       metrics_event['gauges'] << g_hash
       @logger.warn("Metrics hash", :data => metrics_event)
     end
@@ -97,21 +98,21 @@ class LogStash::Outputs::Librato < LogStash::Outputs::Base
       c_hash.each do |k,v|
         c_hash[k] = v.to_f if k=="value"
       end
-      c_hash['measure_time'] = event["@timestamp"].to_i unless c_hash['measure_time']
+      c_hash['measure_time'] = event.timestamp.to_i unless c_hash['measure_time']
       @logger.warn("Counters hash", :data => c_hash)
       metrics_event['counters'] = Array.new
       metrics_event['counters'] << c_hash
       @logger.warn("Metrics hash", :data => metrics_event)
     end
-   
+
     # TODO (lusis)
     # Clean this mess up
     unless metrics_event.size == 0
       request = Net::HTTP::Post.new(@uri.path+"metrics")
       request.basic_auth(@account_id, @api_token)
-      
+
       begin
-        request.body = metrics_event.to_json
+        request.body = LogStash::Json.dump(metrics_event)
         request.add_field("Content-Type", 'application/json')
         response = @client.request(request)
         @logger.warn("Librato convo", :request => request.inspect, :response => response.inspect)
@@ -127,19 +128,19 @@ class LogStash::Outputs::Librato < LogStash::Outputs::Base
       @logger.warn("Original Annotation", :data => @annotation)
       annotation_event = Hash[*@annotation.collect{|k,v| [event.sprintf(k),event.sprintf(v)]}.flatten]
       @logger.warn("Annotation event", :data => annotation_event)
-      
+
       annotation_path = "#{@uri.path}annotations/#{annotation_event['name']}"
       @logger.warn("Annotation path", :data => annotation_path)
       request = Net::HTTP::Post.new(annotation_path)
       request.basic_auth(@account_id, @api_token)
       annotation_event.delete('name')
-      annotation_event['start_time'] = event["@timestamp"].to_i unless annotation_event['start_time']
-      annotation_event['end_time'] = event["@timestamp"].to_i unless annotation_event['end_time']
+      annotation_event['start_time'] = event.timestamp.to_i unless annotation_event['start_time']
+      annotation_event['end_time'] = event.timestamp.to_i unless annotation_event['end_time']
       annotation_hash['annotations'] << annotation_event
       @logger.warn("Annotation event", :data => annotation_event)
 
       begin
-        request.body = annotation_event.to_json
+        request.body = LogStash::Json.dump(annotation_event)
         request.add_field("Content-Type", 'application/json')
         response = @client.request(request)
         @logger.warn("Librato convo", :request => request.inspect, :response => response.inspect)

data/logstash-output-librato.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-librato'
-  s.version         = '0.1.2'
+  s.version         = '0.1.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output lets you send metrics, annotations and alerts to Librato based on Logstash events"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-librato
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: This output lets you send metrics, annotations and alerts to Librato based on Logstash events