my_nagios 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c794797fd9afb6c4b351d3f18f97a82f91353d
-  data.tar.gz: 083333d13eb6f26614edaa8810f3207f7fb0491f
+  metadata.gz: 005a2d3a1d87debfa2bd09ba55382e2a01e57d00
+  data.tar.gz: 80224bda33b1880e06e95cb83733e4962cc035a7
 SHA512:
-  metadata.gz: b87f9ad9d59c82fa234c05072a428481e6da1887cf9c26b0fdd24dfc82bf1af4cbe14f85627f66fe042ffd8944d17d0c9f8b6ed31be1cd4bafb1978eaec18669
-  data.tar.gz: fbad8116f69f35617a3bff242b80dc2543e0db5a768bb4d41cc85d84da5a72a38605eaed6c336ff417998c85e84d8362c9b67e45349c86633c99f3d3f91da049
+  metadata.gz: 73ae5dece408756ae52ef4d1205cd782dfcf204684e99a3cd05fcc7bbc4f2b418303b443d0465627169c62996c04a4edeca8e8eb67b5ca04d4b46258b070ea95
+  data.tar.gz: 40fbece622f7f4a993f5158ac08366cf8459b022f6daae10eb95612319020a7b64724a71affc66527613b0f5f44dd7daaf264dcabde89da1c613dd83bfdcf05a

data/app/jobs/schedule_by_interval_job.rb

@@ -7,7 +7,7 @@ class ScheduleByIntervalJob
 
     # Run each Check separately (new ssh connection for each check even common host)
     if one_by_one
-      MyNagios::Check.where(interval: options['interval']).each do |check|
+      MyNagios::Check.enabled.not_snoozed.where(interval: options['interval']).each do |check|
         MonitoringJob.perform_async(check)
       end
 

data/app/models/my_nagios/check.rb

@@ -23,10 +23,10 @@ module MyNagios
 
           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)
+          self.update(state: :completed, status: status, latest_state: result, latest_updated_at: Time.now, retry_count: 0)
         end
       rescue => e
-        self.update(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now)
+        self.update(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now, retry_count: (self.retry_count + 1))
       end
     end
 
@@ -43,12 +43,12 @@ module MyNagios
 
             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)
+            check.update(state: :completed, status: status, latest_state: result, latest_updated_at: Time.now, retry_count: 0)
           end
         end
 
       rescue => e
-        check_list.each { |check| check.update(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now) }
+        check_list.each { |check| check.update(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now, retry_count: (check.retry_count + 1)) }
       end
     end
 

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

@@ -22,6 +22,9 @@
     %span.label{ class: "label-#{status_to_label(check.status)}"}= check.status
     =check.latest_state
 
+    - if check.retry_count > 0
+      %strong= "(retries count: #{check.retry_count})"
+
     - if is_snooze
       %div.snooze_for
         Snooze for: #{check.snooze_for}

data/app/views/my_nagios/welcome/index.haml

@@ -6,7 +6,7 @@
   =form_tag group_action_path do
     Please, set action for selected checks:
     =select_tag :check_group_action, options_for_select(['Disable', 'Enable', 'Snooze for'])
-    =select_tag :snooze_time_select, options_for_select(['15 min', '30 min', '60 min'])
+    =select_tag :snooze_time_select, options_for_select([['15 min', '15'], ['30 min', '30'], ['1 h', '60'], ['3h', '180'], ['6h', '360'], ['12h', '720']])
     =hidden_field_tag :group_action_check_ids
     =submit_tag
 

data/db/migrate/20160915190233_add_retry_count_to_check.rb

@@ -0,0 +1,5 @@
+class AddRetryCountToCheck < ActiveRecord::Migration
+  def change
+    add_column :my_nagios_checks, :retry_count, :integer, default: 0
+  end
+end

data/lib/my_nagios/version.rb

@@ -1,3 +1,3 @@
 module MyNagios
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_nagios
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,6 +196,7 @@ files:
 - db/migrate/20160601081654_add_regexp_to_check.rb
 - db/migrate/20160621080454_additional_command.rb
 - db/migrate/20160823134410_add_snooze_for_check.rb
+- db/migrate/20160915190233_add_retry_count_to_check.rb
 - lib/my_nagios.rb
 - lib/my_nagios/engine.rb
 - lib/my_nagios/version.rb