my_nagios 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54ccb4307766b97a56702ff3be5b2af13b9f34c6
-  data.tar.gz: 826050115c2a120f1bc0b812af78f22db1f44eb1
+  metadata.gz: 08675c59ec122b34650ee7c21c7218af30ef7d3f
+  data.tar.gz: 6f9e8ea47b9b8479717f96071bb8d61fadfcf0d6
 SHA512:
-  metadata.gz: 68b5a1a4921f1e0bcf7d0a5a25d7d09a195380cb61364443acb37ee1e79bf7592861c3778c8fb94fa9579e6234784130405b2ddb557d865ee915a07e14725235
-  data.tar.gz: 05466c1c0469bc6c60363575e0e07a72bfce83c1392763d1f7a6ee4b63f65d57718ad547b72ffa1488a2ad7541bcca33145550967641975f9f32b09423bfef95
+  metadata.gz: 78340047fcaa7568bbafc843576160fc8e93606afd41def2ec9ab1bd9c27162dde607d13f4c6cba86ee16404955784285ba53a18a8b27087aa5b37b70ff3b0c8
+  data.tar.gz: d958f8248b1c8891990cc9fab96c858fd41e7f219930a54622618d2d0e7e8c910782bf074449cb36f3c59ea44cbb21e666c83eb1126b4d63f26799307f76adeb

data/app/controllers/my_nagios/checks_controller.rb

@@ -3,7 +3,7 @@ require_dependency "my_nagios/application_controller"
 module MyNagios
   class ChecksController < ApplicationController
     before_filter :find_check,  only: [:run_now, :toggle, :edit, :update]
-    before_filter :find_groups, only: [:create, :edit]
+    before_filter :find_groups, only: [:new, :create, :edit]
 
     def new
       @check = Check.new
@@ -49,7 +49,7 @@ module MyNagios
     end
 
     def params_check
-      params.require(:check).permit(:host, :user, :pem_key, :description, :interval, :command, :regexp, :group_id)
+      params.require(:check).permit(:host, :user, :pem_key, :description, :interval, :command, :additional_command, :regexp, :group_id)
     end
   end
 end

data/app/models/my_nagios/check.rb

@@ -7,13 +7,19 @@ module MyNagios
 
     scope :enabled, -> { where(enabled: true) }
 
+    attr_accessor :additional_command_result
+
     def run!
       begin
         self.update(state: :running)
 
         Net::SSH.start( self.host, self.user, config: true, keys: [self.pem_key], non_interactive: true ) do| ssh |
           result = ssh.exec! self.command
-          self.update(state: :completed, status: self.determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
+          status = self.determinate_status_by_response(result)
+
+          self.additional_command_result = ssh.exec!(self.additional_command) if not self.additional_command.blank? and status.eql?(:critical)
+
+          self.update(state: :completed, status: status, latest_state: result, latest_updated_at: Time.now)
         end
       rescue => e
         self.update(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now)
@@ -29,7 +35,11 @@ module MyNagios
         Net::SSH.start( config['host'], config['user'], config: true, keys: [config['pem_key']], non_interactive: true ) do |ssh|
           check_list.each do |check|
             result = ssh.exec! check.command
-            check.update(state: :completed, status: check.determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
+            status = check.determinate_status_by_response(result)
+
+            check.additional_command_result = ssh.exec!(check.additional_command) if not check.additional_command.blank? and status.eql?(:critical)
+
+            check.update(state: :completed, status: status, latest_state: result, latest_updated_at: Time.now)
           end
         end
 

data/app/views/my_nagios/checks/_form.haml

@@ -36,6 +36,11 @@
       .col-sm-10
         =f.text_field :command, class: 'form-control'
 
+    .form-group
+      =f.label :additional_command, 'Additional command (runs if command is fail)', class: 'col-sm-1 control-label'
+      .col-sm-10
+        =f.text_field :additional_command, class: 'form-control'
+
     .form-group
       =f.label :regexp, 'Critical if match:', class: 'col-sm-1 control-label'
       .col-sm-10

data/db/migrate/20160621080454_additional_command.rb

@@ -0,0 +1,5 @@
+class AdditionalCommand < ActiveRecord::Migration
+  def change
+    add_column :my_nagios_checks, :additional_command, :text, default: nil
+  end
+end

data/lib/my_nagios/version.rb

@@ -1,3 +1,3 @@
 module MyNagios
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_nagios
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - db/migrate/20160503110437_create_my_nagios_checks.rb
 - db/migrate/20160503110441_create_my_nagios_groups.rb
 - db/migrate/20160601081654_add_regexp_to_check.rb
+- db/migrate/20160621080454_additional_command.rb
 - lib/my_nagios.rb
 - lib/my_nagios/engine.rb
 - lib/my_nagios/version.rb