naginata 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32af873ea80b3b5ade9260449bb08f15d45fda41
-  data.tar.gz: 232bd48d820d0d500f3a5ac7a26e90564768e8f6
+  metadata.gz: 74e188ef978a45024f7f18d461322f65e679ed9a
+  data.tar.gz: f7c51a3a8467dc3c9ad685ee78cb7990f0c29c3e
 SHA512:
-  metadata.gz: 1c00459ebef2245b3b73d2d97e53a5d5003ff5fd1b0711b5d693d07ddd32fe181288edb76a628265b0ec0473327e11662a8bc60bbe158f93b4132333efadd72a
-  data.tar.gz: 9553c604ea5bcfe803e05a8a17ca70ecdec19865dca3caaf1382268107efd7e1a6c8e23db1d357e944d8bd2227dbdd05937b2785aa610c798ceb56cec837b16b
+  metadata.gz: c9ccf821b8df0b705608cb4021434eddf422470c08f822130204e4a0d5012d8d0fd9d02dc84691e2d4f8e85b280739f93b1351be804b0dcabd2ef4f00c8c3650
+  data.tar.gz: 2ef51b650b5e11b58e6c284686f62af96c3c03a9b1d808a48e17d53b9aae881ae59d746244e2329dd00dbd706a91337162c35a41d1f771b44d68d18052eaa922

data/.travis.yml

@@ -1,5 +1,9 @@
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
+  - ruby-head
+before_install:
+  - "gem install bundler -v '~> 1.9'"

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-### 0.1.1
+### 0.1.2 - 2015/04/06
+
+Enhancement:
+
+* Add tests to evaluate command execution output and behavior
+* List hosts and their services and status
+
+### 0.1.1 - 2015/04/03
 
 Enhancement:
 
@@ -8,6 +15,6 @@ Fixes:
 
 * --dry-run was broken
 
-### 0.1.0
+### 0.1.0 - 2015/04/02
 
 * First release

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in naginata.gemspec
 gemspec
+
+group :development, :test do
+  gem 'coveralls', :require => false
+end

data/README.md

@@ -1,4 +1,4 @@
-# Naginata
+# Naginata [![Build Status](https://travis-ci.org/niku4i/naginata.svg?branch=master)](https://travis-ci.org/niku4i/naginata) [![Coverage Status](https://coveralls.io/repos/niku4i/naginata/badge.svg)](https://coveralls.io/r/niku4i/naginata) [![Gem Version](https://badge.fury.io/rb/naginata.svg)](http://badge.fury.io/rb/naginata)
 
 Naginata is multi nagios server control tool. If you have multiple nagios servers and want to control them from single workstation host by CLI over ssh connection, Naginata is good for you.
 
@@ -86,26 +86,73 @@ $ naginata notification -a -[e|d]
 $ naginata notification -a -s cpu -[e|d] 
 ```
 
-### Display status (will be added)
+### View service status (Experimental)
 
-#### Show server001's status
+#### View service status for all hosts
 
 ```
-$ naginata status server001
+$ naginata services -a
 ```
 
-#### Show all hosts' status
+Output example:
 
 ```
-$ naginata status -a
+$ naginata services -a
+NAGIOS   HOST                 SERVICE          STATUS   FLAGS  OUTPUT
+nagios0  localhost            HTTP             WARNING  AC,nt  HTTP WARNING: HTTP/1.1 403 Forbidden - 5152 bytes in 0.001 second response time
+nagios0  localhost            Current Load     OK       AC,NT  OK - load average: 0.00, 0.00, 0.00
+nagios0  localhost            PING             OK       AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+nagios0  redis01.tokyo.local  Load             CRITICAL AC,NT  Too high load average 15
+nagios0  redis01.tokyo.local  PING             OK       ac,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+nagios0  redis01.tokyo.local  SSH              OK       AC,NT  SSH OK - OpenSSH_5.3 (protocol 2.0)
+nagios0  web01.tokyo.local    Load             OK       AC,NT  OK - load average: 0.01, 0.00, 0.00
+nagios0  web01.tokyo.local    PING             OK       AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+nagios0  web01.tokyo.local    SSH              OK       AC,NT  SSH OK - OpenSSH_5.3 (protocol 2.0)
+nagios1  redis01.osaka.local  Load             OK       AC,NT  OK - load average: 0.00, 0.00, 0.00
+nagios1  redis01.osaka.local  PING             OK       AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+nagios1  redis01.osaka.local  SSH              OK       AC,NT  SSH OK - OpenSSH_5.3 (protocol 2.0)
+...
 ```
 
-#### Show all hosts' specific service status
+
+#### View service status for specific hosts
+
+```
+$ naginata services web01.example.com db01.example.com
+```
+
+#### View service status filtering by services
 
 ```
-$ naginata status -a -s cpu
+$ naginata services -a -s PING,SWAP
 ```
 
+### View host status (Experimental)
+
+#### View all host status
+
+```
+$ naginata hosts -a
+```
+
+Output example:
+
+```
+$ naginata hosts -a
+NAGIOS   HOST                 STATUS  FLAGS  OUTPUT
+nagios0  localhost            OK      AC,NT  PING OK - Packet loss = 0%, RTA = 0.01 ms
+nagios0  redis01.tokyo.local  OK      AC,NT  PING OK - Packet loss = 0%, RTA = 0.03 ms
+nagios0  web01.tokyo.local    OK      AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+nagios1  localhost            OK      AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+nagios1  redis01.osaka.local  OK      AC,NT  PING OK - Packet loss = 0%, RTA = 0.05 ms
+nagios1  web01.osaka.local    OK      AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
+```
+
+#### View host status for specific hosts
+
+```
+$ naginata hosts web01.example.com db01.example.com
+```
 
 ### Global Options
 

data/Rakefile

@@ -1,5 +1,12 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["-c", "-f documentation"]
+end
+task :test => :spec
+task :default => :spec
+
 desc 'Open an irb session preloaded with the gem library'
 task :console do
   require "bundler/setup"

data/lib/naginata.rb

@@ -8,6 +8,8 @@ require "naginata/status"
 require "naginata/ui"
 require "naginata/version"
 
+require "nagios_analyzer/section_decorator"
+
 module Naginata
 
   class NaginatafileNotFound < StandardError; end

data/lib/naginata/cli.rb

@@ -4,8 +4,6 @@ require 'naginata/loader'
 
 module Naginata
   class CLI < Thor
-    class_option :nagios, desc: "Filter hosts by nagios server names", type: :array
-    class_option :dry_run, aliases: "-n", type: :boolean
     class_option :verbose, aliases: "-v", type: :boolean
     class_option :debug, type: :boolean
 
@@ -20,22 +18,53 @@ module Naginata
     end
 
     desc 'notification [hostpattern ..]', 'Control notification'
-    method_option :enable, aliases: "-e", desc: "Enable notification", type: :boolean, default: false
-    method_option :disable, aliases: "-d", desc: "Disable notification", type: :boolean, default: false
-    method_option :force, aliases: "-f", desc: "Run without prompting for confirmation", type: :boolean, default: false
+    method_option :enable, aliases: "-e", desc: "Enable notification", type: :boolean
+    method_option :disable, aliases: "-d", desc: "Disable notification", type: :boolean
+    method_option :dry_run, aliases: "-n", type: :boolean
+    method_option :force, aliases: "-f", desc: "Run without prompting for confirmation", type: :boolean
+    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
     method_option :services, aliases: "-s", desc: "Services to be enabled|disabled", type: :array
-    method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean, default: false
+    method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean
     def notification(*patterns)
+      if patterns.empty? and options.empty?
+        help(:notification)
+        exit(1)
+      end
       require 'naginata/cli/notification'
       CLI::Notification.new(options.merge(patterns: patterns)).execute
     end
 
+    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
     desc 'fetch', 'Download remote status.dat and create cache on local'
     def fetch
       require 'naginata/cli/fetch'
       CLI::Fetch.new(options).execute
     end
 
+    desc 'hosts [hostpattern ..]', 'View host status'
+    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
+    method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean
+    def hosts(*patterns)
+      if patterns.empty? and !options[:all_hosts]
+        help(:hosts)
+        exit(1)
+      end
+      require 'naginata/cli/hosts'
+      CLI::Hosts.new(options.merge(patterns: patterns)).execute
+    end
+
+    desc 'services [hostpattern ..]', 'View service status'
+    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
+    method_option :services, aliases: "-s", desc: "Filter by service description", type: :array
+    method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean
+    def services(*patterns)
+      if patterns.empty? and !options[:all_hosts]
+        help(:services)
+        exit(1)
+      end
+      require 'naginata/cli/services'
+      CLI::Services.new(options.merge(patterns: patterns)).execute
+    end
   end
 end
  

data/lib/naginata/cli/hosts.rb

@@ -0,0 +1,32 @@
+require 'naginata'
+require 'naginata/cli/remote_abstract'
+require 'naginata/configuration'
+require 'naginata/status'
+require 'naginata/runner'
+
+module Naginata
+  class CLI::Hosts < CLI::RemoteAbstract
+
+    def run
+      if @options[:all_hosts]
+        ::Naginata::Configuration.env.add_filter(:host, :all)
+      else
+        ::Naginata::Configuration.env.add_filter(:host, @options[:patterns])
+      end
+
+      table = []
+      table << %w(NAGIOS HOST STATUS FLAGS OUTPUT)
+      Naginata::Runner.run_locally do |nagios_server, services|
+        targets = services.map{ |s| s.hostname }.uniq
+        status = Status.find(nagios_server.hostname)
+        status.scopes << lambda { |s|
+          targets.any? {|host| s.include?("host_name=#{host}") }
+        }
+        table.concat(status.decorate.hosts_table)
+      end
+      Naginata.ui.print_table table
+    end
+
+  end
+end
+

data/lib/naginata/cli/init.rb

@@ -7,7 +7,7 @@ module Naginata
         Naginata.ui.error "Naginatafile already exists at #{Dir.pwd}/Naginatafile"
         exit 1
       end
-      Naginata.ui.info "Writing new Naginatafile to #{Dir.pwd}/Naginatafile", true
+      Naginata.ui.info "Writing new Naginatafile to #{Dir.pwd}/Naginatafile"
       FileUtils.cp(File.expand_path('../../templates/Naginatafile', __FILE__), 'Naginatafile')
     end
 

data/lib/naginata/cli/notification.rb

@@ -29,12 +29,12 @@ module Naginata
       command_file = ::Naginata::Configuration.env.fetch(:nagios_server_options)[:command_file]
 
       if !@options[:force]
-        Naginata.ui.info "Following notifications will be #{@options[:enable] ? 'enabled' : 'disabled'}", true
+        Naginata.ui.info "Following notifications will be #{@options[:enable] ? 'enabled' : 'disabled'}"
         Naginata::Runner.run_locally do |nagios_server, services|
           services.group_by{ |s| s.hostname }.each do |hostname, svcs|
             puts hostname
             svcs.each do |service|
-              Naginata.ui.info "  - #{service.description}", true
+              Naginata.ui.info "  - #{service.description}"
             end
           end
         end
@@ -54,7 +54,7 @@ module Naginata
           backend.execute command, command_arg
         end
       end
-      Naginata.ui.info "Done", true
+      Naginata.ui.info "Done"
     end
 
   end

data/lib/naginata/cli/services.rb

@@ -0,0 +1,39 @@
+require 'naginata'
+require 'naginata/cli/remote_abstract'
+require 'naginata/configuration'
+require 'naginata/status'
+require 'naginata/runner'
+
+module Naginata
+  class CLI::Services < CLI::RemoteAbstract
+
+     def run
+      if @options[:all_hosts]
+        ::Naginata::Configuration.env.add_filter(:host, :all)
+      else
+        ::Naginata::Configuration.env.add_filter(:host, @options[:patterns])
+      end
+      if @options[:services]
+        ::Naginata::Configuration.env.add_filter(:service, @options[:services])
+      end
+
+      table = []
+      table << %w(NAGIOS HOST SERVICE STATUS FLAGS OUTPUT)
+      Naginata::Runner.run_locally do |nagios_server, services|
+        target_hosts = services.map{|s| s.hostname }.uniq
+        target_services = services.reject{|s| s.description == :ping}.map{|s| s.description }.uniq
+        status = Status.find(nagios_server.hostname)
+        status.scopes << lambda { |s|
+          target_hosts.any? {|host| s.include?("host_name=#{host}") }
+        }
+        status.scopes << lambda { |s|
+          target_services.any? {|desc| s.include?("service_description=#{desc}") }
+        }
+        table.concat(status.decorate.services_table)
+      end
+      Naginata.ui.print_table table
+    end
+
+  end
+end
+

data/lib/naginata/status.rb

@@ -1,12 +1,14 @@
 require 'nagios_analyzer'
 require 'forwardable'
 require 'tempfile'
+require 'naginata/status_decorator'
 
 module Naginata
   class Status
     extend Forwardable
     def_delegators :@status, :service_items, :host_items, :items, :service_problems, :host_problems, :scopes
     attr_accessor :status, :hostname
+    alias :nagios :hostname
 
     # Write status.dat into local disk
     #
@@ -35,6 +37,13 @@ module Naginata
       @path ||= File.join(self.class.cache_dir, "#{hostname}.status.dat")
     end
 
+    # Returns decorator instance
+    #
+    # @return [StatusDecorator]
+    def decorate
+      StatusDecorator.new(self)
+    end
+
     # Create a new instance from raw status.dat string
     #
     # @param [String] string raw status.dat text

data/lib/naginata/status_decorator.rb

@@ -0,0 +1,26 @@
+require 'naginata'
+
+module Naginata
+  class StatusDecorator
+
+    attr_reader :object
+
+    def initialize(status)
+      @object = status
+    end
+
+    def hosts_table
+      object.host_items.sort.map do |section|
+        [object.nagios, section.host_name, section.decorate.current_state, section.decorate.flags_short, section.plugin_output]
+      end
+    end
+
+    def services_table
+      object.service_items.sort.map do |section|
+        [object.nagios, section.host_name, section.service_description, section.decorate.current_state, section.decorate.flags_short, section.plugin_output]
+      end
+    end
+
+  end
+end
+

data/lib/naginata/ui/shell.rb

@@ -11,19 +11,19 @@ module Naginata
       end
 
       def info(msg, newline = nil)
-        @shell.say(msg, nil, newline) if level("info")
+        tell_me(msg, nil, newline) if level("info")
       end
 
       def warn(msg, newline = nil)
-        @shell.say(msg, :yellow, newline) if level("warn")
+        tell_me(msg, :yellow, newline) if level("warn")
       end
 
       def error(msg, newline = nil)
-        @shell.say(msg, :red, newline) if level("error")
+        tell_me(msg, :red, newline) if level("error")
       end
 
       def debug(msg, newline = nil)
-        @shell.say(msg, nil, newline) if level("debug")
+        tell_me(msg, nil, newline) if level("debug")
       end
 
       def level(name = nil)
@@ -34,6 +34,20 @@ module Naginata
         @shell.yes?(msg)
       end
 
+      def print_table(array, options = {})
+        @shell.print_table(array, options)
+      end
+
+      private
+
+      def tell_me(msg, color = nil, newline = nil)
+        if newline.nil?
+          @shell.say(msg, color)
+        else
+          @shell.say(msg, color, newline)
+        end
+      end
+
     end
   end
 end

data/lib/naginata/version.rb

@@ -1,3 +1,3 @@
 module Naginata
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/nagios_analyzer/section_decorator.rb

@@ -0,0 +1,37 @@
+require 'nagios_analyzer'
+
+module NagiosAnalyzer
+  class Section
+
+    def decorate
+      SectionDecorator.new(self)
+    end
+
+  end
+end
+
+module NagiosAnalyzer
+  class SectionDecorator
+
+    attr_reader :object
+
+    def initialize(section)
+      @object = section
+    end
+
+    def current_state
+      if object.current_state
+        Status::STATES[object.current_state]
+      end
+    end
+
+    def flags_short
+      ret = []
+      ret.push (object.active_checks_enabled == 1)  ? "AC": "ac"
+      ret.push (object.notifications_enabled == 1)  ? "NT": "nt"
+      ret.join(",")
+    end
+
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naginata
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -117,10 +117,12 @@ files:
 - lib/naginata.rb
 - lib/naginata/cli.rb
 - lib/naginata/cli/fetch.rb
+- lib/naginata/cli/hosts.rb
 - lib/naginata/cli/init.rb
 - lib/naginata/cli/local_abstract.rb
 - lib/naginata/cli/notification.rb
 - lib/naginata/cli/remote_abstract.rb
+- lib/naginata/cli/services.rb
 - lib/naginata/command/external_command.rb
 - lib/naginata/configuration.rb
 - lib/naginata/configuration/filter.rb
@@ -131,10 +133,12 @@ files:
 - lib/naginata/loader.rb
 - lib/naginata/runner.rb
 - lib/naginata/status.rb
+- lib/naginata/status_decorator.rb
 - lib/naginata/templates/Naginatafile
 - lib/naginata/ui.rb
 - lib/naginata/ui/shell.rb
 - lib/naginata/version.rb
+- lib/nagios_analyzer/section_decorator.rb
 - naginata.gemspec
 homepage: https://github.com/niku4i/naginata
 licenses: