logstash-codec-collectd 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306984fc22301cf93451ae1ddf80f9936865882a
-  data.tar.gz: f95fd0dec216ad3d3944b5fdca7844f4b0f2bc5a
+  metadata.gz: 203b89f4f6e554a81c36f4d452ee2fae6941ce3a
+  data.tar.gz: 776de9ef6513114401342ccdc7cc5bd039966463
 SHA512:
-  metadata.gz: 050c27df3b32328cd26ad46b61f22c2241cde4e536b2164ba1901ad7475ef0a45cd347a34fb6ec9f527275e42437f5a14d0d08b7355b2a7d15a4258b10c55f42
-  data.tar.gz: f4a7b1e7a3f9ee1873065c6a983682abf4610edc527ee5732f785474403b4bb930cb003bab02a344baf3ce8b7b47c6f6bda1ba35eba7b22535dedc8bce518c9d
+  metadata.gz: 256fb0ec5cc4546881b820ff61970fa9c2db4b4b83e642f631b3552e730c6d47a99b68d59cd316c0df7aad035e4e8b0043ba6bd4105cd3ff993cd1f3f81831d7
+  data.tar.gz: af4de700cfc0c1fc1853dbfa2aab50645603f17d0ef18ffd9ae7aa58d9451181188c728353c63db90a1cfb1a218e022b35d91f6c282b549736058bf66fde6800

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+# 0.1.10
+  * Ensure that notifications make it through.  Reported in #10

data/lib/logstash/codecs/collectd.rb

@@ -73,6 +73,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
     'host' => true,
     '@timestamp' => true,
     'type_instance' => true,
+    'severity' => true,
   }
 
   COLLECTD_TYPE_FIELDS = {
@@ -81,11 +82,13 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
     'plugin' => true,
     'plugin_instance' => true,
     'type_instance' => true,
+    'severity' => true,
   }
 
   INTERVAL_VALUES_FIELDS = {
     "interval" => true,
     "values" => true,
+    "message" => true,
   }
 
   INTERVAL_BASE_FIELDS = {
@@ -273,7 +276,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
       8 => hirestime_decoder,
       9 => hiresinterval_decoder,
       256 => string_decoder,
-      257 => numeric_decoder,
+      257 => counter_decoder,
       512 => signature_decoder,
       528 => encryption_decoder
     }

data/logstash-codec-collectd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-collectd'
-  s.version         = '0.1.9'
+  s.version         = '0.1.10'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read events from the collectd binary protocol"
   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"

data/spec/codecs/collectd_spec.rb

@@ -5,7 +5,7 @@ require "insist"
 require "tempfile"
 
 describe LogStash::Codecs::Collectd do
-  context "None" do
+  context "Normal message handling" do
     subject do
       next LogStash::Codecs::Collectd.new({})
     end
@@ -17,45 +17,63 @@ describe LogStash::Codecs::Collectd do
       subject.decode(payload) do |event|
         case counter
         when 0
-          insist { event['host'] } == "lieters-klaptop.prot.plexis.eu"
-          insist { event['plugin'] } == "interface"
-          insist { event['plugin_instance'] } == "wlan0"
-          insist { event['collectd_type'] } == "if_errors"
-          insist { event['rx'] } == 0
-          insist { event['tx'] } == 0
+          expect(event['host']).to eq("lieters-klaptop.prot.plexis.eu")
+          expect(event['plugin']).to eq("interface")
+          expect(event['plugin_instance']).to eq("wlan0")
+          expect(event['collectd_type']).to eq("if_errors")
+          expect(event['rx']).to eq(0)
+          expect(event['tx']).to eq(0)
         when 2
-          insist { event['host'] } == "lieters-klaptop.prot.plexis.eu"
-          insist { event['plugin'] } == "entropy"
-          insist { event['collectd_type'] } == "entropy"
-          insist { event['value'] } == 157.0
+          expect(event['host']).to eq("lieters-klaptop.prot.plexis.eu")
+          expect(event['plugin']).to eq("entropy")
+          expect(event['collectd_type']).to eq("entropy")
+          expect(event['value']).to eq(157.0)
         end
         counter += 1
       end
-      insist { counter } == 28
+      expect(counter).to eq(28)
     end # it "should parse a normal packet"
 
+    it "should parse a packet with a message and a severity" do
+      payload = ["000000236c6965746572732d6b6c6170746f702e70726f742e706c657869732e6575000008000c14b0a645f3eb73c30009000c00000002800000000002000e696e74657266616365000003000a776c616e30000004000e69665f6572726f7273000006001800020202000000000000000000000000000000000008000c14b0a645f3eb525e000300076c6f000004000f69665f7061636b6574730000060018000202020000000000001cd80000000000001cd80008000c14b0a645f3ebf8c10002000c656e74726f70790000030005000004000c656e74726f7079000006000f0001010000000000a063400008000c14b0a645f3eb6c700002000e696e74657266616365000003000a776c616e30000004000f69665f7061636b657473000006001800020202000000000002d233000000000001c3b10008000c14b0a645f3eb59b1000300076c6f000004000e69665f6572726f7273000006001800020202000000000000000000000000000000000008000c14b0a645f425380b00020009737761700000030005000004000973776170000005000975736564000006000f00010100000000000000000008000c14b0a645f4254c8d0005000966726565000006000f00010100000000fcffdf410008000c14b0a645f4255ae70005000b636163686564000006000f00010100000000000000000008000c14b0a645f426f09f0004000c737761705f696f0000050007696e000006000f00010200000000000000000008000c14b0a645f42701e7000500086f7574000006000f00010200000000000000000008000c14b0a645f42a0edf0002000a7573657273000004000a75736572730000050005000006000f00010100000000000022400008000c14b0a645f5967c8b0002000e70726f636573736573000004000d70735f7374617465000005000c72756e6e696e67000006000f00010100000000000000000008000c14b0a645f624706c0005000d736c656570696e67000006000f0001010000000000c067400008000c14b0a645f624861a0005000c7a6f6d62696573000006000f00010100000000000000000008000c14b0a645f62494740005000c73746f70706564000006000f00010100000000000010400008000c14b0a645f6254aa90005000b706167696e67000006000f00010100000000000000000008000c14b0a645f6255b110005000c626c6f636b6564000006000f00010100000000000000000008000c14b0a645f62763060004000e666f726b5f726174650000050005000006000f00010200000000000025390008000c14b0a64873bf8f47000200086370750000030006300000040008637075000005000975736572000006000f0001020000000000023caa0008000c14b0a64873bfc9dd000500096e696365000006000f00010200000000000000030008000c14b0a64873bfe9350005000b73797374656d000006000f00010200000000000078bc0008000c14b0a64873c004290005000969646c65000006000f00010200000000000941fe0008000c14b0a64873c020920005000977616974000006000f00010200000000000002050008000c14b0a64873c03e280005000e696e74657272757074000006000f00010200000000000000140008000c14b0a64873c04ba20005000c736f6674697271000006000f00010200000000000001890008000c14b0a64873c058860005000a737465616c000006000f00010200000000000000000008000c14b0a64873c071b80003000631000005000975736572000006000f000102000000000002440e0008000c14b0a64873c07f31000500096e696365000006000f00010200000000000000070001000c00000000556dd2fa0101000c000000000000000200000015746573742e6578616d706c652e636f6d00000200096c6f616400000400096c6f6164000100001154657374204d65737361676500"].pack('H*')
+
+      counter = 0
+      subject.decode(payload) do |event|
+        case counter
+        when 29
+          expect(event['host']).to eq("test.example.com")
+          expect(event['plugin']).to eq("load")
+          expect(event['collectd_type']).to eq("load")
+          expect(event['message']).to eq("Test Message")
+          expect(event['severity']).to eq(2)
+        end
+        counter += 1
+      end
+      expect(counter).to eq(29)
+    end # it "should parse a packet with a message and a severity"
+
     it "should drop a part with an header length" do
       payload = ["000000236c6965746572732d6b6c6170746f702e70726f742e706c657869732e6575000008000c14b0a645f3eb73c30009000c00000002800000000002000e696e74657266616365000003000a776c616e30000004000e69665f6572726f7273000006001800020202000000000000000000000000000000000008000c14b0a645f3eb525e000300076c6f000004000f69665f7061636b6574730000060018000202020000000000001cd80000000000001cd80008000c14b0a645f3ebf8c10002000c656e74726f70790000030005000004000c656e74726f7079000006000f0001010000000000a063400008000c14b0a645f3eb6c700002000e696e74657266616365000003000a776c616e30000004000f69665f7061636b657473000006001800020202000000000002d233000000000001c3b10008000c14b0a645f3eb59b1000300076c6f000004000e69665f6572726f7273000006001800020202000000000000000000000000000000000008000c14b0a645f425380b00020009737761700000030005000004000973776170000005000975736564000006000f00010100000000000000000008000c14b0a645f4254c8d0005000966726565000006000f00010100000000fcffdf410008000c14b0a645f4255ae70005000b636163686564000006000f00010100000000000000000008000c14b0a645f426f09f0004000c737761705f696f0000050007696e000006000f00010200000000000000000008000c14b0a645f42701e7000500086f7574000006000f00010200000000000000000008000c14b0a645f42a0edf0002000a7573657273000004000a75736572730000050005000006000f00010100000000000022400008000c14b0a645f5967c8b0002000e70726f636573736573000004000d70735f7374617465000005000c72756e6e696e67000006000f00010100000000000000000008000c14b0a645f624706c0005000d736c656570696e67000006000f0001010000000000c067400008000c14b0a645f624861a0005000c7a6f6d62696573000006000f00010100000000000000000008000c14b0a645f62494740005000c73746f70706564000006000f00010100000000000010400008000c14b0a645f6254aa90005000b706167696e67000006000f00010100000000000000000008000c14b0a645f6255b110005000c626c6f636b6564000006000f00010100000000000000000008000c14b0a645f62763060004000e666f726b5f726174650000050005000006000f00010200000000000025390008000c14b0a64873bf8f47000200086370750000030006300000040008637075000005000975736572000006000f0001020000000000023caa0008000c14b0a64873bfc9dd000500096e696365000006000f00010200000000000000030008000c14b0a64873bfe9350005000b73797374656d000006000f00010200000000000078bc0008000c14b0a64873c004290005000969646c65000006000f00010200000000000941fe0008000c14b0a64873c020920005000977616974000006000f00010200000000000002050008000c14b0a64873c03e280005000e696e74657272757074000006000f00010200000000000000140008000c14b0a64873c04ba20005000c736f6674697271000006000f00010200000000000001890008000c14b0a64873c058860005000a737465616c000006000f00010200000000000000000008000c14b0a64873c071b80003000631000005000975736572000006000f000102000000000002440e0008000c14b0a64873c07f31000500316e696365000006000f0001020000000000000007"].pack('H*')
       counter = 0
       subject.decode(payload) do |event|
         case counter
         when 0
-          insist { event['host'] } == "lieters-klaptop.prot.plexis.eu"
-          insist { event['plugin'] } == "interface"
-          insist { event['plugin_instance'] } == "wlan0"
-          insist { event['collectd_type'] } == "if_errors"
-          insist { event['rx'] } == 0
-          insist { event['tx'] } == 0
+          expect(event['host']).to eq("lieters-klaptop.prot.plexis.eu")
+          expect(event['plugin']).to eq("interface")
+          expect(event['plugin_instance']).to eq("wlan0")
+          expect(event['collectd_type']).to eq("if_errors")
+          expect(event['rx']).to eq(0)
+          expect(event['tx']).to eq(0)
         when 2
-          insist { event['host'] } == "lieters-klaptop.prot.plexis.eu"
-          insist { event['plugin'] } == "entropy"
-          insist { event['collectd_type'] } == "entropy"
-          insist { event['value'] } == 157.0
+          expect(event['host']).to eq("lieters-klaptop.prot.plexis.eu")
+          expect(event['plugin']).to eq("entropy")
+          expect(event['collectd_type']).to eq("entropy")
+          expect(event['value']).to eq(157.0)
         end
         counter += 1
       end
       # One of these will fail because I altered the payload from the normal packet
-      insist { counter } == 27
+      expect(counter).to eq(27)
     end # it "should drop a part with an header length"
 
     # This payload contains a NaN value
@@ -65,16 +83,16 @@ describe LogStash::Codecs::Collectd do
       subject.decode(payload) do |event|
         case counter
         when 0
-          insist { event['host'] } == "test.example.com"
-          insist { event['plugin'] } == "ping"
-          insist { event['type_instance'] } == "ping-target.example.com"
-          insist { event['collectd_type'] } == "ping"
-          insist { event['value'] } == 0   # Not a NaN
-          insist { event['tags'] } == ["_collectdNaN"]
+          expect(event['host']).to eq("test.example.com")
+          expect(event['plugin']).to eq("ping")
+          expect(event['type_instance']).to eq("ping-target.example.com")
+          expect(event['collectd_type']).to eq("ping")
+          expect(event['value']).to eq(0)   # Not a NaN
+          expect(event['tags']).to eq(["_collectdNaN"])
         end
         counter += 1
       end
-      insist { counter } == 1
+      expect(counter).to eq(1)
     end # it "should replace a NaN with a zero and add tag '_collectdNaN' by default"
   end # context "None"
 
@@ -90,16 +108,16 @@ describe LogStash::Codecs::Collectd do
       subject.decode(payload) do |event|
         case counter
         when 0
-          insist { event['host'] } == "test.example.com"
-          insist { event['plugin'] } == "ping"
-          insist { event['type_instance'] } == "ping-target.example.com"
-          insist { event['collectd_type'] } == "ping"
-          insist { event['value'] } == 1   # Not a NaN
-          insist { event['tags'] } == ["NaN_encountered"]
+          expect(event['host']).to eq("test.example.com")
+          expect(event['plugin']).to eq("ping")
+          expect(event['type_instance']).to eq("ping-target.example.com")
+          expect(event['collectd_type']).to eq("ping")
+          expect(event['value']).to eq(1)   # Not a NaN
+          expect(event['tags']).to eq(["NaN_encountered"])
         end
         counter += 1
       end
-      insist { counter } == 1
+      expect(counter).to eq(1)
     end # it "should replace a NaN with the specified value and tag 'NaN_encountered'"
   end # context "Replace nan_value and nan_tag with non-default values"
 
@@ -115,15 +133,15 @@ describe LogStash::Codecs::Collectd do
       subject.decode(payload) do |event|
         case counter
         when 0
-          insist { event['host'] } == "test.example.com"
-          insist { event['plugin'] } == "ping"
-          insist { event['type_instance'] } == "ping-target.example.com"
-          insist { event['collectd_type'] } == "ping"
-          insist { event['value'] } == 0   # Not a NaN
+          expect(event['host']).to eq("test.example.com")
+          expect(event['plugin']).to eq("ping")
+          expect(event['type_instance']).to eq("ping-target.example.com")
+          expect(event['collectd_type']).to eq("ping")
+          expect(event['value']).to eq(0)   # Not a NaN
         end
         counter += 1
       end
-      insist { counter } == 1
+      expect(counter).to eq(1)
     end # it "should replace a NaN with a zero and receive a warning when 'nan_handling' set to warn"
   end # context "Warn on NaN event"
 
@@ -138,15 +156,15 @@ describe LogStash::Codecs::Collectd do
       subject.decode(payload) do |event|
         case counter
         when 0
-          insist { event['host'] } == "test.example.com"
-          insist { event['plugin'] } == "ping"
-          insist { event['type_instance'] } == "ping-target.example.com"
-          insist { event['collectd_type'] } == "ping"
-          insist { event['value'] } == NaN   # NaN
+          expect(event['host']).to eq("test.example.com")
+          expect(event['plugin']).to eq("ping")
+          expect(event['type_instance']).to eq("ping-target.example.com")
+          expect(event['collectd_type']).to eq("ping")
+          expect(event['value']).to eq(NaN)   # NaN
         end
         counter += 1 # Because we're dropping this, it should not increment
       end
-      insist { counter } == 0 # We expect no increment
+      expect(counter).to eq(0) # We expect no increment
     end # it "should drop an event with a NaN value when 'nan_handling' set to drop"
   end # context "Drop NaN event"
 
@@ -168,7 +186,7 @@ describe LogStash::Codecs::Collectd do
         counter += 1
       end
 
-      insist { counter } == 24
+      expect(counter).to eq(24)
     end # it "should parse a correctly signed packet"
 
     it "should not parse an incorrectly signed packet" do
@@ -178,7 +196,7 @@ describe LogStash::Codecs::Collectd do
         counter += 1
       end
 
-      insist { counter } == 0
+      expect(counter).to eq(0)
     end # it "should not parse and incorrectly signed packet"
   end # context "Sign"
 
@@ -195,7 +213,7 @@ describe LogStash::Codecs::Collectd do
         counter += 1
       end
 
-      insist { counter } == 24
+      expect(counter).to eq(24)
     end # it "should parse an encrypted packet"
 
     it "should not parse unencrypted packets when encrypt is configured" do
@@ -205,7 +223,7 @@ describe LogStash::Codecs::Collectd do
         counter += 1
       end
 
-      insist { counter } == 0
+      expect(counter).to eq(0)
     end # it "should not parse unencrypted packets when encrypt is configured"
   end # context "Encrypt"
 end # describe LogStash::Codecs::Collectd

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-collectd
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,20 +28,22 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-devutils
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 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@elastic.co
 executables: []
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE