foreman_openscap 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0895db81e437924a55b31bb9abe2f1a4f217d6e6108b1324fc52af3950aacd33'
-  data.tar.gz: 5031307c30cddd992d58e0cd4b855b3cdc7e43dfe766947df66adf8154d8a048
+  metadata.gz: 629a167f8a2ea481556fa422d375bc3a85ad1c9a2ed78d3976796d7a1631c7f1
+  data.tar.gz: bed0c059fae8275515b39faa672553a805e6a4b91612e4b1d0b9b8bd6ed4ba30
 SHA512:
-  metadata.gz: fa6478fc462f96ca1ba815c8369476e58e253bb1ed01307e81895c28ed6e7684602029949233a7e7d89ba8cba6f73d197f5fef76746273120f94ab26aa3acec8
-  data.tar.gz: 0a97a049d86e101f303316b4b49d0b21864c207884fd1ca45b19456735159f8cb1e2b4d762057d078668dcfe7c729b50665d3f7290dab2c20e2b3995ee15128f
+  metadata.gz: 25197b4a417ebfdb3f1a757015caab03dba232e2a2e667b01e84a4f666a8d3dea713aab3bd6794ed0809e1e147d9306e830318f75f7a46f57126914e572f4f5d
+  data.tar.gz: 136a1b268b7164ae19ba5daf4f13dac82fdc08f20697370b8820d6ff49cb6f28189af63821cc91c0097177cb22fa766774a18d944ebc8e4d4f6a55b966a30e6f

data/app/assets/javascripts/foreman_openscap/scap_hosts_show.js

@@ -1,4 +1,4 @@
 $(function() {
   // Not sure about this ugly hack.
-  $('.col-md-4 .stats-well').height($('.col-md-8 .stats-well').height() + 28);
+  $('.col-md-4 .stats-well').height($('.col-md-8 .stats-well').height());
 });

data/app/assets/stylesheets/foreman_openscap/scap_breakdown_chart.css

@@ -0,0 +1,26 @@
+.scap-breakdown-chart {
+  margin: 25px auto 12px;
+  width: 240px;
+}
+
+#arf-report-breakdown-chart {
+  margin-top: 58px;
+  padding-bottom: 50px;
+}
+
+.scap-breakdown-chart-col {
+  min-width: 340px;
+}
+
+.arf-report-rule-chart-col {
+  min-width: 440px;
+}
+
+.metrics-stats-row {
+  padding-top: 20px;
+}
+
+#arf-report-rule-chart .bar-chart-pf {
+  max-width: fit-content;
+  margin: auto;
+}

data/app/helpers/arf_report_dashboard_helper.rb

@@ -5,13 +5,28 @@ module ArfReportDashboardHelper
     :othered => '#DB843D',
   }.freeze
 
-  def reports_breakdown_chart(report, options = {})
-    data = []
-    [[:failed, _('Failed')],
-     [:passed, _('Passed')],
-     [:othered, _('Othered')],].each do |i|
-      data << { :label => i[1], :data => report[i[0]], :color => COLORS[i[0]] }
+  def breakdown_chart_data(categories, report, colors = COLORS)
+    data = categories.reduce([]) do |memo, (key, value)|
+      memo << [value, report[key], colors[key]]
     end
-    flot_pie_chart 'overview', _('Compliance reports breakdown'), data, options
+
+    data.to_json
+  end
+
+  def donut_breakdown_chart_data(report)
+    categories = {
+      :failed => _('Failed'),
+      :passed => _('Passed'),
+      :othered => _('Other')
+    }
+    breakdown_chart_data categories, report
+  end
+
+  def arf_report_status_chart_data(status)
+    {
+      :data => status.to_a,
+      :yAxisLabel => _("Number of Events"),
+      :xAxisLabel => _("Rule Results"),
+    }.to_json
   end
 end

data/app/helpers/compliance_hosts_helper.rb

@@ -1,25 +1,21 @@
 module ComplianceHostsHelper
-  def host_policy_breakdown_chart(report, options = {})
-    data = []
-    [[:passed, _('Passed')],
-     [:failed, _('Failed')],
-     [:othered, _('Other')],].each do |i|
-      data << { :label => i[1], :data => report[i[0]], :color => ArfReportDashboardHelper::COLORS[i[0]] }
-    end
-    flot_pie_chart 'overview', _('Compliance reports breakdown'), data, options
-  end
-
-  def host_arf_reports_chart(policy_id)
+  def host_arf_reports_chart_data(policy_id)
     passed = []
     failed = []
     othered = []
+    date = []
     @host.arf_reports.of_policy(policy_id).each do |report|
-      passed  << [report.created_at.to_i * 1000, report.passed]
-      failed  << [report.created_at.to_i * 1000, report.failed]
-      othered << [report.created_at.to_i * 1000, report.othered]
+      passed  << report.passed
+      failed  << report.failed
+      othered << report.othered
+      date << report.created_at.to_i * 1000
     end
-    [{ :label => _("Passed"), :data => passed, :color => ArfReportDashboardHelper::COLORS[:passed] },
-     { :label => _("Failed"), :data => failed, :color => ArfReportDashboardHelper::COLORS[:failed] },
-     { :label => _("Othered"), :data => othered, :color => ArfReportDashboardHelper::COLORS[:othered] }]
+    data = [
+      [_("Passed"), passed, ArfReportDashboardHelper::COLORS[:passed]],
+      [_("Failed"), failed, ArfReportDashboardHelper::COLORS[:failed]],
+      [_("Othered"), othered, ArfReportDashboardHelper::COLORS[:othered]],
+      ['dates', date, nil]
+    ]
+    { :data => data, :xAxisDataLabel => 'dates', :config => 'timeseries' }.to_json
   end
 end

data/app/helpers/policy_dashboard_helper.rb

@@ -6,15 +6,15 @@ module PolicyDashboardHelper
     :report_missing => '#92A8CD',
   }.freeze
 
-  def host_breakdown_chart(report, options = {})
-    data = []
-    [[:compliant_hosts, _('Compliant hosts')],
-     [:incompliant_hosts, _('Incompliant hosts')],
-     [:inconclusive_hosts, _('Inconclusive')],
-     [:report_missing, _('Not audited')],].each do |i|
-      data << { :label => i[1], :data => report[i[0]], :color => COLORS[i[0]] }
-    end
-    flot_pie_chart 'overview', _('Compliance Status'), data, options
+  def policy_breakdown_chart_data(report)
+    categories = {
+      :compliant_hosts =>  _('Compliant hosts'),
+      :incompliant_hosts =>  _('Incompliant hosts'),
+      :inconclusive_hosts => _('Inconclusive'),
+      :report_missing =>  _('Not audited'),
+    }
+
+    breakdown_chart_data categories, report, COLORS
   end
 
   def status_link(name, label, path)

data/app/views/arf_reports/_metrics.html.erb

@@ -1,19 +1,21 @@
-<div class="row">
-  <div class="col-md-4">
+<% stylesheet 'foreman_openscap/scap_breakdown_chart' %>
+
+<div class="row metrics-stats-row">
+  <div class="col-md-5 scap-breakdown-chart-col">
     <div class="stats-well">
       <h4 class="ca" ><%= _('Report Metrics') %></h4>
-      <div style="margin-top:50px;padding-bottom: 40px;">
-        <%= reports_breakdown_chart(metrics, :class => 'statistics-pie small') %>
-      </div>
+      <div id="arf-report-breakdown-chart" class="scap-breakdown-chart"></div>
+      <%= mount_react_component('DonutChart', "#arf-report-breakdown-chart", donut_breakdown_chart_data(metrics)) %>
     </div>
   </div>
-  <div class="col-md-4">
+  <div class="col-md-5 arf-report-rule-chart-col">
     <div class="stats-well">
       <h4 class="ca" ><%= _('Report Status') %></h4>
-      <%= flot_bar_chart("status" ,"", _("Number of Events"), status, :class => "statistics-bar")%>
+      <div id="arf-report-rule-chart"></div>
+      <%= mount_react_component('BarChart', "#arf-report-rule-chart", arf_report_status_chart_data(status), :flatten_data => true) %>
     </div>
   </div>
-  <div class="col-md-4">
+  <div class="col-md-2">
     <table class='<%= table_css_classes %>'>
       <tbody>
         <% metrics.sort.each do |title, value|%>

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

@@ -1,4 +1,5 @@
-<% javascript 'charts', 'dashboard', 'foreman_openscap/scap_hosts_show' %>
+<% javascript 'charts', 'foreman_openscap/scap_hosts_show' %>
+<% stylesheet 'foreman_openscap/scap_breakdown_chart' %>
 
 <%= breadcrumbs(:resource_url => api_hosts_path,
                 :resource_filter => "is_compliance_host = true",
@@ -23,14 +24,18 @@
                                                         hash_for_arf_report_path(:id => data.latest_report.id)
                                                           .merge(:auth_object => data.latest_report)) %></h4>
         <% report = data.report %>
-        <%= host_policy_breakdown_chart(report, :class => 'statistics-pie small') %>
+        <% id = "host-policy-breakdown-chart-#{policy.id}" %>
+        <div id="<%= id %>" class="scap-breakdown-chart"></div>
+        <%= mount_react_component('DonutChart', "##{id}", donut_breakdown_chart_data(report)) %>
       </div>
     </div>
 
     <div class="col-md-8">
       <div class="stats-well">
         <h4 class="ca"><%= _("%s reports over time") % policy %></h4>
-        <%= flot_chart('resource_graph', '', '', host_arf_reports_chart(policy.id)) %>
+        <% reports_graph_id = "arf-reports-over-time-#{policy.id}" %>
+        <div id="<%= reports_graph_id %>"></div>
+        <%= mount_react_component('LineChart', "##{reports_graph_id}", host_arf_reports_chart_data(policy.id), :flatten_data => true) %>
       </div>
     </div>
     <% else %>

data/app/views/policy_dashboard/_policy_chart_widget.html.erb

@@ -1,4 +1,7 @@
+<% stylesheet 'foreman_openscap/scap_breakdown_chart'%>
+
 <div id='status-chart'>
   <h4 class="header ca"><%= _('Host Breakdown Chart') %></h4>
-  <%= host_breakdown_chart(@report, :class => 'statistics-pie small') %>
+  <div id="policy-breakdown-chart" class="scap-breakdown-chart"></div>
+  <%= mount_react_component('DonutChart', "#policy-breakdown-chart", policy_breakdown_chart_data(@report)) %>
 </div>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "1.0.6".freeze
+  VERSION = "1.0.7".freeze
 end

data/test/helpers/arf_report_dashboard_helper_test.rb

@@ -0,0 +1,33 @@
+require 'test_plugin_helper'
+
+class ArfReportDashboardHelperTest < ActionView::TestCase
+  include ArfReportDashboardHelper
+
+  test 'should return breakdown chart data with custom colors as json' do
+    categories = { :passed => 'passed', :failed => 'failed' }
+    report = { :passed => 23, :failed => 24 }
+    colors = { :passed => '#FFF', :failed => '#000' }
+    res = JSON.parse(breakdown_chart_data(categories, report, colors))
+    assert_equal ["passed", 23, "#FFF"], res.first
+    assert_equal ["failed", 24, "#000"], res.last
+  end
+
+  test 'should return breakdown chart data for donut as json' do
+    report = { :passed => 4, :failed => 7, :othered => 5 }
+    res = JSON.parse(donut_breakdown_chart_data(report))
+    assert_equal 3, res.size
+    assert_include res, ["Passed", 4, ArfReportDashboardHelper::COLORS[:passed]]
+    assert_include res, ["Failed", 7, ArfReportDashboardHelper::COLORS[:failed]]
+    assert_include res, ["Other", 5, ArfReportDashboardHelper::COLORS[:othered]]
+  end
+
+  test 'should return data for report status chart' do
+    res = JSON.parse(arf_report_status_chart_data(:passed => 6, :failed => 7, :othered => 8))
+    assert_equal "Number of Events", res['yAxisLabel']
+    assert_equal "Rule Results", res['xAxisLabel']
+    assert_equal 3, res['data'].size
+    assert_include res['data'], ["passed", 6]
+    assert_include res['data'], ["failed", 7]
+    assert_include res['data'], ["othered", 8]
+  end
+end

data/test/helpers/policy_dashboard_helper_test.rb

@@ -0,0 +1,21 @@
+require 'test_plugin_helper'
+
+class PolicyDashboardHelperTest < ActionView::TestCase
+  include ArfReportDashboardHelper
+  include PolicyDashboardHelper
+
+  test 'should return data for policy breakdown chart' do
+    report = {
+      :compliant_hosts => 5,
+      :incompliant_hosts => 6,
+      :inconclusive_hosts => 7,
+      :report_missing => 8
+    }
+    res = JSON.parse(policy_breakdown_chart_data(report))
+    assert_equal 4, res.size
+    assert_include res, ['Compliant hosts', 5, PolicyDashboardHelper::COLORS[:compliant_hosts]]
+    assert_include res, ['Incompliant hosts', 6, PolicyDashboardHelper::COLORS[:incompliant_hosts]]
+    assert_include res, ['Inconclusive', 7, PolicyDashboardHelper::COLORS[:inconclusive_hosts]]
+    assert_include res, ['Not audited', 8, PolicyDashboardHelper::COLORS[:report_missing]]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -43,6 +43,7 @@ files:
 - app/assets/stylesheets/foreman_openscap/policy.css
 - app/assets/stylesheets/foreman_openscap/policy_dashboard.css
 - app/assets/stylesheets/foreman_openscap/reports.css
+- app/assets/stylesheets/foreman_openscap/scap_breakdown_chart.css
 - app/controllers/api/v2/compliance/arf_reports_controller.rb
 - app/controllers/api/v2/compliance/policies_controller.rb
 - app/controllers/api/v2/compliance/scap_contents_controller.rb
@@ -329,6 +330,8 @@ files:
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
 - test/functional/tailoring_files_controller_test.rb
+- test/helpers/arf_report_dashboard_helper_test.rb
+- test/helpers/policy_dashboard_helper_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
 - test/test_plugin_helper.rb
 - test/unit/arf_report_status_calculator_test.rb
@@ -371,6 +374,8 @@ signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
+- test/helpers/arf_report_dashboard_helper_test.rb
+- test/helpers/policy_dashboard_helper_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
 - test/unit/message_cleaner_test.rb
 - test/unit/scap_content_test.rb