foreman_monitoring 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f742aa658a66234e28555d6dbba4beca116e6ba3d49db3c02898bd7cc295a5d9
-  data.tar.gz: f11b41bb8dc37e78431df10c3fc255f7680039293e7e0c9ff0268a4c975d49ef
+  metadata.gz: 4006edcbe7c896898b2b9a2d68c23e0649925364efbc0f18d5bc09311d183cc7
+  data.tar.gz: 033ebafd117fdbab220bc2d64f9afdd844997c8f7af106f5df8f0bf53d48811b
 SHA512:
-  metadata.gz: f7dbdfc58ea1b7669eefff4b603ccc4f813b87a3aadbb4cd4a48ad86de3899403b440709d1b2a1f9145dc5b4b4487875ad0a33de031142d70e47d139278043d1
-  data.tar.gz: 39f27d2331c23bd24392d1abcaa47dc4ec9757463a27503518d501581ba2b276acc2528fa58b2e76f632f58ac00cb91801060d09a821a9853e0754ced75342dc
+  metadata.gz: b1eb8d83ffb58a6e7e7ee2cd6fcf048662029256dcb15738c5b9cfec6f675e67a00f10f8fcbf9601a80efdef6d9db3b8e4926cfadcec49f2b00972d10de6e762
+  data.tar.gz: bf7116a3092e7226a1513b6a83dde8f1cd51bfc05aac48c9c87cfd5890d6fb5b066ca96bc603d78b37edb061a3eb6e853361658408eda5b4a87fde2b7f0f2985

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

@@ -58,10 +58,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

@@ -66,7 +66,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 < ActiveRecord::Base
 
   belongs_to_host
 
+  # rubocop:disable Metrics/AbcSize
   def self.import(result)
     host = Host.find_by_name(result[:host])
 
@@ -27,7 +28,8 @@ class MonitoringResult < ActiveRecord::Base
     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 < ActiveRecord::Base
     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/lib/foreman_monitoring/version.rb

@@ -1,3 +1,3 @@
 module ForemanMonitoring
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.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: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -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