nagios_analyzer 0.0.3 → 0.0.4

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
 .rvmrc
+Gemfile.lock
 pkg/*
 tmp/*

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -41,6 +41,9 @@ pp status.host_problems
 # and can be accessed as a Hash
 pp status.items.first[:current_state]
 
+# or directly
+pp status.items.first.current_state
+
 # get all sections, even those where status is OK
 status = NagiosAnalyzer::Status.new("/path/to/status.dat", :include_ok => true)
 
@@ -55,3 +58,7 @@ status.scopes << lambda{|s| s.start_with?("hoststatus") } #only host statuses
 # reset cached results (if you changed scopes!)
 status.reset_cache!
 </pre>
+
+h2. License
+
+This gem is distributed under the MIT license, see LICENSE file for more details.

data/lib/nagios_analyzer/section.rb

@@ -5,7 +5,12 @@ module NagiosAnalyzer
     end
 
     def method_missing(method, *args)
-      hash.send(method, *args)
+      begin
+        hash.send(method, *args)
+      rescue NoMethodError => e
+        raise e if args.size > 0
+        hash[method]
+      end
     end
 
     def hash
@@ -13,10 +18,16 @@ module NagiosAnalyzer
       @hash = {}
       @section.each_line do |line|
         line.strip!
-        if line.match(/(\S+) \{/)
+        if line.match(/^\s*([a-zA-Z0-9]*)\s*\{/)
           @hash[:type] = $1
         elsif line.match(/(\S+)=(.*)/) #more efficient than include?+split+join..
-          @hash[$1.to_sym] = ($2 == "#{$2.to_i}" ? $2.to_i : $2)
+          property, value = ["#{$1}", "#{$2}"]
+          @hash[property.to_sym] =
+            case
+            when value.strip =~ /^[0-9]+$/ then value.to_i
+            when value.strip =~ /^[0-9.]+$/ then value.to_f
+            else value
+            end
         end
       end
       if @hash[:type] == "servicestatus"

data/lib/nagios_analyzer/status.rb

@@ -17,7 +17,7 @@ module NagiosAnalyzer
       4 => 3,
       0 => 4
     }
-  
+
     def initialize(statusfile, options = {})
       @file = statusfile
       sections #loads section at this point so we raise immediatly if file has a item
@@ -27,39 +27,67 @@ module NagiosAnalyzer
       @scopes << lambda { |section| !section.include?("current_state=#{STATE_OK}") } unless options[:include_ok]
       @scopes << options[:scope] if options[:scope].is_a?(Proc)
     end
-  
+
     def sections
       # don't try to instanciate each section ! on my conf (85hosts/700services),
       # it makes the script more 10 times slower (0.25s => >3s)
-      @sections ||= File.read(@file).split("\n\n")
+      @sections ||= File.read(@file).split(/\}\s*\n/).map(&:strip)
     end
 
     def host_items
-      @host_items ||= sections.map do |s|
-        Section.new(s) if s =~ /^hoststatus/ && in_scope?(s)
-      end.compact
+      section_items(:hoststatus)
     end
 
     def service_items
-      @service_items ||= sections.map do |s|
-        Section.new(s) if s =~ /^servicestatus/ && in_scope?(s)
-      end.compact
+      section_items(:servicestatus)
     end
 
     def items
       @items ||= (host_items + service_items)
     end
 
+    def contactstatus_items
+      section_items(:contactstatus)
+    end
+
+    def hostcomment_items
+      section_items(:hostcomment)
+    end
+
+    def hostdowntime_items
+      section_items(:hostdowntime)
+    end
+
+    def hoststatus_items
+      section_items(:hoststatus)
+    end
+
+    def info_items
+      section_items(:info)
+    end
+
+    def programstatus_items
+      section_items(:programstatus)
+    end
+
+    def servicecomment_items
+      section_items(:servicecomment)
+    end
+
+    def servicedowntime_items
+      section_items(:servicedowntime)
+    end
+
+    def servicestatus_items
+      section_items(:servicestatus)
+    end
+
     def host_problems
-      @host_problems ||= sections.map do |s|
-        Section.new(s) if s =~ /^hoststatus/ && in_scope?(s) && problem?(s)
-      end.compact
+      section_items(:hoststatus, true)
     end
 
     def service_problems
-      @service_problems ||= sections.map do |s|
-        Section.new(s) if s =~ /^servicestatus/ && in_scope?(s) && problem?(s)
-      end.compact
+      section_items(:servicestatus, true)
     end
 
     def in_scope?(section)
@@ -73,7 +101,42 @@ module NagiosAnalyzer
     end
 
     def reset_cache!
-      @items = @service_items = @host_items = nil
+      @items = nil
+      [
+        :contactstatus,
+        :hostcomment,
+        :hostdowntime,
+        :hoststatus,
+        :info,
+        :programstatus,
+        :servicecomment,
+        :servicedowntime,
+        :servicestatus,
+      ].each do |name|
+        self.instance_variable_set(section_var_sym(name, true), nil)
+        self.instance_variable_set(section_var_sym(name, false), nil)
+      end
+    end
+
+  private
+
+    def section_items(name, filter_problems = false)
+      var_sym = section_var_sym(name, filter_problems)
+      if !self.instance_variable_get(var_sym)
+        map = sections.map do |s|
+          Section.new(s) if s =~ regexp_for_section(name) && in_scope?(s) && (!filter_problems || problem?(s))
+        end.compact
+        self.instance_variable_set(var_sym, map)
+      end
+      self.instance_variable_get(var_sym)
+    end
+    
+    def regexp_for_section(name)
+      Regexp.new("^\\s*#{name}\\s*{")
+    end
+    
+    def section_var_sym(name, filter_problems)
+      "@#{name}_#{filter_problems}".to_sym
     end
   end
 end

data/lib/nagios_analyzer/version.rb

@@ -1,3 +1,3 @@
 module NagiosAnalyzer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/data/morestatus.dat

@@ -0,0 +1,35 @@
+contactstatus {
+  id_for_testing=1
+  }
+
+hostcomment {
+  id_for_testing=2
+  }
+
+hostdowntime {
+  id_for_testing=3
+  }
+
+hoststatus {
+  id_for_testing=4
+  }
+
+info {
+  id_for_testing=5
+  }
+
+programstatus {
+  id_for_testing=6
+  }
+
+servicecomment {
+  id_for_testing=7
+  }
+
+servicedowntime {
+  id_for_testing=8
+  }
+
+servicestatus {
+  id_for_testing=9
+  }

data/spec/section_spec.rb

@@ -34,6 +34,32 @@ describe NA::Section do
     NA::Section.new("hoststatus {\ncurrent_state=42\n}")[:status].should == "CRITICAL"
   end
 
+  it "properly parses sections with free text" do
+    section = NA::Section.new("somethinghere {\n\tcomment_data=Free Text here. Possibly even with characters like } or = or even {.\n\nhello_prop=789321\n}")
+    section.type.should == "somethinghere"
+    section.comment_data.should == "Free Text here. Possibly even with characters like } or = or even {."
+    section.hello_prop.should == 789321
+  end
+
+  it "properly parses sections with decimal values" do
+    section = NA::Section.new("somethinghere {\n\nnumerical_value=3.141529\n}")
+    section.type.should == "somethinghere"
+    section.numerical_value.should == 3.141529
+  end
+
+  context "direct access" do
+    it "allows direct access to properties" do
+      section = NA::Section.new("servicestatus {\ncurrent_state=2\n}")
+      section.current_state.should == 2
+      section.something_else.should be_nil
+    end
+
+    it "properly bubbles a NoMethodError when using inexistant methods" do
+      section = NA::Section.new("servicestatus {\ncurrent_state=2\n}")
+      lambda { section.weird_inexistent_method(1) }.should raise_error NoMethodError
+    end
+  end
+
   context "#sort" do
     it "places servicestatus'es after hoststatus'es" do
       a = NA::Section.new("servicestatus {\ncurrent_state=0\n}")

data/spec/status_spec.rb

@@ -3,84 +3,150 @@ require File.expand_path('../spec_helper',__FILE__)
 describe NagiosAnalyzer::Status do
   before(:each) do
     @file = File.expand_path('../data/status.dat',__FILE__)
-    @status = NagiosAnalyzer::Status.new(@file, :include_ok => true)
   end
 
+  let(:status) { NagiosAnalyzer::Status.new(@file, :include_ok => true) }
+
   it "creates a NagiosAnalyzer::Status object" do
-    @status.should be
-    @status.sections.should be_a(Array)
-    @status.sections.first.should include("created=")
-    @status.should have(6).sections
+    status.should be
+    status.sections.should be_a(Array)
+    status.sections.first.should include("created=")
+    status.should have(6).sections
   end
 
   it "provides a last_updated attribute" do
-    @status.last_updated.should be_a(Time)
+    status.last_updated.should be_a(Time)
   end
 
   context "#scopes" do
     it "provides scopes to filter sections" do
-      @status.should have(6).sections
-      @status.should have(0).scopes
+      status.should have(6).sections
+      status.should have(0).scopes
     end
 
     it "tells if a section is in the scopes" do
-      @status.scopes << lambda{|s|s.include?("host_name=server-web")}
-      @status.in_scope?(@status.sections[2]).should be_true
-      @status.in_scope?(@status.sections[3]).should be_false
+      status.scopes << lambda{|s|s.include?("host_name=server-web")}
+      status.in_scope?(status.sections[2]).should be_true
+      status.in_scope?(status.sections[3]).should be_false
     end
-    
+
     it "defines scope in the initialization" do
-      @status = NagiosAnalyzer::Status.new(@file, :include_ok => true,
-                                           :scope => lambda{|s|s.include?("host_name=server-web")})
-      @status.in_scope?(@status.sections[2]).should be_true
-      @status.in_scope?(@status.sections[3]).should be_false
+      status = NagiosAnalyzer::Status.new(@file, :include_ok => true,
+                                          :scope => lambda{|s|s.include?("host_name=server-web")})
+      status.in_scope?(status.sections[2]).should be_true
+      status.in_scope?(status.sections[3]).should be_false
     end
   end
 
-  context "#items, #service_items, #host_items" do
+  context "#items, #service_items, #host_items, #hostcomment_items" do
     it "returns all items" do
-      @status.should have(6).sections
-      @status.should have(4).items         #don't return info{} and programstatus{} sections
-      @status.items.first.should be_a(NagiosAnalyzer::Section)
+      status.should have(6).sections
+      status.should have(4).items         #don't return info{} and programstatus{} sections
+      status.items.first.should be_a(NagiosAnalyzer::Section)
     end
 
     it "returns host items" do
-      @status.should have(2).host_items    #4 = 2 host_items
-      @status.host_items.first[:type].should == "hoststatus"
+      status.should have(2).host_items    #4 = 2 host_items
+      status.host_items.first[:type].should == "hoststatus"
     end
 
     it "returns service items" do
-      @status.should have(2).service_items # ... + 2 service_items
-      @status.service_items.first[:type].should == "servicestatus"
+      status.should have(2).service_items # ... + 2 service_items
+      status.service_items.first[:type].should == "servicestatus"
     end
 
     it "returns only service problems, keeping scopes on every items" do
-      @status.should have(1).service_problems
-      @status.should have(2).service_items
+      status.should have(1).service_problems
+      status.should have(2).service_items
     end
 
     it "returns host problems, currently none" do
-      @status.should have(0).host_problems
+      status.should have(0).host_problems
     end
 
     it "resets cached attributes" do
-      @status.should have(4).items
-      @status.scopes << lambda{|s| s.start_with?("servicestatus")}
-      @status.should have(4).items
-      @status.reset_cache!
-      @status.should have(2).items
-      @status.should have(0).host_items
-      @status.should have(2).service_items
+      status.should have(4).items
+      status.scopes << lambda{|s| s.start_with?("servicestatus")}
+      status.should have(4).items
+      status.reset_cache!
+      status.should have(2).items
+      status.should have(0).host_items
+      status.should have(2).service_items
     end
   end
 
   context "without :include_ok option" do
     it "should filter items" do
-      @status = NagiosAnalyzer::Status.new(@file)
-      @status.should have(1).items         #don't return info{} and programstatus{} sections
-      @status.should have(0).host_items    #4 = 2 host_items
-      @status.should have(1).service_items # ... + 2 service_items
-      @status.service_items.first.should_not include("current_state=0")
+      status = NagiosAnalyzer::Status.new(@file)
+      status.should have(1).items         #don't return info{} and programstatus{} sections
+      status.should have(0).host_items    #4 = 2 host_items
+      status.should have(1).service_items # ... + 2 service_items
+      status.service_items.first.should_not include("current_state=0")
+    end
+  end
+
+  context "more status" do
+    before(:each) do
+      @file = File.expand_path('../data/morestatus.dat',__FILE__)
+    end
+
+    it "sould have lists for all kinds of nagios sections" do
+      status.contactstatus_items.should have(1).items
+      status.hostcomment_items.should have(1).items
+      status.hostdowntime_items.should have(1).items
+      status.hoststatus_items.should have(1).items
+      status.info_items.should have(1).items
+      status.programstatus_items.should have(1).items
+      status.servicecomment_items.should have(1).items
+      status.servicedowntime_items.should have(1).items
+      status.servicestatus_items.should have(1).items
+    end
+
+    it "sould properly classify each kind of nagios sections" do
+      status.contactstatus_items.first.id_for_testing.should == 1
+      status.hostcomment_items.first.id_for_testing.should == 2
+      status.hostdowntime_items.first.id_for_testing.should == 3
+      status.hoststatus_items.first.id_for_testing.should == 4
+      status.info_items.first.id_for_testing.should == 5
+      status.programstatus_items.first.id_for_testing.should == 6
+      status.servicecomment_items.first.id_for_testing.should == 7
+      status.servicedowntime_items.first.id_for_testing.should == 8
+      status.servicestatus_items.first.id_for_testing.should == 9
+    end
+  end
+
+  context "parsing sections" do
+    it "parses sections when they are appart" do
+      status = status_for_data <<-DAT
+        hoststatus {
+          host_name=abc
+          }
+
+
+        hoststatus {
+          host_name=abc
+          }
+      DAT
+      status.hoststatus_items.size.should == 2
+    end
+
+    it "parses when sections are close by" do
+      status = status_for_data <<-DAT
+        hoststatus {
+          host_name=abc
+          }
+        hoststatus {
+          host_name=abc
+          }
+      DAT
+      status.hoststatus_items.size.should == 2
+    end
+
+    def status_for_data(data)
+      filename = "fixture.dat"
+      File.stub(:mtime).with(filename).and_return(Time.now)
+      File.stub(:read).with(filename).and_return(data)
+      NagiosAnalyzer::Status.new(filename, :include_ok => true)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios_analyzer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75650760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75650760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helps you parse a status.dat file produced by nagios or shinken. It aims
   at being performant for big status.dat files. Take a look at nagios_parser too if
   you want, looks very cool too !
@@ -34,7 +39,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
+- LICENSE
 - README.textile
 - Rakefile
 - lib/nagios_analyzer.rb
@@ -42,6 +47,7 @@ files:
 - lib/nagios_analyzer/status.rb
 - lib/nagios_analyzer/version.rb
 - nagios_analyzer.gemspec
+- spec/data/morestatus.dat
 - spec/data/status.dat
 - spec/section_spec.rb
 - spec/spec_helper.rb
@@ -60,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 91061875
+      hash: 458145368960384668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -69,10 +75,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 91061875
+      hash: 458145368960384668
 requirements: []
 rubyforge_project: nagios_analyzer
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Parses a nagios/shinken status.dat file

data/Gemfile.lock

@@ -1,26 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nagios_analyzer (0.0.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  nagios_analyzer!
-  rake
-  rspec