my_nagios 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e62afd01bda82322ef1f452962ceb0aba1b30f
-  data.tar.gz: 96837294e7d5b3f495c403883361e365b8caaed8
+  metadata.gz: 54ccb4307766b97a56702ff3be5b2af13b9f34c6
+  data.tar.gz: 826050115c2a120f1bc0b812af78f22db1f44eb1
 SHA512:
-  metadata.gz: 96aefa7289b8bcd23f8ec17666dd55652e63763ef1fc67640f700b3ed05925c10f3b5f92fb5e312a34b8d38fc542487c2afdf6ddebd494ccf05095b64e8949e1
-  data.tar.gz: e3ff0224cd1aa8695f8e6715def41980938f1fa58ec2ce4c8e6b3dec42e91f9469aab27e7ca76d116d2317d34f50412aa1ec7dad5e228b7b01e4da18f8214675
+  metadata.gz: 68b5a1a4921f1e0bcf7d0a5a25d7d09a195380cb61364443acb37ee1e79bf7592861c3778c8fb94fa9579e6234784130405b2ddb557d865ee915a07e14725235
+  data.tar.gz: 05466c1c0469bc6c60363575e0e07a72bfce83c1392763d1f7a6ee4b63f65d57718ad547b72ffa1488a2ad7541bcca33145550967641975f9f32b09423bfef95

data/app/assets/stylesheets/my_nagios/welcome.scss

@@ -27,5 +27,9 @@
     tr.disabled {
       background-color: #e6e6e6;
     }
+
+    .check_interval {
+      color: #e6e6e6;
+    }
   }
 }

data/app/models/my_nagios/check.rb

@@ -13,12 +13,10 @@ 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: self.determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
+          self.update(state: :completed, status: self.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)
-      ensure
-        self.update(state: :completed)
+        self.update(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now)
       end
     end
 
@@ -31,14 +29,12 @@ 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(state: :completed, status: check.determinate_status_by_response(result), latest_state: result, latest_updated_at: Time.now)
           end
         end
 
       rescue => e
-        check_list.update_all(status: :info, latest_state: e, latest_updated_at: Time.now)
-      ensure
-        check_list.update_all(state: :completed)
+        check_list.update_all(state: :completed, status: :info, latest_state: e, latest_updated_at: Time.now)
       end
     end
 

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

@@ -11,6 +11,7 @@
     %td
       =check.command
       ="(regexp: #{check.regexp})" unless check.regexp.blank?
+      %p.check_interval= "run every: #{check.interval} min"
 
   %td
     %span.label{ class: "label-#{status_to_label(check.status)}"}= check.status

data/lib/my_nagios/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_nagios
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails