foreman_monitoring 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83bf8624bc1c1ecbb9e8dc6c11340022a204244afe293789405cdaf9e80b10be
-  data.tar.gz: 0d3d42280a04d22a33792c03ed62aee41a9800cf6a307abb16a06589d03ea0af
+  metadata.gz: eca113371402bd1f2251f09d5fd35ef5fce8ef9719299517e37cd56856ee9bbc
+  data.tar.gz: 1d03b4a53865238e521074bf22f9f247e0b74413b1265790995ca6269be923cf
 SHA512:
-  metadata.gz: 3ec31b7e2cf93786431ccbedbbb7ec36e4fdcce70bb4d2beb0c2faf741b9e3287ceec3878c5f168c09bcb2fe190694f1f5f77d435e3f686456d47dd0f90b57aa
-  data.tar.gz: 317ad1fdc9bf7a61008007b6b8edce1eec053aecf55cd0abcda95e97dfc670021c01100f5fbe2f30eebbc543ededbbe3e0f3a4811e44609716be9b570635ed77
+  metadata.gz: 9f6bb65a07d9a823f9ebad01708ce60b5a8058b6d86b2d67af1016c5361927de85a7e5ce2868bd4b8ec886236949f755d2a04e8b78698d07ed0de9b208b0e830
+  data.tar.gz: f1a7ae4199d026bbcf8feb054f783aca7d0eb86096129b3d54d6e051d2be6174648086280ca4b3e1c4c3545cc41d8f4aa921cdd8fa720ea52ef7f1b177e444ac

data/README.md

@@ -42,15 +42,15 @@ the `monitoring` feature has to be assigned. This can be done during
 provisioning or as a bulk action from the host overview.
 
 You can configure the default action which will be done during host
-provisioning and deprovisioning. Provisioning allows to create a monitoring
-object or take no action while deprovisioing allows to delete the monitoring
-object, set a downtime or take no action. For rebuild it will by default
+provisioning and de-provisioning. Provisioning allows to create a monitoring
+object or take no action while de-provisoning allows deleting the monitoring
+object, set a downtime or take no action. For rebuild, it will by default
 set a downtime.
 
 The plugin will show you the monitoring status as a sub-status and a detail
 panel. You can configure if the sub-status should affect the global status.
 
-Furthermore it allows to individually set a downtime at the host detail view
+Furthermore, it allows to individually set a downtime at the host detail view
 or as a bulk action from the host overview.
 
 # Troubleshooting
@@ -58,8 +58,8 @@ or as a bulk action from the host overview.
 Logging entries relevant to the plug-in will be located in the Foreman's log
 which is by default `/var/log/foreman/production.log`.
 
-Also check the troubleshooting section of the Smart Proxy plug-in if problems
-occure in the underlying communication.
+Also, check the troubleshooting section of the Smart Proxy plug-in if problems
+occur in the underlying communication.
 
 ## Contributing
 

data/app/controllers/api/v2/monitoring_results_controller.rb

@@ -17,10 +17,9 @@ module Api
 
       def create
         begin
-          MonitoringResult.import(monitoring_result_params.with_indifferent_access)
+          MonitoringResult.import(monitoring_result_params.to_h.with_indifferent_access)
         rescue StandardError => e
-          logger.error "Failed to import monitoring result: #{e.message}"
-          logger.debug e.backtrace.join("\n")
+          Foreman::Logging.exception('Failed to import monitoring result', e)
           render :json => { 'message' => e.message }, :status => :unprocessable_entity
           return
         end

data/app/helpers/concerns/foreman_monitoring/hosts_helper_ext.rb

@@ -53,10 +53,10 @@ module ForemanMonitoring
       end
     end
 
-    def datetime_f(f, attr, options = {})
+    def monitoring_datetime_f(f, attr, options = {})
       field(f, attr, options) do
         addClass options, 'form-control'
-        f.datetime_local_field attr, options
+        f.datetime_field attr, options
       end
     end
   end

data/app/models/concerns/foreman_monitoring/host_extensions.rb

@@ -64,7 +64,7 @@ module ForemanMonitoring
         :compute_resource => compute_resource.try(:to_label),
         :hostgroup => hostgroup.try(:to_label),
         :organization => organization.try(:name),
-        :location => organization.try(:name),
+        :location => location.try(:name),
         :comment => comment,
         :environment => environment.try(:to_s),
         :owner_name => owner.try(:name)

data/app/models/monitoring_result.rb

@@ -3,6 +3,7 @@ class MonitoringResult < ApplicationRecord
 
   belongs_to_host
 
+  # rubocop:disable Metrics/AbcSize
   def self.import(result)
     host = Host.find_by(name: result[:host])
 
@@ -27,7 +28,8 @@ class MonitoringResult < ApplicationRecord
     end
 
     created = MonitoringResult.where(:host => host, :service => result[:service]).first_or_create
-    if created.timestamp.blank? || updates[:timestamp].blank? || created.timestamp < updates[:timestamp]
+    # rubocop:disable Rails/Date
+    if created.timestamp.blank? || updates[:timestamp].blank? || (created.timestamp.to_time - updates[:timestamp].to_time) < 2
       created.update_attributes(updates)
 
       if created.persisted?
@@ -37,7 +39,9 @@ class MonitoringResult < ApplicationRecord
     else
       logger.debug "Skipping monitoring result import for #{host} as it is older than what we have."
     end
+    # rubocop:enable Rails/Date
   end
+  # rubocop:enable Metrics/AbcSize
 
   def status
     return :ok if downtime

data/app/views/hosts/_downtime_fields.html.erb

@@ -1,3 +1,3 @@
 <%= text_f f, :comment, :size => "col-md-5", :label => _('Comment'), :help_inline => _('Short description that explains why the downtime was set.'), :required => true %>
-<%= datetime_f f, :starttime, :size => "col-md-5", :label => _('Starttime'), :help_inline => _('Time when the downtime should start.'), :value => Time.current.strftime("%Y-%m-%dT%H:%M"), :required => true %>
-<%= datetime_f f, :endtime, :size => "col-md-5", :label => _('Endtime'), :help_inline => _('Time when the downtime should end.'), :value => Time.current.advance(:hours => 2).strftime("%Y-%m-%dT%H:%M"), :required => true %>
+<%= monitoring_datetime_f f, :starttime, :size => "col-md-5", :label => _('Starttime'), :help_inline => _('Time when the downtime should start.'), :min => DateTime.now, :value => Time.current, :required => true %>
+<%= monitoring_datetime_f f, :endtime, :size => "col-md-5", :label => _('Endtime'), :help_inline => _('Time when the downtime should end.'), :value => Time.current.advance(:hours => 2), :required => true %>

data/app/views/monitoring_results/_host_tab_pane.html.erb

@@ -1,7 +1,7 @@
 <%- if authorized_for(:permission => 'view_monitoring_results', :auth_object => @host) && @host.monitored? -%>
 <div class="tab-pane" id="monitoring">
 <% if @host.monitoring_results.any? %>
-  <table class="table table-bordered table-striped">
+  <table class="<%= table_css_classes %>">
     <thead
       <tr>
         <th colspan="2">Monitoring</th>

data/lib/foreman_monitoring/version.rb

@@ -1,3 +1,3 @@
 module ForemanMonitoring
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/test/unit/monitoring_result_test.rb

@@ -0,0 +1,73 @@
+require 'test_plugin_helper'
+
+class MonitoringResultTest < ActiveSupport::TestCase
+  setup do
+    User.current = FactoryBot.build(:user, :admin)
+    setup_settings
+    disable_orchestration
+    disable_monitoring_orchestration
+  end
+
+  context '#import' do
+    let(:host) { FactoryBot.create(:host, :managed, :with_monitoring) }
+
+    let(:initial) do
+      {
+        host: host.name,
+        service: 'cpu metrics',
+        timestamp: 1_516_365_380.8834700584,
+        result: 1,
+        acknowledged: true
+      }
+    end
+
+    let(:acknowledegment_cleared) do
+      {
+        host: host.name,
+        service: 'cpu metrics',
+        timestamp: 1_516_365_971.2455039024,
+        acknowledged: false
+      }
+    end
+
+    let(:state_change) do
+      {
+        host: host.name,
+        service: 'cpu metrics',
+        timestamp: 1_516_365_971.2461779118,
+        result: 0
+      }
+    end
+
+    test 'imports a monitoring result' do
+      MonitoringResult.import(initial)
+      imported = host.monitoring_results.last
+      assert_equal true, imported.acknowledged?
+    end
+
+    test 'handles ack and state change in correct order' do
+      MonitoringResult.import(initial)
+      MonitoringResult.import(acknowledegment_cleared)
+      MonitoringResult.import(state_change)
+      imported = host.monitoring_results.last
+      assert_equal :ok, imported.status
+      assert_equal false, imported.acknowledged?
+    end
+
+    test 'handles ack and state change in reverse order' do
+      MonitoringResult.import(initial)
+      MonitoringResult.import(state_change)
+      MonitoringResult.import(acknowledegment_cleared)
+      imported = host.monitoring_results.last
+      assert_equal :ok, imported.status
+      assert_equal false, imported.acknowledged?
+    end
+
+    test 'ignores old data' do
+      MonitoringResult.import(state_change)
+      MonitoringResult.import(initial)
+      imported = host.monitoring_results.last
+      assert_equal false, imported.acknowledged?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_monitoring
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -104,6 +104,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/host_status/monitoring_status_test.rb
 - test/unit/host_test.rb
+- test/unit/monitoring_result_test.rb
 - test/unit/monitoring_test.rb
 homepage: http://www.github.com/theforeman/foreman_monitoring
 licenses:
@@ -130,13 +131,14 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin for monitoring system integration.
 test_files:
+- test/unit/host_test.rb
+- test/unit/monitoring_result_test.rb
+- test/unit/host_status/monitoring_status_test.rb
+- test/unit/monitoring_test.rb
+- test/factories/smart_proxy.rb
+- test/factories/monitoring_results.rb
 - test/factories/feature.rb
 - test/factories/host.rb
-- test/factories/monitoring_results.rb
-- test/factories/smart_proxy.rb
-- test/functional/hosts_controller_test.rb
 - test/lib/proxy_api/monitoring_test.rb
 - test/test_plugin_helper.rb
-- test/unit/host_status/monitoring_status_test.rb
-- test/unit/host_test.rb
-- test/unit/monitoring_test.rb
+- test/functional/hosts_controller_test.rb