logstash-codec-collectd 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322604cfe191bf4f20131a1c189d28487c4076b3
-  data.tar.gz: 38cd8905eeb1f231ab883e123374af6bb0fb2cbf
+  metadata.gz: decc3be655939a06a907407677c23e75286dd70b
+  data.tar.gz: 7df39f00db930c448f03679e8dac5a3e18476cc3
 SHA512:
-  metadata.gz: 1f5b7aaba18ec50b81cbb8a810b81c13a7cb554ec8b6708dc62c402c78277ccb7ab14b9fb9c22809c2d93bd49360c769d05633f5db44d40513293118d101e64c
-  data.tar.gz: afebec996e0a9ee6e467815b11e538af6ed382a18b11f98ade55ec87829b79249a744b19c36d0ebe8a3b342e32c4ea964f25dff7f249abb183c39f4770f27564
+  metadata.gz: eadab78a1e9ed8c9ebdeaf64f123b8a534829f09aaf1273f53eb8b5e4c75fefda80111bfe6948ad3f9d196138b6817a8f2cff4d5a6c5b325ee411843d7c39cb2
+  data.tar.gz: 6a723a6cb8c4d37f34e377ff5e0dc6f7435c5ddbcb0182f7977a054ece840d19fb4b32c93d5b7c5a4daaabd7b06e609ba00e650f800bf844645702120ec0a15e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.4
+  - Make this plugins compatible with JRuby 9 by using the OpenSSL::HMAC class and keep it backward compatible with JRuby 1.7.25 (Issue #24)
+
 ## 3.0.3
   - Fix log levels
 

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in logstash-mass_effect.gemspec
 gemspec
+
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
+
+if Dir.exist?(logstash_path) && use_logstash_source
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end

data/docs/index.asciidoc

@@ -0,0 +1,147 @@
+:plugin: collectd
+:type: codec
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}-{plugin}"]
+
+=== Collectd
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+Read events from the collectd binary protocol over the network via udp.
+See https://collectd.org/wiki/index.php/Binary_protocol
+
+Configuration in your Logstash configuration file can be as simple as:
+[source,ruby]
+    input {
+      udp {
+        port => 25826
+        buffer_size => 1452
+        codec => collectd { }
+      }
+    }
+
+A sample `collectd.conf` to send to Logstash might be:
+[source,xml]
+    Hostname    "host.example.com"
+    LoadPlugin interface
+    LoadPlugin load
+    LoadPlugin memory
+    LoadPlugin network
+    <Plugin interface>
+        Interface "eth0"
+        IgnoreSelected false
+    </Plugin>
+    <Plugin network>
+        <Server "10.0.0.1" "25826">
+        </Server>
+    </Plugin>
+
+Be sure to replace `10.0.0.1` with the IP of your Logstash instance.
+
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Collectd Codec Configuration Options
+
+This plugin supports the following configuration options plus the <<plugins-{type}s-common-options>> described later.
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-authfile>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-nan_handling>> |<<string,string>>, one of `["change_value", "warn", "drop"]`|No
+| <<plugins-{type}s-{plugin}-nan_tag>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-nan_value>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-prune_intervals>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-security_level>> |<<string,string>>, one of `["None", "Sign", "Encrypt"]`|No
+| <<plugins-{type}s-{plugin}-typesdb>> |<<array,array>>|No
+|=======================================================================
+
+Also see <<plugins-{type}s-common-options>> for a list of options supported by all
+codec plugins.
+
+&nbsp;
+
+[id="plugins-{type}s-{plugin}-authfile"]
+===== `authfile` 
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+
+Path to the authentication file. This file should have the same format as
+the http://collectd.org/documentation/manpages/collectd.conf.5.shtml#authfile_filename[AuthFile]
+in collectd. You only need to set this option if the `security_level` is set to
+`Sign` or `Encrypt`
+
+[id="plugins-{type}s-{plugin}-nan_handling"]
+===== `nan_handling` 
+
+  * Value can be any of: `change_value`, `warn`, `drop`
+  * Default value is `"change_value"`
+
+What to do when a value in the event is `NaN` (Not a Number)
+
+- change_value (default): Change the `NaN` to the value of the nan_value option and add `nan_tag` as a tag
+- warn: Change the `NaN` to the value of the nan_value option, print a warning to the log and add `nan_tag` as a tag
+- drop: Drop the event containing the `NaN` (this only drops the single event, not the whole packet)
+
+[id="plugins-{type}s-{plugin}-nan_tag"]
+===== `nan_tag` 
+
+  * Value type is <<string,string>>
+  * Default value is `"_collectdNaN"`
+
+The tag to add to the event if a `NaN` value was found
+Set this to an empty string ('') if you don't want to tag
+
+[id="plugins-{type}s-{plugin}-nan_value"]
+===== `nan_value` 
+
+  * Value type is <<number,number>>
+  * Default value is `0`
+
+Only relevant when `nan_handeling` is set to `change_value`
+Change NaN to this configured value
+
+[id="plugins-{type}s-{plugin}-prune_intervals"]
+===== `prune_intervals` 
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `true`
+
+Prune interval records.  Defaults to `true`.
+
+[id="plugins-{type}s-{plugin}-security_level"]
+===== `security_level` 
+
+  * Value can be any of: `None`, `Sign`, `Encrypt`
+  * Default value is `"None"`
+
+Security Level. Default is `None`. This setting mirrors the setting from the
+collectd https://collectd.org/wiki/index.php/Plugin:Network[Network plugin]
+
+[id="plugins-{type}s-{plugin}-typesdb"]
+===== `typesdb` 
+
+  * Value type is <<array,array>>
+  * There is no default value for this setting.
+
+File path(s) to collectd `types.db` to use.
+The last matching pattern wins if you have identical pattern names in multiple files.
+If no types.db is provided the included `types.db` will be used (currently 5.4.0).
+
+
+
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash/codecs/collectd.rb

@@ -6,6 +6,8 @@ require "logstash/errors"
 require "tempfile"
 require "time"
 
+import "javax.crypto.Mac"
+
 class ProtocolError < LogStash::Error; end
 class HeaderError < LogStash::Error; end
 class EncryptionError < LogStash::Error; end
@@ -339,10 +341,29 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
 
     key = get_key(user)
     return false if key.nil?
-
-    return Digest::HMAC.digest(user+payload, key, Digest::SHA256) == signature
+    return digest(user, payload, key) == signature
   end # def verify_signature
 
+  private
+  def digest_ruby19(user, payload, key)
+    Digest::HMAC.digest(user+payload, key , Digest::SHA256)
+  end
+
+  private
+  def digest_ruby20(user, payload, key)
+    OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), key, user+payload)
+  end
+
+  def self.ruby_19?
+    RUBY_VERSION == "1.9.3"
+  end
+
+  if ruby_19?
+    alias_method :digest, :digest_ruby19
+  else
+    alias_method :digest, :digest_ruby20
+  end
+
   private
   def decrypt_packet(user, iv, content)
     # Content has to have at least a SHA1 hash (20 bytes), a header (4 bytes) and

data/logstash-codec-collectd.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
-
   s.name            = 'logstash-codec-collectd'
-  s.version         = '3.0.3'
+  s.version         = '3.0.4'
   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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-collectd
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -56,10 +56,10 @@ files:
 - LICENSE
 - NOTICE.TXT
 - README.md
+- docs/index.asciidoc
 - lib/logstash/codecs/collectd.rb
 - logstash-codec-collectd.gemspec
 - spec/codecs/collectd_spec.rb
-- vendor/types.db
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)

data/vendor/types.db

@@ -1,208 +0,0 @@
-absolute		value:ABSOLUTE:0:U
-apache_bytes		value:DERIVE:0:U
-apache_connections	value:GAUGE:0:65535
-apache_idle_workers	value:GAUGE:0:65535
-apache_requests		value:DERIVE:0:U
-apache_scoreboard	value:GAUGE:0:65535
-ath_nodes		value:GAUGE:0:65535
-ath_stat		value:DERIVE:0:U
-backends		value:GAUGE:0:65535
-bitrate			value:GAUGE:0:4294967295
-bytes			value:GAUGE:0:U
-cache_eviction		value:DERIVE:0:U
-cache_operation		value:DERIVE:0:U
-cache_ratio		value:GAUGE:0:100
-cache_result		value:DERIVE:0:U
-cache_size		value:GAUGE:0:4294967295
-charge			value:GAUGE:0:U
-compression_ratio	value:GAUGE:0:2
-compression		uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
-connections		value:DERIVE:0:U
-conntrack		value:GAUGE:0:4294967295
-contextswitch		value:DERIVE:0:U
-counter			value:COUNTER:U:U
-cpufreq			value:GAUGE:0:U
-cpu			value:DERIVE:0:U
-current_connections	value:GAUGE:0:U
-current_sessions	value:GAUGE:0:U
-current			value:GAUGE:U:U
-delay			value:GAUGE:-1000000:1000000
-derive			value:DERIVE:0:U
-df_complex		value:GAUGE:0:U
-df_inodes		value:GAUGE:0:U
-df			used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
-disk_latency		read:GAUGE:0:U, write:GAUGE:0:U
-disk_merged		read:DERIVE:0:U, write:DERIVE:0:U
-disk_octets		read:DERIVE:0:U, write:DERIVE:0:U
-disk_ops_complex	value:DERIVE:0:U
-disk_ops		read:DERIVE:0:U, write:DERIVE:0:U
-disk_time		read:DERIVE:0:U, write:DERIVE:0:U
-dns_answer		value:DERIVE:0:U
-dns_notify		value:DERIVE:0:U
-dns_octets		queries:DERIVE:0:U, responses:DERIVE:0:U
-dns_opcode		value:DERIVE:0:U
-dns_qtype_cached	value:GAUGE:0:4294967295
-dns_qtype		value:DERIVE:0:U
-dns_query		value:DERIVE:0:U
-dns_question		value:DERIVE:0:U
-dns_rcode		value:DERIVE:0:U
-dns_reject		value:DERIVE:0:U
-dns_request		value:DERIVE:0:U
-dns_resolver		value:DERIVE:0:U
-dns_response		value:DERIVE:0:U
-dns_transfer		value:DERIVE:0:U
-dns_update		value:DERIVE:0:U
-dns_zops		value:DERIVE:0:U
-duration		seconds:GAUGE:0:U
-email_check		value:GAUGE:0:U
-email_count		value:GAUGE:0:U
-email_size		value:GAUGE:0:U
-entropy			value:GAUGE:0:4294967295
-fanspeed		value:GAUGE:0:U
-file_size		value:GAUGE:0:U
-files			value:GAUGE:0:U
-fork_rate		value:DERIVE:0:U
-frequency_offset	value:GAUGE:-1000000:1000000
-frequency		value:GAUGE:0:U
-fscache_stat		value:DERIVE:0:U
-gauge			value:GAUGE:U:U
-hash_collisions		value:DERIVE:0:U
-http_request_methods	value:DERIVE:0:U
-http_requests		value:DERIVE:0:U
-http_response_codes	value:DERIVE:0:U
-humidity		value:GAUGE:0:100
-if_collisions		value:DERIVE:0:U
-if_dropped		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_errors		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_multicast		value:DERIVE:0:U
-if_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_rx_errors		value:DERIVE:0:U
-if_rx_octets		value:DERIVE:0:U
-if_tx_errors		value:DERIVE:0:U
-if_tx_octets		value:DERIVE:0:U
-invocations		value:DERIVE:0:U
-io_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-io_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
-ipt_bytes		value:DERIVE:0:U
-ipt_packets		value:DERIVE:0:U
-irq			value:DERIVE:0:U
-latency			value:GAUGE:0:U
-links			value:GAUGE:0:U
-load			shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
-md_disks		value:GAUGE:0:U
-memcached_command	value:DERIVE:0:U
-memcached_connections	value:GAUGE:0:U
-memcached_items		value:GAUGE:0:U
-memcached_octets	rx:DERIVE:0:U, tx:DERIVE:0:U
-memcached_ops		value:DERIVE:0:U
-memory			value:GAUGE:0:281474976710656
-multimeter		value:GAUGE:U:U
-mutex_operations	value:DERIVE:0:U
-mysql_commands		value:DERIVE:0:U
-mysql_handler		value:DERIVE:0:U
-mysql_locks		value:DERIVE:0:U
-mysql_log_position	value:DERIVE:0:U
-mysql_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-nfs_procedure		value:DERIVE:0:U
-nginx_connections	value:GAUGE:0:U
-nginx_requests		value:DERIVE:0:U
-node_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-node_rssi		value:GAUGE:0:255
-node_stat		value:DERIVE:0:U
-node_tx_rate		value:GAUGE:0:127
-objects			value:GAUGE:0:U
-operations		value:DERIVE:0:U
-percent			value:GAUGE:0:100.1
-percent_bytes		value:GAUGE:0:100.1
-percent_inodes		value:GAUGE:0:100.1
-pf_counters		value:DERIVE:0:U
-pf_limits		value:DERIVE:0:U
-pf_source		value:DERIVE:0:U
-pf_states		value:GAUGE:0:U
-pf_state		value:DERIVE:0:U
-pg_blks			value:DERIVE:0:U
-pg_db_size		value:GAUGE:0:U
-pg_n_tup_c		value:DERIVE:0:U
-pg_n_tup_g		value:GAUGE:0:U
-pg_numbackends		value:GAUGE:0:U
-pg_scan			value:DERIVE:0:U
-pg_xact			value:DERIVE:0:U
-ping_droprate		value:GAUGE:0:100
-ping_stddev		value:GAUGE:0:65535
-ping			value:GAUGE:0:65535
-players			value:GAUGE:0:1000000
-power			value:GAUGE:0:U
-protocol_counter	value:DERIVE:0:U
-ps_code			value:GAUGE:0:9223372036854775807
-ps_count		processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
-ps_cputime		user:DERIVE:0:U, syst:DERIVE:0:U
-ps_data			value:GAUGE:0:9223372036854775807
-ps_disk_octets		read:DERIVE:0:U, write:DERIVE:0:U
-ps_disk_ops		read:DERIVE:0:U, write:DERIVE:0:U
-ps_pagefaults		minflt:DERIVE:0:U, majflt:DERIVE:0:U
-ps_rss			value:GAUGE:0:9223372036854775807
-ps_stacksize		value:GAUGE:0:9223372036854775807
-ps_state		value:GAUGE:0:65535
-ps_vm			value:GAUGE:0:9223372036854775807
-queue_length		value:GAUGE:0:U
-records			value:GAUGE:0:U
-requests		value:GAUGE:0:U
-response_time		value:GAUGE:0:U
-response_code		value:GAUGE:0:U
-route_etx		value:GAUGE:0:U
-route_metric		value:GAUGE:0:U
-routes			value:GAUGE:0:U
-serial_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-signal_noise		value:GAUGE:U:0
-signal_power		value:GAUGE:U:0
-signal_quality		value:GAUGE:0:U
-snr			value:GAUGE:0:U
-spam_check		value:GAUGE:0:U
-spam_score		value:GAUGE:U:U
-spl			value:GAUGE:U:U
-swap_io			value:DERIVE:0:U
-swap			value:GAUGE:0:1099511627776
-tcp_connections		value:GAUGE:0:4294967295
-temperature		value:GAUGE:U:U
-threads			value:GAUGE:0:U
-time_dispersion		value:GAUGE:-1000000:1000000
-timeleft		value:GAUGE:0:U
-time_offset		value:GAUGE:-1000000:1000000
-total_bytes		value:DERIVE:0:U
-total_connections	value:DERIVE:0:U
-total_objects		value:DERIVE:0:U
-total_operations	value:DERIVE:0:U
-total_requests		value:DERIVE:0:U
-total_sessions		value:DERIVE:0:U
-total_threads		value:DERIVE:0:U
-total_time_in_ms	value:DERIVE:0:U
-total_values		value:DERIVE:0:U
-uptime			value:GAUGE:0:4294967295
-users			value:GAUGE:0:65535
-vcl			value:GAUGE:0:65535
-vcpu			value:GAUGE:0:U
-virt_cpu_total		value:DERIVE:0:U
-virt_vcpu		value:DERIVE:0:U
-vmpage_action		value:DERIVE:0:U
-vmpage_faults		minflt:DERIVE:0:U, majflt:DERIVE:0:U
-vmpage_io		in:DERIVE:0:U, out:DERIVE:0:U
-vmpage_number		value:GAUGE:0:4294967295
-volatile_changes	value:GAUGE:0:U
-voltage_threshold	value:GAUGE:U:U, threshold:GAUGE:U:U
-voltage			value:GAUGE:U:U
-vs_memory		value:GAUGE:0:9223372036854775807
-vs_processes		value:GAUGE:0:65535
-vs_threads		value:GAUGE:0:65535
-
-#
-# Legacy types
-# (required for the v5 upgrade target)
-#
-arc_counts		demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U
-arc_l2_bytes		read:COUNTER:0:U, write:COUNTER:0:U
-arc_l2_size		value:GAUGE:0:U
-arc_ratio		value:GAUGE:0:U
-arc_size		current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
-mysql_qcache		hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
-mysql_threads		running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U