logstash-input-ganglia 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9027acda85099173a8d1521296246995c5103b9
-  data.tar.gz: 385006fcdaa7132e9fe0c020abc87fa4262a7b7e
+  metadata.gz: e71cd4eb2c312f38f6a9cdd424a1b40eaa104095
+  data.tar.gz: 8ce6c1eace0180133fe1408b4267224447e1e835
 SHA512:
-  metadata.gz: 986725b977be118d1b6f74d382a54d73a09413556265d9c27a725df05f5428a081f955bf1b1d07cee861c6e0e9bb87cbcd1d6d1c5c2bb9cec0a6244c31cc9bb9
-  data.tar.gz: 5313d4148b54340acca0a544381fee6c9f1c8cb529ff344e296d5deeeae82ec97a63e5932544f2b788995674f614b4e4e1f64c4259e7c7f063b1d4dae5ea3ddb
+  metadata.gz: e201136446763096ad428755dbf2896ec589d7ce5ede7bdac752a513efd5dc1e2963c4baa63ea267667afda2267b21ca1e712491b3f158e883d5e5067eda5517
+  data.tar.gz: abb1831b01ad5fa9206a10daa9c64c71dcb1ac98a4b64b93a8e957adb470e7a4e3d9abffb76314850a172a1c165aa331d91cd421700677781adf093597f74010

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.0
+  - Store the name and value of ganglia metrics
+
 ## 3.0.2
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 

data/lib/logstash/inputs/ganglia.rb

@@ -111,8 +111,9 @@ class LogStash::Inputs::Ganglia < LogStash::Inputs::Base
 
       # Check if it was a valid data request
       return nil unless data
-      props={ "program" => "ganglia", "log_host" => data["hostname"] }
-      %w{dmax tmax slope type units}.each do |info|
+      props={ "program" => "ganglia", "log_host" => data["hostname"],
+              "val" => data["val"] }
+      %w{dmax tmax slope type units name}.each do |info|
         props[info] = @metadata[data["name"]][info]
       end
       return LogStash::Event.new(props)

data/lib/logstash/inputs/ganglia/gmondpacket.rb

@@ -20,12 +20,22 @@ class GmonPacket
     case type
     when 128
       @type=:meta
+	when 129
+      @type=:ushort
+    when 130
+      @type=:short
+    when 131
+      @type=:int
     when 132
-      @type=:heartbeat
-    when 133..134
-      @type=:data
+      @type=:uint
+    when 133
+      @type=:string
+    when 134
+      @type=:float
     when 135
-      @type=:gexec
+      @type=:double
+    when 136
+      @type=:meta_request
     else
       @type=:unknown
     end
@@ -36,7 +46,7 @@ class GmonPacket
   end
 
   def data?
-    @type == :data
+    [:ushort, :short, :int, :uint, :string, :float, :double].include? @type
   end
 
   def meta?
@@ -94,15 +104,7 @@ class GmonPacket
     data['spoof']=@xdr.uint32
     data['format']=@xdr.string
 
-    metrictype=name_to_type(metricname,metadata)
-
-    if metrictype.nil?
-      # Probably we got a data packet before a metadata packet
-      #puts "Received datapacket without metadata packet"
-      return nil
-    end
-
-    data['val']=parse_value(metrictype)
+    data['val']=parse_value(@type)
 
     # If we received a packet, last update was 0 time ago
     data['tn']=0
@@ -114,19 +116,19 @@ class GmonPacket
   def parse_value(type)
     value=:unknown
     case type
-    when "int16"
+    when :short
       value=@xdr.int16
-    when "uint16"
+    when :ushort
       value=@xdr.uint16
-    when "uint32"
-      value=@xdr.uint32
-    when "int32"
+    when :int
       value=@xdr.int32
-    when "float"
+    when :uint
+      value=@xdr.uint32
+    when :float
       value=@xdr.float32
-    when "double"
+    when :double
       value=@xdr.float64
-    when "string"
+    when :string
       value=@xdr.string
     else
       #puts "Received unknown type #{type}"
@@ -134,13 +136,4 @@ class GmonPacket
     return value
   end
 
-  # Does lookup of metricname in metadata table to find the correct type
-  def name_to_type(name,metadata)
-    # Lookup this metric metadata
-    meta=metadata[name]
-    return nil if meta.nil?
-
-    return meta['type']
-  end
-
 end

data/logstash-input-ganglia.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-ganglia'
-  s.version         = '3.0.2'
+  s.version         = '3.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read ganglia packets from the network via udp"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/ganglia_spec.rb

@@ -61,5 +61,16 @@ describe LogStash::Inputs::Ganglia do
       expect(event.get("tmax")).to eq(60)
     end
 
+    it "should receive the correct data type" do
+      expect(event.get("type")).to eq('uint8')
+    end
+
+    it "should receive the name" do
+      expect(event.get("name")).to eq('pageviews')
+    end
+
+    it "should receive the value" do
+      expect(event.get("val")).to eq('7000')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-ganglia
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Read ganglia packets from the network via udp