[PATCH/foreman 1/1] fixes #1152 - eventful should not include skipped

Signed-off-by: Amos Benari <abenari@redhat.com>

··· --- app/models/hostext/search.rb | 2 +- app/models/report.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/hostext/search.rb b/app/models/hostext/search.rb
index aa467ad…7e27832 100644
— a/app/models/hostext/search.rb
+++ b/app/models/hostext/search.rb
@@ -9,7 +9,7 @@ module Hostext
scoped_search :on => :last_report, :complete_value => true
scoped_search :on => :ip, :complete_value => true
scoped_search :on => :enabled, :complete_value => {:true => true, :false => false}, :rename => :‘status.enabled’

  •    scoped_search :on => :puppet_status, :complete_value => {:true => true, :false => false}, :rename => :'status.interesting'
    
  •    scoped_search :on => :puppet_status, :offset => 0, :word_size => Report::BIT_NUM*4, :complete_value => {:true => true, :false => false}, :rename => :'status.interesting'
       scoped_search :on => :puppet_status, :offset => Report::METRIC.index("applied"),         :word_size => Report::BIT_NUM, :rename => :'status.applied'
       scoped_search :on => :puppet_status, :offset => Report::METRIC.index("restarted"),       :word_size => Report::BIT_NUM, :rename => :'status.restarted'
       scoped_search :on => :puppet_status, :offset => Report::METRIC.index("failed"),          :word_size => Report::BIT_NUM, :rename => :'status.failed'
    

diff --git a/app/models/report.rb b/app/models/report.rb
index 6c8d9a6…8fe170b 100644
— a/app/models/report.rb
+++ b/app/models/report.rb
@@ -13,7 +13,7 @@ class Report < ActiveRecord::Base
scoped_search :in => :sources, :on => :value, :rename => :resource

scoped_search :on => :reported_at, :complete_value => true, :default_order => :desc, :rename => :reported

  • scoped_search :on => :status, :complete_value => {:true => true, :false => false}, :rename => :eventful
  • scoped_search :on => :status, :offset => 0, :word_size => 4*BIT_NUM, :complete_value => {:true => true, :false => false}, :rename => :eventful

    scoped_search :on => :status, :offset => METRIC.index(“applied”), :word_size => BIT_NUM, :rename => :applied
    scoped_search :on => :status, :offset => METRIC.index(“restarted”), :word_size => BIT_NUM, :rename => :restarted

    1.7.4.2