my_nagios 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e159c1af6b876084ddd20065a7a34457aaad958e
-  data.tar.gz: c496c5b760f0e6c7e1b9e91051f36303a187c57e
+  metadata.gz: f9928548b5874bca05dd4fabc05972fde4a50913
+  data.tar.gz: f0c88b2b2c1e6651f7e95f4e5a12e48f7ffd6aea
 SHA512:
-  metadata.gz: c61b31172b266832baee8a37b5c8d9b2d1cb140b0afa6c46902b643a315f39acfebf74c848e983d95dfc9f5f6e350d417a9a2d0632ee57874938ea8776643a6f
-  data.tar.gz: bc6a133739fc68aa286d652cdab69e19dee1a22d66ce417c795eff33a09b263a181329e39c85be243abdfd1e9fd451df2d3fafaabbc42ebf06a9f5d644d9b476
+  metadata.gz: c0066bb8dcc6a7d74bb345907ec0682496fbf57f28e5aba5fc54bd354070e4e30829b5c97d53242df16e8510cbed168d308048069509bbd358dad4901b302890
+  data.tar.gz: 2dc32a663f977e82b0d94a79ed1568723fa3ac9692330f0789da385240330d5afaaf32449f93cb5e7a89379e23d17e7bd42e6f93cc89ca195b5ff4cb9fdd720f

data/app/assets/javascripts/my_nagios/checks.coffee

@@ -1,9 +1,27 @@
 $ ->
   $('img.spinner').hide()
 
+  # Group Check Action
+  $('#group_action').hide()
+  $('#snooze_time_select').hide()
+
+  $('#check_group_action').change (event) ->
+    if $(this).val() == 'Snooze for' then $('#snooze_time_select').show() else $('#snooze_time_select').hide()
+
   $('.check_now').click (event) ->
     onclick_check_now(event)
 
+  $(':checkbox').change (event) ->
+    if $('input:checked').length > 0
+      $('#group_action').show();
+      selected_ids = $('input:checked').map () ->
+        return $(this).val()
+
+      $('#group_action_check_ids').val(selected_ids.get() + '')
+    else
+      $('#group_action').hide();
+
+
 @onclick_check_now = (event) ->
   $(event.target).closest('tr').addClass('updating')
   $(event.target).closest('tr').find('img.spinner').show()

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

@@ -16,4 +16,17 @@
   .spinner {
     width: 14px;
   }
+
+  .checkbox_holder {
+    padding-right: 8px;
+  }
+
+  td.snooze_for {
+    color: #e6e6e6;
+  }
+
+  .snooze_for {
+    font-weight: bold;
+    color: #31708f;
+  }
 }

data/app/controllers/my_nagios/checks_controller.rb

@@ -38,6 +38,22 @@ module MyNagios
       end
     end
 
+    def group_action
+      check_ids = params["group_action_check_ids"].split(',')
+      redirect_to root_path and return if check_ids.blank?
+
+      case params['check_group_action'].downcase
+      when 'disable'
+        Check.where(id: check_ids).update_all(enabled: false)
+      when 'enable'
+        Check.where(id: check_ids).update_all(enabled: true)
+      when 'snooze for'
+        Check.where(id: check_ids).update_all(snooze_for: (Time.now + params['snooze_time_select'].to_i.minutes))
+      end
+
+      redirect_to root_path
+    end
+
     private
 
     def find_check

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.enabled.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.not_snoozed.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

@@ -5,7 +5,8 @@ module MyNagios
     enum status:  [ :info, :success, :critical ]
     enum state:   [ :completed, :running ]
 
-    scope :enabled, -> { where(enabled: true) }
+    scope :enabled,     -> { where(enabled: true) }
+    scope :not_snoozed, -> { where('`my_nagios_checks`.`snooze_for` <= NOW() OR `my_nagios_checks`.`snooze_for` IS NULL') }
 
     attr_accessor :additional_command_result
 

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

@@ -1,9 +1,12 @@
 - run_now     ||= false
 - show_group  ||= false
+- is_snooze     = check.snooze_for and check.snooze_for > Time.now
 
 - tr_id = show_group ? nil : dom_id(check)
+- tr_html_class  = check.enabled? ? 'enabled' : 'disabled'
+- tr_html_class += ' alert alert-info' if is_snooze
 
-%tr{ id: tr_id, class: (check.enabled? ? 'enabled' : 'disabled') }
+%tr{ id: tr_id, class: tr_html_class }
   - if show_group
     %td
       =link_to check.group.name, "##{dom_id(check)}", class: 'fail_check'
@@ -13,10 +16,14 @@
       ="(regexp: #{check.regexp})" unless check.regexp.blank?
       %p.check_interval= "run every: #{check.interval} min"
 
-  %td
+  %td{ class: is_snooze ? 'snooze_for' : '' }
     %span.label{ class: "label-#{status_to_label(check.status)}"}= check.status
     =check.latest_state
 
+    - if is_snooze
+      %div.snooze_for
+        Snooze for: #{check.snooze_for}
+
     - if show_group
       %strong=check.command
 
@@ -30,4 +37,8 @@
       #actions
         %br
         =link_to 'edit', edit_check_path(check)
-        =link_to (check.enabled? ? 'disable' : 'enable' ), toggle_check_path(check), class: 'disable_check', method: :post, data: { remote: true, confirm: 'Are you sure?' }
+        =link_to (check.enabled? ? 'disable' : 'enable' ), toggle_check_path(check), class: 'disable_check', method: :post, data: { remote: true, confirm: 'Are you sure?' }
+
+    %td
+      .checkbox_holder
+        =check_box_tag dom_id(check), check.id

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

@@ -2,16 +2,37 @@
 
 = render partial: 'failures_list', locals: { criticals: @criticals, show_group: true }
 
+#group_action.text-center.alert.alert-warning{ role: :alert }
+  =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'])
+    =hidden_field_tag :group_action_check_ids
+    =submit_tag
+
+
+
 #checks{ data: :no_turbolink }
-  - @group.each do |group|
+  %table.table.check_list
+    %colgroup
+      %col{ width: '10%'}
+      %col{ width: '78%'}
+      %col{ width: '5%'}
+      %col{ width: '5%'}
+      %col{ width: '2%'}
+    %tr
+      %td
+      %td
+      %td
+      %td
+      %td
+        .checkbox_holder
+          =check_box_tag :select_all
 
-    %h3=group.name
+    - @group.each do |group|
+      %tr
+        %td{ colspan: 5 }
+          %h3=group.name
 
-    %table.table.check_list
-      %colgroup
-        %col{ width: '10%'}
-        %col{ width: '80%'}
-        %col{ width: '5%'}
-        %col{ width: '5%'}
       - group.checks.each do |check|
         = render partial: '/my_nagios/checks/check_row', locals: { check: check, run_now: true }

data/config/routes.rb

@@ -3,7 +3,8 @@ MyNagios::Engine.routes.draw do
   mount Sidekiq::Web, at: '/sidekiq'
 
   root 'welcome#index'
-  match 'autorefresh',  to: 'welcome#autorefresh',    via: [:post]
+  match 'autorefresh',    to: 'welcome#autorefresh',    via: [:post]
+  match 'group_action',   to: 'checks#group_action',    via: [:post]
 
   resources :checks do
     member do

data/db/migrate/20160823134410_add_snooze_for_check.rb

@@ -0,0 +1,5 @@
+class AddSnoozeForCheck < ActiveRecord::Migration
+  def change
+    add_column :my_nagios_checks, :snooze_for, :datetime, default: nil
+  end
+end

data/lib/my_nagios/version.rb

@@ -1,3 +1,3 @@
 module MyNagios
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

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