logstash-output-opennms 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c165a76106a883993225957e07688745f3339cb3
-  data.tar.gz: 1ef23846b764564b5ec6b71a61de0547b656bae1
+  metadata.gz: 51fed44322cd1297e543aa0945ea75f31b26fdda
+  data.tar.gz: f6f286dca3e3f7ef6a5c9d4311db4c63caee7b66
 SHA512:
-  metadata.gz: 8f4b75b3881e3bf71c14c1589fd4c448c1f062ea7e8782cc31a0bb1e0eb72cd049dbbf92da4400e7c7059a27e9c5fd1f2af7633b634783b1758b44629f1a0af7
-  data.tar.gz: d1a6baad25139074f2996c3e8adb6721caf2e7e2209191ed9c4db41cfd860a7c76f494ae0cd0e547a78a7d21cdb97fcde8ad627b1b2c27ae5cf3e5b4f049ef47
+  metadata.gz: d0076df93fe41f33b997d4a0b644d88f528fa8121c20cb331a9aa2a6994af9b091513f8b18310610146af4101985dc9ac1d9c96139705cae461a2cca0bdf557b
+  data.tar.gz: 3d3471be7d1f47b2cd695b843bf88abe43b7a30397a7eaa3853469645c8a4eb1785d4734852fb73e281d4b328c03acf75253e1f6b74b6ead01fa78c8f067081b

data/CHANGELOG.md

@@ -1,2 +1,6 @@
-## 1.0.0
-  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
+## 0.1.1
+  - The order for event parms can be defined in the
+    logstash config.
+  - Date/Time format was incorrect. Error was fixed.
+## 0.1.0
+  - Initial version of the logstash-output-opennms.

data/lib/logstash/outputs/opennms.rb

@@ -9,22 +9,8 @@ require "rexml/document"
 # server.  The event `@timestamp` will automatically be associated with the
 # OpenNMS item data.
 #
-# Each "host" is an identifier, and each item is associated with that host.
-# Items are typed on the OpenNMS side.  You can send numbers as strings and
-# OpenNMS will Do The Right Thing.
-#
-# In the OpenNMS UI, ensure that your hostname matches the value referenced by
-# `opennms_host`. Create the item with the key as it appears in the field
-# referenced by `opennms_key`.  In the item configuration window, ensure that the
-# type dropdown is set to OpenNMS Trapper. Also be sure to set the type of
-# information that OpenNMS should expect for this item.
-#
-# This plugin does not currently send in batches.  While it is possible to do
-# so, this is not supported.  Be careful not to flood your OpenNMS server with
-# too many events per second.
-#
-# NOTE: This plugin will log a warning if a necessary field is missing. It will
-# not attempt to resend if OpenNMS is down, but will log an error message.
+# NOTE: This plugin will log a warning if a necessary field is missing. It 
+# will not attempt to resend if OpenNMS is down, but will log an error message.
 
 class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
   config_name "opennms"
@@ -56,7 +42,7 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
   
   # The field name which holds the OpenNMS ... This can be a sub-field of
   # the @metadata field.
-  config :opennms_event_uei, :validate => :string, :default => "uei.opennms.org/logstash"
+  config :opennms_event_uei, :validate => :string, :default => "uei.opennms.org/elastic/logstash/generic/state/1"
   
   # The field name which holds the OpenNMS ... This can be a sub-field of
   # the @metadata field.
@@ -64,7 +50,7 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
   
   # The field name which holds the OpenNMS ... This can be a sub-field of
   # the @metadata field.
-  config :opennms_event_severity, :validate => :number, :required => true, :default => 4
+  config :opennms_event_severity, :validate => :string, :required => true, :default => "Warning"
   
     # The field name which holds the OpenNMS ... This can be a sub-field of
   # the @metadata field.
@@ -81,6 +67,10 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
   # This directive cannot be used in conjunction with the single-value directives
   # `opennms_key` and `opennms_value`.
   config :opennms_event_parms, :validate => :hash
+  
+  # The field name which holds the OpenNMS ... This can be a sub-field of
+  # the @metadata field.
+  config :opennms_event_parms_order, :validate => :array
 
   public
   def register
@@ -141,14 +131,16 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
     props.each do |props_key,props_value|
       if props_value.is_a?(::Hash)
          found[props_key] = validate_props(event,props_value,{})
-      else
+      elsif props_value.is_a?(::Array)
+         found[props_key]=props_value
+	    else
 	     if !event.get(props_value)
-	       @logger.warn("Field referenced by #{props_value} is missing")
-	       found[props_key] = props_value.empty? ? "n/a" : props_value
-	     else
-	       found[props_key]=event.get(props_value)
-	     end
-	  end
+         @logger.warn("Field referenced by #{props_value} is missing")
+         found[props_key] = props_value.empty? ? "n/a" : props_value
+       else
+         found[props_key]=event.get(props_value)
+       end
+      end
     end
     found
   end # def validate_props
@@ -162,12 +154,14 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
     event_doc += "<uei>" + message['uei'] + "</uei>"
     event_doc += "<source>" + message['source'] + "</source>"
     event_doc += "<nodeid>" + message['nodeid'] + "</nodeid>" if !message['nodeid'].empty?
-    event_doc += "<time>" + Time.now.strftime("%A %d %B %Y %H:%M:%S o'clock GMT") + "</time>"
+    event_doc += "<time>" + Time.now.strftime("%A, %d %B %Y %H:%M:%S o'clock GMT") + "</time>"
     event_doc += "<host>" + message['origin'] + "</host>"
     event_doc += "<interface>" + message['interface'] + "</interface>" if !message['interface'].empty?
     event_doc += "<service>" + message ['service'] + "</service>" if !message['service'].empty?
     event_doc += "<parms>"
-    message['parms'].each do |parm_name, parm_value|
+    #message['parms'].each do |parm_name, parm_value|
+    message['parms_order'].each do |parm_name|
+       parm_value = message['parms'][parm_name]
        next if parm_name == 'severity'
        event_doc += "<parm>"
        event_doc += "<parmName><![CDATA[" + parm_name + "]]></parmName>"
@@ -175,7 +169,7 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
        event_doc += "</parm>"
     end
     event_doc += "</parms>"
-    event_doc += "<descr>"    + message['description'] + "</descr>" if !message['description'].empty?
+    #event_doc += "<descr>"    + message['description'] + "</descr>" if !message['description'].empty?
     event_doc += "<logmsg>"   + message['logmsg'] + "</logmsg>" if !message['logmsg'].empty?
     event_doc += "<severity>" + message['severity'] + "</severity>"
     event_doc += "</event>"
@@ -233,8 +227,9 @@ class LogStash::Outputs::OpenNMS < LogStash::Outputs::Base
                     'description' => @opennms_event_description.to_s,
                     'logmsg'      => @opennms_event_logmsg.to_s,
                     'parms'       => @opennms_event_parms,
+                    'parms_order' => @opennms_event_parms_order
     }
-              
+    
     message = validate_props(event,message_map,{})
                  
     #message['parms'].each do |k,v| 

data/logstash-output-opennms.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-opennms'
-  s.version         = '0.1.0'
+  s.version         = '0.1.1'
   s.licenses      = ["Apache License (2.0)"]
   s.summary       = "This output sends a xml document (event) to an OpenNMS server."
   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"
@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency "logstash-codec-plain"
-  s.add_development_dependency "logstash-devutils", ">= 0.0.12"
+  #s.add_development_dependency "logstash-devutils", ">= 0.0.12"
+  s.add_development_dependency "logstash-devutils"
   s.add_development_dependency "logstash-filter-mutate"
   s.add_development_dependency "longshoreman"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-opennms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - schneidermatic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '0'
   name: logstash-devutils
   prerelease: false
   type: :development
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: