nagira 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d1159c3f0f60f42147bc66a3274f02b499087c
-  data.tar.gz: fa0384885a832cff96e1124ba14426799fbc34f7
+  metadata.gz: 0be37e447b15c8087f82209470877a5fb202d77d
+  data.tar.gz: e9670a022cfbe3184264353ac346d2133b6eb258
 SHA512:
-  metadata.gz: 3c8f272cd12b05e72fa09794ecc170b447a6ae2135d1d814f9ef2f71c7313a21386a85a25f11defad0c2fd2deff91458c5a285371edcf51e8bcf32f61a24dd3e
-  data.tar.gz: 90ba66335e2715eb62784600967a432bbf076246c6f715ff7d3cf524ee046d5f9f9265c67f6f52b26da6e8b158ebc540d5ef44385f69d41ea7d68bad3c7b0115
+  metadata.gz: 065f49e0b3c74dffb37dbffaf9273407a8a7d329b4cfd4448ce1c143a2426218f3b1119a3423795ccaf283d37f36ad1e096dd41ff675b662e607fe69f911519a
+  data.tar.gz: 7940f90fba42d4ab49f3fcb057a216654a2c7af9791a83fbc7d262dc99cdf48ba06d94c35cb5761d8f2817dc15a2653dba05c2b73355f95f1c8403e8a39ed285

data/History.md

@@ -1,7 +1,8 @@
-### v.0.3.1
-* Fri Aug 30 2013 -- Dmytro Kovalov
-  - Add requirement for Ruby version in gemspec
-  - Requirement documentation
+
+### v.0.3.3
+* Tue May 27 2014 -- Dmytro Kovalov
+  - Bugfix: fix parsing of service blocks https://github.com/dmytro/nagira/issues/27
+
 ### v.0.3.1
 * Mon Aug 26 2013 -- Dmytro Kovalov
   - Bugfix: fix for init.d script to load defaults file

data/spec/get/endpoints_spec.rb

@@ -1,4 +1,45 @@
-require_relative 'get_helper'
+require 'spec_helper'
+
+#
+# Specs for implemetned API endpoints. Only check response: OK or 404.
+#
+
+shared_examples_for :fail_on_random_url do |base|  
+  RANDOM.each do |url|
+    ep = "#{base}/#{url}"
+    it "fails on '#{ep}' string" do
+      get ep
+      last_response.status.should be 404
+    end
+  end
+end
+
+shared_examples_for :respond_to_valid_url do |base, urls, custom_regex|
+
+  case urls
+    when Array
+    urls.each do |url|
+      ep = "#{base}/#{url}"
+      it "responds to #{ep}" do
+        get ep
+        last_response.should be_ok
+      end
+    end
+    when nil
+      ep = "#{base}"
+      it "responds to #{ep}" do
+        get ep
+        last_response.should be_ok
+      end
+  end
+end
+
+shared_examples_for :fail_on_bad_url do |url|
+  before {  get url }
+  it "fails on #{url}" do 
+    last_response.status.should be 404
+  end
+end
 
 describe Nagira do 
   
@@ -10,9 +51,53 @@ describe Nagira do
   
   context "API endpoints" do
     
+    host   = IMPLEMENTED[:hosts].first 
+    spaces = "host%20with%20space"
+
+
     context :top do 
       it_should_behave_like :respond_to_valid_url,  '', IMPLEMENTED[:top]
       it_should_behave_like :fail_on_random_url,    ''
     end
-  end
-end      
+      
+
+    context "/_status" do
+      it_should_behave_like :respond_to_valid_url,  "/_status", IMPLEMENTED[:hosts]
+      it_should_behave_like :respond_to_valid_url,  "/_status", IMPLEMENTED[:output] + ["_hosts"]
+      it_should_behave_like :fail_on_random_url, '/_status'
+    end
+
+    context "/_status/:host" do
+      it_should_behave_like :respond_to_valid_url,  "/_status/#{host}", IMPLEMENTED[:status]
+      it_should_behave_like :fail_on_random_url,    "/_status/#{host}"
+
+      context "hostname with space" do
+        it_should_behave_like :fail_on_bad_url,  "/_status/#{spaces}"
+      end
+
+      context :unknown_host do
+        it_should_behave_like :fail_on_bad_url,       '/_status/unknown_host'
+        it_should_behave_like :fail_on_random_url,    "/_status/unknown_host"
+      end
+    end                         # /_status/:host
+
+    context "/_status/:host/_services" do 
+      it_should_behave_like :respond_to_valid_url,  "/_status/#{host}/_services"
+      it_should_behave_like :respond_to_valid_url,  "/_status/#{host}/_services", ["SSH", "PING"]
+
+      context "hostname with space" do
+        it_should_behave_like :fail_on_bad_url,  "/_status/#{spaces}/_services"
+      end
+    end
+
+
+    context "custom hostname regex - host with spaces" do
+        
+      it { pending "Need to figure out how to change hostname regex on the fly" }
+        #it_should_behave_like :respond_to_valid_url,  "/_status/#{spaces}", nil, '\w[(%20)\w\-\.]+'
+        #it_should_behave_like :respond_to_valid_url,  "/_status/#{spaces}/_services"
+    end                         # custom hostname regex
+    
+  end                           # API endpoints
+    
+end

data/version.txt

@@ -1 +1 @@
-0.3.2
+0.3.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagira
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmytro Kovalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
@@ -71,6 +71,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
@@ -78,6 +81,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
@@ -128,14 +134,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +232,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -278,21 +276,25 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/nagira
 - History.md
 - Rakefile
-- version.txt
+- bin/nagira
+- bin/nagira-setup
+- config/defaults.rb
+- config/environment.rb
+- config/nagira.defaults
+- config/nagira.init_d
+- lib/app.rb
 - lib/app/routes/get/config.rb
 - lib/app/routes/get/objects.rb
 - lib/app/routes/get/status.rb
+- lib/app/routes/put.rb
 - lib/app/routes/put/host.rb
 - lib/app/routes/put/status.rb
-- lib/app/routes/put.rb
-- lib/app.rb
+- lib/nagira.rb
 - lib/nagira/background_parse.rb
 - lib/nagira/nagios.rb
 - lib/nagira/timed_parse.rb
-- lib/nagira.rb
 - lib/tasks/config.rake
 - lib/tasks/debug.rake
 - lib/tasks/doc.rake
@@ -303,38 +305,29 @@ files:
 - spec/01_data_format/03_api_spec.rb
 - spec/get/comments_spec.rb
 - spec/get/endpoints_spec.rb
-- spec/get/get_helper.rb
 - spec/get/hosts_spec.rb
-- spec/get/objects/data_spec.rb
-- spec/get/objects/endpoints_spec.rb
 - spec/get/services_spec.rb
-- spec/get/status/endpoints_spec.rb
 - spec/put/host_spec.rb
 - spec/put/status_spec.rb
 - spec/put/support.rb
 - spec/spec_helper.rb
-- config/defaults.rb
-- config/environment.rb
-- config/nagira.defaults
-- config/nagira.defaults.erb
-- config/nagira.init_d
 - test/benchmark.rb
+- test/data/bad/README
 - test/data/bad/nagios.cfg
 - test/data/bad/objects.cache
-- test/data/bad/README
 - test/data/bad/status.dat
 - test/data/json/GET.txt
+- test/data/json/README.txt
 - test/data/json/host_check.json
 - test/data/json/host_check.sh
 - test/data/json/ping.json
 - test/data/json/ping_and_http.json
 - test/data/json/ping_and_http_check.sh
 - test/data/json/ping_check.sh
-- test/data/json/README.txt
 - test/data/nagios.cfg
 - test/data/objects.cache
 - test/data/status.dat
-- bin/nagira-setup
+- version.txt
 homepage: http://dmytro.github.com/nagira
 licenses:
 - MIT
@@ -348,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -356,9 +349,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 'Nagira : Nagios RESTful API'
 test_files: []
-has_rdoc: 

data/config/nagira.defaults.erb

@@ -1,98 +0,0 @@
-#
-# Defaults configuration file for Nagira
-# --------------------------------------------
-<% %w{ NAGIRA_PORT NAGIRA_BIND RACK_ENV NAGIRA_USER RVM_STRING NAGIRA_LOG NAGIRA_TTL NAGIRA_BG_PARSING NAGIOS_CFG_FILE NAGIOS_HOST_CUSTOM_REGEX}.each do |env| -%>
-  <% if env.downcase.to_sym -%>
-    <%= env -%>=<%="#{env}" -%>
-  <% end -%>
-<% end -%>
-#
-# Examples below are default values.
-#
-# ----------------------
-# Port. Default 4567
-# ----------------------
-# NAGIRA_PORT=
-#
-# ----------------------
-# BIND
-# ----------------------
-# String specifying the hostname or IP address of the interface to
-# listen on when the :run setting is enabled. The default value –
-# '0.0.0.0' – causes the server to listen on all available
-# interfaces. To listen on the loopback interface only, use: 'localhost'
-#
-# NAGIRA_BIND=localhost
-#
-# ----------------------
-# Environment
-# ----------------------
-# Usually needs to be production
-#
-# RACK_ENV=production
-#
-# ----------------------
-# Nagira user
-# ----------------------
-# Usually nagira process should be run by same user ID as Nagios. In
-# many cases this is nagios user.
-#
-# NAGIRA_USER=nagios
-#
-# ----------------------
-# RVM
-# ----------------------
-# RVM_STRING="rvm use default"
-#
-# ----------------------
-# Log file
-# ----------------------
-# NAGIRA_LOG=/var/log/nagios/nagira.log
-#
-# ----------------------
-# TTL for data
-# ----------------------
-# Number of seconds between re-parses. All Nagios file are parsed no
-# more often than this. Default is 5 sec. Setting this to 0 or
-# negative number disables TTL and backgroiund prser as well.
-#
-# NAGIRA_TTL=20
-#
-# ----------------------
-# Background parsing
-# ----------------------
-# Set this to 0, to disable background parsing.
-# NAGIRA_BG_PARSING=1
-#
-# ----------------------
-# Nagios configuration file
-# ----------------------
-# Where main Nagios configuration file is located. usually this does
-# not need to change.
-#
-# NAGIOS_CFG_FILE=/etc/nagios/nagios.cfg
-#
-# ----------------------
-# Custom regex for hostnames
-# ----------------------
-#
-# By default hostname regular expression accepts alpha-numerics,
-# dashes and dots, as specified by http://tools.ietf.org/html/rfc952
-# for hostnames. Extended to accept dots in the middle for FQHN's.
-#
-# Possible settings:
-#
-# - default: '\w([\w\-\.]+)?\w' FQHN
-# - short hostname: '\w([\w\-]+)?\w'
-# - FQHN allow space in hostname: '\w([\w\-\.(%20)]+)?\w' 
-#
-# Explanation regarding spaces: 
-# ---------------------------------
-#
-# Nagios works OK with hostnames with spaces. This is against RFC's
-# and can't really used for real hosts, but for aggregated checks
-# (like cluster name for example), you might want to consider this
-# option.
-# 
-# NAGIOS_HOST_CUSTOM_REGEX='\w([\w\-\.]+)?\w'
-#

data/spec/get/get_helper.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-IMPLEMENTED = {
-  top:            %w{ _api _status _objects _config _runtime},
-  output:         %w{ _list _state _full }, # Type of requests as in varaible @output
-  hosts:          %w{ archive tv },
-  status:         %w{ _services _servicecomments _hostcomments },
-  objects:        %w{ timeperiod command contactgroup hostgroup contact host service }
-}
-
-#
-# Specs for implemetned API endpoints. Only check response: OK or 404.
-#
-
-shared_examples_for :fail_on_random_url do |base|  
-  RANDOM.each do |url|
-    ep = "#{base}/#{url}"
-    it "fails on '#{ep}' string" do
-      get ep
-      last_response.status.should be 404
-    end
-  end
-end
-
-shared_examples_for :respond_to_valid_url do |base, urls, custom_regex|
-
-  case urls
-    when Array
-    urls.each do |url|
-      ep = "#{base}/#{url}"
-      it "responds to #{ep}" do
-        get ep
-        last_response.should be_ok
-      end
-    end
-    when nil
-      ep = "#{base}"
-      it "responds to #{ep}" do
-        get ep
-        last_response.should be_ok
-      end
-  end
-end
-
-shared_examples_for :fail_on_bad_url do |url|
-  before {  get url }
-  it "fails on #{url}" do 
-    last_response.status.should be 404
-  end
-end

data/spec/get/objects/data_spec.rb

@@ -1,25 +0,0 @@
-require_relative '../get_helper'
-
-describe Nagira do 
-  
-  set :environment, :test       # This should run only in test mode as it uses hardcoded host names
-  include Rack::Test::Methods
-  def app 
-    @app ||= Nagira
-  end
-  
-  subject {  JSON.parse last_response.body }
-
-  context "Data structure" do
-    context "/_objects" do
-
-      let (:host) {  IMPLEMENTED[:hosts].first }
-
-      it { get "/_objects" ; should be_a_kind_of Hash }
-      it { get "/_objects/_list" ; should be_a_kind_of Array }
-      it { get "/_objects/host" ; should be_a_kind_of Hash }
-      it { get "/_objects/host/#{host}" ; should be_a_kind_of Hash }
-      
-    end
-  end                           # Data structure
-end                             # describe Nagira

data/spec/get/objects/endpoints_spec.rb

@@ -1,33 +0,0 @@
-require_relative '../get_helper'
-
-describe Nagira do 
-  
-  set :environment, :test       # This should run only in test mode as it uses hardcoded host names
-  include Rack::Test::Methods
-  def app 
-    @app ||= Nagira
-  end
-  
-  context "API endpoints" do
-    context "/_objects" do
-      it_should_behave_like :respond_to_valid_url,  "/_objects"
-      it_should_behave_like :respond_to_valid_url,  "/_objects/_list"
-
-
-      it_should_behave_like :respond_to_valid_url,  "/_objects", IMPLEMENTED[:objects]
-      it_should_behave_like :fail_on_random_url,    "/_objects"
-      # AR- compatibility
-      it_should_behave_like :respond_to_valid_url,  "/_objects", IMPLEMENTED[:objects].map(&:pluralize)
-      
-      context :host do 
-        host   = IMPLEMENTED[:hosts].first 
-        spaces = "host%20with%20space"
-
-        it_should_behave_like :respond_to_valid_url,  "/_objects/host/#{host}"
-        it_should_behave_like :fail_on_bad_url,       "/_objects/host/#{spaces}"
-        it_should_behave_like :respond_to_valid_url,  "/_objects/host/#{host}/_list"
-        
-      end
-    end
-  end                           # API endpoints
-end                             # describe Nagira

data/spec/get/status/endpoints_spec.rb

@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-#
-# Specs for implemetned API endpoints. Only check response: OK or 404.
-#
-
-shared_examples_for :fail_on_random_url do |base|  
-  RANDOM.each do |url|
-    ep = "#{base}/#{url}"
-    it "fails on '#{ep}' string" do
-      get ep
-      last_response.status.should be 404
-    end
-  end
-end
-
-shared_examples_for :respond_to_valid_url do |base, urls, custom_regex|
-
-  case urls
-    when Array
-    urls.each do |url|
-      ep = "#{base}/#{url}"
-      it "responds to #{ep}" do
-        get ep
-        last_response.should be_ok
-      end
-    end
-    when nil
-      ep = "#{base}"
-      it "responds to #{ep}" do
-        get ep
-        last_response.should be_ok
-      end
-  end
-end
-
-shared_examples_for :fail_on_bad_url do |url|
-  before {  get url }
-  it "fails on #{url}" do 
-    last_response.status.should be 404
-  end
-end
-
-describe Nagira do 
-  
-  set :environment, :test       # This should run only in test mode as it uses hardcoded host names
-  include Rack::Test::Methods
-  def app 
-    @app ||= Nagira
-  end
-  
-  context "API endpoints" do
-    
-    host   = IMPLEMENTED[:hosts].first 
-    spaces = "host%20with%20space"
-
-
-    context :top do 
-      it_should_behave_like :respond_to_valid_url,  '', IMPLEMENTED[:top]
-      it_should_behave_like :fail_on_random_url,    ''
-    end
-      
-
-    context "/_status" do
-      it_should_behave_like :respond_to_valid_url,  "/_status", IMPLEMENTED[:hosts]
-      it_should_behave_like :respond_to_valid_url,  "/_status", IMPLEMENTED[:output] + ["_hosts"]
-      it_should_behave_like :fail_on_random_url, '/_status'
-    end
-
-    context "/_status/:host" do
-      it_should_behave_like :respond_to_valid_url,  "/_status/#{host}", IMPLEMENTED[:status]
-      it_should_behave_like :fail_on_random_url,    "/_status/#{host}"
-
-      context "hostname with space" do
-        it_should_behave_like :fail_on_bad_url,  "/_status/#{spaces}"
-      end
-
-      context :unknown_host do
-        it_should_behave_like :fail_on_bad_url,       '/_status/unknown_host'
-        it_should_behave_like :fail_on_random_url,    "/_status/unknown_host"
-      end
-    end                         # /_status/:host
-
-    context "/_status/:host/_services" do 
-      it_should_behave_like :respond_to_valid_url,  "/_status/#{host}/_services"
-      it_should_behave_like :respond_to_valid_url,  "/_status/#{host}/_services", ["SSH", "PING"]
-
-      context "hostname with space" do
-        it_should_behave_like :fail_on_bad_url,  "/_status/#{spaces}/_services"
-      end
-    end
-
-
-    context "custom hostname regex - host with spaces" do
-        
-      it { pending "Need to figure out how to change hostname regex on the fly" }
-        #it_should_behave_like :respond_to_valid_url,  "/_status/#{spaces}", nil, '\w[(%20)\w\-\.]+'
-        #it_should_behave_like :respond_to_valid_url,  "/_status/#{spaces}/_services"
-    end                         # custom hostname regex
-    
-  end                           # API endpoints
-    
-end