noms-client 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eefbee8038f40b86639c9e2c5d48fce572ae0a47
-  data.tar.gz: 544f15add64ac39f124378f3494f4088cdfde7ef
+  metadata.gz: 9e24aa514edf837a8d6d263ffe707e86aefcc76f
+  data.tar.gz: 09e54474d3b41a4a257fa1cf98a248ad16b66cd5
 SHA512:
-  metadata.gz: 39a017624eb96f65a3775eca26d4a78633eccf6a2367ed99b230f2a337e6908ad4de01fe52c868213f44c9ad97c7f91fe86c43a20ececa61f2c8db228189f026
-  data.tar.gz: 955a6fbb43bc3d79e8cab1f30b38521120060f8c7599b7e4385beb878af9aa622e5467029f4457671e7270a7f65ee61478632309837bdff47c9e1cebe97b2c17
+  metadata.gz: c6707f63d16653725c7d9e00be5421e282db4a7195a932bd793643021f70ef8da14a04d698bcd940c1fc41ffa3d11613ec24180bb54b59e357ccb9970fb7bc1e
+  data.tar.gz: 35bf1ffa2984e3f338927060d46f1021b8c2b21b09d8656f70cd965468c920800aaf4752995cc3435f9cc7679767781d3f224a1cd32aac131946042e3c0f523f

data/TODO

@@ -6,3 +6,7 @@
 * Complex requests for NCC API
 * Factor almost all of CLI into interface library (in particular,
   waitfor)
+
+* need a way for the docs/help/usage to be additive from library. 
+  i.e. library has new functions, docs/help/usage for how to use 
+  them, should be displayed in noms --help

data/bin/noms

@@ -59,6 +59,12 @@
 #          cloud name                - Describe named cloud
 #          ncc                       - Describe NCC API endpoint
 #          cmdb                      - Describe system fields
+#       nagios subcommand
+#          show type name            - Show information for named type [hostgroup,host,service]
+#          detail host               - Show object detail for named host
+#          query type [condition [...]]   - Query for object by type [hostgroup,host,service]
+#          check <host> [<service>]  - Run service check for host (or host check) synchronously
+#
 #    Options:
 #       --names                      - Just print entity names, equivalent to
 #                                      --fields name --noheader --nofeedback --nolabel
@@ -180,6 +186,7 @@ require 'csv'
 require 'noms/client/version'
 require 'ncc/client'
 require 'noms/cmdb'
+require 'noms/nagui'
 
 $VERSION = NOMS::Client::VERSION
 $me = 'noms'
@@ -189,6 +196,8 @@ $opt = Optconfig.new('noms', {
                              'url' => 'http://noms/ncc_api/v2' },
                          'cmdb=s%' => {
                              'url' => 'http://cmdb/cmdb_api/v1' },
+                         'nagui=s%' => {
+                             'url' => 'http://nagios/nagui/nagios_live.cgi' },
                          'fields=s' => '',
                          'mock=s' => nil,
                          'format=s' => 'text',
@@ -201,6 +210,50 @@ $opt = Optconfig.new('noms', {
                          'default-environment' => 'production',
                          'default-cloud' => 'ec2',
                          'format-field=s%' => {
+                            'hostgroup' => {
+                                'fields' => [
+                                    'name','num_hosts', 'num_services'
+                                ],
+                                'length' => {
+                                    'name' => 20,
+                                    'members' => 36,
+                                    'num_hosts' => 5,
+                                    'num_services' => 5
+                                }
+                             },
+                             'host' => {
+                                'fields' => [
+                                    'name','state', 'plugin_output'
+                                ],
+                                'length' => {
+                                    'name' => 36,
+                                    'state' => 5,
+                                    'plugin_output' => 36
+                                }
+                             },
+                             'nagcheck' => {
+                                'fields' => [
+                                    'host_name','address','service_description','state', 'plugin_output'
+                                ],
+                                'length' => {
+                                    'host_name' => 36,
+                                    'address' => 16,
+                                    'service_description' => 20,
+                                    'state' => 5,
+                                    'plugin_output' => 36
+                                }
+                             },                            
+                             'service' => {
+                                'fields' => [
+                                    'host_name','description','state', 'plugin_output'
+                                ],
+                                'length' => {
+                                    'host_name' => 36,
+                                    'description' => 20,
+                                    'state' => 5,
+                                    'plugin_output' => 36
+                                }
+                             },
                              'svcinst' => {
                                  'fields' => [
                                      'name', 'type', 'note'
@@ -255,6 +308,7 @@ $opt = Optconfig.new('noms', {
 if $opt['mock']
     NCC::Client.mock! $opt['mock']
     NOMS::CMDB.mock! $opt['mock']
+    NOMS::Nagui.mock! $opt['mock']
 end
 
 case $opt['format']
@@ -278,6 +332,7 @@ $opt['ncc']['timeout'] ||= $opt['timeout']
 
 $cmdb = NOMS::CMDB.new($opt)
 $ncc = NCC::Client.new($opt)
+$nagui = NOMS::Nagui.new($opt)
 
 def parse_format(fields, type)
     dbg "Specified fields: #{fields.inspect}"
@@ -359,7 +414,7 @@ end
 
 def record_formatted_output(object, type='instance', fields=nil)
     fields = fmt_fields(type, fields)
-    all_fields = object.keys
+    all_fields = object.keys.sort
     fields = fields & all_fields
     fieldlist = parse_format($opt['fields'], type) || fields + (all_fields - fields)
     case $opt['format']
@@ -464,19 +519,111 @@ def cmdb_show(args)
     fqdn = args.shift
     system = $cmdb.query('system', 'fqdn=' + fqdn).first
     record = if ! args.empty?
-                 system.keys.inject({}) do |h, k|
+        system.keys.inject({}) do |h, k|
             if args.include? k
                 h.merge({k => system[k]})
             else
                 h
             end
         end
-             else
-                 system
-             end
+    else
+        system
+    end
     record
 end
 
+def nagcheck(args)
+    host = args.shift
+    if args.empty?
+        $nagui.nagcheck_host(host)
+    else
+        service=args.shift
+        $nagui.nagcheck_service(host,service)    
+    end
+end
+
+def nagios(args)
+    cmd = args.shift
+    case cmd
+    when 'query'
+        type = args.shift
+        if $opt['names']
+            if type == 'service'
+                $opt['fields'] = ['host_name','description']
+            else
+                $opt['fields'] = [$nagui.default_query_key(type)] if $opt['names']
+            end
+        end
+        output = $nagui.query(type,args)
+        if type == 'hostgroup'
+            output.each do |item|
+                item.delete('members')
+            end
+        end
+        formatted_output(output, type)
+    when 'detail'
+        host = args.shift
+        record_formatted_output($nagui.host(host), 'host')
+    when 'show'
+        type = args.shift
+        key = args.shift
+        $opt['feedback'] = false
+        case type 
+        when 'host'
+            output = $nagui.host(key)
+            dbg("show host: #{output.inspect}")
+            if output != nil
+                data = [{ 
+                    'host_name' => output['name'],
+                    'description' => '',
+                    'state' => output['state'],
+                    'plugin_output' => output['plugin_output'] 
+                }]
+                output['services_with_info'].each do |svc|
+                    data << {
+                        'host_name' => '',
+                        'description' => svc[0],
+                        'state' => svc[1],
+                        'plugin_output' => svc[3]
+                    }
+                end
+                formatted_output(data,'service')
+            end
+        when 'hostgroup'
+            output = $nagui.hostgroup(key)
+            dbg("show hostgroup: #{output.inspect}")
+            if output != nil
+                data = [{
+                    'name' => output['name'],
+                    'members' => "#{output['num_hosts']} hosts #{output['num_services']} services",
+                    'num_hosts' => output['num_hosts'],
+                    'num_services' => output['num_services']
+                }]
+                output['members_with_state'].each do |host|
+                    data << {
+                        'members' => host[0],
+                        'state' => host[1]
+                    }
+                end
+                formatted_output(data,type,['name','members','state'])
+            end
+
+        when 'service'
+            service = args.shift
+            output = $nagui.service(key,service)
+            dbg("show service: #{output.inspect}")
+            record_formatted_output(output,type)
+       else
+            data = nil
+        end
+    when 'check'
+        record_formatted_output(nagcheck(args),'nagcheck')
+    else
+        $stderr.puts "Unknown nagios command '#{cmd}'"
+        Process.exit(2)
+    end
+end 
+
 def cmdb(args)
     $opt['fields'] = ['fqdn'] if $opt['names']
     cmd = args.shift
@@ -686,10 +833,12 @@ def dispatch_command(argv)
         outs svcinst argv
     when 'environment', 'env'
         outs env argv
-    when 'instance'
+    when 'instance', 'inst'
         outs instance argv
     when 'waitfor'
         waitfor argv
+    when 'nagios', 'nag'
+        outs nagios argv
     when nil
         $stderr.puts "Usage:\n   noms --help\n   noms {desc|cmdb|instance|waitfor|...} [arg]"
         Process.exit(1)

data/lib/noms/client/version.rb

@@ -3,5 +3,5 @@ class NOMS
 end
 
 class NOMS::Client
-    VERSION = '1.9.0'
+    VERSION = '1.10.0'
 end

data/lib/noms/cmdb.rb

@@ -100,6 +100,7 @@ class NOMS::CMDB < NOMS::HttpClient
   end
 
   # CMDB API bug means use this endpoint to create
+  # TODO needs update as this bug is no longer present
   def create_service(env, service, attrs)
       attrs[:name] = service
       attrs[:environment_name] = env

data/lib/noms/nagui.rb

@@ -23,28 +23,110 @@ class NOMS
 end
 
 class NOMS::Nagui < NOMS::HttpClient
+
+  @@validtypes =['hosts','services','hostgroups','servicegroups','contacts','commands',
+    'downtimes','timeperiods','status','contactgroups']
+
   def dbg(msg)
       if @opt.has_key? 'debug' and @opt['debug'] > 2
           puts "DBG(#{self.class}): #{msg}"
       end
   end
-  def initialize(opt)
-      @opt = opt
-      self.dbg "Initialized with options: #{opt.inspect}"
-  end
+
+  # def initialize(opt)
+  #     @opt = opt
+  #     self.dbg "Initialized with options: #{opt.inspect}"
+  # end
 
   def config_key
     'nagui'
   end
 
-  def system(hostname)
-    results = do_request(:GET => '/nagui/nagios_live.cgi', :query => URI.encode("query=GET hosts|Filter: name ~~ #{hostname}"))
+  def make_plural(str)
+    "#{str}s"
+  end
+
+  def default_query_key(type)
+    case type
+    when 'host'
+      'name'
+    when 'service'
+      'description'
+    when 'hostgroup'
+      'name'
+    end
+  end
+
+  def make_lql(type,queries)
+    if !queries.kind_of?(Array)
+      queries=[queries]
+    end
+    lql='GET ' 
+    lql << make_plural(type) 
+    queries.each do |q|
+      query = /(\w+)([!~>=<]+)(.*)/.match(q)
+      if query == nil
+        lql << "|Filter: #{default_query_key(type)} ~~ #{q}"
+      else
+        lql << "|Filter: #{query[1]} #{query[2]} #{query[3]}"
+      end
+    end
+    lql
+  end
+
+  def query(type,queries)
+    unless @@validtypes.include? make_plural(type)
+      puts "#{type} is not a valid type"
+      Process.exit(1)
+    end
+    query_string = make_lql(type,queries)
+    results = do_request(:GET => '/nagui/nagios_live.cgi', :query => URI.encode("query=#{query_string}"))
+  end
+  def hostgroup(name)
+    results = do_request(:GET => '/nagui/nagios_live.cgi', :query => URI.encode("query=GET hostgroups|Filter: name = #{name}"))
+    if results.kind_of?(Array) && results.length > 0
+      results[0]
+    else
+      nil
+    end
+  end
+  def service(host,description)
+    results = do_request(:GET => '/nagui/nagios_live.cgi', :query => URI.encode("query=GET services|Filter: host_name = #{host}|Filter: description = #{description}"))
+    if results.kind_of?(Array) && results.length > 0
+      results[0]
+    else
+      nil
+    end
+  end
+  def servicegroup(name)
+    results = do_request(:GET => '/nagui/nagios_live.cgi', :query => URI.encode("query=GET hosts|Filter: name = #{name}"))
+    if results.kind_of?(Array) && results.length > 0
+      results[0]
+    else
+      nil
+    end
+  end
+  def host(hostname)
+    results = do_request(:GET => '/nagui/nagios_live.cgi', :query => URI.encode("query=GET hosts|Filter: name = #{hostname}"))
     if results.kind_of?(Array) && results.length > 0
       results[0]
     else
       nil
     end
   end
+
+  def nagcheck_host(host)
+    url = "/nagcheck/host/#{host}"
+    dbg("nagcheck url= #{url}")
+    nagcheck=do_request(:GET => url, :query => "report=true")
+  end
+
+  def nagcheck_service(host,service)
+    url = "/nagcheck/service/#{host}/#{service}"
+    dbg("nagcheck url= #{url}")
+    nagcheck=do_request(:GET => url, :query => "report=true")
+  end
+
   def check_host_online(host)
     @opt['host_up_command'] = 'check-host-alive' unless @opt.has_key?('host_up_command')
     nagcheck=do_request(:GET => "/nagcheck/command/#{host}/#{@opt['host_up_command']}")
@@ -54,4 +136,5 @@ class NOMS::Nagui < NOMS::HttpClient
       false
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noms-client
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Jeremy Brinkley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler