foreman_statistics 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b623960c9e0058919e38a547a7a887d2a4ccaf4180a0753721edf1f2a2088c3
-  data.tar.gz: 25b17b3c94e390c59717fd199c6b0800371765d0570675def385022a5281d4cb
+  metadata.gz: b95468f6ef7bf5f7cc61869bd23e46bf7a64331aa2d162962178b7c186df6f8a
+  data.tar.gz: 62baddb120c01c609e1e8a62d30e785a8ee12c3dcdbe4591468822d1fe464d6e
 SHA512:
-  metadata.gz: 95769dbdefb08373a4b7a69558d4e0d8dd082bfa7ae921689e736e884686e2ffafad6c76550f85a629507407103a4f159435864444bc554ec45e3f50b0a7ab58
-  data.tar.gz: 5250e86365ce05e50e1580e1034b4a649df10816dc2868d5797834b9542ef2002c3b1fd0636d2c2492ae6b5cbb78942b9f39fa5c1f0e02621305cfda6f4ac601
+  metadata.gz: 455324c4b0fcb964e4db90d36da2c0ccf74323298bac57def3197af5b71e12c80cc7b835e16262cd7fa27d7bd96d15e8ca0f9ac454299835367863c3c5fb30bc
+  data.tar.gz: 66f4bcf63408b04889e53ed846753bd34e5e3c83ecb17fdd9694181a5aa7322ef12b68ba26378aa6a21d3b6a2ae1195a1a6c52e506e715a4f5d18a3b7db97d96

data/app/helpers/foreman_statistics/trends_helper.rb

@@ -3,16 +3,18 @@ module ForemanStatistics
     include ::CommonParametersHelper
 
     def trendable_types
-      options = { _('Environment') => 'Environment', _('Operating system') => 'Operatingsystem',
-                  _('Model') => 'Model', _('Facts') => 'FactName', _('Host group') => 'Hostgroup', _('Compute resource') => 'ComputeResource' }
       existing = ForemanTrend.types.pluck(:trendable_type)
+      options = {}
+      options = { _('Environment') => 'ForemanPuppet::Environment' } if Foreman::Plugin.find(:foreman_puppet)
+      options.merge!({ _('Operating system') => 'Operatingsystem', _('Model') => 'Model', _('Facts') => 'FactName',
+                       _('Host group') => 'Hostgroup', _('Compute resource') => 'ComputeResource' })
       options.delete_if { |_k, v| existing.include?(v) }
     end
 
     def trend_days_filter(trend)
       form_tag trend, :id => 'days_filter', :method => :get, :class => 'form form-inline' do
         content_tag(:span, (_('Trend of the last %s days.') %
-                            select(nil, 'range', 1..Setting[:max_trend], { :selected => range },
+                            select(nil, 'range', 1..Setting[:max_trend], { :selected => trends_range },
                               { :onchange => "$('#days_filter').submit();$(this).attr('disabled','disabled');;" })).html_safe)
       end
     end
@@ -25,28 +27,36 @@ module ForemanStatistics
       end
     end
 
-    def chart_data(trend, from = Setting[:max_trend], _to = Time.now.utc)
-      chart_colors = ['#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', '#DB843D', '#92A8CD', '#A47D7C', '#B5CA92']
-      values = trend.values
-      labels = {}
-      values.includes(:trendable).each { |v| labels[v.id] = [CGI.escapeHTML(v.to_label), trend_path(:id => v)] }
-      values.includes(:trend_counters).where(['trend_counters.interval_end > ? or trend_counters.interval_end is null', from])
-            .reorder('trend_counters.interval_start')
-            .each_with_index.map do |value, idx|
-        data = []
+    ##
+    # Returns data in format:
+    #
+    # [
+    #   [time, <time_int>, <time_int>],
+    #   [trend_val1, <host_count>, <host_count>],
+    #   [trend_val2, 5, 2],
+    #   [trend_valx, 213, 3]
+    # ]
+    def trend_chart_data(trend, from = Setting[:max_trend])
+      data = {}
+      names = {}
+      trend.values.preload(:trendable).each { |value| names[value.id] = CGI.escapeHTML(value.to_label) }
+      trend.values.preload(:trend_counters).joins(:trend_counters)
+           .where(['trend_counters.interval_end > ? or trend_counters.interval_end is null', from])
+           .reorder('trend_counters.interval_start')
+           .each do |value|
         value.trend_counters.each do |counter|
-          # cut the left side of the graph
-          interval_start = (counter.interval_start || from) > from ? counter.interval_start : from
+          current_data = data[counter.interval_start.to_i] ||= {}
           next_timestamp = counter.try(:interval_end) || Time.now.utc
-          # transform the timestamp values to flot format - from seconds in Ruby to milliseconds in flot
-          data << [interval_start.to_i * 1000, counter.count]
-          data << [next_timestamp.to_i * 1000 - 1, counter.count]
+          next_data = data[next_timestamp.to_i] ||= {}
+          current_data[value.id] = next_data[value.id] = counter.count
         end
-        { :label => labels[value.id][0], :href => labels[value.id][1], :data => data, :color => chart_colors[idx % chart_colors.size] } unless data.empty?
-      end.compact
+      end
+      times = data.keys.sort
+      result = names.map { |id, label| [label].concat(times.map { |time| data[time][id].to_f }) }
+      result.unshift(['time'].concat(times))
     end
 
-    def range
+    def trends_range
       params['range'].empty? ? Setting[:max_trend] : params['range'].to_i
     end
   end

data/app/models/concerns/foreman_statistics/has_many_trends.rb

@@ -0,0 +1,9 @@
+module ForemanStatistics
+  module HasManyTrends
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :trends, as: :trendable, class_name: 'ForemanStatistics::ForemanTrend', dependent: :destroy
+    end
+  end
+end

data/app/models/foreman_statistics/trend.rb

@@ -25,7 +25,9 @@ module ForemanStatistics
     end
 
     def self.build_trend(trend_params = {})
-      trend_params[:trendable_type] == 'FactName' ? FactTrend.new(trend_params) : ForemanTrend.new(trend_params)
+      params = trend_params.dup
+      params[:trendable_type] = 'ForemanPuppet::Environment' if params[:trendable_type] == 'Environment'
+      params[:trendable_type] == 'FactName' ? FactTrend.new(params) : ForemanTrend.new(params)
     end
 
     private

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

@@ -4,7 +4,7 @@
       <% group.each do |host| %>
         <ul class="base">
           <li>
-            <%= link_to(host, host_path(:id => host), :title => _("Show Host")) %>
+            <%= link_to(host, main_app.host_path(id: host), title: _("Show Host")) %>
           </li>
         </ul>
       <% end %>

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

@@ -1,4 +1,3 @@
-<%= javascript 'charts' %>
 <% title _("Trends") %>
 <% title_actions new_link(_("Add Trend Counter"), engine: foreman_statistics),
                  documentation_button('4.1.3Trends') %>

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

@@ -1,14 +1,14 @@
-<%= javascript 'charts' %>
 <% title(_("Trends for %s") % trend_title(@trend)) %>
 <% content_for(:search_bar) { trend_days_filter(@trend) } %>
 <div class="row">
-  <div class="stats-well col-md-12">
-    <h4 class="ca"><%= "#{trend_title(@trend)}" %></h4>
-    <h6 class="ca"><%= n_("last %s day", "last %s days", range) % range %></h6>
-    <%= flot_chart 'trend_graph','' ,_('Number of Hosts') , chart_data(@trend, range.days.ago), :class=>'statistics-chart stack', :legend => 'external' %>
+  <div class="col-md-12">
+    <div class="stats-well trends-chart">
+      <h4 class="ca"><%= "#{trend_title(@trend)}" %></h4>
+      <h6 class="ca"><%= n_("last %s day", "last %s days", trends_range) % trends_range %></h6>
+      <%= react_component('AreaChart', yAxisLabel: _('Number of Hosts'), data: trend_chart_data(@trend, trends_range.days.ago), searchUrl: trend_path(id: '~VAL~')) %>
+    </div>
   </div>
 </div>
-<div id="legendContainer"></div>
 <table class="table">
   <% unless @trend.fact_value.nil? %>
     <thead>

data/config/jest.config.js

@@ -0,0 +1,21 @@
+const tfmConfig = require('@theforeman/test/src/pluginConfig');
+
+// Find where foreman is located
+const { foremanRelativePath, foremanLocation } = require('@theforeman/find-foreman');
+const foremanReactRelative = 'webpack/assets/javascripts/react_app';
+const foremanFull = foremanLocation();
+const foremanReactFull = foremanRelativePath(foremanReactRelative);
+
+// Find correct path to foremanReact so we do not have to mock it in tests
+tfmConfig.moduleNameMapper['^foremanReact(.*)$'] = `${foremanReactFull}/$1`;
+
+// Do not use default resolver
+tfmConfig.resolver = null;
+// Specify module dirs instead
+tfmConfig.moduleDirectories = [
+  `${foremanFull}/node_modules`,
+  `${foremanFull}/node_modules/@theforeman/vendor-core/node_modules`,
+  'node_modules',
+]
+
+module.exports = tfmConfig;

data/db/migrate/20210523143005_migrate_environments.rb

@@ -0,0 +1,13 @@
+class MigrateEnvironments < ActiveRecord::Migration[6.0]
+  class FakeTrend < ApplicationRecord
+    self.table_name = 'trends'
+  end
+
+  def up
+    FakeTrend.where(trendable_type: 'Environment').update_all(trendable_type: 'ForemanPuppet::Environment')
+  end
+
+  def down
+    FakeTrend.where(trendable_type: 'ForemanPuppet::Environment').update_all(trendable_type: 'Environment')
+  end
+end

data/lib/foreman_statistics/engine.rb

@@ -87,11 +87,12 @@ module ForemanStatistics
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
-      ::ComputeResource.include ForemanStatistics::ComputeResourceDecorations
-      ::Environment.include ForemanStatistics::EnvironmentDecorations
-      ::Hostgroup.include ForemanStatistics::HostgroupDecorations
-      ::Model.include ForemanStatistics::ModelDecorations
-      ::Operatingsystem.include ForemanStatistics::OperatingsystemDecorations
+      ::ComputeResource.include ForemanStatistics::HasManyTrends
+      ::Hostgroup.include ForemanStatistics::HasManyTrends
+      ::Model.include ForemanStatistics::HasManyTrends
+      ::Operatingsystem.include ForemanStatistics::HasManyTrends
+      '::Environment'.safe_constantize&.include ForemanStatistics::HasManyTrends
+      'ForemanPuppet::Environment'.safe_constantize&.include ForemanStatistics::HasManyTrends
       ::Setting.include ForemanStatistics::SettingDecorations
       ::Setting::General.prepend ForemanStatistics::GeneralSettingDecorations
       begin

data/lib/foreman_statistics/version.rb

@@ -1,3 +1,3 @@
 module ForemanStatistics
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/locale/ca/foreman_statistics.edit.po

@@ -0,0 +1,263 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_statistics package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2021
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-04 02:22+0100\n"
+"PO-Revision-Date: 2021-02-03 22:59+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2021\n"
+"Language-Team: Catalan (https://www.transifex.com/foreman/teams/114/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../app/controllers/foreman_statistics/api/v2/statistics_controller.rb:12
+msgid "Get statistics"
+msgstr "Obtén les estadístiques"
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:20
+msgid "List of trends counters"
+msgstr ""
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:25
+msgid "Show a trend"
+msgstr ""
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:29
+msgid "Create a trend counter"
+msgstr ""
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:42
+msgid "Delete a trend counter"
+msgstr ""
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:6
+msgid "Environment"
+msgstr "Entorn"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:6
+msgid "Operating system"
+msgstr "Sistema operatiu"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Model"
+msgstr "Model"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Facts"
+msgstr "Objectes d'interès"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Host group"
+msgstr "Grup d'amfitrions"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Compute resource"
+msgstr "Recurs computacional"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:14
+msgid "Trend of the last %s days."
+msgstr ""
+
+#: ../app/jobs/foreman_statistics/trend_counter_job.rb:20
+msgid "Trend Counter Job"
+msgstr ""
+
+#: ../app/models/concerns/foreman_statistics/general_setting_decorations.rb:12
+msgid "Max days for Trends graphs"
+msgstr "Nombre màxim de dies per als gràfics de les tendències"
+
+#: ../app/models/concerns/foreman_statistics/general_setting_decorations.rb:12
+msgid "Max trends"
+msgstr "Tendències màx."
+
+#: ../app/services/foreman_statistics/statistics.rb:6
+msgid "Architecture Distribution"
+msgstr "Distribució de l'arquitectura"
+
+#: ../app/services/foreman_statistics/statistics.rb:7
+msgid "Environment Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:8
+msgid "Host Group Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:9
+msgid "Compute Resource Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:10
+msgid "Number of CPUs"
+msgstr "Nombre de CPU"
+
+#: ../app/services/foreman_statistics/statistics.rb:11
+msgid "Hardware"
+msgstr "Maquinari"
+
+#: ../app/services/foreman_statistics/statistics.rb:12
+msgid "Average Memory Usage"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:13
+msgid "Average Swap Usage"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:14
+msgid "Class Distribution"
+msgstr "Distribució de la classe"
+
+#: ../app/services/foreman_statistics/statistics.rb:15
+msgid "Location Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:16
+msgid "Organization Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics/count_numerical_fact_pair.rb:22
+msgid "free memory"
+msgstr "memòria lliure"
+
+#: ../app/services/foreman_statistics/statistics/count_numerical_fact_pair.rb:26
+msgid "used memory"
+msgstr "memòria utilitzada"
+
+#: ../app/views/foreman_statistics/trends/_empty_data.html.erb:1 ../app/views/foreman_statistics/trends/show.html.erb:2
+msgid "Trends for %s"
+msgstr "Tendències per %s"
+
+#: ../app/views/foreman_statistics/trends/_empty_data.html.erb:4
+msgid "No data for this trend."
+msgstr "No hi ha dades per aquesta tendència."
+
+#: ../app/views/foreman_statistics/trends/_form.html.erb:4
+msgid "Please Select"
+msgstr "Si us plau, seleccioneu"
+
+#: ../app/views/foreman_statistics/trends/_hosts.html.erb:7
+msgid "Show Host"
+msgstr "Mosta l'amfitrió"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:1
+msgid "Edit Trend %s"
+msgstr "Edita la tendència %s"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:8
+msgid "Fact Name"
+msgstr "Nom de l'objecte d'interès"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:9 ../app/views/foreman_statistics/trends/edit.html.erb:30
+msgid "Display Name"
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:43
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:44
+msgid "Submit"
+msgstr "Envia"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:2 ../app/views/foreman_statistics/trends/welcome.html.erb:1 ../app/views/foreman_statistics/trends/welcome.html.erb:6 ../lib/foreman_statistics/engine.rb:63
+msgid "Trends"
+msgstr "Tendències"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:3 ../app/views/foreman_statistics/trends/welcome.html.erb:10
+msgid "Add Trend Counter"
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:9
+msgid "Name"
+msgstr "Nom"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:10
+msgid "Action"
+msgstr "Acció"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:16
+msgid "Show Trends"
+msgstr "Mostra les tendències"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:19
+msgid "Edit"
+msgstr "Edita"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:20
+msgid "Delete all the trend history for %s?"
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:28
+msgid "Last update:"
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/new.html.erb:1
+msgid "Create Trend"
+msgstr "Crea una tendència"
+
+#: ../app/views/foreman_statistics/trends/show.html.erb:7
+msgid "last %s day"
+msgid_plural "last %s days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/views/foreman_statistics/trends/show.html.erb:8
+msgid "Number of Hosts"
+msgstr "Nombre d'amfitrions"
+
+#: ../app/views/foreman_statistics/trends/show.html.erb:16
+msgid "Hosts"
+msgstr "Amfitrions"
+
+#: ../app/views/foreman_statistics/trends/welcome.html.erb:7
+msgid "Trends in Foreman allow you to track changes in your infrastructure over time. It allows you to track both Foreman related information and to any fact. The Trend pages give a graph of how the number of hosts with that value have changed over time, and list the current hosts."
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/welcome.html.erb:8
+msgid "Learn more about this in the documentation."
+msgstr "Obteniu més informació sobre això a la documentació."
+
+#: ../lib/foreman_statistics/engine.rb:69 ../webpack/src/Router/StatisticsPage/StatisticsPage.js:8
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#: ../webpack/src/Components/StatisticsChartsList/index.js:14
+msgid "No data available"
+msgstr "Sense dades disponibles"
+
+#: ../webpack/src/Components/StatisticsChartsList/index.js:15
+msgid "Expand the chart"
+msgstr "Expandeix la gràfica"
+
+#: ../webpack/src/Router/StatisticsPage/Statistics/Statistics.js:13
+msgid "No Charts To Load"
+msgstr ""
+
+#: action_names.rb:2
+msgid "Action with sub plans"
+msgstr ""
+
+#: action_names.rb:3
+msgid "Import facts"
+msgstr ""
+
+#: action_names.rb:4
+msgid "Import Puppet classes"
+msgstr ""
+
+#: action_names.rb:5
+msgid "Remote action:"
+msgstr ""
+
+#: gemspec.rb:2
+msgid "Statistics and Trends for Foreman gives users overview of their infrastructure."
+msgstr ""