nagios_mklivestatus 0.0.9 → 0.0.11

data/RELEASE.rdoc

@@ -17,4 +17,11 @@
 * include logging management
 * preparing release v1.0.0
 * include wait query manager
-* include binaries for library
+* include binaries for library
+
+== 0.0.10
+* correcting bugs
+* adding logs to verbose mode 
+
+== 0.0.11
+* correcting bug : limit

data/bin/nagmk-ruby

@@ -16,7 +16,7 @@ require 'yaml'
 
 #default logging
 log_opts = {
-  :name  => '/var/logs/nagios_mklivestatus_ruby.log',
+  :name  => File.join(File.absolute_path(File.dirname(__FILE__)),'..', 'log','nagios_mklivestatus_ruby.log'),
   :level => Logger::INFO
 }
 
@@ -61,7 +61,6 @@ optparser = OptionParser.new do |opts|
   end
   
   opts.on( '-o', '--options NAME=VALUE', "Options to add to make the request.\n\tcolumn_headers : show column header\n\tlimit          : limit output lines\n\toutput         : \'json\' or \'python\' output formating\n\tlocal_time     : local time settings\n\tuser           : authenticated user\n ") do |opt|
-    
     if opt.match(/^([\w_]+)=(true|false)$/)
       name,value = opt.split("=")
       if value == "true"
@@ -69,10 +68,10 @@ optparser = OptionParser.new do |opts|
       elsif value == "false"
         mk_opts[name.to_sym] = false
       end
-    elsif opt.match(/^([\w_]+)=(\d)$/) 
+    elsif opt.match(/^([\w_]+)=(\d+)$/) 
       name,value = opt.split("=")
       mk_opts[name.to_sym] = value.to_i
-    elsif opt.match(/^([\w_]+)=(\w)$/)
+    elsif opt.match(/^([\w_]+)=(\w+)$/)
       name,value = opt.split("=")
       mk_opts[name.to_sym] = value
     end
@@ -88,6 +87,7 @@ optparser.parse!
 
 #set logging options
 Nagios::MkLiveStatus.init(:log=>log_opts)
+include Nagios::MkLiveStatus
 
 begin
   
@@ -142,5 +142,7 @@ begin
 rescue Exception => ex
   if log_opts[:name] != STDOUT
     puts ex.message
+  else
+    logger.error(ex.message)
   end
 end

data/bin/nagmk-ruby-config

@@ -55,10 +55,10 @@ optparser = OptionParser.new do |opts|
       elsif value == "false"
         mk_opts[:options][name.to_sym] = false
       end
-    elsif opt.match(/^([\w_]+)=(\d)$/) 
+    elsif opt.match(/^([\w_]+)=(\d+)$/) 
       name,value = opt.split("=")
       mk_opts[:options][name.to_sym] = value.to_i
-    elsif opt.match(/^([\w_]+)=(\w)$/)
+    elsif opt.match(/^([\w_]+)=(\w+)$/)
       name,value = opt.split("=")
       mk_opts[:options][name.to_sym] = value
     end

data/lib/nagios_mklivestatus/parser.rb

@@ -107,9 +107,9 @@ module Nagios::MkLiveStatus::Parser
         
         wait_dispatching(command, waits)
         
-      elsif command.match(/^UserAuth: (.+)$/)
+      elsif command.match(/^AuthUser: (.+)$/)
         query_parsed = true
-        nagios_opts[:user] = command.match(/^UserAuth: (.+)$/)[1]
+        nagios_opts[:user] = command.match(/^AuthUser: (.+)$/)[1]
         
       elsif command.match(/^ColumnHeaders: (on|off)$/)
         query_parsed = true

data/lib/nagios_mklivestatus/request.rb

@@ -67,6 +67,18 @@ class Nagios::MkLiveStatus::Request
   # * :output : output format like json/python, if none provided set to CSV (OutputFormat: out)
   def query(query=nil, options={})
     
+    
+    if logger.debug?
+      logger.debug("query recieved :")
+      query.to_s.split("\n").each do |line|
+        logger.debug(line)
+      end
+      logger.debug("options recieved : ")
+      options.keys.each do |key|
+        logger.debug("#{key} : #{options[key]}")
+      end
+    end
+    
     #set column headers
     column_header = false
     if options.has_key? :column_headers and options[:column_headers]
@@ -81,7 +93,7 @@ class Nagios::MkLiveStatus::Request
     
     #set limit
     limit = nil
-    if options.has_key? :limit and options[:limit] != nil and not options[:limit].to_i
+    if options.has_key? :limit and options[:limit] != nil and options[:limit].to_i > 0
       limit = options[:limit].to_i
     end
     
@@ -117,7 +129,7 @@ class Nagios::MkLiveStatus::Request
       
       #set user if needed
       if user != nil and not user.empty? and strQuery.match /^GET\s+(hosts|hostgroups|services|servicegroup|log)\s*$/
-        strQuery << "UserAuth: #{user}\n"
+        strQuery << "AuthUser: #{user}\n"
       end
       
       if localtime != nil
@@ -179,8 +191,11 @@ class Nagios::MkLiveStatus::Request
         response.split("\n").each do |line|
           logger.info(line)
         end
+      else
+        logger.info("No results.")
       end
       
+      
       return response
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios_mklivestatus
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies: []
 description: Querying Nagios MKLiveStatus through TCP or Unix sockets
 email: team@esco-lan.org
@@ -49,6 +49,7 @@ files:
 - bin/nagmk-conf.yml
 - bin/nagmk-ruby-config
 - bin/nagmk-ruby
+- log/nagios_mklivestatus_ruby.log
 - README.rdoc
 - RELEASE.rdoc
 homepage: https://github.com/RECIA/nagios_mklivestatus
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Querying Nagios MKLiveStatus through sockets TCP or Unix