sensu-plugins-network-interface 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4fc90cff8cbd8d41fcc836513b63e380a1f0b8b
-  data.tar.gz: 16c08b831f0d14287abf7db42034bb11f24187ca
+  metadata.gz: a9df281e905ea0881d3db6754b1f69db6c56bbcf
+  data.tar.gz: 59f0f9d9f364b74e7406d6e9dddd49af101a9201
 SHA512:
-  metadata.gz: e41795bccea80aba209f0c574ca91f39da7f39567e3af8a3741e464f04e75072c2542e077d7047444a207d02621611848f8e4aab5035b85455f82cdb9951233d
-  data.tar.gz: 4b3a3937c571390f04b1b2b3047c6e0f4c207db20fd53566617a593f37147ece7a91eb094f9b6ade9040d25dccaeee6027b872f025be61befbd3222463fae3c3
+  metadata.gz: e48cdcc0e40760c5a41859fde1638829dddf41484de2c72d6b18aa70d164c9937459b031a5553ef769e8060aca9e55da4a34c23f8aa24e72400d28a1c5672f2b
+  data.tar.gz: 621f255afd3d7b77ac9c08c6bbcf758d54c89d6d58a945db58e22c2a7ab9f36e1a0c0ccbba58eecf71563b2702d8e0d6522e7ddaef93622630f43ad29f186b6c

data/CHANGELOG.md

@@ -5,6 +5,18 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
-## [0.0.1] - 2015-12-28
+## [0.1.4] - 2015-12-29
+### Added
+- Added ifcfg-<interface> support
+
+## [0.1.3] - 2015-12-28
+### Added
+- Requiring json globally
+
+## [0.1.2] - 2015-12-28
+### Added
+- Defaulting @json_config to empty hash
+
+## [0.1.1] - 2015-12-28
 ### Added
 - Initial release

data/README.md

@@ -25,8 +25,8 @@ Usage: check-network-interface.rb (options)
     -w, --warn                       Warn instead of throwing a critical failure
 ```
 
-By default, command line option parameters are global to all interfaces. However, each interface can override the defaults in an optional JSON configuration file which must be placed
-in the same location as the plugin.
+By default, command line option parameters are global to all interfaces. However, each interface can override the defaults either in their ifcfg configuration files (e.g. MTU) or
+in an optional JSON configuration file which must be placed in the same location as the plugin.
 
 JSON example:
 

data/bin/check-network-interface.rb

@@ -16,7 +16,7 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
          :proc => proc { |a| a.split(',') },
          :default => []
 
-  option :rinterface,
+  option :interface_regex,
          :description => "Comma separated list of interfaces to check (regex)",
          :short => "-I <INTERFACES>",
          :proc => proc { |a| a.split(',') },
@@ -28,7 +28,7 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
          :proc => proc { |a| a.split(',') },
          :default => []
 
-  option :rignore_interface,
+  option :ignore_interface_regex,
          :description => "Comma separated list of Interfaces to ignore (regex)",
          :short => "-X <INTERFACES>",
          :proc => proc { |a| a.split(',') },
@@ -95,9 +95,9 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
         next if config[:ignore_interface].include?(interface)
       end
 
-      if config[:rignore_interface].size > 0
+      if config[:ignore_interface_regex].size > 0
         b = false
-        config[:rignore_interface].each do |ignore_interface|
+        config[:ignore_interface_regex].each do |ignore_interface|
           if interface =~ Regexp.new(ignore_interface)
             b = true
             break
@@ -110,10 +110,10 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
         next unless config[:interface].include?(interface)
       end
 
-      if config[:rinterface].size > 0
+      if config[:interface_regex].size > 0
         b = true
-        config[:rinterface].each do |rinterface|
-          if interface =~ Regexp.new(rinterface)
+        config[:interface_regex].each do |interface_regex|
+          if interface =~ Regexp.new(interface_regex)
             b = false
             break
           end
@@ -192,11 +192,45 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
     problems = 0
 
     @interfaces.each do |interface|
+      ifcfg = nil
+
+      # RHEL
+      if File.exists?("/etc/sysconfig/network-scripts/ifcfg-#{interface}")
+        ifcfg = "/etc/sysconfig/network-scripts/ifcfg-#{interface}"
+      # SuSE
+      elsif File.exists?("/etc/sysconfig/network/ifcfg-#{interface}")
+        ifcfg = "/etc/sysconfig/network/ifcfg-#{interface}"
+      end
+
+      interface_config = {}
+      if ifcfg
+        File.read(ifcfg).split("\n").reject { |i| i =~ /^#/ or i =~ /^\s*$/ }.each do |i|
+          k, v = i.split('=')
+          case k
+            when 'mtu', 'txqueuelen'
+              v = v.to_i
+          end
+          interface_config[k] = v
+        end
+      end
+
       get_info(interface).each do |metric, value|
         check_name = "network-interface-#{interface}-#{metric}"
 
         if value != nil
-          if @json_config.has_key?('interfaces') and @json_config['interfaces'].has_key?(interface) and @json_config['interfaces'][interface].has_key?(metric)
+          if interface_config.has_key(metric)
+            if value != interface_config[metric]
+              msg = "Expected #{metric} #{interface_config[metric]} but found #{value} on #{interface}"
+              if config[:warn]
+                send_warning(check_name, msg)
+              else
+                send_critical(check_name, msg)
+              end
+              problems += 1
+            else
+              send_ok(check_name, "Found expected #{metric} (#{interface_config[metric]}) on #{interface}")
+            end
+          elsif @json_config.has_key?('interfaces') and @json_config['interfaces'].has_key?(interface) and @json_config['interfaces'][interface].has_key?(metric)
             if value != @json_config['interfaces'][interface][metric]
               msg = "Expected #{metric} #{@json_config['interfaces'][interface][metric]} but found #{value} on #{interface}"
               if config[:warn]

data/lib/sensu-plugins-network-interface/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-network-interface
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin