dribbled 0.8.2 → 0.9.2

data/lib/dribbled/cli.rb

@@ -15,6 +15,13 @@ module Dribbled
     COMPONENTS = %w(resources)
     DEFAULT_CONFIG_FILE = File.join(ENV['HOME'],"/.senedsa/config")
 
+    STATUS = {
+      :ok       =>  OpenStruct.new({ :num => 0, :str => "OK",       }),
+      :warning  =>  OpenStruct.new({ :num => 1, :str => "WARNING",  }),
+      :critical =>  OpenStruct.new({ :num => 2, :str => "CRITICAL", }),
+      :unknown  =>  OpenStruct.new({ :num => 3, :str => "UNKNOWN"   })
+    }
+
     def initialize(arguments)
       @arguments = arguments
       @whoami = File.basename($PROGRAM_NAME).to_sym
@@ -112,7 +119,7 @@ module Dribbled
       output_message opts, 0 if (@arguments.size == 0 and @whoami != :check_drbd) or @global_options[:HELP]
 
       @action = @whoami == :check_drbd ? :check : @arguments.shift.to_sym
-      raise OptionParser::InvalidArgument, "invalid action #@action" if actions[@action].nil?
+      raise OptionParser::InvalidArgument, "invalid action #{@action}" if actions[@action].nil?
       actions[@action].order!(@arguments)
       case @action
         when :show
@@ -198,8 +205,8 @@ module Dribbled
 
     def run_check
 
-      plugin_output = ""
-      plugin_status = ""
+      output = ''
+      status = :ok
 
       # check for configuration vs running resources
 
@@ -215,41 +222,22 @@ module Dribbled
       # + dstate should be: UpToDate/UpToDate
 
       @drbdset.each do |r,res|
-        next if res.cstate == 'Unconfigured'
-
-        po_cstate = ""
-        po_dstate = ""
-
-        po_cstate = "cs:#{res.cstate}" unless res.cstate == "Connected" and res.in_kernel? and res.in_configuration?
-        po_dstate = "ds:#{res.dstate}" unless res.dstate == "UpToDate/UpToDate" and res.in_kernel? and res.in_configuration?
-
-        unless po_cstate.gsub('cs:','').empty? and po_dstate.gsub('ds:','').empty?
-          if ['SyncSource','SyncTarget','VerifyS','VerifyT','PausedSyncS','PausedSyncT','StandAlone'].include? res.cstate
-            plugin_status = :warning
-            plugin_output += res.percent.nil? ? " #{res.id}:#{po_cstate};#{po_dstate}" : " #{res.id}:#{po_cstate}[#{res.percent}%,#{res.finish}];#{po_dstate}"
-          elsif not res.in_configuration?
-            plugin_status = :warning
-            plugin_output += " #{res.id}[unconfigured]>#{po_cstate}/;#{po_dstate}"
-          else
-            plugin_output += " #{res.id}>#{po_cstate};#{po_dstate}"
-            plugin_status = :critical
-          end
-        end
+        next if res.cs == 'Unconfigured'
+        s,o = res.status
+        output << " #{o}"
+        status = s if STATUS[s].num > STATUS[status].num
       end
 
-      plugin_output = " all DRBD resources Connected, UpToDate/UpToDate" if plugin_output.empty? and plugin_status.empty?
-      plugin_status = :ok if plugin_status.empty?
-
       case @action_options[:monitor]
         when :nagios
           case @action_options[:mode]
             when :active
-              puts "#{plugin_status.to_s.upcase}:#{plugin_output}"
-              exit SendNsca::STATUS[plugin_status]
+              puts "#{status.to_s.upcase}:#{output}"
+              exit SendNsca::STATUS[status]
             when :passive
               sn = SendNsca.new @action_options
               begin
-                sn.send plugin_status, plugin_output
+                sn.send status, output
               rescue SendNsca::SendNscaError => e
                 output_message "send_nsca failed: #{e.message}", 1
               end
@@ -271,7 +259,7 @@ module Dribbled
         loop do
           @drbdset = DrbdSet.new @global_options
           @drbdset.each do |r,resource|
-            if resource.cstate =~ /#{@action_options[:cstate]}/ or resource.dstate =~ /#{@action_options[:dstate]}/ or resource.name == @action_options[:resource]
+            if resource.cs =~ /#{@action_options[:cstate]}/ or resource.ds =~ /#{@action_options[:dstate]}/ or resource.name == @action_options[:resource]
               puts resource
             end
           end

data/lib/dribbled/drbd.rb

@@ -9,8 +9,8 @@ module Dribbled
     attr_reader :resources_cfg_raw, :resources_run_raw
 
     PROCDRBD_VERSION_RE = /^version:\s+(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)\s+\(api:(?<api>\d+)\/proto:(?<proto>[0-9-]+)/
-    PROCDRBD_RESOURCE_RE = /^\s*(?<id>\d+):\s+cs:(?<cstate>[\w\/]+)\s+(st|ro):(?<state>[\w\/]+)\s+ds:(?<dstate>[\w\/]+)\s+/
-    PROCDRBD_URESOURCE_RE = /^\s*(?<id>\d+):\s+cs:(?<cstate>[\w\/]+)/
+    PROCDRBD_RESOURCE_RE = /^\s*(?<id>\d+):\s+cs:(?<cs>[\w\/]+)\s+(st|ro):(?<ro>[\w\/]+)\s+ds:(?<ds>[\w\/]+)\s+/
+    PROCDRBD_URESOURCE_RE = /^\s*(?<id>\d+):\s+cs:(?<cs>[\w\/]+)/
     PROCDRBD_ACTIVITY_RE = /^\s+\[[.>=]+\]\s+(?<activity>[a-z']+):\s+(?<percent>[0-9.]+)%\s+\(\d+\/\d+\)M(finish:\s+(?<finish>[0-9:]+)\s+)*/
     PROCDRBD_ACTIVITY_STATUS_RE = /^\s+finish:\s+(?<finish>[0-9:]+)\s+/
 
@@ -36,7 +36,7 @@ module Dribbled
     end
 
     def version
-      "#@version_major.#@version_minor.#@version_path"
+      "#{@version_major}.#{@version_minor}.#{@version_path}"
     end
 
     protected
@@ -44,7 +44,7 @@ module Dribbled
       def _read_procdrbd(resources_run_src)
         @log.debug "Running configuration source: #{resources_run_src}" unless @log.nil?
         resources_run = {}
-        @resources_run_raw = File.open(resources_run_src,"r") { |f| f.read }
+        @resources_run_raw = File.open(resources_run_src,'r') { |f| f.read }
         r = nil
         @resources_run_raw.each_line do |line|
           if /^\s*(\d+):/.match(line)
@@ -53,11 +53,11 @@ module Dribbled
             resources_run[r].in_kernel = true
             if PROCDRBD_RESOURCE_RE.match(line)
               m = PROCDRBD_RESOURCE_RE.match(line)
-              resources_run[r].cstate = m[:cstate]
-              resources_run[r].state  = m[:state]
-              resources_run[r].dstate = m[:dstate]
+              resources_run[r].cs = m[:cs]
+              resources_run[r].ro  = m[:ro]
+              resources_run[r].ds = m[:ds]
             elsif PROCDRBD_URESOURCE_RE.match(line)
-              resources_run[r].cstate = PROCDRBD_URESOURCE_RE.match(line)[:cstate]
+              resources_run[r].cs = PROCDRBD_URESOURCE_RE.match(line)[:cs]
             end
             @log.debug "  #{resources_run[r].inspect}" unless @log.nil?
           elsif PROCDRBD_ACTIVITY_RE.match(line)
@@ -99,14 +99,14 @@ module Dribbled
           end
           if self[r].nil?
             self[r] = DrbdResource.new r, @hostname
-            self[r].cstate = "StandAlone"
-            self[r].dstate = "DUnknown"
-            self[r].state = "Unknown"
+            self[r].cs = 'StandAlone'
+            self[r].ds = 'DUnknown'
+            self[r].ro = 'Unknown'
           end
           self[r].name = name
           self[r].in_configuration = true
-          @log.debug "    resource: #{r}, state: #{self[r].state}"
-          if self[r].state == 'Primary/Secondary'
+          @log.debug "    resource: #{r}, state: #{self[r].ro}"
+          if self[r].ro == 'Primary/Secondary'
             if hostname == @hostname
               @log.debug "    resource: #{r}, primary"
               self[r].primary[:disk] = disk
@@ -118,7 +118,7 @@ module Dribbled
               self[r].secondary[:device] = device
               self[r].secondary[:hostname] = hostname
             end
-          elsif self[r].state == 'Secondary/Primary' or self[r].state == 'Unknown'
+          elsif self[r].ro == 'Secondary/Primary' or self[r].ro == 'Unknown'
             if hostname == @hostname
               @log.debug "    resource: #{r}, secondary"
               self[r].secondary[:disk] = disk
@@ -138,15 +138,15 @@ module Dribbled
   class DrbdResource
 
     attr_reader :id
-    attr_accessor :name, :cstate, :dstate, :state, :config, :primary, :secondary, :activity, :percent, :finish, :in_kernel, :in_configuration
+    attr_accessor :name, :cs, :ds, :ro, :config, :primary, :secondary, :activity, :percent, :finish, :in_kernel, :in_configuration
 
     def initialize(res,hostname)
       @id = res
       @name = nil
       @config = nil
-      @dstate = nil
-      @cstate = nil
-      @state = nil
+      @ds = nil
+      @cs = nil
+      @ro = nil
       @activity = nil
       @percent = nil
       @finish = nil
@@ -164,11 +164,38 @@ module Dribbled
       @in_configuration
     end
 
-    def to_s
-      ph = @primary[:hostname].gsub(/\.[a-z0-9-]+\.[a-z0-9-]+$/,"") unless @primary[:hostname].nil?
-      sh = @secondary[:hostname].gsub(/\.[a-z0-9-]+\.[a-z0-9-]+$/,"") unless @secondary[:hostname].nil?
+    def status
+      s = :unknown
+      o = 'unable to assert health'
 
-      if @state == 'Primary/Secondary'
+      if self.cs == 'Unconfigured'
+        [:ok,"#{self.id}[unconfigured]"]
+      else
+        if self.in_kernel? and self.in_configuration?
+          if self.cs == 'Connected' and self.ds == 'UpToDate/UpToDate' and (self.ro == 'Primary/Secondary' or self.ro == 'Secondary/Primary')
+            s = :ok
+          else
+            if ['SyncSource','SyncTarget','VerifyS','VerifyT','PausedSyncS','PausedSyncT','StandAlone'].include? self.cs
+              s = :warning
+            elsif not self.in_configuration?
+              s = :warning
+            else
+              s = :critical
+            end
+          end
+        else
+          s = :unknown
+        end
+      end
+
+      [s,self.to_s(:concise)]
+    end
+
+    def to_s(mode=:line)
+      ph = @primary[:hostname].gsub(/\.[a-z0-9-]+\.[a-z0-9-]+$/,'') unless @primary[:hostname].nil?
+      sh = @secondary[:hostname].gsub(/\.[a-z0-9-]+\.[a-z0-9-]+$/,'') unless @secondary[:hostname].nil?
+
+      if @ro == 'Primary/Secondary'
         h1 = ph; dev1 = @primary[:device]
         h2 = sh; dev2 = @secondary[:device]
       else
@@ -176,13 +203,27 @@ module Dribbled
         h2 = ph; dev2 = @primary[:device]
       end
 
-      percent_finish = @activity.nil? ? nil : "[%3d%% %8s]" % [@percent,@finish]
+      percent_finish = @activity.nil? ? nil : '[%3d%% %8s]' % [@percent,@finish]
+
+      case mode
+        when :line
+          fmt_string = '%2d %6s %-13s %15s %-22s %-20s %10s %-11s %10s %-11s'
+          percent_finish = @activity.nil? ? nil : '[%3d%% %8s]' % [@percent,@finish]
+        when :concise
+          fmt_string = '%s>%s:%s%s:%s:%s'
+          percent_finish = @activity.nil? ? nil : '[%d%%,%s]' % [@percent,@finish]
+        when :verbose
+          fmt_string = '%s'
+        else
+          fmt_string = '%s'
+      end
+
+      fmt_string % [@id,@name,@cs,percent_finish,@ro,@ds,h1,dev1,h2,dev2]
 
-      "%2d %6s %-13s %15s %-22s %-20s %10s %-11s %10s %-11s" % [@id,@name,@cstate,percent_finish,@dstate,@state,h1,dev1,h2,dev2]
     end
 
     def inspect
-      "#{self.class}: #@id[#@name]: #@cstate,#@dstate,#@state"
+      "#{self.class}: #{@id}[#{@name}]: #{@cs},#{@ds},#{@ro}"
     end
 
     def check

data/lib/dribbled/version.rb

@@ -1,3 +1,3 @@
 module Dribbled
-  VERSION = "0.8.2"
+  VERSION = '0.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dribbled
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple