my_nagios 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4f50f6cc3f9dd7fee7469107733dca82ffeb0c
-  data.tar.gz: 9ac66821b232b0b0729288eeb482a1416e9422ed
+  metadata.gz: b637570a04fd2adb5def00b3f8cfd77ad3f1679e
+  data.tar.gz: 0c52e8509e3e5604970a159b002a3bed9a118155
 SHA512:
-  metadata.gz: d4f7dcf8b450d3325f72a6341442d6afbbae1cb7a41c26060d4b9152df251b0f32a34ad65cb4fb375cec7a5cc9f6d58760b027e34f5a4f4e2bf8f44cc107885f
-  data.tar.gz: 68dafde5cfb3c71916e60c395a117fd2abe934f9e73406f85c0064f25737751c4f2c7957da33cc4f4ad64e62bcb910f5de6d4ca95e39c7396e56c983871bb8b6
+  metadata.gz: 15964788d84148d14e5a46da1d0a9b91bedc93128b5cf206dc77d63bef1cf98722d8ee8f259d738e67ff38fed5bc45d413b99d6a5978598753dd9998a3282c01
+  data.tar.gz: 3ed140d7131a60ae6382ee991f44d74b6e184474976d7d4ff77e335b1085537171cfef0e2680d172665a851bf551b6554575ad20caa8bebf7bf4b54e69806be3

data/app/controllers/my_nagios/checks_controller.rb

@@ -5,7 +5,8 @@ module MyNagios
     before_filter :find_check, only: [:run_now, :toggle, :edit, :update]
 
     def new
-      @check = Check.new
+      @check  = Check.new
+      @groups = MyNagios::Group.all
     end
 
     def create
@@ -44,7 +45,7 @@ module MyNagios
     end
 
     def params_check
-      params.require(:check).permit(:host, :user, :pem_key, :description, :interval, :command)
+      params.require(:check).permit(:host, :user, :pem_key, :description, :interval, :command, :regexp, :group_id)
     end
   end
 end

data/app/models/my_nagios/check.rb

@@ -13,7 +13,7 @@ module MyNagios
 
         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(status: Check.determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
+          self.update(status: determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
         end
       rescue => e
         self.update(status: :info, latest_state: e, latest_updated_at: Time.now)
@@ -31,7 +31,7 @@ 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(status: Check.determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
+            check.update(status: determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
           end
         end
 
@@ -42,7 +42,10 @@ module MyNagios
       end
     end
 
-    def self.determinate_status_by_response(response)
+    private
+
+    def determinate_status_by_response(response)
+      return :critical if not regexp.blank? and response =~ /#{regexp}/
       return :critical if not response.scan('CRITICAL').blank?
       return :info     if response.nil? or not response.scan('No such file or directory').blank?
       :success

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

@@ -8,7 +8,9 @@
     %td
       =link_to check.group.name, "##{dom_id(check)}", class: 'fail_check'
   - else
-    %td=check.command
+    %td
+      =check.command
+      ="(regexp: #{check.regexp})" unless check.regexp.blank?
 
   %td
     %span.label{ class: "label-#{status_to_label(check.status)}"}= check.status

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

@@ -1,9 +1,10 @@
 .row.col-sm-12
   =form_for @check, html: { class: 'form-horizontal' } do |f|
+
     .form-group
-      =f.label :group, class: 'col-sm-1 control-label'
+      =f.label :group_id, class: 'col-sm-1 control-label'
       .col-sm-10
-        =f.select :group, options_for_select( MyNagios::Group.all.map{|g| [g.name, g.id]}, @check.group_id ), class: 'form-control'
+        =f.select :group_id, options_for_select( @groups.map{|g| [g.name, g.id]}, @check.group_id ), class: 'form-control'
 
     .form-group
       =f.label :host, class: 'col-sm-1 control-label'
@@ -35,6 +36,11 @@
       .col-sm-10
         =f.text_field :command, class: 'form-control'
 
+    .form-group
+      =f.label :regexp, 'Critical if match:', class: 'col-sm-1 control-label'
+      .col-sm-10
+        =f.text_field :regexp, class: 'form-control'
+
     .form-group
       .col-sm-10.col-sm-offset-1
         =f.submit

data/db/migrate/20160601081654_add_regexp_to_check.rb

@@ -0,0 +1,5 @@
+class AddRegexpToCheck < ActiveRecord::Migration
+  def change
+    add_column :my_nagios_checks, :regexp, :string, default: nil
+  end
+end

data/lib/my_nagios/version.rb

@@ -1,3 +1,3 @@
 module MyNagios
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_nagios
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,7 @@ files:
 - config/schedule.yml
 - db/migrate/20160503110437_create_my_nagios_checks.rb
 - db/migrate/20160503110441_create_my_nagios_groups.rb
+- db/migrate/20160601081654_add_regexp_to_check.rb
 - lib/my_nagios.rb
 - lib/my_nagios/engine.rb
 - lib/my_nagios/version.rb