logstash-output-graphite 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f6e4f154e115fbe917cc0628bb226f149f0cba6
-  data.tar.gz: 6890c1f0fd637b69cfff41f7cf0ae0e4dc8feb70
+  metadata.gz: 3c226cdd8c7baa2e2b52e8cf0d297086c9e2aba4
+  data.tar.gz: e6a52d491ec2b3e8946b046165c81370aae3eaec
 SHA512:
-  metadata.gz: 23ce971e35e2c28a5a0248eb89b3a3aa6bfbe5f66bfae074862898fa6eab6a0fb8548bfb272aeb288263aa3af99bba4f7af17ef887a30204930f0ce11799875d
-  data.tar.gz: 00b51e81ef446f6dcf23a57d65207e0591acc3c00fa0174e617a51aacadd4791b950b4fbebae8f1bee5951d3c296dc2cf4769bd3ddcb71dd44e625348946638e
+  metadata.gz: 29793d23baaca1de73782c5c3be699bbdf6df57116382ff3cadb59944dce0cdccd952b2b6a5d47d16bb035d8a2b9bd861b713dc779cfa359ee7e9f764749754e
+  data.tar.gz: a4e2c5fbc9344699064be2d349ed60f4dd64e2f42b90e4d6d215e52922180e906174337bbdf6e6f00e78bc479320082326b2215d856d4977e5b7669cf00a2b49

data/lib/logstash/outputs/graphite.rb

@@ -51,6 +51,11 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
   # Exclude regex matched metric names, by default exclude unresolved %{field} strings.
   config :exclude_metrics, :validate => :array, :default => [ "%\{[^}]+\}" ]
 
+  # Use this field for the timestamp instead of '@timestamp' which is the
+  # default. Useful when backfilling or just getting more accurate data into
+  # graphite since you probably have a cache layer infront of Logstash.
+  config :timestamp_field, :validate => :string, :default => '@timestamp'
+
   # Enable debug output.
   config :debug, :validate => :boolean, :default => false, :deprecated => "This setting was never used by this plugin. It will be removed soon."
 
@@ -102,7 +107,7 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
     # Graphite message format: metric value timestamp\n
 
     messages = []
-    timestamp = event.sprintf("%{+%s}")
+    timestamp = event[@timestamp_field].to_i
 
     if @fields_are_metrics
       @logger.debug("got metrics event", :metrics => event.to_hash)

data/logstash-output-graphite.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-graphite'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output allows you to pull metrics from your logs and ship them to Graphite"
   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"
@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-input-generator'
   s.add_development_dependency 'logstash-filter-kv'
+  s.add_development_dependency 'logstash-filter-ruby'
 end
 

data/spec/outputs/graphite_spec.rb

@@ -248,4 +248,40 @@ describe LogStash::Outputs::Graphite do
     end
   end
 
+  context "timestamp_field used is timestamp_new" do
+    timestamp_new = (Time.now + 3).to_i
+    let(:config) do <<-CONFIG
+          input {
+            generator {
+              message => "foo=123"
+              count => 1
+              type => "generator"
+            }
+          }
+
+          filter {
+            ruby {
+              code => "event['timestamp_new'] = Time.at(#{timestamp_new})"
+            }
+          }
+
+          output {
+            graphite {
+                host => "localhost"
+                port => #{port}
+                timestamp_field => "timestamp_new"
+                metrics => ["foo", "1"]
+                debug => true
+            }
+          }
+    CONFIG
+    end
+
+    it "timestamp matches timestamp_new" do
+      lines = server.pop
+      expect(lines).to match(/^foo 1.0 #{timestamp_new}\n$/)
+    end
+
+  end
+
 end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -20,7 +19,10 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -28,50 +30,62 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   name: logstash-devutils
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-input-generator
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-input-generator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-filter-kv
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-filter-kv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-filter-ruby
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
 email: info@elasticsearch.com
 executables: []