sensu-plugins-snmp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 981861f0c8c4d1c6224b22f085bd38ab3171336c
-  data.tar.gz: e9305f8fb476d104625eb2e2fbaaaf61c1490e46
+  metadata.gz: 0a3dc5871ee186fb00adf69e1ed79a306018c466
+  data.tar.gz: 0c1a1146ccafb8deeb21ab3a8248cb2f73b48064
 SHA512:
-  metadata.gz: 058efc26776dbd20c0bb79b2c882ab34f442d824d858bc43a324ef3b631fd81c573903f65ab44c42ceea9ecedc74174d9fce198c616a4cbb92bb544da27c6bab
-  data.tar.gz: 0958889fb4dd9a7f80bb307db5d7f148d2a3105b94cbc8a445eac0b2bbd49867368b76e24a70464cf286b751cb86bdf62d5783792b64ac07a65debad63fca112
+  metadata.gz: c7484dd3e1342151d2180a042a04c984de7f8f7eeb48fbbc14b0323f420cf42821e3d1d40b501d881b35c30da78da2865155233740940d55afd54ad371a5e4af
+  data.tar.gz: 88d7c8bc2ab442e2b5d8c3432ee1db436a53d2fa4eddad1e13d1c84994c1fb644405e695d4e426f0aa4181dee3a1cad2e6f233b1082a0fae521699b07873856c

data/CHANGELOG.md

@@ -3,7 +3,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased][unreleased]
+## [0.0.4] - 2015-07-22
+### Fixed
+- Fixed graphite output when using a prefix in metrics-snmp-bulk.rb
+
+### Added
+- Made suffix an optional flag in metrics-snmp-bulk.rb so you can choose exactly how to format your metrics output
 
 ## [0.0.3] - 2015-07-14
 ### Changed

data/bin/check-snmp.rb

@@ -5,14 +5,16 @@
 # This is a simple SNMP check script for Sensu, We need to supply details like
 # Server, port, SNMP community, and Limits
 #
-#
-# Requires SNMP gem
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: snmp
 #
 # USAGE:
 #
 #   check-snmp -h host -C community -O oid -w warning -c critical
 #   check-snmp -h host -C community -O oid -m "(P|p)attern to match\.?"
 #
+# LICENSE:
 #
 #  Author Deepak Mohan Das   <deepakmdass88@gmail.com>
 #

data/bin/metrics-snmp-bulk.rb

@@ -4,13 +4,15 @@
 #
 # This is a script to 'bulk walk' an SNMP OID value, collecting metrics
 #
-#
-# Requires SNMP gem
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: snmp
 #
 # USAGE:
 #
-#   snmp-bulk-metrics -h host -C community -O oid1,oid2... -s suffix
+#   snmp-bulk-metrics -h host -C community -O oid1,oid2...
 #
+# LICENSE:
 #   Copyright 2014 Matthew Richardson <m.richardson@ed.ac.uk>
 #   Based on snmp-metrics.rb by Double Negative Limited
 #
@@ -44,8 +46,7 @@ class SNMPGraphite < Sensu::Plugin::Metric::CLI::Graphite
 
   option :suffix,
          short: '-s suffix',
-         description: 'suffix to attach to graphite path',
-         required: true
+         description: 'suffix to attach to graphite path'
 
   option :snmp_version,
          short: '-v version',
@@ -104,13 +105,13 @@ class SNMPGraphite < Sensu::Plugin::Metric::CLI::Graphite
       name = vb.oid
       name = "#{name}".gsub('.', '_') if config[:graphite]
       begin
-        if config[:prefix]
-          output "#{config[:prefix]}.#{config[:host]}.#{config[:suffix]}.#{name}", value.to_f
-        else
-          output "#{config[:host]}.#{config[:suffix]}.#{name}", vb.value.to_f
-        end
+        metric_string = config[:host]
+        metric_string = "#{config[:prefix]}.#{metric_string}" if config[:prefix]
+        metric_string += ".#{config[:suffix]}" if config[:suffix]
+        metric_string += ".#{name}"
+        output metric_string, vb.value.to_f
       rescue NameError # rubocop:disable all
-        # Some values may fail to cast to float
+        # Rescue as some values may fail to cast to float
       end
     end
     manager.close

data/bin/metrics-snmp-if.rb

@@ -8,8 +8,11 @@
 # modern devices probably support. If there is no HC support, use --low-capacity
 # flag.
 #
-# Example
-# -------
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: snmp
+#
+# USAGE:
 #
 #   snmp-if-metrics.rb -C community -h host
 #
@@ -27,12 +30,12 @@
 # - `--version`: Set SNMP protocol version (SNMPv2c or SNMPv1)
 # - `--low-capacity`: Use low capacity counters
 #
+# LICENSE:
 # Copyright (c) 2013 Joe Miller
 #
 # Released under the same terms as Sensu (the MIT license); see LICENSE
 # for details.
 
-# #YELLOW
 # rubocop:disable VariableName
 require 'sensu-plugin/metric/cli'
 require 'snmp'

data/bin/metrics-snmp.rb

@@ -4,13 +4,15 @@
 #
 # This is a simple script to collect metrics from a SNMP OID value
 #
-#
-# Requires SNMP gem
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: snmp
 #
 # USAGE:
 #
 #   check-snmp -h host -C community -O oid -p prefix -s suffix
 #
+# LICENSE:
 #   Copyright (c) 2013 Double Negative Limited
 #   Based on check-snmp.rb by Deepak Mohan Das   <deepakmdass88@gmail.com>
 #

data/lib/sensu-plugins-snmp/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsSnmp
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-snmp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement