nagios-splunk 1.0.0 → 1.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDYxNjliNjVmMjI2ZTJhM2RiZTYyNWU1MmNiNTU4NzU2ZjhiNTU4NQ==
-  data.tar.gz: !binary |-
-    NzhhM2ZjZGE4NjAyYjEwYzczNmY1MzVhMTM5Yjk1ZjkzMmI5ODAxNQ==
+SHA1:
+  metadata.gz: 3bb587efb3794782fa89cfd9a82365ad5a8f2df7
+  data.tar.gz: 6695dca86a60dc661ba75db67c77cd9d9f110e1a
 SHA512:
-  metadata.gz: !binary |-
-    N2FhMWYxMGY0MjI4M2YzNWRjNzBiNjM4ZmI3NzNjMWEzYTBhMWVjOThmYWNl
-    YzEzYjBmM2NlYTAxYWYzMGRkOTBjY2FhOTgzMjM4NWI5ODRlODQwYmI2ZDVi
-    Y2MzYWNmZDhiNjViMTUwNDMzZDcwZWQ4YTJiYjcwNDg2NDNkY2U=
-  data.tar.gz: !binary |-
-    Njk2YzlhMjliOTI1MzQ5NWNmY2ZjZDMyMzM0MTYzMzc4ZGQ4MTU1OTM3ZDE5
-    NmJkNDIxZmMwY2ZmMDc1NGEyOWIzMzhkNzUwODZkNzY3ZmE2MzlmMDE5ODQ1
-    ZTcwYjg1OTQwZmQwNjIyOThjYzQyZTJjNzg1ZWMxOTBmNjVkYWI=
+  metadata.gz: 2ae529dbca5d506c8749c6bfed74356e463051e0ac49f8df52af751f9211501625cfc64ca1b92c734c4fb8a530432cdfdb5def42757f126db8d45f63ac7c26cd
+  data.tar.gz: 5e3fe4ef0039241cd2d040a92e8846119d67da564b95ab8ab4c285a22ffe3588ac85b5e41c4c7c0fe8c6f6df1fcf5e9c9ab0086fb4bf650fb05204bfe347adf9

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rake/packagetask'
 
 task :default => :test
 
@@ -12,9 +12,9 @@ end
 
 gem_spec = eval(File.read("nagios-splunk.gemspec"))
 
-Rake::GemPackageTask.new(gem_spec) do |pkg|
-  pkg.gem_spec = gem_spec
-end
+#Rake::PackageTask.new(gem_spec) do |pkg|
+#  pkg.spec = gem_spec
+#end
 
 desc "remove build files"
 task :clean do

data/bin/check_splunk

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'nagios/splunk'
 exit Nagios::Splunk::CLI.new.run

data/lib/nagios/splunk.rb

@@ -8,6 +8,7 @@ module Nagios
     POOL_LIST_URL = "/services/licenser/pools"
     LICENSE_LIST_URL = "/services/licenser/licenses"
     LICENSE_LOCALSLAVE_URL = "/services/licenser/localslave"
+    CLUSTER_MASTER_INFO_URL = "/services/licenser/localslave"
 
     autoload :Check, "nagios/splunk/check"
     autoload :RestClient, "nagios/splunk/rest_client"
@@ -15,6 +16,7 @@ module Nagios
     autoload :Exception, "nagios/splunk/exception"
     autoload :NoPoolsFound, "nagios/splunk/exception"
     autoload :NoLicensesFound, "nagios/splunk/exception"
+    autoload :Splunk, "nagios/splunk/splunk"
 
   end
 end

data/lib/nagios/splunk/check.rb

@@ -63,6 +63,28 @@ module Nagios
         return [code, message]
       end
 
+      def cluster_bundle_status
+        splunk = Splunk.new(rest_client)
+        info = splunk.cluster_master_info
+        errors = info.xpath("//s:key[@name='bundle_validation_errors_on_master']//s:item").map { |n| n.text.chomp }
+        code = (errors.empty? ? 0 : 1)
+        return [code, "Splunk cluster bundle status is #{STATUS[code]} | #{errors.join("\n")}"]
+      end
+
+      def cluster_replication_factor
+        splunk = Splunk.new(rest_client)
+        info = splunk.cluster_master_generation
+        code = info.xpath("//s:key[@name='replication_factor_met']").text.to_i
+        return [code == 1 ? 0 : 1, "Splunk cluster replication factor is #{code == 1 ? "met" : "not met"}"]
+      end
+
+      def cluster_search_factor
+        splunk = Splunk.new(rest_client)
+        info = splunk.cluster_master_generation
+        code = info.xpath("//s:key[@name='search_factor_met']").text.to_i
+        return [code == 1 ? 0 : 1, "Splunk cluster search factor is #{code == 1 ? "met" : "not met"}"]
+      end
+
       private
 
       # Compare usage and quota with threshold

data/lib/nagios/splunk/cli.rb

@@ -41,6 +41,18 @@ module Nagios
              :default => 'enterprise',
              :description => "License Stack ID.")
 
+      option(:replication_factor,
+              :long => "--repl-factor",
+              :description => "Check if replication factor is met.")
+
+      option(:search_factor,
+              :long => "--search-factor",
+              :description => "Check if search factor is met.")
+
+      option(:cluster_bundle_status,
+              :long => "--cluster-bundle-status",
+              :description => "Check cluster bundle status.")
+
       def run(argv = ARGV)
         parse_options(argv)
 
@@ -48,7 +60,13 @@ module Nagios
         splunk = Check.new(client)
 
         begin
-          if config[:localslave]
+          if config[:replication_factor]
+            status, message = splunk.cluster_replication_factor
+          elsif config[:search_factor]
+            status, message = splunk.cluster_search_factor
+          elsif config[:cluster_bundle_status]
+            status, message = splunk.cluster_bundle_status
+          elsif config[:localslave]
             status, message = splunk.localslave(config[:warn], config[:crit])
           elsif config[:pool]
             status, message = splunk.pool_usage(config[:pool], config[:warn], config[:crit])

data/lib/nagios/splunk/rest_client.rb

@@ -48,10 +48,14 @@ module Nagios
       # build HTTP connection
       # @return [Net::HTTP]
       def client
-        @client ||= Net::HTTP.new(@host, @port)
-        @client.use_ssl = @use_ssl
-        @client.set_debug_output $stderr if debug
-        @client
+        @client ||=
+          begin
+            http = Net::HTTP.new(@host, @port)
+            http.use_ssl = @use_ssl
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl?
+            http.set_debug_output $stderr if debug
+            http
+          end
       end
 
       def debug

data/lib/nagios/splunk/splunk.rb

@@ -0,0 +1,23 @@
+module Nagios
+  module Splunk
+    class Splunk
+
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      def cluster_master_info
+        response = @client.get("/services/cluster/master/info")
+        Nokogiri::Slop(response.body) if response.code.to_i == 200
+      end
+
+      def cluster_master_generation
+        response = @client.get("/services/cluster/master/generation")
+        Nokogiri::Slop(response.body) if response.code.to_i == 200
+      end
+
+    end
+  end
+end

data/nagios-splunk.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "nagios-splunk"
-  s.version     = "1.0.0"
+  s.version     = "1.1.3"
   s.authors     = 'Max Horbul'
   s.email       = ["max@gorbul.net"]
   s.homepage    = "https://github.com/mhorbul/nagios-splunk"

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: nagios-splunk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Max Horbul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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: rake
   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'
 description: Splunk monitoring in Nagios
@@ -74,16 +74,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README
-- Rakefile
 - bin/check_splunk
-- lib/nagios/splunk.rb
 - lib/nagios/splunk/check.rb
 - lib/nagios/splunk/cli.rb
 - lib/nagios/splunk/exception.rb
 - lib/nagios/splunk/rest_client.rb
-- nagios-splunk.gemspec
+- lib/nagios/splunk/splunk.rb
+- lib/nagios/splunk.rb
 - test/test_helper.rb
+- README
+- Rakefile
+- nagios-splunk.gemspec
 homepage: https://github.com/mhorbul/nagios-splunk
 licenses: []
 metadata: {}
@@ -93,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nagios-splunk
-rubygems_version: 2.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Nagios Splunk plugin