naginata 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5153f8a4699719891f2a79d83eb4b66c1cca2a1
-  data.tar.gz: 8ceceddd2a134409b7fed9a382311342dd6ca783
+  metadata.gz: 4a8ceb909d5af735d4415f2a4b2b510b3ef9cc96
+  data.tar.gz: 137468f15fcd645b7a4b114b69845ccfb3fab30b
 SHA512:
-  metadata.gz: 0c5a5b08495929ea05708b73bb00036114f30b7264788f9b10ce2266822ec9385e867c70e7f8e83703a848e5565c7538b3dc6cfb3a533fa936c8417f58b99020
-  data.tar.gz: 3863bc85efbb2bafc139427b8b323e3230e81b1aeddea2beed36d27172f93bc41d6aa593e0406d4987116c779ec071429f7110b3f7745b5612366a5bbc3f96e1
+  metadata.gz: bf65f48fb8b918f22e9eac4051605a2e039b1acbd35b656d919a1ff5965a09b77dde38f59672892f15dfde595866ae5359d132d933763a6ab681d54020ef2897
+  data.tar.gz: 631c3ac537362cbd5ac31be6ea675921905fa7547480f810b7eea19fe2da7658cfd607afe84d463db25168f9d0b36041e5cddcef092bbf2bca3071a9851a8d14

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.1.5 - 2015/06/09
+
+CLI:
+
+* Print version number
+* Add naginata activecheck subcommand
+
+Fixes:
+
+* Run commands on login user if run_command_as is not set
+
 ### 0.1.4 - 2015/04/08
 
 CLI:

data/README.md

@@ -12,7 +12,8 @@ If you already have nagios servers, it's easy to try out Naginata! It does not r
 
 ## Requirements
 
-Set up a workstation host which can connect to nagios servers over ssh connection. Currently supports only no passphrase remote login.
+* Ruby 1.9.3, 2.0.0, 2.1.x, 2.2.x
+* Nagios 3.x, 4.x
 
 ## Installation
 
@@ -49,11 +50,16 @@ nagios_server 'baz@nagios3.example.com'
 set :nagios_server_options, {
   command_file: '/usr/local/nagios/var/rw/nagios.cmd',
   status_file: '/usr/local/nagios/var/status.cmd',
+  # If you want to change run user for external commands execution after login
+  # to nagios servers, uncomment below and set a proper user name. This is
+  # usefull if a login user does not have write or read permission to
+  # command_file or status_file.
   run_command_as: 'nagios',
 }
 
 # Global SSH options
 set :ssh_options, {
+  # Currently Naginata only supports remote login with no passphrase.
   keys: %w(/home/nikushi/.ssh/id_rsa),
 }
 ```
@@ -98,6 +104,16 @@ $ naginata notification -a -s cpu -[e|d]
 $ naginata notification -a -[e|d] -s 'disk.+' -s 'https?'
 ```
 
+### Active Checks Control
+
+You can enable or disable active checks of hosts and services.
+
+```
+$ naginata activecheck [hostpattern...] [OPTIONS]
+```
+
+Optinos are same as `naginata notification`. See above examples.
+
 ### View service status (Experimental)
 
 #### View service status for all hosts

data/integration-test/Vagrantfile

@@ -6,6 +6,7 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/"
    AllowOverride None
    Order allow,deny
    Allow from all
+   SetEnv REMOTE_USER nagiosadmin
 </Directory>
 
 Alias /nagios "/usr/share/nagios/html"
@@ -91,7 +92,6 @@ Vagrant.configure("2") do |config|
 " > /etc/nagios/conf.d/servers.cfg
 
 
-          sed -i 's/use_authentication=1/use_authentication=0/' /etc/nagios/cgi.cfg
           service httpd start && service nagios start
       INLINE
 

data/lib/naginata/cli.rb

@@ -11,6 +11,13 @@ module Naginata
     #  super(args, opts, config)
     #end
 
+    desc "version", "Prints the naginata's version information"
+    def version
+      require 'naginata/version'
+      Naginata.ui.info "Naginata version #{Naginata::VERSION}"
+    end
+    map %w(--version) => :version
+
     desc 'init', 'Init generates a default Nagipfile into current directory'
     def init
       require 'naginata/cli/init'
@@ -34,6 +41,23 @@ module Naginata
       CLI::Notification.new(options.merge(patterns: patterns)).execute
     end
 
+    desc 'activecheck [hostpattern ..]', 'Control active checks'
+    method_option :enable, aliases: "-e", desc: "Enable active checks", type: :boolean
+    method_option :disable, aliases: "-d", desc: "Disable active checks", 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, aliases: "-N", desc: "Filter targeted nagios servers by their hostname", 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
+    def activecheck(*patterns)
+      if patterns.empty? and options.empty?
+        help(:activecheck)
+        exit(1)
+      end
+      require 'naginata/cli/active_check'
+      CLI::ActiveCheck.new(options.merge(patterns: patterns)).execute
+    end
+
     method_option :nagios, aliases: "-N", desc: "Filter targeted nagios servers by their hostname", type: :array
     desc 'fetch', 'Download remote status.dat and create cache on local'
     def fetch

data/lib/naginata/cli/active_check.rb

@@ -0,0 +1,61 @@
+require 'naginata'
+require 'naginata/cli/remote_abstract'
+require 'naginata/command/external_command'
+require 'naginata/configuration'
+require 'naginata/runner'
+
+module Naginata
+  class CLI::ActiveCheck < CLI::RemoteAbstract
+
+    def run
+      if !@options[:enable] and !@options[:disable]
+        abort "Either --enable or --disable options is required"
+      end
+      if @options[:enable] and @options[:disable]
+        abort "Both --enable and --disable options can not be given"
+      end
+
+      if @options[:all_hosts]
+        ::Naginata::Configuration.env.add_filter(:host, :all)
+      elsif @options[:patterns].empty?
+        abort "At least one hostpattern must be given or use --all-hosts option"
+      else
+        ::Naginata::Configuration.env.add_filter(:host, @options[:patterns])
+      end
+      if @options[:services]
+        ::Naginata::Configuration.env.add_filter(:service, @options[:services])
+      end
+
+      command_file = ::Naginata::Configuration.env.fetch(:nagios_server_options)[:command_file]
+
+      if !@options[:force]
+        Naginata.ui.info "Following active checks will be #{@options[:enable] ? 'enabled' : 'disabled'}"
+        Naginata::Runner.run_locally do |nagios_server, services|
+          services.group_by{ |s| s.hostname }.each do |hostname, svcs|
+            Naginata.ui.info hostname
+            svcs.each do |service|
+              Naginata.ui.info "  - #{service.description}"
+            end
+          end
+        end
+        abort unless Naginata.ui.yes?("Are you sure? [y|N]")
+      end
+
+      Naginata::Runner.run do |backend, nagios_server, services|
+        path = nagios_server.fetch(:command_file) || command_file
+
+        services.each do |service|
+          opts = {path: (nagios_server.fetch(:command_file) || command_file), host_name: service.hostname}
+          opts.merge!(service_description: service.description) if service.description != :ping
+          action = @options[:enable] ? 'enable' : 'disable'
+          host_or_svc = service.description == :ping ? 'host' : 'svc'
+          command_arg = Naginata::Command::ExternalCommand.send("#{action}_#{host_or_svc}_check".to_sym, opts).split(/\s+/, 2)
+          command = command_arg.shift.to_sym
+          backend.execute command, command_arg
+        end
+      end
+      Naginata.ui.info "Done"
+    end
+
+  end
+end

data/lib/naginata/loader.rb

@@ -18,13 +18,8 @@ module Naginata
         # Refresh cached status.dat
         CLI::Fetch.new(fetch_options).run
 
-        # Load status.dat
-        #
-        # @Note currently here reads all nagios servers' cache files. This
-        # means that users can not reduce nagios servers by --nagios= CLI 
-        # option. Below loop may be moved into initialization phase of CLI
-        # class.
-        Configuration.env.nagios_servers.each do |nagios_server|
+        nagios_servers = Configuration.env.filter(Configuration.env.nagios_servers)
+        nagios_servers.each do |nagios_server|
           status = ::Naginata::Status.find(nagios_server.hostname)
           status.service_items.group_by{ |section| section.host_name }.each do |host, sections|
             services = sections.map { |s| s.service_description }

data/lib/naginata/runner.rb

@@ -11,7 +11,9 @@ module Naginata
 
       run_backend(nagios_servers) do |nagios_server|
         svcs = Configuration::Filter.new(:nagios_server, nagios_server).filter_service(services)
-        as(user) do
+        if user
+          as(user) { yield self, nagios_server, svcs }
+        else
           yield self, nagios_server, svcs
         end
       end

data/lib/naginata/templates/Naginatafile

@@ -11,10 +11,12 @@
 # Global Nagios Server Options
 # ============================
 # You can set global properties for all nagios servers here.
+#
 # `run_command_as` is a user who execute external commands on a remote nagios
 # server. By default external commands are as the same user who is log-in.
-# This means naginata executes sudo -u `run_command_as sh -c ...` on remote
-# servers if `run_command_as` is set.
+# If you want to change run user for external commands execution after login
+# to nagios servers, set a proper user name . This is usefull if a login user
+# does not have write or read permission to command_file or status_file.
 
 # set :nagios_server_options, {
 #   command_file: '/var/spool/nagios/cmd/nagios.cmd',

data/lib/naginata/version.rb

@@ -1,3 +1,3 @@
 module Naginata
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naginata
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -116,6 +116,7 @@ files:
 - integration-test/Vagrantfile
 - lib/naginata.rb
 - lib/naginata/cli.rb
+- lib/naginata/cli/active_check.rb
 - lib/naginata/cli/fetch.rb
 - lib/naginata/cli/hosts.rb
 - lib/naginata/cli/init.rb