dribbled 0.6.0 → 0.7.0

data/README.md

@@ -7,6 +7,8 @@
 # SYNOPSIS
 
     dribbled [options] <action> [options]
+    
+Actions are one of `show`, `check`, `snap`.
 
 Options are as follows:
 
@@ -20,18 +22,28 @@ Options are as follows:
         -V, --version                    Display dribbled version
             --help                       Show this messageSenedsa options
 
-With no options or arguments, `dribbled` displays help (as shown above).
+With no options or arguments, `dribbled` displays help as shown above (unless called as `check_drbd`; see _Personalities_).
 
 # PERSONALITIES
 
-*Dribbled* has two personalities: when run as `dribbled`, it behaves according to the action and parameters used; when run as `check_drbd`, it assumes the `check` action, which enables Nagios plugin behavior.
+*Dribbled* has two personalities: when run as `dribbled`, it behaves according to the action and parameters used; when run as `check_drbd`, it assumes the `check` action, which enables Nagios plugin behavior. (i.e., `dribbled check` is equivalent to `check_drbd`).
+
+# ACTIONS
+
+## Show
+
+The `show` action displays information about DRBD devices in the system. This action currently accepts no options.
 
       gerir@boxie:~:dribbled show
-      0     r0 Connected         UpToDate/UpToDate      Secondary/Primary  sourcehost /dev/drbd0    desthost /dev/drbd0
+      0     r0 Connected         UpToDate/UpToDate      Secondary/Primary   sourcehost /dev/drbd0   desthost /dev/drbd0
       1     r1 Connected         UpToDate/UpToDate      Secondary/Primary   sourcehost /dev/drbd1   desthost /dev/drbd1
       5     r5 Connected         UpToDate/UpToDate      Secondary/Primary   sourcehost /dev/drbd5   desthost /dev/drbd5
       6     r6 SyncTarget [  4%] Inconsistent/UpToDate  Secondary/Primary   sourcehost /dev/drbd6   desthost /dev/drbd6
 
+## Check
+
+The `check` action enables Nagios plugin mode, in which a single line of output is produced on `STDOUT` with the status of the devices.
+
       gerir@boxie:~:dribbled check
       warning: 6:cs:SyncTarget[4.6%%];ds:Inconsistent/UpToDate
 
@@ -40,3 +52,33 @@ With no options or arguments, `dribbled` displays help (as shown above).
 
 Currently, there is no way to configure what constitutes alert conditions, but generally, a **critical** alert will be generated when a resource is found in non-`Connected` and non-`UpToDate` state,  except when said resource is in `SyncSource`, `SyncTarget`, `VerifyS`, `VerifyT`, `PausedSyncS`, `PausedSyncT`, or `StandAlone` connection state, which causes a **warning**. Also, resources that are `Connected` and `UpToDate` but missing from the configuration will generate a **warning**.
 
+Both active and passive modes are supported, with the corresponding options:
+
+        Check Options
+        -M, --monitor [nagios]           Monitoring system
+        -m, --mode [active|passive]      Monitoring mode
+        -H, --nsca_hostname HOSTNAME     NSCA hostname to send passive checks
+        -c, --config CONFIG              Path to Senedsa (send_nsca) configuration
+        -S, --svc_descr SVC_DESR         Nagios service description
+        -h, --hostname HOSTNAME          Service hostname
+
+As `dribbled` uses [Senedsa](https://github.com/evernote/ops-senedsa "Senedsa"), configurations files are supported.
+
+## Snap
+
+The `snap` action is useful to capture raw data DRBD from a system for test and development. It produces two files, `xmldump.`_suffix_ and `proddrbd.`_suffix_:
+
+    Snap Options
+    -S, --suffix SUFFIX              Suffix (defaults to PID)
+    -D, --directory DIRECTORY        Directory (defaults to /tmp)
+    
+These files can then be used with the general `--procdrbd PROCDRBD` and `--xmldump XMLDUMP` options:
+
+	gerir@boxie:~/dribbled -P data/procdrbd.wfconnection -X data/xmldump.wfconnection -H sourcehost show
+	 0  r0 Connected     UpToDate/UpToDate   Primary/Secondary   sourcehost /dev/drbd0   desthost /dev/drbd0 
+ 	 1  r1 Connected     UpToDate/UpToDate   Primary/Secondary   sourcehost /dev/drbd1   desthost /dev/drbd1 
+	12 r12 Connected     UpToDate/UpToDate   Primary/Secondary   sourcehost /dev/drbd12  desthost /dev/drbd12
+	13 r13 WFConnection  UpToDate/DUnknown   Primary/Unknown
+
+We use the general `-H` option to let `dribbled` know which host the commands were captured on (so that it can properly identify source and destination).
+	                                                                                            

data/lib/dribbled/cli.rb

@@ -194,9 +194,9 @@ module Dribbled
         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}%%];#{po_dstate}"
+            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_status = :ok
             plugin_output += " #{res.id}[unconfigured]>#{po_cstate}/;#{po_dstate}"
           else
             plugin_output += " #{res.id}>#{po_cstate};#{po_dstate}"
@@ -212,12 +212,12 @@ module Dribbled
         when :nagios
           case @action_options[:mode]
             when :active
-              puts "#{plugin_status}:#{plugin_output}"
+              puts "#{plugin_status.to_s.upcase}:#{plugin_output}"
               exit SendNsca::STATUS[plugin_status]
             when :passive
               sn = SendNsca.new @action_options
               begin
-                sn.send plugin_status , plugin_output
+                sn.send plugin_status, plugin_output
               rescue SendNsca::SendNscaError => e
                 output_message "send_nsca failed: #{e.message}", 1
               end

data/lib/dribbled/drbd.rb

@@ -11,7 +11,8 @@ module Dribbled
     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_ACTIVITY_RE = /^\s+\[[.>=]+\]\s+(?<activity>[a-z']+):\s+(?<percent>[0-9.]+)%/
+    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+/
 
     def initialize(options)
       @log = options[:log].nil? ? nil : options[:log]
@@ -63,6 +64,10 @@ module Dribbled
             m = PROCDRBD_ACTIVITY_RE.match(line)
             resources_run[r].activity = m[:activity].gsub(/'/,"").to_sym
             resources_run[r].percent = m[:percent].to_f
+            resources_run[r].finish = m[:finish]
+          elsif PROCDRBD_ACTIVITY_STATUS_RE.match(line)
+            m = PROCDRBD_ACTIVITY_STATUS_RE.match(line)
+            resources_run[r].finish = m[:finish]
           elsif PROCDRBD_VERSION_RE.match(line)
             @version_major = $1
             @version_minor = $2
@@ -133,7 +138,7 @@ module Dribbled
   class DrbdResource
 
     attr_reader :id
-    attr_accessor :name, :cstate, :dstate, :state, :config, :primary, :secondary, :activity, :percent, :in_kernel, :in_configuration
+    attr_accessor :name, :cstate, :dstate, :state, :config, :primary, :secondary, :activity, :percent, :finish, :in_kernel, :in_configuration
 
     def initialize(res,hostname)
       @id = res
@@ -144,6 +149,7 @@ module Dribbled
       @state = nil
       @activity = nil
       @percent = nil
+      @finish = nil
       @primary = { :hostname => nil, :disk => nil, :device => nil }
       @secondary = { :hostname => nil, :disk => nil, :device => nil }
       @in_kernel = false
@@ -170,9 +176,9 @@ module Dribbled
         h2 = ph; dev2 = @primary[:device]
       end
 
-      percent = @activity.nil? ? nil : "[%3d%%]" % @percent
+      percent_finish = @activity.nil? ? nil : "[%3d%% %8s]" % [@percent,@finish]
 
-      "%2d %6s %-13s %6s %-22s %-20s %10s %-11s %10s %-11s" % [@id,@name,@cstate,percent,@dstate,@state,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

data/lib/dribbled/version.rb

@@ -1,3 +1,3 @@
 module Dribbled
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dribbled
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple