my_nagios 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08675c59ec122b34650ee7c21c7218af30ef7d3f
-  data.tar.gz: 6f9e8ea47b9b8479717f96071bb8d61fadfcf0d6
+  metadata.gz: 69de582704e1d1281a717ac8c297cb41d1c229be
+  data.tar.gz: 8f47dcce1b50d80cc04013d6628ca42b66826cbf
 SHA512:
-  metadata.gz: 78340047fcaa7568bbafc843576160fc8e93606afd41def2ec9ab1bd9c27162dde607d13f4c6cba86ee16404955784285ba53a18a8b27087aa5b37b70ff3b0c8
-  data.tar.gz: d958f8248b1c8891990cc9fab96c858fd41e7f219930a54622618d2d0e7e8c910782bf074449cb36f3c59ea44cbb21e666c83eb1126b4d63f26799307f76adeb
+  metadata.gz: 733dd9e8261faf8f757108048e174a7c2d878e6498cb5d296e45888654232f677869a83febcf89019641a70b6da69a055cc32d60507f526052303e9a9ff87715
+  data.tar.gz: a05b85d8b88a3f31c98a022acbc6638657bfd59cecba86578fee68a7d1ac0d79e758ca244314dc91d697600e6bf70f6025b5911f7e2b0ea0a78a81c0fe93bdba

data/app/jobs/schedule_by_interval_job.rb

@@ -15,7 +15,7 @@ class ScheduleByIntervalJob
     end
 
     # Optimized variant, group checks, run all necessary checks with one ssh connection
-    MyNagios::Check.where(interval: options['interval']).group_by{|check| { host: check.host, user: check.user, pem_key: check.pem_key } }.each do |config, checks|
+    MyNagios::Check.enabled.where(interval: options['interval']).group_by{|check| { host: check.host, user: check.user, pem_key: check.pem_key } }.each do |config, checks|
       MonitoringJob.perform_async(checks.map(&:id), config)
     end
   end

data/app/models/my_nagios/check.rb

@@ -13,7 +13,7 @@ module MyNagios
       begin
         self.update(state: :running)
 
-        Net::SSH.start( self.host, self.user, config: true, keys: [self.pem_key], non_interactive: true ) do| ssh |
+        Net::SSH.start( self.host, self.user, MyNagios::Check.ssh_config(self.pem_key) ) do |ssh|
           result = ssh.exec! self.command
           status = self.determinate_status_by_response(result)
 
@@ -32,7 +32,7 @@ module MyNagios
       begin
         check_list.update_all(state: :running)
 
-        Net::SSH.start( config['host'], config['user'], config: true, keys: [config['pem_key']], non_interactive: true ) do |ssh|
+        Net::SSH.start( config['host'], config['user'], MyNagios::Check.ssh_config(config['pem_key']) ) do |ssh|
           check_list.each do |check|
             result = ssh.exec! check.command
             status = check.determinate_status_by_response(result)
@@ -54,5 +54,13 @@ module MyNagios
       return :info     if response.nil? or not response.scan('No such file or directory').blank?
       :success
     end
+
+    def self.ssh_config(pem_key = nil)
+      config = { config: true, non_interactive: true, auth_methods: ['publickey', 'hostbased'] }
+      config[:keys] = [pem_key] unless pem_key.blank?
+
+      config
+    end
+
   end
 end

data/lib/my_nagios/version.rb

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

metadata

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