my_nagios 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9928548b5874bca05dd4fabc05972fde4a50913
-  data.tar.gz: f0c88b2b2c1e6651f7e95f4e5a12e48f7ffd6aea
+  metadata.gz: 74f6a424eb4c104a4d30c8d62c63750c9fa7d236
+  data.tar.gz: 41a78f4f3c23af33791782f15739c864826f8f9b
 SHA512:
-  metadata.gz: c0066bb8dcc6a7d74bb345907ec0682496fbf57f28e5aba5fc54bd354070e4e30829b5c97d53242df16e8510cbed168d308048069509bbd358dad4901b302890
-  data.tar.gz: 2dc32a663f977e82b0d94a79ed1568723fa3ac9692330f0789da385240330d5afaaf32449f93cb5e7a89379e23d17e7bd42e6f93cc89ca195b5ff4cb9fdd720f
+  metadata.gz: 2bb4bf4269479a807debb39721ff2229c016292bc2744183271737859b701cbf12bece5af2f0486d9061d297aed3c659b71b6c886936ef2f8f6b7420e4dab0b3
+  data.tar.gz: 996ffe877bee2475e84ad9a2bf2a3613cdde09e83e076be05d72df0853a5582a211f322ac9800a79b570fb7a8343e792b482c3288d0f716fa95efd760f3d2fcb

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

@@ -11,14 +11,25 @@ $ ->
   $('.check_now').click (event) ->
     onclick_check_now(event)
 
-  $(':checkbox').change (event) ->
+  # Select all checkboxes in group
+  $('.select_all_group').click (event) ->
+    group_id = $(this).data('select-all-group')
+    $(':checkbox.group_' + group_id).click()
+
+  # Select all checkboxes
+  $('#select_all').click (event) ->
+    $(':checkbox.select_all_group').click()
+
+  # Show and hide action dialog for selected checkboxes, store selected check ids
+  $('.my_nagios_check :checkbox').change (event) ->
     if $('input:checked').length > 0
       $('#group_action').show();
       selected_ids = $('input:checked').map () ->
-        return $(this).val()
+        return $(this).data('check-id')
 
       $('#group_action_check_ids').val(selected_ids.get() + '')
     else
+      $('#group_action_check_ids').val('')
       $('#group_action').hide();
 
 

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

@@ -21,6 +21,10 @@
     padding-right: 8px;
   }
 
+  input.select_all_group {
+    margin-top: 30px;
+  }
+
   td.snooze_for {
     color: #e6e6e6;
   }

data/app/models/my_nagios/check.rb

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

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

@@ -1,11 +1,13 @@
 - run_now     ||= false
 - show_group  ||= false
-- is_snooze     = check.snooze_for and check.snooze_for > Time.now
+- is_snooze     = check.snooze_for && (check.snooze_for.utc > Time.now.utc)
 
 - tr_id = show_group ? nil : dom_id(check)
 - tr_html_class  = check.enabled? ? 'enabled' : 'disabled'
 - tr_html_class += ' alert alert-info' if is_snooze
 
+- td_html_class = is_snooze ? 'snooze_for' : ''
+
 %tr{ id: tr_id, class: tr_html_class }
   - if show_group
     %td
@@ -16,7 +18,7 @@
       ="(regexp: #{check.regexp})" unless check.regexp.blank?
       %p.check_interval= "run every: #{check.interval} min"
 
-  %td{ class: is_snooze ? 'snooze_for' : '' }
+  %td{ class: td_html_class }
     %span.label{ class: "label-#{status_to_label(check.status)}"}= check.status
     =check.latest_state
 
@@ -40,5 +42,5 @@
         =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
+      .checkbox_holder.my_nagios_check
+        =check_box_tag dom_id(check, :checkbox), nil, false, data: { check_id: check.id }, class: "group_#{check.group_id}"

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

@@ -31,8 +31,11 @@
 
     - @group.each do |group|
       %tr
-        %td{ colspan: 5 }
+        %td{ colspan: 4 }
           %h3=group.name
+        %td
+          .checkbox_holder
+            =check_box_tag "select_all_group_#{group.id}", nil, false, class: 'select_all_group', data: { select_all_group: group.id}
 
       - group.checks.each do |check|
         = render partial: '/my_nagios/checks/check_row', locals: { check: check, run_now: true }

data/lib/my_nagios/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_nagios
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Vitaly Omelchenko