panteras_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8db33bb5a7340e8fcb86c7dcccfe931b3056f0c
-  data.tar.gz: 065497857bd5683953b622dadf8058dc12440256
+  metadata.gz: 760d66fb4486f6945abc681a3e555fa912708f0e
+  data.tar.gz: 93c3800a560e6051ab773cef3d730e83a04bb9a4
 SHA512:
-  metadata.gz: 54602e23a73d1badcc724249a01466bc08884e67ffd384305e3550bfd960d92e66ab6d7256791bf442e3525771770ab781a42f1e85bed8dffb52cd026c4f12d5
-  data.tar.gz: d14d7e8327e2075e933af5880e33065979eb5a91d6ce60b8fa7ac6a5b38477b81f6cf1ca1e78b58a6b63ff3f286ba6b9db40fbf91db5491e64f2487fdc796290
+  metadata.gz: 34820fe9e2adb908ab53c4f4dfd041f6452bec397d493d7ca74f5beb09a4f409806e0a0a0b36a47cee13657938a1c00b239ba1587b8c738caca240122260e884
+  data.tar.gz: 910a7ae9b5037bca25cccc857731955f8deda0ad3aa27555aba918ea216fb302bedca0273dddb6807e388961745460bf90efe0f9a3788f7c0c1cc5c344f772f7

data/extra/mesos_consul_consistency_check_nagios_wrapper

@@ -6,7 +6,7 @@ require 'optparse'
 
 $VERSION = '1.0.0'
 $SEND_NSCA='/usr/sbin/send_nsca'
-$SCRIPT='/usr/local/bin/panteras_api'
+$SCRIPT='/usr/local/bin/mesos_consul_consistency_check'
 my_datacenter=Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address.split('.')[1]
 $MESOS_MASTER="paasmaster#{my_datacenter.strip}-1.mobile.rz"
 $NAGIOS_SERVICE='paas_consistency_check'
@@ -14,23 +14,23 @@ $NAGIOS_SERVICE='paas_consistency_check'
 # default nagios host
 defaults = { :nsca_host => 'monitor.mobile.rz', :debug => false, :error_code => 1 }
 options = {}
-  
+
 OptionParser.new("Options: #{$0} -n NAGIOS_HOST [options]") do |opts|
- 
+
  opts.release =  $VERSION
- 
+
  opts.on("-n","--nsca-host NAGIOS_HOST","") do |n|
    options[:nsca_host] = n
  end
- 
+
   opts.on("-d","--debug","") do |d|
     options[:debug] = true
   end
 
   opts.on("-c", "--critical", "Exit with CRITICAL when problems seen. Default is WARNING") do |c|
-    options[:error_code] = 2 
+    options[:error_code] = 2
   end
- 
+
 end.parse!
 
 config = defaults.merge!(options)
@@ -51,36 +51,36 @@ def send_ncsa(nagios_host, host, result, code)
   command="#{$SEND_NSCA} -c /etc/send_nsca.cfg -H #{nagios_host}"
   puts "Running command: #{command}" if $DEBUG
   Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-  
+
   result_line = "#{host}\t#{$NAGIOS_SERVICE}\t#{code}\t#{result}"
   puts "Sending result to #{nagios_host}: #{result_line}" if $DEBUG
   stdin.puts result_line
   stdin.close
-  
+
   exit_status = wait_thr.value
-  
+
       unless exit_status.success?
           $stderr.puts stderr.readlines
-          raise StandardError, "Command '#{command}' returned status #{exit_status.exitstatus}"          
+          raise StandardError, "Command '#{command}' returned status #{exit_status.exitstatus}"
         end
-        
+
         while line = stderr.gets
           if line.strip.length > 0
             puts "Error (send_ncsa): #{line}" if $DEBUG
             error << line.strip
           end
         end
-        
+
         while line = stdout.gets
-         if line.strip.length > 0 
+         if line.strip.length > 0
            puts "Output (send ncsa): #{line}" if $DEBUG
            output << line.strip
          end
-        end  
+        end
 
   end
-  
-  puts output.join if ( ! output.empty? && $DEBUG ) 
+
+  puts output.join if ( ! output.empty? && $DEBUG )
   puts error.join if ( ! error.empty? && $DEBUG )
 
 end
@@ -91,33 +91,33 @@ puts "Running command: #{command}" if $DEBUG
 
 Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
 
-	exit_status = wait_thr.value
-	    unless exit_status.success?
-          send_ncsa(nsca_host, my_hostname, stderr.readlines, config[:error_code])
-          raise StandardError, "Command '#{command}' returned status #{exit_status.exitstatus}"          
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          puts "#{command} returned exit code #{exit_status.exitstatus}" if $DEBUG
+          send_ncsa(nsca_host, my_hostname, stdout.readlines.join("|"), config[:error_code])
+          raise StandardError, "Command '#{command}' returned status #{exit_status.exitstatus}"
         end
-        
-        while line = stderr.gets          
+
+        while line = stderr.gets
           if line.strip.length > 0
             puts "Error: #{line}" if $DEBUG
             error << line.strip
           end
         end
-        
+
         while line = stdout.gets
-         if line.strip.length > 0 
-           puts "Output: #{line}" if $DEBUG        
+         if line.strip.length > 0
+           puts "Output: #{line}" if $DEBUG
            output << line.strip
          end
-        end  
-        
+        end
+
         if ! error.empty?
           error_msg = error.join
-          puts "#{my_hostname}: #{error_msg} exit_code #{config[:error_code]}"
+          puts "#{my_hostname}: #{error_msg} exit_code #{config[:error_code]}" if $DEBUG
           send_ncsa(nsca_host, my_hostname, error.join, config[:error_code])
         else
           output_msg = output.join
-          puts "#{my_hostname}: #{output_msg} exit_code #{config[:error_code]}"
           send_ncsa(nsca_host, my_hostname, output.join, 0)
         end
 

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/panteras_api.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Ruby API library for Panteras PaaS platform.}
   spec.description   = %q{A convenient api for getting information from consul, mesos, marathon, and docker in the Panteras PaaS infrastructure.}
-  spec.homepage      = "https://github.com/joncolby/panteras_api"
+  spec.homepage      = "https://github.com/eBayClassifiedsGroup/panteras_api"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-#  spec.bindir        = "bin"
+  spec.bindir        = "extra"
 #  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
-bindir: bin
+bindir: extra
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ files:
 - lib/panteras_api/utils.rb
 - lib/panteras_api/version.rb
 - panteras_api.gemspec
-homepage: https://github.com/joncolby/panteras_api
+homepage: https://github.com/eBayClassifiedsGroup/panteras_api
 licenses: []
 metadata: {}
 post_install_message: 
@@ -97,9 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby API library for Panteras PaaS platform.
 test_files: []
-has_rdoc: