foreman_statistics 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04f2e0c985cab00b83985bacac5d7bd98c093137c29ee2079ab0efa90ed55adc
-  data.tar.gz: a0f5a576e915cfdc64adb3fa4c6558a44aa92c8aa5cc081d3e007f3e06f6879b
+  metadata.gz: e4728ccddc8531f182f6bcf2c29250a3de8dfef2e7dd9987ac9fd782431b3028
+  data.tar.gz: 2227db4f50f237718e189adaab27a128a586f81cc816abdafd96d8d2dbf61cee
 SHA512:
-  metadata.gz: fa78c311e2d59333e2fb2b43aaaf998805c358919450e5f8e82fdca7d38a725b16b3bbf8373e88d07784fc43c0564bc73d521cc47b20a9268f0c004bd1042055
-  data.tar.gz: e6d653c21cbb859740aaab5ed524d583ef6d866c6e9a27e6567440047eec4b0d2df8d2fb39efe595848eb41fbc8ebd0616770d9976318ae599502c85b286fe79
+  metadata.gz: 4100dd3c03a548a2724d60ba7c7d986899fb12d7b675d565c395dfecfaace8cc03bf5a726f6eda8d6407980bd264c16b929fb83e156036ab3550222345081854
+  data.tar.gz: d25813980f43dd399dd5e39da1ffb19bc31bed171ecee7e4903cba89dbbfd9b8b95355d8518fefd7bdd7bc30a9812a969ad9646c826e69f209bb5baec285cd4e

data/app/jobs/foreman_statistics/trend_counter_job.rb

@@ -0,0 +1,23 @@
+module ForemanStatistics
+  class TrendCounterJob < ApplicationJob
+    def perform(options = {})
+      start_time = Time.zone.now
+      ForemanStatistics::TrendImporter.update!
+    ensure
+      duration = start_time.is_a?(Time) ? Time.zone.now - start_time : 0
+      self.class.set(wait: [30.minutes - duration, 0].max).perform_later(options)
+    end
+
+    rescue_from(StandardError) do |error|
+      Foreman::Logging.logger('background').error(
+        'Trend Counter Job: '\
+        "Error while creating new data #{error.message}"
+      )
+      raise error # propagate the error to the tasking system to properly report it there
+    end
+
+    def humanized_name
+      _('Trend Counter Job')
+    end
+  end
+end

data/app/views/foreman_statistics/trends/_empty_data.html.erb

@@ -2,6 +2,5 @@
 <div class="row">
   <div class="stats-well col-md-12">
     <p><strong><%= _('No data for this trend.') %></strong></p>
-    <div><%= (_("Is the cron job that executes %s enabled?") % "<span class='black'>foreman-rake foreman_statistics:trends:counter</span>").html_safe %></div>
   </div>
 </div>

data/app/views/foreman_statistics/trends/index.html.erb

@@ -2,15 +2,6 @@
 <% title _("Trends") %>
 <% title_actions new_link(_("Add Trend Counter")),
                  documentation_button('4.1.3Trends') %>
-<% if @trends.empty? %>
-  <%= alert :class => 'alert-info', :header => _("No trend counter defined"),
-            :text => (_("To define trend counters, use the Add Trend Counter button.</br> To start collecting trend data, set a cron job to execute 'foreman-rake foreman_statistics:trends:counter' at least every %s minutes.") % Setting[:outofsync_interval]).html_safe %>
-<% end %>
-
-<% if @trends.any? and ForemanStatistics::TrendCounter.unconfigured? %>
-  <%= alert :class => 'alert-info', :header => _("No trend counter found"),
-            :text => (_("To start collecting trend data, set a cron job to execute <span class='black'>foreman-rake foreman_statistics:trends:counter</span> at least every %s minutes.") % Setting[:outofsync_interval]).html_safe %>
-<% end %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">
   <thead>
@@ -33,7 +24,7 @@
   </tbody>
 </table>
 <%= will_paginate_with_info @trends %>
-<% unless ForemanStatistics::TrendCounter.unconfigured? %>
+<% if (latest_counter_time = ForemanStatistics::TrendCounter.maximum(:created_at)) %>
   <%= _("Last update:") %>
-  <%= date_time_relative(ForemanStatistics::TrendCounter.order(:created_at).last.created_at) %>
+  <%= date_time_relative(latest_counter_time) %>
 <% end %>

data/lib/foreman_statistics/engine.rb

@@ -79,6 +79,12 @@ module ForemanStatistics
       Apipie.configuration.checksum_path += ['/foreman_statistics/api/']
     end
 
+    initializer 'foreman_statistics.trend_counter_job' do
+      ::Foreman::Application.dynflow.config.on_init do |world|
+        TrendCounterJob.spawn_if_missing(world)
+      end
+    end
+
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       ::ComputeResource.include ForemanStatistics::ComputeResourceDecorations

data/lib/foreman_statistics/version.rb

@@ -1,3 +1,3 @@
 module ForemanStatistics
-  VERSION = '0.1.3'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/webpack/src/Router/StatisticsPage/StatisticsPageSelectors.js

@@ -1,4 +1,5 @@
-export const selectStatisticsPage = state => state.statisticsPage;
+export const selectStatisticsPage = state =>
+  state.foremanStatistics.statisticsPage;
 
 export const selectStatisticsMetadata = state =>
   selectStatisticsPage(state).metadata;

data/webpack/src/Router/StatisticsPage/__tests__/StatisticsPageSelectors.test.js

@@ -10,8 +10,10 @@ import {
 import { statisticsProps } from '../StatisticsPage.fixtures';
 
 const state = {
-  statisticsPage: {
-    ...statisticsProps,
+  foremanStatistics: {
+    statisticsPage: {
+      ...statisticsProps,
+    },
   },
 };
 

data/webpack/src/reducers.js

@@ -1,7 +1,9 @@
-// import { combineReducers } from 'redux';
+import { combineReducers } from 'redux';
+
+import { reducers as statisticsPageReducers } from './Router/StatisticsPage';
 
 const reducers = {
-  // foremanStatistics: combineReducers({}),
+  foremanStatistics: combineReducers(statisticsPageReducers),
 };
 
 export default reducers;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_statistics
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ondrej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.83'
+        version: 0.87.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.83'
+        version: 0.87.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - app/controllers/foreman_statistics/statistics_controller.rb
 - app/controllers/foreman_statistics/trends_controller.rb
 - app/helpers/foreman_statistics/trends_helper.rb
+- app/jobs/foreman_statistics/trend_counter_job.rb
 - app/models/concerns/foreman_statistics/compute_resource_decorations.rb
 - app/models/concerns/foreman_statistics/environment_decorations.rb
 - app/models/concerns/foreman_statistics/general_setting_decorations.rb