sensu-plugins-network-interface 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0446a7dd7f1d1ebe7c99ef64461fe99d29b7e6dc
-  data.tar.gz: 97214fefb73a8065427e23a5902d5f19b1cf8612
+  metadata.gz: 6d9e84f5b75b04e750ead82a8a08c0c3cdfe0ab8
+  data.tar.gz: af09ac9b9ca0d549dbb3268c108bda97e9a2921d
 SHA512:
-  metadata.gz: e816415a4439578058b85404bcf4b354aff2b84cb2f7cebba417a56ee65099a7aac8577c34567bad33a1299a6e5b487e995e95bf2e84d23e236a84bb0a2abce3
-  data.tar.gz: c7c4b32e8557f88054315b6dd97d01eb2ed152470e68afa82580db9d08417b0c51a1b787400b2dccd14c3aa7355e83c3960f4525b8ed7984c5cdef9443f63e00
+  metadata.gz: fe09233e33eee94126c28325a62c48826d9b646a8a837a48ded12a0bd60209563dff0168c2b068b17bb7ac4223a87fe0c082d502dac8b7ed56c14fdb98a3df68
+  data.tar.gz: 16e9b95bfcda64244c7b83784214c92bb90c4200188c049b4cbea295af59cf9c316a04dbde045609f9b935dd8d79e362e8df8fdc407bf325682cfe76dc46b9cc

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.1.9] - 2016-01-07
+### Added
+- Also monitor interfaces that are configured via the ifcfg config files.
+
 ## [0.1.8] - 2015-12-29
 ### Added
 - Adding long options

data/README.md

@@ -13,18 +13,22 @@ The plugin accepts command line options to specify things like expected mtu, spe
 Usage: check-network-interface.rb (options)
         --carrier <STATE>            Indicates the current physical link state of the interface (default: up)
     -c, --config <PATH>              Optional configuration file (default: ./network-interface.json)
+        --dryrun                     Do not send events to sensu client socket
     -d, --duplex <STATE>             Check interface duplex settings (default: full)
-    -x <INTERFACES>                  Comma separated list of interfaces to ignore
-    -i <INTERFACES>                  Comma separated list of interfaces to check (default: ALL)
+    -x <INTERFACES>,                 Comma separated list of interfaces to ignore
+        --ignore-interface
+    -i, --interface <INTERFACES>     Comma separated list of interfaces to check (default: ALL)
     -m, --mtu <MTU>                  Message Transfer Unit
         --operstate <STATE>          Indicates the interface RFC2863 operational state (default: up)
-    -X <INTERFACES>                  Comma separated list of Interfaces to ignore (regex)
-    -I <INTERFACES>                  Comma separated list of interfaces to check (regex)
     -s, --speed <SPEED>              Expected speed in Mb/s
     -t, --txqueuelen <TXQUEUELEN>    Transmit Queue Length
     -w, --warn                       Warn instead of throwing a critical failure
 ```
 
+The --interface and --ignore-interface parameters can also accept regular expressions.
+
+When no interface is specified, the plugin will monitor all interfaces that are found under /sys/class/net as well as those set up under /etc/sysconfig/network-scripts/ifcfg-\*.
+
 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.
 

data/bin/check-network-interface.rb

@@ -17,13 +17,6 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
          :proc => proc { |a| a.split(',') },
          :default => []
 
-  option :interface_regex,
-         :description => "Comma separated list of interfaces to check (regex)",
-         :short => "-I <INTERFACES>",
-         :long => "--interface-regex <INTERFACES>",
-         :proc => proc { |a| a.split(',') },
-         :default => []
-
   option :ignore_interface,
          :description => "Comma separated list of interfaces to ignore",
          :short => "-x <INTERFACES>",
@@ -31,13 +24,6 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
          :proc => proc { |a| a.split(',') },
          :default => []
 
-  option :ignore_interface_regex,
-         :description => "Comma separated list of Interfaces to ignore (regex)",
-         :short => "-X <INTERFACES>",
-         :long => "--ignore-interface-regex <INTERFACES>",
-         :proc => proc { |a| a.split(',') },
-         :default => []
-
   option :config_file,
          :description => "Optional configuration file (default: #{File.dirname(__FILE__)}/network-interface.json)",
          :short => "-c <PATH>",
@@ -88,21 +74,24 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
          :description => "Warn instead of throwing a critical failure",
          :short => "-w",
          :long => "--warn",
-         :boolean => false
+         :boolean => true,
+         :default => false
+
+  option :dryrun,
+         :description => "Do not send events to sensu client socket",
+         :long => "--dryrun",
+         :boolean => true,
+         :default => false
 
   def initialize()
     super
 
     @interfaces = []
-    find_interfaces().each do |interface|
+    find_interfaces().each do |intf|
       if config[:ignore_interface].size > 0
-        next if config[:ignore_interface].include?(interface)
-      end
-
-      if config[:ignore_interface_regex].size > 0
         b = false
-        config[:ignore_interface_regex].each do |ignore_interface|
-          if interface =~ Regexp.new(ignore_interface)
+        config[:ignore_interface].each do |ignore_interface|
+          if intf.match(ignore_interface)
             b = true
             break
           end
@@ -111,13 +100,9 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
       end
 
       if config[:interface].size > 0
-        next unless config[:interface].include?(interface)
-      end
-
-      if config[:interface_regex].size > 0
         b = true
-        config[:interface_regex].each do |interface_regex|
-          if interface =~ Regexp.new(interface_regex)
+        config[:interface].each do |interface|
+          if intf.match(interface)
             b = false
             break
           end
@@ -125,18 +110,31 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
         next if b
       end
 
-      @interfaces << interface
+      @interfaces << intf
     end
 
     @json_config = {}
     if File.exists?(config[:config_file])
       @json_config = JSON.parse(File.read(config[:config_file]))
     end
+
+    @ifcfg_dir = nil
+    # RHEL
+    if File.directory?("/etc/sysconfig/network-scripts")
+      @ifcfg_dir = "/etc/sysconfig/network-scripts"
+    # SuSE
+    elsif File.directory?("/etc/sysconfig/network")
+      @ifcfg_dir = "/etc/sysconfig/network"
+    end
   end
 
   def send_client_socket(data)
-    sock = UDPSocket.new
-    sock.send(data + "\n", 0, "127.0.0.1", 3030)
+    if config[:dryrun]
+      puts data.inspect
+    else
+      sock = UDPSocket.new
+      sock.send(data + "\n", 0, "127.0.0.1", 3030)
+    end
   end
 
   def send_ok(check_name, msg)
@@ -160,7 +158,15 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
   end
 
   def find_interfaces()
-    Dir["/sys/class/net/*"].select { |i| File.symlink?(i) }.map { |i| File.basename(i) }.reject { |i| i =~ /^lo/ or i =~ /^dummy/ }
+    interfaces = Dir["/sys/class/net/*"].select { |i| File.symlink?(i) }.map { |i| File.basename(i) }.reject { |i| i =~ /^lo/ or i =~ /^dummy/ }
+
+    if @ifcfg_dir
+      Dir[@ifcfg_dir + "/ifcfg-*"].map { |i| File.basename(i) }.reject { |i| i =~ /-lo.*$/ or i =~ /^-range.*$/ }.each do |cfg|
+        content = File.read(@ifcfg_dir + "/" + cfg)
+        device = content[/^DEVICE=(.*)/, 1]
+        interfaces << device unless interfaces.include?(device)
+      end
+    end
   end
 
   def get_info(interface)
@@ -202,12 +208,10 @@ class CheckNetworkInterface < Sensu::Plugin::Check::CLI
     @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}"
+      if @ifcfg_dir
+        if File.exists?("#{@ifcfg_dir}/ifcfg-#{interface}")
+          ifcfg = "#{@ifcfg_dir}/ifcfg-#{interface}"
+        end
       end
 
       interface_config = {}

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

@@ -2,7 +2,7 @@ module SensuPluginsNetworkInterface
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 8
+    PATCH = 9
 
     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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin