foreman_abrt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4619b63f22f7dd8925edbcad245b1e6bd07d36
-  data.tar.gz: 831029909552803d1fb4cae1dfa3ddd50e5cc1ef
+  metadata.gz: 7e90f9c2daa852c6ac8d2debd86a5d6e6f816641
+  data.tar.gz: aa3047b35ec9493988d41327ebde7ed4add6e507
 SHA512:
-  metadata.gz: 53407dd9d8297ee166e93744bb5957d74f3b922f37258bdd12d42b974c5b1d527480476de23731c06dd6f750890d69963c010befaee89f31b563baadb582f98e
-  data.tar.gz: e6e98d3b0d50ff4dd6541292f7c913179fa67c28ee3e70a73fe33ebed8aef67aaa4119f91dc92dc7c50fd69e14cb5f48e756c50d4d94fa7b1ce5abd09a760b0f
+  metadata.gz: 90ea5b440d83acf850edb42699fcd3ad1985fef6f4fb5f2cae338909f93e5cdb08082831d5a78a172a9bb0efa045dda41ac2a3f2255021739d6276d8584d3b7e
+  data.tar.gz: 003b81e150d41deab12c8ee4d40a8e4df164d91868b5d0dd331693f5997f9d2190c9309c9400a29096336f37ba1bb1e300adf930d963f167f916ffc98f0f8d95

data/README.md

@@ -43,6 +43,10 @@ To be able to see ABRT bug reports in your Foreman instance, you need to
 install the plugin itself, install ABRT plugin for your smart proxies and
 configure your hosts to send the bug reports to their smart proxy.
 
+Both plugins are available as RPMs in [Foremay YUM repositories](http://yum.theforeman.org/).
+
+The plugins require both Foreman and smart-proxy to be version 1.6 or later.
+
 ### Installing the Foreman plugin
 
 To install the Foreman plugin, follow the [plugin installation
@@ -50,28 +54,9 @@ instructions](http://projects.theforeman.org/projects/foreman/wiki/How_to_Instal
 
 ### Setting up smart proxies
 
-You need smart-proxy version 1.6 or later (e.g. installed from git) in order to
-install the ABRT plugin.
-
-- If you want to use the report aggregation (reports are grouped on the proxy
-  and the same reports are sent only once), you have to install the satyr ruby
-  gem:
-
-  ```
-  ~# yum install satyr rubygem-ffi
-  ~# gem install satyr
-  ```
-
-- Install the ABRT smart-proxy plugin:
-
-  ```
-  ~$ git clone https://github.com/abrt/smart-proxy-abrt.git
-  ~$ cd smart-proxy-abrt
-  ~/smart-proxy-abrt$ gem build smart_proxy_abrt.gemspec
-  ~/smart-proxy-abrt$ yum install rubygems-devel rubygem-minitest
-  ~/smart-proxy-abrt$ rpmbuild --define "_sourcedir `pwd`" -ba extra/rubygem-smart_proxy_abrt.spec
-  ~/smart-proxy-abrt$ yum install ~/rpmbuild/RPMS/noarch/rubygem-smart_proxy_abrt*rpm
-  ```
+Follow the [smart-proxy plugin installation
+instructions](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Smart-Proxy_Plugin).
+The plugin needs some configuration in order to work correctly.
 
 - Edit `/etc/foreman-proxy/settings.yml` to configure the main Foreman host,
   which is normally not needed. Assuming Foreman runs on `f19-foreman.tld` the
@@ -82,17 +67,15 @@ install the ABRT plugin.
   :foreman_url: https://f19-foreman.tld
   ```
 
-- Rename `/etc/foreman-proxy/settings.d/abrt.yml.example` to `abrt.yml` to enable the ABRT proxy plugin:
+- Ensure that `/etc/foreman-proxy/settings.d/abrt.yml` contains the following line:
   ```
-  ~$ cd /etc/foreman-proxy/settings.d/
-  /etc/foreman-proxy/settings.d/$ mv abrt.yml.example abrt.yml
+  :enabled: true
   ```
 
-- Start the smart-proxy.
-
-  ```
-  ~# systemctl start foreman-proxy
-  ```
+- Cron is used to transfer the captured bug reports to Foreman in batches.
+  Ensure that the `smart-proxy-abrt-send` command is run periodically. The
+  provided RPM package contains a cron snippet that runs the command every 30
+  minutes.
 
 ### Configuring hosts to send bug reports to Foreman
 
@@ -164,7 +147,6 @@ configuration screen (*Administer*->*Settings*).
 
 ## TODO
 
-- Graph with number of reports vs. time on the dashboard.
 - Forwarding reports on the proxy - drop it altogether, or forward the server
   response to the client?
 - Use puppet to configure managed hosts to send ureports to Foreman.

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

@@ -0,0 +1,12 @@
+module ForemanAbrt::DashboardControllerExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    before_filter :prefetch_abrt_data, :only => :index
+  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])
+  end
+end

data/app/helpers/abrt_reports_helper.rb

@@ -6,4 +6,20 @@ module AbrtReportsHelper
       str
     end
   end
+
+  def count_abrt_reports abrt_reports
+    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]
+    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
+  end
 end

data/app/models/abrt_report.rb

@@ -30,13 +30,13 @@ class AbrtReport < ActiveRecord::Base
   scoped_search :on => :response_message, :complete_value => true, :rename => :response
   scoped_search :on => :response_bthash,  :complete_value => true, :rename => :bthash
 
-  scoped_search :in => :abrt_report_response_destination, :on => :reporter, :complete_value => true, :rename => :destination_reporter
-  scoped_search :in => :abrt_report_response_destination, :on => :desttype, :complete_value => true, :rename => :destination_type
-  scoped_search :in => :abrt_report_response_destination, :on => :value   , :complete_value => true, :rename => :destination_value
+  scoped_search :in => :abrt_report_response_destinations, :on => :reporter, :complete_value => true, :rename => :destination_reporter
+  scoped_search :in => :abrt_report_response_destinations, :on => :desttype, :complete_value => true, :rename => :destination_type
+  scoped_search :in => :abrt_report_response_destinations, :on => :value   , :complete_value => true, :rename => :destination_value
 
-  scoped_search :in => :abrt_report_response_solution, :on => :cause, :complete_value => true, :rename => :solution_cause
-  scoped_search :in => :abrt_report_response_solution, :on => :note,  :complete_value => true, :rename => :solution_note
-  scoped_search :in => :abrt_report_response_solution, :on => :url,   :complete_value => true, :rename => :solution_url
+  scoped_search :in => :abrt_report_response_solutions, :on => :cause, :complete_value => true, :rename => :solution_cause
+  scoped_search :in => :abrt_report_response_solutions, :on => :note,  :complete_value => true, :rename => :solution_note
+  scoped_search :in => :abrt_report_response_solutions, :on => :url,   :complete_value => true, :rename => :solution_url
 
   def self.import(json)
     host = Host.find_by_name(json[:host])

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

@@ -15,7 +15,7 @@
         <% if abrt_report.host.nil? %>
             <td></td>
         <% else %>
-            <td><%= link_to abrt_report.host, host_abrt_reports_path(abrt_report) %></td>
+            <td><%= link_to abrt_report.host, host_abrt_reports_path(abrt_report.host) %></td>
         <% end %>
       <% end %>
       <td> <%= link_to(_("%s ago") % time_ago_in_words(abrt_report.reported_at.getlocal), abrt_report_path(abrt_report)) %> </td>

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

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

data/lib/foreman_abrt/engine.rb

@@ -39,6 +39,9 @@ module ForemanAbrt
              :caption  => _('Bug reports'),
              :parent   => :monitor_menu,
              :after    => :reports
+
+        # add dashboard widget
+        widget 'foreman_abrt_widget', :name => N_('Bug report chart'), :sizex => 6, :sizey => 1
       end
     end
 
@@ -46,6 +49,7 @@ module ForemanAbrt
     config.to_prepare do
       begin
         Host::Managed.send(:include, ForemanAbrt::HostExtensions)
+        DashboardController.send(:include, ForemanAbrt::DashboardControllerExtensions)
       rescue => e
         puts "ForemanAbrt: skipping engine hook (#{e.to_s})"
       end

data/lib/foreman_abrt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_abrt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Martin Milata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -32,6 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/concerns/foreman_abrt/dashboard_controller_extensions.rb
 - app/controllers/api/v2/abrt_reports_controller.rb
 - app/controllers/abrt_reports_controller.rb
 - app/assets/javascripts/abrt_reports.js
@@ -49,6 +50,7 @@ files:
 - app/views/abrt_reports/index.html.erb
 - app/views/abrt_reports/_list.html.erb
 - app/views/abrt_reports/show.html.erb
+- app/views/dashboard/_foreman_abrt_widget.html.erb
 - config/routes.rb
 - db/migrate/20140414095631_create_abrt_reports.rb
 - lib/foreman_abrt/version.rb