foreman_abrt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e90f9c2daa852c6ac8d2debd86a5d6e6f816641
-  data.tar.gz: aa3047b35ec9493988d41327ebde7ed4add6e507
+  metadata.gz: 2a1e0fe4d7a14fcc470200bc41dbd3ccd7209e01
+  data.tar.gz: 656ef1589530a037fd2669cd6ea7014d29bbef31
 SHA512:
-  metadata.gz: 90ea5b440d83acf850edb42699fcd3ad1985fef6f4fb5f2cae338909f93e5cdb08082831d5a78a172a9bb0efa045dda41ac2a3f2255021739d6276d8584d3b7e
-  data.tar.gz: 003b81e150d41deab12c8ee4d40a8e4df164d91868b5d0dd331693f5997f9d2190c9309c9400a29096336f37ba1bb1e300adf930d963f167f916ffc98f0f8d95
+  metadata.gz: 12800b0a258c8d3f290c0e05b62a170b5f1de76834b1fd8488b7e879a833911250636fbbea47b48f421e1d69d60105bfd3a29b3b4c67883afabc5836b8b32c8b
+  data.tar.gz: 8e426bc88cf4bd925db6c213da9a2206665c22ecfbad1b4f057ab6d0cf1f2caf38b356754168fb3a489342309fc9e447ab4e06682f4451e860fd4fa5194fa4c0

data/app/controllers/abrt_reports_controller.rb

@@ -1,11 +1,12 @@
 class AbrtReportsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
+  include AbrtReportsHelper
+
   before_filter :setup_search_options, :only => :index
+  before_filter :find_by_id, :only => [:show, :destroy, :forward]
 
   def action_permission
     case params[:action]
-      when 'json'
-        :view
       when 'forward'
         :forward
       else
@@ -20,12 +21,14 @@ class AbrtReportsController < ApplicationController
 
   # GET /abrt_reports/42
   def show
-    @abrt_report = resource_base.find(params[:id])
+    respond_to do |format|
+      format.html
+      format.json { render :json => @abrt_report.json }
+    end
   end
 
   # DELETE /abrt_reports/42
   def destroy
-    @abrt_report = resource_base.find(params[:id])
     if @abrt_report.destroy
       notice _("Successfully deleted bug report.")
     else
@@ -34,19 +37,12 @@ class AbrtReportsController < ApplicationController
     redirect_to abrt_reports_url
   end
 
-  # GET /abrt_reports/42/json
-  def json
-    @abrt_report = resource_base.find(params[:id])
-    render :json => JSON.parse(@abrt_report.json)
-  end
-
   # POST /abrt_reports/42/forward
   def forward
-    @abrt_report = resource_base.find(params[:id])
     redirect_to abrt_report_url(@abrt_report)
 
     begin
-      response = @abrt_report.forward
+      response = send_to_abrt_server @abrt_report
     rescue => e
       error _("Server rejected our report: #{e.message}") and return
     end
@@ -59,4 +55,10 @@ class AbrtReportsController < ApplicationController
 
     notice _("Report successfully forwarded")
   end
+
+  private
+
+  def find_by_id
+    @abrt_report = resource_base.find(params[:id])
+  end
 end

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

@@ -3,6 +3,7 @@ module Api
     class AbrtReportsController < V2::BaseController
       include Api::Version2
       include Foreman::Controller::SmartProxyAuth
+      include AbrtReportsHelper
 
       add_puppetmaster_filters :create
 
@@ -16,10 +17,15 @@ module Api
           return
         end
 
+        if abrt_reports.count == 0
+          render :json => { "Failed to import any report" => e.message }, :status => :unprocessable_entity
+          return
+        end
+
         if Setting[:abrt_automatically_forward]
           abrt_reports.each do |report|
             begin
-              response = report.forward
+              response = send_to_abrt_server report
               report.add_response response
             rescue => e
               logger.error "Failed to forward ABRT report: #{e.message}"

data/app/controllers/concerns/foreman_abrt/dashboard_controller_extensions.rb

@@ -6,7 +6,6 @@ module ForemanAbrt::DashboardControllerExtensions
   end
 
   def prefetch_abrt_data
-    # fetch reports from last 24 hours
-    @abrt_reports = AbrtReport.authorized(:view_abrt_reports).where(:created_at => (Time.now - 24.hours)..Time.now).search_for(params[:search])
+    @abrt_reports = AbrtReport.authorized(:view_abrt_reports)
   end
 end

data/app/helpers/abrt_reports_helper.rb

@@ -8,18 +8,60 @@ module AbrtReportsHelper
   end
 
   def count_abrt_reports abrt_reports
+    range_days = 14
     data = []
-    interval = 1.hours
-    start = Time.now.utc - 24.hours
-    (0..23).each do |i|
-      t = start + (interval * i)
-      data << [24-i, abrt_reports.where(:created_at => t..(t+interval)).count]
+    now = Time.now.utc
+    start = now - range_days.days
+    by_day = abrt_reports.where(:reported_at => start..now).
+                          group('DATE(reported_at)').
+                          sum(:count)
+
+    range_days.downto(1) do |days_back|
+      date = (now - (days_back-1).days).strftime('%Y-%m-%d')
+      crashes = by_day[date] or 0
+      data << [days_back, crashes]
     end
     data
   end
 
   def render_abrt_graph abrt_reports, options = {}
     data = count_abrt_reports abrt_reports
-    flot_bar_chart 'abrt_graph', _('Hours Ago'), _('Number of crashes'), data, options
+    flot_bar_chart 'abrt_graph', _('Days Ago'), _('Number of crashes'), data, options
+  end
+
+  def send_to_abrt_server abrt_report
+    request_params = {
+      :timeout => 60,
+      :open_timeout => 10,
+      :verify_ssl => Setting[:abrt_server_verify_ssl] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+    }
+
+    if Setting[:abrt_server_ssl_ca_file] && !Setting[:abrt_server_ssl_ca_file].empty?
+      request_params[:ssl_ca_file] = Setting[:abrt_server_ssl_ca_file]
+    end
+
+    if Setting[:abrt_server_ssl_certificate] && !Setting[:abrt_server_ssl_certificate].empty? \
+       && Setting[:abrt_server_ssl_priv_key] && !Setting[:abrt_server_ssl_priv_key].empty?
+      request_params[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(Setting[:abrt_server_ssl_certificate]))
+      request_params[:ssl_client_key]  = OpenSSL::PKey::RSA.new(File.read(Setting[:abrt_server_ssl_priv_key]))
+    end
+
+    resource = RestClient::Resource.new(Setting[:abrt_server_url], request_params)
+    response = resource['reports/new/'].post({:file => abrt_report.json, :multipart => true}, :content_type => :json, :accept => :json)
+
+    if response.code != 202
+      logger.error "Failed to forward bug report: #{response.code}: #{response.to_str}"
+      raise ::Foreman::Exception.new(N_("Failed to forward bug report: %s: %s", response.code, response.to_str))
+    end
+
+    JSON.parse(response.body)
+  end
+
+  def format_reason reason
+    if reason.nil? or reason.empty?
+      _("Unknown")
+    else
+      reason
+    end
   end
 end

data/app/models/abrt_report.rb

@@ -13,6 +13,7 @@ class AbrtReport < ActiveRecord::Base
   validates :json, :presence => true
   validates :count, :numericality => { :only_integer => true, :greater_than => 0 }
   validates :duphash, :format => { :with => /\A[0-9a-fA-F]+\z/ }, :allow_blank => true
+  validates :reported_at, :presence => true
 
   scoped_search :in => :host,        :on => :name,  :complete_value => true, :rename => :host
   scoped_search :in => :environment, :on => :name,  :complete_value => true, :rename => :environment
@@ -41,47 +42,18 @@ class AbrtReport < ActiveRecord::Base
   def self.import(json)
     host = Host.find_by_name(json[:host])
     reports = []
-    AbrtReport.transaction do
-      json[:reports].each do |report|
-        # import one report
-        reason = nil # try extracting reason from the report
-        reason ||= report[:full][:reason] if report[:full].has_key? :reason
+
+    json[:reports].each do |report|
+      begin
         reports << AbrtReport.create!(:host => host, :count => report[:count], :json => report[:full].to_json,
-                                      :duphash => report[:duphash], :reason => reason,
+                                      :duphash => report[:duphash], :reason => report[:full][:reason],
                                       :reported_at => report[:reported_at])
+      rescue => e
+        logger.error "Failed to import ABRT report from #{host}: #{e.class}:#{e.message}"
       end
     end
-    reports
-  end
-
-  # XXX is the network communication acceptable in a model?
-  def forward
-    request_params = {
-      :timeout => 60,
-      :open_timeout => 10,
-      :verify_ssl => Setting[:abrt_server_verify_ssl] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
-    }
-
-    if Setting[:abrt_server_ssl_ca_file] && !Setting[:abrt_server_ssl_ca_file].empty?
-      request_params[:ssl_ca_file] = Setting[:abrt_server_ssl_ca_file]
-    end
 
-    # XXX what certificates will be used if communicating with e.g. customer portal?
-    if Setting[:abrt_server_ssl_certificate] && !Setting[:abrt_server_ssl_certificate].empty? \
-       && Setting[:abrt_server_ssl_priv_key] && !Setting[:abrt_server_ssl_priv_key].empty?
-      request_params[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(Setting[:abrt_server_ssl_certificate]))
-      request_params[:ssl_client_key]  = OpenSSL::PKey::RSA.new(File.read(Setting[:abrt_server_ssl_priv_key]))
-    end
-
-    resource = RestClient::Resource.new(Setting[:abrt_server_url], request_params)
-    response = resource['reports/new/'].post({:file => json, :multipart => true}, :content_type => :json, :accept => :json)
-
-    if response.code != 202
-      logger.error "Failed to forward bug report: #{response.code}: #{response.to_str}"
-      raise ::Foreman::Exception.new(N_("Failed to forward bug report: %s: %s", response.code, response.to_str))
-    end
-
-    JSON.parse(response.body)
+    reports
   end
 
   def add_response(response)

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

@@ -6,13 +6,6 @@ module ForemanAbrt::HostExtensions
   end
 
   def recent_abrt_reports
-    abrt_reports.where(:created_at => (Time.now - 1.month)..Time.now)
+    abrt_reports.where(:reported_at => (Time.now - 1.week)..Time.now).limit(10)
   end
-
-  #module ClassMethods
-  #  # create or overwrite class methods...
-  #  def class_method_name
-  #  end
-  #end
-
 end

data/app/models/setting/abrt.rb

@@ -6,10 +6,10 @@ class Setting::Abrt < ::Setting
     fqdn = Facter.value(:fqdn) || SETTINGS[:fqdn]
     lower_fqdn = fqdn.downcase
 
-    ssl_cert     = "#{SETTINGS[:puppetvardir]}/ssl/certs/#{lower_fqdn}.pem"
-    ssl_ca_file  = "#{SETTINGS[:puppetvardir]}/ssl/certs/ca.pem"
-    ssl_priv_key = "#{SETTINGS[:puppetvardir]}/ssl/private_keys/#{lower_fqdn}.pem"
-    #XXX initialize from ssl_{certificate,ca_file,priv_key}
+    # Try taking the provisioning SSL setup for default
+    ssl_cert     = Setting[:ssl_certificate] or "#{SETTINGS[:puppetvardir]}/ssl/certs/#{lower_fqdn}.pem"
+    ssl_ca_file  = Setting[:ssl_ca_file]     or "#{SETTINGS[:puppetvardir]}/ssl/certs/ca.pem"
+    ssl_priv_key = Setting[:ssl_priv_key]    or "#{SETTINGS[:puppetvardir]}/ssl/private_keys/#{lower_fqdn}.pem"
 
     Setting.transaction do
       [

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

@@ -10,7 +10,7 @@
     <tr>
       <td> <%= link_to (_("%s ago") % time_ago_in_words(abrt_report.reported_at.getlocal)), abrt_report %></td>
       <td> <%= abrt_report.count %> </td>
-      <td> <%= abrt_report.reason %> </td>
+      <td> <%= format_reason abrt_report.reason %> </td>
     </tr>
     <% end %>
   </table>

data/app/views/abrt_reports/_list.html.erb

@@ -19,7 +19,7 @@
         <% end %>
       <% end %>
       <td> <%= link_to(_("%s ago") % time_ago_in_words(abrt_report.reported_at.getlocal), abrt_report_path(abrt_report)) %> </td>
-      <td> <%= if abrt_report.reason.nil? or abrt_report.reason.empty? then _("Unknown") else abrt_report.reason end %> </td>
+      <td> <%= format_reason abrt_report.reason %> </td>
       <td> <%= abrt_report.count %> </td>
       <td> <%= checked_icon !abrt_report.forwarded_at.nil? %> </td>
       <td align="right">

data/app/views/abrt_reports/show.html.erb

@@ -2,7 +2,6 @@
 
 <%= title_actions link_to(_("Host details"), @abrt_report.host),
   link_to(_("Other reports for this host"), host_abrt_reports_path(@abrt_report.host)),
-  link_to(_("JSON"), json_abrt_report_path(@abrt_report)),
   link_to(_("Forward report"),
           forward_abrt_report_path(@abrt_report),
           :class => "btn btn-success",
@@ -14,7 +13,7 @@
 <div class="row">
   <div class="col-md-12">
     <table class="table table-bordered table-striped">
-      <tr><th><%= _('Reason') %></th><td><%= @abrt_report.reason %></td></tr>
+      <tr><th><%= _('Reason') %></th><td><%= format_reason @abrt_report.reason %></td></tr>
       <tr><th><%= _('First reported') %></th><td><%= @abrt_report.reported_at.getlocal %></td></tr>
       <tr><th><%= _('Repeated') %></th><td><%= @abrt_report.count %></td></tr>
       <tr><th><%= _('Duplication hash') %></th><td><%= @abrt_report.duphash %></td></tr>

data/app/views/dashboard/_foreman_abrt_widget.html.erb

@@ -1,2 +1,2 @@
-<h4 style="text-align: center;"><%= _('Bug report distribution in last 24 hours') %></h4>
+<h4 style="text-align: center;"><%= _('Bug report distribution in last 14 days') %></h4>
 <%= render_abrt_graph(@abrt_reports, :class => 'statistics-bar') %>

data/config/routes.rb

@@ -2,9 +2,11 @@ Rails.application.routes.draw do
 
   resources :abrt_reports, :only => [:index, :show, :destroy] do
     member do
-      get 'json'
       post 'forward'
     end
+    collection do
+      get 'auto_complete_search'
+    end
   end
   get 'hosts/:host_id/abrt_reports', :to => 'abrt_reports#index',
                                      :constraints => {:host_id => /[^\/]+/},

data/db/migrate/20140909170102_abrt_reports_drop_timestamps.rb

@@ -0,0 +1,5 @@
+class AbrtReportsDropTimestamps < ActiveRecord::Migration
+  def change
+    remove_timestamps :abrt_reports
+  end
+end

data/lib/foreman_abrt/version.rb

@@ -1,3 +1,3 @@
 module ForemanAbrt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_abrt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Martin Milata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -53,6 +53,7 @@ files:
 - app/views/dashboard/_foreman_abrt_widget.html.erb
 - config/routes.rb
 - db/migrate/20140414095631_create_abrt_reports.rb
+- db/migrate/20140909170102_abrt_reports_drop_timestamps.rb
 - lib/foreman_abrt/version.rb
 - lib/foreman_abrt/engine.rb
 - lib/foreman_abrt.rb